'+jsonData.rss[article].title+'
'+jsonData.rss[article].date+''+jsonData.rss[article].short_desc+' '+read_more+'
{if $is_rtl}
-
+
-
+
+
+
+
+
+
{else}
-
+
-
+
{/if}
-
+
+
+
+
+
+
';
+ }
+ }
+ });
}
-$(document).ready( function () {
- $('#calendar_form input[type="submit"]').on('click', function(elt) {
- elt.preventDefault();
- setDashboardDateRange(elt.currentTarget.name);
- });
+$(document).ready(function() {
+ $('#calendar_form input[type="submit"]').on('click', function(elt) {
+ elt.preventDefault();
+ setDashboardDateRange(elt.currentTarget.name);
+ });
- refreshDashboard(false, false);
- getBlogRss();
- bindSubmitDashConfig();
- bindCancelDashConfig();
+ refreshDashboard(false, false);
+ getBlogRss();
+ bindSubmitDashConfig();
+ bindCancelDashConfig();
- $('#page-header-desc-configuration-switch_demo').tooltip().click(function(e) {
- $.ajax({
- url : dashboard_ajax_url,
- data : {
- ajax:true,
- action:'setSimulationMode',
- PS_DASHBOARD_SIMULATION: $(this).find('i').hasClass('process-icon-toggle-on') ? 0 : 1
- },
- success : function(result) {
- if ($('#page-header-desc-configuration-switch_demo i').hasClass('process-icon-toggle-on')) {
- $('#page-header-desc-configuration-switch_demo i').removeClass('process-icon-toggle-on').addClass('process-icon-toggle-off');
- } else {
- $('#page-header-desc-configuration-switch_demo i').removeClass('process-icon-toggle-off').addClass('process-icon-toggle-on');
- }
- refreshDashboard(false, false);
- }
- });
- });
-});
+ $('#page-header-desc-configuration-switch_demo').tooltip().click(function(e) {
+ $.ajax({
+ url: dashboard_ajax_url,
+ data: {
+ ajax: true,
+ action: 'setSimulationMode',
+ PS_DASHBOARD_SIMULATION: $(this).find('i').hasClass('process-icon-toggle-on') ? 0 : 1
+ },
+ success: function(result) {
+ if ($('#page-header-desc-configuration-switch_demo i').hasClass('process-icon-toggle-on')) {
+ $('#page-header-desc-configuration-switch_demo i').removeClass('process-icon-toggle-on').addClass('process-icon-toggle-off');
+ } else {
+ $('#page-header-desc-configuration-switch_demo i').removeClass('process-icon-toggle-off').addClass('process-icon-toggle-on');
+ }
+ refreshDashboard(false, false);
+ }
+ });
+ });
+});
\ No newline at end of file
diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index 9326aa862..9d661a6b5 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -78,8 +78,9 @@ public function hookActionAdminControllerSetMedia()
array(
_PS_JS_DIR_.'date.js',
_PS_JS_DIR_.'tools.js'
- ) // retro compat themes 1.5
- );
+ ) // retro compat themes 1.5
+ );
+ $this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
}
}
diff --git a/modules/dashactivity/translations/en.php b/modules/dashactivity/translations/en.php
new file mode 100644
index 000000000..065be4431
--- /dev/null
+++ b/modules/dashactivity/translations/en.php
@@ -0,0 +1,46 @@
+dashactivity_0369e7f54bf8a30b2766e6a9a708de0b'] = 'Dashboard Activity';
+$_MODULE['<{dashactivity}prestashop>dashactivity_02b5205ddff3073efc5c8b5b9cc165ba'] = '(from %s to %s)';
+$_MODULE['<{dashactivity}prestashop>dashactivity_14542f5997c4a02d4276da364657f501'] = 'Direct link';
+$_MODULE['<{dashactivity}prestashop>dashactivity_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
+$_MODULE['<{dashactivity}prestashop>dashactivity_ea4788705e6873b424c65e91c2846b19'] = 'Cancel';
+$_MODULE['<{dashactivity}prestashop>dashactivity_914030b0a079e4eec3b3f5090c0fc35a'] = 'Active cart';
+$_MODULE['<{dashactivity}prestashop>dashactivity_78fa968db0e87c6fc302614b26f93b5d'] = 'How long (in minutes) a cart is to be considered as active after the last recorded change (default: 30 min).';
+$_MODULE['<{dashactivity}prestashop>dashactivity_47b8a33a5335cce8d4e353c4d1743f31'] = 'Online visitor';
+$_MODULE['<{dashactivity}prestashop>dashactivity_b13a895857368f29e5e127767388b0ab'] = 'How long (in minutes) a visitor is to be considered as online after their last action (default: 30 min).';
+$_MODULE['<{dashactivity}prestashop>dashactivity_6ad366c171531a83ffbc5625e159f340'] = 'Abandoned cart (min)';
+$_MODULE['<{dashactivity}prestashop>dashactivity_8f1f252cfd3cbbcba7a2325f12e3dbc4'] = 'How long (in hours) after the last action a cart is to be considered as abandoned (default: 24 hrs).';
+$_MODULE['<{dashactivity}prestashop>dashactivity_c760237f74bcc7e3f90ad956086edb66'] = 'hrs';
+$_MODULE['<{dashactivity}prestashop>dashactivity_a5493eb7cba36f452249d093e7757adc'] = 'Abandoned cart (max)';
+$_MODULE['<{dashactivity}prestashop>dashactivity_45e9c82415a3bee4413485c6bcb4347f'] = 'How long (in hours) after the last action a cart is no longer to be considered as abandoned (default: 24 hrs).';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_91b1b529580f2bb429493a51a1af932b'] = 'Activity overview';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_f1206f9fadc5ce41694f69129aecac26'] = 'Configure';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_63a6a88c066880c5ac42394a22803ca6'] = 'Refresh';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_254f642527b45bc260048e30704edb39'] = 'Configuration';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_edfc5fccc0439856b5bd432522ef47aa'] = 'Online Visitors';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_962b7da7912bc637b03626e23b5832b5'] = 'in the last %d minutes';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_7aaacf26dbf7d8929916618bb57d81f8'] = 'Active Shopping Carts';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_24042b0e4b783724dac4178df4db5d68'] = 'Currently Pending';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_247d96cbab5bfc79dff10eb2ce6d8897'] = 'Return/Exchanges';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_54e85d70ea67acdcc86963b14d6223a8'] = 'Abandoned Carts';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_1c4407dd95b9ef941d30c2838208977e'] = 'Out of Stock Products';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_a274f4d4670213a9045ce258c6c56b80'] = 'Notifications';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_a644e8cd597f2b92aa52861632c0363d'] = 'New Messages';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_56d4e9a4c8e9f47549e8129393b3740f'] = 'Product Reviews';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_e539ae01694149c9e12295fe564a376b'] = 'Customers & Newsletters';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_8471314b4a53476fbf2379d9a0f7ac28'] = 'New Customers';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_d833d1b3c98b980090f79ad42badcf9f'] = 'New Subscriptions';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_e42bc03dcf18091455cb8a06ce1d56e9'] = 'Total Subscribers';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_e7935ae6c516d89405ec532359d2d75a'] = 'Traffic';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_1a4aeb4ca6cd736a4a7b25d8657d9972'] = 'Link to your Google Analytics account';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_d7e637a6e9ff116de2fa89551240a94d'] = 'Visits';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_945f170a18e4894c90381a3d01bdef8b'] = 'Unique Visitors';
+$_MODULE['<{dashactivity}prestashop>dashboard_zone_one_0fcff541ec15c6ed895d5dec49436488'] = 'Traffic Sources';
+
+
+return $_MODULE;
diff --git a/modules/dashactivity/views/css/dashactivity.css b/modules/dashactivity/views/css/dashactivity.css
new file mode 100644
index 000000000..aec00c179
--- /dev/null
+++ b/modules/dashactivity/views/css/dashactivity.css
@@ -0,0 +1,116 @@
+/**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author PrestaShop SA
+* @copyright 2007-2015 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+/* start */
+.bootstrap #dashboard #dashactivity svg {
+ height: 150px;
+}
+
+/* end */
+#dashactivity .activity-section {
+ position: relative;
+ padding-bottom: 2px;
+ margin-bottom: 15px;
+ border-bottom: 2px solid #D3D8DB;
+}
+
+#dashactivity .title span {
+ margin-bottom: 4px;
+ font-weight: bold;
+ font-size: 18px;
+ color: #555555;
+}
+
+#dashactivity .value {
+ position: absolute;
+ top: 0;
+ right: 0;
+ text-align: right;
+}
+
+#dashactivity .value span {
+ font-weight: bold;
+ font-size: 18px;
+ text-align: right;
+ color: #555555;
+}
+
+#dashactivity .sub-title small {
+ font-weight: normal;
+ font-size: 12px;
+ color: #999999;
+}
+
+#dashactivity .activity-section a, a:hover, a:active {
+ color: #555555;
+}
+
+#dashactivity .stats-list {
+ position: relative;
+ list-style: none;
+ margin: 0;
+ padding: 0;
+ padding-top: 10px;
+}
+
+#dashactivity .stats-list > li:not(:last-child) {
+ margin-bottom: 10px;
+}
+
+#dashactivity .stats-list .item-label span {
+ margin-bottom: 4px;
+ font-size: 16px;
+ color: #555555;
+}
+
+#dashactivity .stats-list .item-value {
+ position: absolute;
+ right: 0;
+ text-align: right;
+}
+
+#dashactivity .stats-list .item-value span {
+ font-weight: bold;
+ font-size: 18px;
+ text-align: right;
+ color: #555555;
+}
+
+#dashactivity #dash_traffic {
+ border: none;
+}
+
+#dashactivity #dash_traffic .stats-list .data_list_small {
+ list-style: none;
+}
+
+#dashactivity #dash_traffic #dash_traffic_chart2 {
+ margin-top: -30px;
+ margin-bottom: -40px;
+}
+
+#dashactivity #dash_traffic_chart2 svg {
+ height: 200px !important; /* default size override */
+}
\ No newline at end of file
diff --git a/modules/dashactivity/views/css/index.php b/modules/dashactivity/views/css/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashactivity/views/css/index.php
@@ -0,0 +1,29 @@
+
-
\ No newline at end of file
diff --git a/modules/dashguestcycle/views/templates/hook/index.php b/modules/dashguestcycle/views/templates/hook/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashguestcycle/views/templates/hook/index.php
@@ -0,0 +1,29 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashoccupancy/dashoccupancy.php b/modules/dashoccupancy/dashoccupancy.php
new file mode 100644
index 000000000..b1d317833
--- /dev/null
+++ b/modules/dashoccupancy/dashoccupancy.php
@@ -0,0 +1,143 @@
+name = 'dashoccupancy';
+ $this->tab = 'dashboard';
+ $this->version = '1.0.0';
+ $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6');
+ $this->author = 'Webkul';
+ $this->bootstrap = true;
+ parent::__construct();
+ $this->displayName = $this->l('Dashboard Occupancy');
+ $this->description = $this->l('Adds a block with a graphical representation of occupancy of your hotel`s room.');
+ $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+
+ $this->allow_push = true;
+
+ }
+
+ public function install()
+ {
+ return (parent::install()
+ && $this->registerHook('dashboardZoneTwo')
+ && $this->registerHook('dashboardData')
+ && $this->registerHook('actionAdminControllerSetMedia')
+ );
+ }
+
+ public function hookActionAdminControllerSetMedia()
+ {
+ if (get_class($this->context->controller) == 'AdminDashboardController') {
+ $this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
+ }
+ $this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
+ }
+
+ public function hookDashboardZoneTwo($params)
+ {
+ Media::addJsDef(array(
+ 'ajaxUrl' => $this->context->link->getModuleLink($this->name, 'chartdata'),
+ 'date_from' => $params['date_from'],
+ 'date_to' => $params['date_to'],
+ ));
+ $availPieChartLabelData = AdminStatsController::getAvailPieChartData($params['date_from'], $params['date_to']);
+ $totalRooms = sprintf("%02d", AdminStatsController::getTotalRooms());
+ $this->context->smarty->assign(array(
+ 'totalRooms' => $totalRooms,
+ 'inactiveRooms' => $availPieChartLabelData['inactive'],
+ 'availableRooms' => $availPieChartLabelData['available'],
+ 'occupiedRooms' => $availPieChartLabelData['occupied'],
+ 'date_occupancy_range' => $this->l('(from %s to %s)'),
+ 'date_occupancy_avail_format' => $this->context->language->date_format_lite,
+ ));
+ return $this->display(__FILE__, 'dashboard_zone_two.tpl');
+ }
+
+ public function hookDashboardData($params)
+ {
+ $totalRooms = sprintf("%02d", AdminStatsController::getTotalRooms());
+ $data = array();
+ $data['total_rooms'] = $totalRooms;
+
+ if (Configuration::get('PS_DASHBOARD_SIMULATION'))
+ {
+ $data['occupied'] = round(rand(0, 20));
+ $data['available'] = round(rand(0, 20));
+ $data['inactive'] = round(rand(0, 20));
+ $availPieChartData = array();
+ $objChartData = array();
+ $objChartData['label'] = $this->l('Occupied');;
+ $objChartData['value'] = $data['occupied']*100/$totalRooms;
+ $availPieChartData[] = $objChartData;
+
+ $objChartData = array();
+ $objChartData['label'] = $this->l('Available');
+ $objChartData['value'] = $data['available']*100/$totalRooms;
+ $availPieChartData[] = $objChartData;
+
+ $objChartData = array();
+ $objChartData['label'] = $this->l('Inactive/ maintainance');
+ $objChartData['value'] = $data['inactive']*100/$totalRooms;
+ $availPieChartData[] = $objChartData;
+
+ $data['chart_data'] = $availPieChartData;
+
+ } else {
+ $dateFrom = $params['date_from'];
+ $dateTo = $params['date_to'];
+ $availPieChartLabelData = AdminStatsController::getAvailPieChartData(
+ $dateFrom,
+ $dateTo
+ );
+
+ $availPieChartData = array();
+ $objChartData = array();
+ $objChartData['label'] = $this->l('Occupied');;
+ $objChartData['value'] = $availPieChartLabelData['occupied']*100/$totalRooms;
+ $availPieChartData[] = $objChartData;
+
+ $objChartData = array();
+ $objChartData['label'] = $this->l('Available');
+ $objChartData['value'] = $availPieChartLabelData['available']*100/$totalRooms;
+ $availPieChartData[] = $objChartData;
+
+ $objChartData = array();
+ $objChartData['label'] = $this->l('Inactive/ maintainance');
+ $objChartData['value'] = $availPieChartLabelData['inactive']*100/$totalRooms;
+ $availPieChartData[] = $objChartData;
+
+ $data['occupied'] = $availPieChartLabelData['occupied'];
+ $data['available'] = $availPieChartLabelData['available'];
+ $data['inactive'] = $availPieChartLabelData['inactive'];
+ $data['chart_data'] = $availPieChartData;
+
+ }
+
+ return array('data_avail_pie_chart' => $data);
+ }
+}
diff --git a/modules/dashoccupancy/index.php b/modules/dashoccupancy/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashoccupancy/index.php
@@ -0,0 +1,29 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashoccupancy/views/js/dashoccupancy.js b/modules/dashoccupancy/views/js/dashoccupancy.js
new file mode 100644
index 000000000..516502741
--- /dev/null
+++ b/modules/dashoccupancy/views/js/dashoccupancy.js
@@ -0,0 +1,62 @@
+/**
+ * 2010-2021 Webkul.
+ *
+ * NOTICE OF LICENSE
+ *
+ * All right is reserved,
+ * Please go through LICENSE.txt file inside our module
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please refer to CustomizationPolicy.txt file inside our module for more information.
+ *
+ * @author Webkul IN
+ * @copyright 2010-2021 Webkul IN
+ * @license LICENSE.txt
+ */
+
+// PIE CHART CODE
+function generateAvailablityPieChart(chartData) {
+ nv.addGraph(function() {
+ var chart = nv.models.pieChart()
+ .x(function(d) { return d.label })
+ .y(function(d) { return d.value })
+ .showLabels(true)
+ .showLegend(false)
+ .labelThreshold(.01)
+ .labelType("percent")
+ .donut(true)
+ .donutRatio(0.35)
+ .color(["#A569DF", "#56CE56", "#FF655C"]);
+
+ d3.select("#availablePieChart svg")
+ .datum(chartData)
+ .transition().duration(350)
+ .call(chart);
+ nv.utils.windowResize(chart.update);
+ return chart;
+ });
+}
+
+$(document).ready(function() {
+ if (typeof date_occupancy_range === "undefined")
+ var date_occupancy_range = '(from %s to %s)';
+
+ if (typeof date_occupancy_avail_format === "undefined")
+ var date_occupancy_avail_format = 'Y-mm-dd';
+
+ $('#date-start').change(function() {
+ start = Date.parseDate($('#date-start').val(), 'Y-m-d');
+ end = Date.parseDate($('#date-end').val(), 'Y-m-d');
+ $('#dashoccupancy_date_range').html(sprintf(date_occupancy_range, start.format(date_occupancy_avail_format), end.format(date_occupancy_avail_format)));
+ });
+
+ $('#date-end').change(function() {
+ start = Date.parseDate($('#date-start').val(), 'Y-m-d');
+ end = Date.parseDate($('#date-end').val(), 'Y-m-d');
+
+ $('#dashoccupancy_date_range').html(sprintf(date_occupancy_range, start.format(date_occupancy_avail_format), end.format(date_occupancy_avail_format)));
+ });
+});
\ No newline at end of file
diff --git a/modules/dashoccupancy/views/js/index.php b/modules/dashoccupancy/views/js/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashoccupancy/views/js/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashoccupancy/views/templates/hook/dashboard_zone_two.tpl b/modules/dashoccupancy/views/templates/hook/dashboard_zone_two.tpl
new file mode 100644
index 000000000..0d6893f68
--- /dev/null
+++ b/modules/dashoccupancy/views/templates/hook/dashboard_zone_two.tpl
@@ -0,0 +1,94 @@
+{**
+* 2010-2021 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through LICENSE.txt file inside our module
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to CustomizationPolicy.txt file inside our module for more information.
+*
+* @author Webkul IN
+* @copyright 2010-2021 Webkul IN
+* @license LICENSE.txt
+*}
+
+
'.Tools::displayPrice($productPrice), + 'value' => ''. + Tools::htmlentitiesUTF8($product['product_name']).''. + '
'.Tools::displayPrice($productPrice), 'class' => 'text-center' ), array( 'id' => 'category', - 'value' => $category->name, + 'value' => ''. + Tools::htmlentitiesUTF8($roomTypeInfo['hotel_name']).'', 'class' => 'text-center' ), array( @@ -261,11 +282,6 @@ public function getTableBestSellers($date_from, $date_to) 'value' => Tools::displayPrice($product['sales']), 'class' => 'text-center' ), - array( - 'id' => 'net_profit', - 'value' => Tools::displayPrice($product['sales'] - $product['expenses']), - 'class' => 'text-center' - ) ); } @@ -282,7 +298,12 @@ public function getTableMostViewed($date_from, $date_to) ), array( 'id' => 'product', - 'title' => $this->l('Product'), + 'title' => $this->l('Room type'), + 'class' => 'text-center', + ), + array( + 'id' => 'hotel', + 'title' => $this->l('Hotel'), 'class' => 'text-center', ), array( @@ -297,35 +318,36 @@ public function getTableMostViewed($date_from, $date_to) ), array( 'id' => 'purchased', - 'title' => $this->l('Purchased'), + 'title' => $this->l('Booked'), 'class' => 'text-center', ), array( 'id' => 'rate', - 'title' => $this->l('Percentage'), + 'title' => $this->l('Conversion rate'), 'class' => 'text-center', ) ); - if (Configuration::get('PS_STATSDATA_PAGESVIEWS')) - { + if (Configuration::get('PS_STATSDATA_PAGESVIEWS')) { $products = $this->getTotalViewed($date_from, $date_to, (int)Configuration::get('DASHPRODUCT_NBR_SHOW_MOST_VIEWED')); $body = array(); - if (is_array($products) && count($products)) - foreach ($products as $product) - { + if (is_array($products) && count($products)) { + foreach ($products as $product) { $product_obj = new Product((int)$product['id_object'], true, $this->context->language->id); - if (!Validate::isLoadedObject($product_obj)) + if (!Validate::isLoadedObject($product_obj)) { continue; + } $img = ''; - if (($row_image = Product::getCover($product_obj->id)) && $row_image['id_image']) - { + if (($row_image = Product::getCover($product_obj->id)) && $row_image['id_image']) { $image = new Image($row_image['id_image']); $path_to_image = _PS_PROD_IMG_DIR_.$image->getExistingImgPath().'.'.$this->context->controller->imageType; $img = ImageManager::thumbnail($path_to_image, 'product_mini_'.$product_obj->id.'.'.$this->context->controller->imageType, 45, $this->context->controller->imageType); } + $objHRT = new HotelRoomType($product_obj->id); + $objHBI = new HotelBranchInformation($objHRT->id_hotel, $this->context->language->id); + $tr = array(); $tr[] = array( 'id' => 'product', @@ -334,7 +356,17 @@ public function getTableMostViewed($date_from, $date_to) ); $tr[] = array( 'id' => 'product', - 'value' => Tools::htmlentitiesUTF8($product_obj->name).'
'.Tools::displayPrice(Product::getPriceStatic((int)$product_obj->id)), + 'value' => ''. + Tools::htmlentitiesUTF8($product_obj->name).''.'
'. + Tools::displayPrice(Product::getPriceStatic((int)$product_obj->id)), + 'class' => 'text-center', + ); + $tr[] = array( + 'id' => 'hotel', + 'value' => ''. + Tools::htmlentitiesUTF8($objHBI->hotel_name).'', 'class' => 'text-center', ); $tr[] = array( @@ -351,7 +383,7 @@ public function getTableMostViewed($date_from, $date_to) $purchased = $this->getTotalProductPurchased($date_from, $date_to, (int)$product_obj->id); $tr[] = array( 'id' => 'purchased', - 'value' => $this->getTotalProductPurchased($date_from, $date_to, (int)$product_obj->id), + 'value' => $purchased, 'class' => 'text-center', ); $tr[] = array( @@ -361,9 +393,10 @@ public function getTableMostViewed($date_from, $date_to) ); $body[] = $tr; } + } } else - $body = '
';
+ }
+
public function getTableTop5Search()
{
$header = array(
@@ -436,7 +513,7 @@ public function getTotalProductSales($date_from, $date_to, $id_product)
WHERE od.`product_id` = '.(int)$id_product.'
'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
AND o.valid = 1
- AND o.`date_add` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"';
+ AND o.`date_add` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"';
return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
}
@@ -448,26 +525,23 @@ public function getTotalProductAddedCart($date_from, $date_to, $id_product)
FROM `'._DB_PREFIX_.'cart_product` cp
WHERE cp.`id_product` = '.(int)$id_product.'
'.Shop::addSqlRestriction(false, 'cp').'
- AND cp.`date_add` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"');
+ AND cp.`date_add` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"');
}
public function getTotalProductPurchased($date_from, $date_to, $id_product)
{
- return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
- SELECT count(`product_id`) as count
- FROM `'._DB_PREFIX_.'order_detail` od
- JOIN `'._DB_PREFIX_.'orders` o ON o.`id_order` = od.`id_order`
- WHERE od.`product_id` = '.(int)$id_product.'
- '.Shop::addSqlRestriction(false, 'od').'
- AND o.valid = 1
- AND o.`date_add` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"');
+ return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(
+ 'SELECT COUNT(hbd.`id_product`) AS `count`
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0 AND hbd.`id_product` = '.(int)$id_product.'
+ AND hbd.`date_add` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"'
+ );
}
public function getTotalViewed($date_from, $date_to, $limit = 10)
{
$gapi = Module::isInstalled('gapi') ? Module::getInstanceByName('gapi') : false;
- if (Validate::isLoadedObject($gapi) && $gapi->isConfigured())
- {
+ if (Validate::isLoadedObject($gapi) && $gapi->isConfigured()) {
$products = array();
// Only works with the default product URL pattern at this time
if ($result = $gapi->requestReportData('ga:pagePath', 'ga:visits', $date_from, $date_to, '-ga:visits', 'ga:pagePath=~/([a-z]{2}/)?([a-z]+/)?[0-9][0-9]*\-.*\.html$', 1, 10))
@@ -479,33 +553,44 @@ public function getTotalViewed($date_from, $date_to, $limit = 10)
return $products;
}
- else
+ else {
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
- SELECT p.id_object, pv.counter
+ SELECT p.id_object, SUM(pv.counter) AS `counter`
FROM `'._DB_PREFIX_.'page_viewed` pv
LEFT JOIN `'._DB_PREFIX_.'date_range` dr ON pv.`id_date_range` = dr.`id_date_range`
LEFT JOIN `'._DB_PREFIX_.'page` p ON pv.`id_page` = p.`id_page`
LEFT JOIN `'._DB_PREFIX_.'page_type` pt ON pt.`id_page_type` = p.`id_page_type`
WHERE pt.`name` = \'product\'
'.Shop::addSqlRestriction(false, 'pv').'
- AND dr.`time_start` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"
- AND dr.`time_end` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"
+ AND dr.`time_start` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"
+ AND dr.`time_end` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"
+ GROUP BY p.id_object
+ ORDER BY `counter` DESC
LIMIT '.(int)$limit);
+ }
}
- public function getMostSearchTerms($date_from, $date_to, $limit = 10)
+ public function getMostSearchedHotels($date_from, $date_to, $limit = 10)
{
- if (!Module::isInstalled('statssearch'))
+ if (!Module::isInstalled('statsdata')) {
return array();
+ }
- return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
- SELECT `keywords`, count(`id_statssearch`) as count_keywords, `results`
- FROM `'._DB_PREFIX_.'statssearch` ss
- WHERE ss.`date_add` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"
- '.Shop::addSqlRestriction(false, 'ss').'
- GROUP BY ss.`keywords`
- ORDER BY `count_keywords` DESC
- LIMIT '.(int)$limit);
+ $pageType = Page::getPageTypeByName('category');
+ return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
+ 'SELECT hbi.`id` AS `id_hotel`, cl.`name` AS `hotel_name`, pv.`counter` AS `views`
+ FROM `'._DB_PREFIX_.'page_viewed` pv
+ LEFT JOIN `'._DB_PREFIX_.'page` p ON (p.`id_page` = pv.`id_page`)
+ LEFT JOIN `'._DB_PREFIX_.'page_type` pt ON (pt.`id_page_type` = p.`id_page_type`)
+ LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (cl.`id_category` = p.`id_object`)
+ LEFT JOIN `'._DB_PREFIX_.'htl_branch_info` hbi ON (hbi.`id_category` = hbi.`id_category`)
+ LEFT JOIN `'._DB_PREFIX_.'date_range` dr ON (pv.`id_date_range` = dr.`id_date_range`)
+ WHERE pt.`name` = "'.pSQL('category').'"
+ AND dr.`time_start` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"
+ AND dr.`time_end` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"
+ GROUP BY p.`id_page_type`, p.`id_object`
+ LIMIT '.(int)$limit
+ );
}
public function renderConfigForm()
@@ -526,11 +611,11 @@ public function renderConfigForm()
$inputs = array(
array(
- 'label' => $this->l('Number of "Recent Orders" to display'),
+ 'label' => $this->l('Number of "Recent Bookings" to display'),
'config_name' => 'DASHPRODUCT_NBR_SHOW_LAST_ORDER'
),
array(
- 'label' => $this->l('Number of "Best Sellers" to display'),
+ 'label' => $this->l('Number of "Best Selling" to display'),
'config_name' => 'DASHPRODUCT_NBR_SHOW_BEST_SELLER'
),
array(
diff --git a/modules/dashproducts/translations/en.php b/modules/dashproducts/translations/en.php
new file mode 100644
index 000000000..445245a38
--- /dev/null
+++ b/modules/dashproducts/translations/en.php
@@ -0,0 +1,50 @@
+dashproducts_6655df4af87b2038afd507a33545a56d'] = 'Dashboard Products';
+$_MODULE['<{dashproducts}prestashop>dashproducts_4a528e24be5aca96e8a15b256efe1f31'] = 'Adds a block with a table of your latest orders and a ranking of your products';
+$_MODULE['<{dashproducts}prestashop>dashproducts_2ea989f83006e233627987293f4bde0a'] = 'Customer Name';
+$_MODULE['<{dashproducts}prestashop>dashproducts_068f80c7519d0528fb08e82137a72131'] = 'Products';
+$_MODULE['<{dashproducts}prestashop>dashproducts_96b0141273eabab320119c467cdcaf17'] = 'Total';
+$_MODULE['<{dashproducts}prestashop>dashproducts_58ef6750a23ba432fc1377b7de085d9f'] = 'Tax excl.';
+$_MODULE['<{dashproducts}prestashop>dashproducts_44749712dbec183e983dcd78a7736c41'] = 'Date';
+$_MODULE['<{dashproducts}prestashop>dashproducts_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
+$_MODULE['<{dashproducts}prestashop>dashproducts_3ec365dd533ddb7ef3d1c111186ce872'] = 'Details';
+$_MODULE['<{dashproducts}prestashop>dashproducts_be53a0541a6d36f6ecb879fa2c584b08'] = 'Image';
+$_MODULE['<{dashproducts}prestashop>dashproducts_deb10517653c255364175796ace3553f'] = 'Product';
+$_MODULE['<{dashproducts}prestashop>dashproducts_3adbdb3ac060038aa0e6e6c138ef9873'] = 'Category';
+$_MODULE['<{dashproducts}prestashop>dashproducts_2aed3d711270a6ed67d21ec2d7cd4af8'] = 'Total sold';
+$_MODULE['<{dashproducts}prestashop>dashproducts_11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales';
+$_MODULE['<{dashproducts}prestashop>dashproducts_9e79098315622e58529d664b9a8b3cf8'] = 'Net profit';
+$_MODULE['<{dashproducts}prestashop>dashproducts_ed4832a84ee072b00a6740f657183598'] = 'Views';
+$_MODULE['<{dashproducts}prestashop>dashproducts_2c04f1ad7694378897b98624780327ff'] = 'Added to cart';
+$_MODULE['<{dashproducts}prestashop>dashproducts_ce4ee01637f4279d02d0f232459dc9a4'] = 'Purchased';
+$_MODULE['<{dashproducts}prestashop>dashproducts_37be07209f53a5d636d5c904ca9ae64c'] = 'Percentage';
+$_MODULE['<{dashproducts}prestashop>dashproducts_1eb18ea1d018abef5759cef60ddc289b'] = 'You must enable the "Save global page views" option from the "Data mining for statistics" module in order to display the most viewed products, or use the Google Analytics module.';
+$_MODULE['<{dashproducts}prestashop>dashproducts_cf5f3091e30dee6597885d8c0e0c357f'] = 'Term';
+$_MODULE['<{dashproducts}prestashop>dashproducts_13348442cc6a27032d2b4aa28b75a5d3'] = 'Search';
+$_MODULE['<{dashproducts}prestashop>dashproducts_fd69c5cf902969e6fb71d043085ddee6'] = 'Results';
+$_MODULE['<{dashproducts}prestashop>dashproducts_38fb7d24e0d60a048f540ecb18e13376'] = ' Save ';
+$_MODULE['<{dashproducts}prestashop>dashproducts_ea4788705e6873b424c65e91c2846b19'] = 'Cancel';
+$_MODULE['<{dashproducts}prestashop>dashproducts_85bf7474324d7d02725e4dca586afcd9'] = 'Number of "Recent Orders" to display';
+$_MODULE['<{dashproducts}prestashop>dashproducts_735b8c7f6d50b4c6f818deeab3cdea4a'] = 'Number of "Best Sellers" to display';
+$_MODULE['<{dashproducts}prestashop>dashproducts_14d24dddc4c67abf8364b980b2ccd5a2'] = 'Number of "Most Viewed" to display';
+$_MODULE['<{dashproducts}prestashop>dashproducts_f1ee1eaab342241138d45f35f4d8466a'] = 'Number of "Top Searches" to display';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_3e361ce73ecabd6524af286d55809ed7'] = 'Products and Sales';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_f1206f9fadc5ce41694f69129aecac26'] = 'Configure';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Refresh';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Configuration';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_fd3458547ef9c3a8bd0e1e1b4ef2b4dd'] = 'Recent Orders';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_d7b2933ba512ada478c97fa43dd7ebe6'] = 'Best Sellers';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_be5006eb5af9ab6dbca803f8d3065bbc'] = 'Most Viewed';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_1eb5e5713d7363e921dd7f5500b6d212'] = 'Top Searches';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_3d23ac9ab254a9f1014c3a859b01bcfc'] = 'Last %d orders';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_82f0f8d535196ce2a6ea16652d981f94'] = 'Top %d products';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_5da618e8e4b89c66fe86e32cdafde142'] = 'From';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_01b6e20344b68835c5ed1ddedf20d531'] = 'to';
+$_MODULE['<{dashproducts}prestashop>dashboard_zone_two_1daaca459ce1e6610e0b97a9ad723f27'] = 'Top %d most search terms';
+
+
+return $_MODULE;
diff --git a/modules/dashproducts/views/css/dashproducts.css b/modules/dashproducts/views/css/dashproducts.css
new file mode 100644
index 000000000..c0008a3b3
--- /dev/null
+++ b/modules/dashproducts/views/css/dashproducts.css
@@ -0,0 +1,73 @@
+/**
+* 2010-2021 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through LICENSE.txt file inside our module
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to CustomizationPolicy.txt file inside our module for more information.
+*
+* @author Webkul IN
+* @copyright 2010-2021 Webkul IN
+* @license LICENSE.txt
+*/
+
+/* start */
+.bootstrap #dashboard #dashproducts nav {
+ margin-bottom: 10px;
+ font: 400 1.1em/120% "Ubuntu Condensed", Helvetica, Arial, sans-serif;
+ text-transform: uppercase;
+ }
+/* end */
+
+.bootstrap #dashboard #dashproducts nav {
+ margin-top: 16px;
+ margin-bottom: 16px;
+ text-align: center;
+}
+
+#content.bootstrap #dashproducts section:last-child .tab-content.panel {
+ border-radius: 5px;
+ margin: 0 10px;
+}
+
+#dashproducts #table_top_10_most_search .hotel-thumbnail {
+ width: 55px;
+}
+
+#dashproducts section .nav-pills {
+ padding: 0 15%;
+ margin-top: 30px;
+ margin-bottom: 30px;
+}
+
+@media (max-width: 500px) {
+ #dashproducts section .nav-pills {
+ padding: 0 5%;
+ }
+}
+
+
+@media (max-width: 900px) {
+ #dashproducts section .nav-pills {
+ padding: 0 10%;
+ }
+}
+
+#dashproducts section .nav-pills .nav-item {
+ margin-bottom: 2px;
+}
+
+#dashproducts section .nav-pills .nav-item a {
+ border: 1px solid #00AFF0;
+ border-radius: 5px;
+}
+
+#dashproducts section .nav-pills .nav-item + .nav-item {
+ margin-left: 0px;
+}
\ No newline at end of file
diff --git a/modules/dashproducts/views/css/index.php b/modules/dashproducts/views/css/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashproducts/views/css/index.php
@@ -0,0 +1,29 @@
+
-* @copyright 2007-2016 PrestaShop SA
-* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
+* @author Webkul IN
+* @copyright 2010-2021 Webkul IN
+* @license LICENSE.txt
*}
-
-
- {l s='Products and Sales' mod='dashproducts'}
-
-
-
-
-
-
-
-
-
+
diff --git a/classes/CustomerMessage.php b/classes/CustomerMessage.php
index 553efaad5..efab7e2f1 100644
--- a/classes/CustomerMessage.php
+++ b/classes/CustomerMessage.php
@@ -118,4 +118,13 @@ public function delete()
}
return parent::delete();
}
+
+ public static function getMessagesByDate($date)
+ {
+ return Db::getInstance()->getValue(
+ 'SELECT COUNT(cm.`id_customer_message`)
+ FROM `'._DB_PREFIX_.'customer_message` cm
+ WHERE cm.`date_add` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'
+ );
+ }
}
diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php
index 8494928a5..91ffbceb6 100644
--- a/controllers/admin/AdminStatsController.php
+++ b/controllers/admin/AdminStatsController.php
@@ -542,7 +542,7 @@ public function displayAjaxGetKpi()
}
$value .= '%';
- // ConfigurationKPI::updateValue('CONVERSION_RATE_CHART', json_encode($data));
+ // ConfigurationKPI::updateValue('CONVERSION_RATE_CHART', Tools::jsonEncode($data));
ConfigurationKPI::updateValue('CONVERSION_RATE', $value);
ConfigurationKPI::updateValue('CONVERSION_RATE_EXPIRE', strtotime(date('Y-m-d 00:00:00', strtotime('+1 day'))));
break;
@@ -797,4 +797,223 @@ public function displayAjaxGetKpi()
}
die(json_encode(array('has_errors' => true)));
}
+
+ public static function getArrivalsByDate($date)
+ {
+ $totalArrivals = Db::getInstance()->getValue(
+ 'SELECT COUNT(hbd.`id_room`)
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0
+ AND hbd.`date_from` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'
+ );
+
+ $arrived = Db::getInstance()->getValue(
+ 'SELECT COUNT(hbd.`id_room`)
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0
+ AND hbd.`date_from` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"
+ AND hbd.`id_status` = '.(int)HotelBookingDetail::STATUS_CHECKED_IN
+ );
+
+ return array('arrived' => $arrived, 'total_arrivals' => $totalArrivals);
+ }
+
+ public static function getDeparturesByDate($date)
+ {
+ $totalDepartures = Db::getInstance()->getValue(
+ 'SELECT COUNT(hbd.`id_room`)
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0
+ AND hbd.`date_to` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'
+ );
+
+ $departed = Db::getInstance()->getValue(
+ 'SELECT COUNT(hbd.`id_room`)
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0
+ AND hbd.`date_to` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"
+ AND hbd.`id_status` = '.(int)HotelBookingDetail::STATUS_CHECKED_OUT
+ );
+
+ return array('departed' => $departed, 'total_departures' => $totalDepartures);
+ }
+
+ public static function getBookingsByDate($date)
+ {
+ return Db::getInstance()->getValue(
+ 'SELECT COUNT(o.`id_order`)
+ FROM `'._DB_PREFIX_.'orders` o
+ WHERE o.`date_add` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'
+ );
+ }
+
+ public static function getStayOversByDate($date)
+ {
+ return Db::getInstance()->getValue(
+ 'SELECT COUNT(hbd.`id_room`)
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0
+ AND hbd.`id_status` = '.(int)HotelBookingDetail::STATUS_CHECKED_IN.'
+ AND hbd.`date_to` > "'.pSQL($date).' 00:00:00"'
+ );
+ }
+
+ public static function getCancelledBookingsByDate($date)
+ {
+ return Db::getInstance()->getValue(
+ 'SELECT COUNT(o.`id_order`)
+ FROM `'._DB_PREFIX_.'orders` o
+ LEFT JOIN `'._DB_PREFIX_.'order_state` os ON (os.`id_order_state` = o.`current_state`)
+ WHERE o.`date_upd` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"
+ AND o.`current_state` = '.(int)Configuration::get('PS_OS_CANCELED')
+ );
+ }
+
+ public static function getGuestsByDate($date)
+ {
+ return Db::getInstance()->getRow(
+ 'SELECT SUM(hbd.`adult`) AS `adults`, SUM(hbd.`children`) AS `children`
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0
+ AND hbd.`date_from` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'
+ );
+ }
+
+ public static function getTotalRooms()
+ {
+ return Db::getInstance()->getValue(
+ 'SELECT COUNT("id") FROM `'._DB_PREFIX_.'htl_room_information`'
+ );
+ }
+
+ public static function getAvailPieChartData($date_from, $date_to)
+ {
+ $bookedRoomSql = 'SELECT hri.id FROM `'._DB_PREFIX_.'htl_booking_detail` as hbd LEFT JOIN
+ `'._DB_PREFIX_.'htl_room_information` as hri ON hbd.id_room = hri.id WHERE hbd.date_from BETWEEN "'
+ .pSQL($date_from).'" and "'.pSQL($date_to).'" OR hbd.date_to BETWEEN "'.pSQL($date_from).'" and "'
+ .pSQL($date_to).'" AND is_refunded = 0 AND is_back_order = 0';
+
+ $tempBookedRoomIds = Db::getInstance()->ExecuteS($bookedRoomSql);
+ $bookedRoomIds = array();
+ if (count($tempBookedRoomIds)) {
+ foreach ($tempBookedRoomIds as $value) {
+ if ($value['id']) {
+ $bookedRoomIds[] = $value['id'];
+ }
+ }
+ } else {
+ $bookedRoomIds[] = "0";
+ }
+
+ $availRoomSql = 'SELECT COUNT("id") FROM `'._DB_PREFIX_.'htl_room_information` WHERE id NOT IN
+ ('.implode(',', $bookedRoomIds).') AND id_status != '.(int)HotelRoomInformation::STATUS_INACTIVE.
+ ' AND id_status != '.(int)HotelRoomInformation::STATUS_TEMPORARY_INACTIVE;
+ $availRoomIds = Db::getInstance()->getValue($availRoomSql);
+
+ $inactiveSql = 'SELECT COUNT("id") FROM `'._DB_PREFIX_.'htl_room_information` WHERE id_status = 2 OR
+ id_status = 3';
+ $inactiveRoomIds = Db::getInstance()->getValue($inactiveSql);
+
+
+ $data = array();
+ $data['occupied'] = sprintf("%02d", count($tempBookedRoomIds));
+ $data['available'] = sprintf("%02d", $availRoomIds);
+ $data['inactive'] = sprintf("%02d", $inactiveRoomIds);
+ return $data;
+ }
+
+ public static function getAvailBarChartData($days, $date_from)
+ {
+ $newFromDate = $date_from;
+ $availability_data = array();
+ $from = strtotime($date_from." 00:00:00");
+ $to = min(time(), strtotime($date_from."+".$days." day 23:59:59"));
+
+ for ($date = $from; $date <= $to; $date = strtotime("+1 days", $date)) {
+ $newFromDate = date('Y-m-d', strtotime($newFromDate.'+'.($days/5).'days'));
+ $bookedRoomSql = 'SELECT hri.id FROM `'._DB_PREFIX_.
+ 'htl_booking_detail` as hbd LEFT JOIN `'._DB_PREFIX_
+ .'htl_room_information` as hri ON hbd.id_room = hri.id WHERE hbd.date_from <= "'.pSQL($newFromDate)
+ .'" and hbd.date_to >= "'.pSQL(date('Y-m-d' ,strtotime($newFromDate."+1 days"))).'" AND is_refunded = 0 AND is_back_order = 0';
+
+ $tempBookedRoomIds = Db::getInstance()->ExecuteS($bookedRoomSql);
+ $bookedRoomIds = array();
+ if (count($tempBookedRoomIds)) {
+ foreach ($tempBookedRoomIds as $value) {
+ if ($value['id']) {
+ $bookedRoomIds[] = $value['id'];
+ }
+ }
+ } else {
+ $bookedRoomIds[] = "0";
+ }
+
+ $availRoomSql = 'SELECT COUNT("id") FROM `'._DB_PREFIX_.'htl_room_information` WHERE id NOT IN
+ ('.implode(',', $bookedRoomIds).') AND id_status != '.(int)HotelRoomInformation::STATUS_INACTIVE.'
+ AND id_status != '.(int)HotelRoomInformation::STATUS_TEMPORARY_INACTIVE;
+ $availRoomIds = Db::getInstance()->getValue($availRoomSql);
+
+ $availability_data["values"][] = array($date, sprintf("%02d", $availRoomIds));
+ }
+ return $availability_data;
+ }
+
+ public static function getAverageDailyRate($dateFrom, $dateTo)
+ {
+ $result = Db::getInstance()->getRow(
+ 'SELECT
+ SUM(hbd.`total_price_tax_excl`) AS `rooms_revenue`,
+ COUNT(hbd.`id_room`) AS `room_sold`
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0
+ AND hbd.`date_add` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"'
+ );
+ return Tools::displayPrice($result['rooms_revenue'] ? $result['rooms_revenue'] / $result['room_sold'] : 0);
+ }
+
+ public static function getCancellationRate($dateFrom, $dateTo)
+ {
+ $numAllOrders = Db::getInstance()->getValue(
+ 'SELECT COUNT(o.`id_order`) FROM `'._DB_PREFIX_.'orders` o
+ WHERE o.`date_add` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"'
+ );
+
+ $numCancelledOrders = Db::getInstance()->getValue(
+ 'SELECT COUNT(o.`id_order`) FROM `'._DB_PREFIX_.'orders` o
+ LEFT JOIN `'._DB_PREFIX_.'order_state` os ON (os.`id_order_state` = o.`current_state`)
+ WHERE o.`date_add` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"
+ AND o.`current_state` = '.(int)Configuration::get('PS_OS_CANCELED')
+ );
+
+ if ($numCancelledOrders != 0) {
+ return round(($numCancelledOrders / $numAllOrders) * 100, 2).'%';
+ } else {
+ return '0.00%';
+ }
+ }
+
+ public static function getRevenue($dateFrom, $dateTo)
+ {
+ $result = Db::getInstance()->getValue(
+ 'SELECT SUM(`total_paid_tax_excl` / `conversion_rate`)
+ FROM `'._DB_PREFIX_.'orders`
+ WHERE `invoice_date` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"'
+ );
+ return Tools::displayPrice($result ? $result : 0);
+ }
+
+ public static function getNightsStayed($dateFrom, $dateTo)
+ {
+ return Db::getInstance()->getValue(
+ 'SELECT COUNT(a.`id`)
+ FROM `'._DB_PREFIX_.'htl_booking_detail` a
+ WHERE a.`is_refunded` = 0 AND a.`is_back_order` = 0
+ AND ((a.`id_status` = '.(int)HotelBookingDetail::STATUS_CHECKED_IN.'
+ AND a.`check_in` <= "'.pSQL($dateFrom).' 00:00:00" AND a.`check_out` > "'.pSQL($dateFrom).' 23:59:59") OR (
+ a.`id_status` = '.(int)HotelBookingDetail::STATUS_CHECKED_OUT.'
+ AND a.`check_in` >= "'.pSQL($dateFrom).' 00:00:00" AND a.`check_out` <= "'.pSQL($dateTo).' 23:59:59") OR (
+ a.`id_status` = '.(int)HotelBookingDetail::STATUS_CHECKED_IN.'
+ AND a.`check_in` <= "'.pSQL($dateTo).' 00:00:00" AND a.`check_out` > "'.pSQL($dateTo).' 23:59:59"))'
+ );
+ }
}
diff --git a/install/models/install.php b/install/models/install.php
index 96cafd57d..0634206e8 100644
--- a/install/models/install.php
+++ b/install/models/install.php
@@ -24,8 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*/
-require_once (_PS_TOOL_DIR_.'defuse/php-encryption/defuse-crypto.phar');
-
class InstallModelInstall extends InstallAbstractModel
{
const SETTINGS_FILE = 'config/settings.inc.php';
@@ -71,7 +69,6 @@ public function generateSettingsFile($database_server, $database_login, $databas
$this->setError($this->language->l('%s folder is not writable (check permissions)', dirname(self::SETTINGS_FILE)));
return false;
}
- $key = \Defuse\Crypto\Key::createNewRandomKey();
// Generate settings content and write file
$settings_constants = array(
@@ -85,12 +82,17 @@ public function generateSettingsFile($database_server, $database_login, $databas
'_PS_CACHE_ENABLED_' => '0',
'_COOKIE_KEY_' => Tools::passwdGen(56),
'_COOKIE_IV_' => Tools::passwdGen(8),
- '_NEW_COOKIE_KEY_' => $key->saveToAsciiSafeString(),
'_PS_CREATION_DATE_' => date('Y-m-d'),
'_PS_VERSION_' => _PS_INSTALL_VERSION_,
'_QLOAPPS_VERSION_' => _QLO_INSTALL_VERSION_,
);
+ // If mcrypt is activated, add Rijndael 128 configuration
+ if (function_exists('mcrypt_encrypt')) {
+ $settings_constants['_RIJNDAEL_KEY_'] = Tools::passwdGen(mcrypt_get_key_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
+ $settings_constants['_RIJNDAEL_IV_'] = base64_encode(mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC), MCRYPT_RAND));
+ }
+
$settings_content = " $value) {
@@ -665,9 +667,13 @@ public function getModulesList()
'wkfooterpaymentblock',
'wkfooternotificationblock',
'blocknavigationmenu',
+ 'dashguestcycle',
+ 'dashoccupancy',
+ 'dashavailability',
'dashactivity',
'dashtrends',
'dashgoals',
+ 'dashperformance',
'dashproducts',
'graphnvd3',
'statsdata',
diff --git a/js/admin/dashboard.js b/js/admin/dashboard.js
index a3252ee57..5c73118e5 100644
--- a/js/admin/dashboard.js
+++ b/js/admin/dashboard.js
@@ -1,26 +1,26 @@
/*
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-* @author PrestaShop SA
-* @copyright 2007-2017 PrestaShop SA
-* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
-*/
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author PrestaShop SA
+ * @copyright 2007-2017 PrestaShop SA
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
// This variables are defined in the dashboard view.tpl
// dashboard_ajax_url
@@ -30,295 +30,293 @@
// read_more
function refreshDashboard(module_name, use_push, extra) {
- var module_list = [];
- this.getWidget = function(module_id) {
- $.ajax({
- url : dashboard_ajax_url,
- data : {
- ajax: true,
- action:'refreshDashboard',
- module: module_list[module_id],
- dashboard_use_push: Number(use_push),
- extra: extra
- },
- // Ensure to get fresh data
- headers: { "cache-control": "no-cache" },
- cache: false,
- global: false,
- dataType: 'json',
- success : function(widgets){
- for (var widget_name in widgets) {
- for (var data_type in widgets[widget_name]) {
- window[data_type](widget_name, widgets[widget_name][data_type]);
- }
- }
- if (parseInt(dashboard_use_push) === 1) {
- refreshDashboard(false, true);
- }
- },
- contentType: 'application/json'
- });
- };
- if (module_name === false) {
- $('.widget').each( function () {
- module_list.push($(this).attr('id'));
- if (!use_push) {
- $(this).addClass('loading');
- }
- });
- }
- else {
- module_list.push(module_name);
- if (!use_push) {
- $('#'+module_name+' section').each( function (){
- $(this).addClass('loading');
- });
- }
- }
- for (var module_id in module_list) {
- if (use_push && !$('#'+module_list[module_id]).hasClass('allow_push')) {
- continue;
- }
- this.getWidget(module_id);
- }
+ var module_list = [];
+ this.getWidget = function(module_id) {
+ $.ajax({
+ url: dashboard_ajax_url,
+ data: {
+ ajax: true,
+ action: 'refreshDashboard',
+ module: module_list[module_id],
+ dashboard_use_push: Number(use_push),
+ extra: String(extra)
+ },
+ // Ensure to get fresh data
+ headers: { "cache-control": "no-cache" },
+ cache: false,
+ global: false,
+ dataType: 'json',
+ success: function(widgets) {
+ for (var widget_name in widgets) {
+ for (var data_type in widgets[widget_name]) {
+ window[data_type](widget_name, widgets[widget_name][data_type]);
+ }
+ }
+ if (parseInt(dashboard_use_push) === 1) {
+ refreshDashboard(false, true);
+ }
+ },
+ contentType: 'application/json'
+ });
+ };
+ if (module_name === false) {
+ $('.widget').each(function() {
+ module_list.push($(this).attr('id'));
+ if (!use_push) {
+ $(this).addClass('loading');
+ }
+ });
+ } else {
+ module_list.push(module_name);
+ if (!use_push) {
+ $('#' + module_name + ' section').each(function() {
+ $(this).addClass('loading');
+ });
+ }
+ }
+ for (var module_id in module_list) {
+ if (use_push && !$('#' + module_list[module_id]).hasClass('allow_push')) {
+ continue;
+ }
+ this.getWidget(module_id);
+ }
}
function setDashboardDateRange(action) {
- $('#datepickerFrom, #datepickerTo').parent('.input-group').removeClass('has-error');
- var data = 'ajax=true&action=setDashboardDateRange&submitDatePicker=true&'+$('#calendar_form').serialize()+'&'+action+'=1';
- $.ajax({
- url : adminstats_ajax_url,
- data : data,
- dataType: 'json',
- type: 'POST',
- success : function(jsonData){
- if (!jsonData.has_errors) {
- refreshDashboard(false, false);
- $('#datepickerFrom').val(jsonData.date_from);
- $('#datepickerTo').val(jsonData.date_to);
- }
- else {
- $('#datepickerFrom, #datepickerTo').parent('.input-group').addClass('has-error');
- }
- }
- });
+ $('#datepickerFrom, #datepickerTo').parent('.input-group').removeClass('has-error');
+ var data = 'ajax=true&action=setDashboardDateRange&submitDatePicker=true&' + $('#calendar_form').serialize() + '&' + action + '=1';
+ $.ajax({
+ url: adminstats_ajax_url,
+ data: data,
+ dataType: 'json',
+ type: 'POST',
+ success: function(jsonData) {
+ if (!jsonData.has_errors) {
+ refreshDashboard(false, false);
+ $('#datepickerFrom').val(jsonData.date_from);
+ $('#datepickerTo').val(jsonData.date_to);
+ } else {
+ $('#datepickerFrom, #datepickerTo').parent('.input-group').addClass('has-error');
+ }
+ }
+ });
}
function data_value(widget_name, data) {
- for (var data_id in data) {
- $('#'+data_id+' ').html(data[data_id]);
- $('#'+data_id+', #'+widget_name).closest('section').removeClass('loading');
- }
+ for (var data_id in data) {
+ $('#' + data_id + ' ').html(data[data_id]);
+ $('#' + data_id + ', #' + widget_name).closest('section').removeClass('loading');
+ }
+}
+
+function data_avail_pie_chart(widget_name, data) {
+ if (data) {
+ $("#pie_occupied_text").text(data.occupied + '/' + data.total_rooms);
+ $("#pie_avail_text").text(data.available);
+ $("#pie_inactive_text").text(data.inactive);
+ generateAvailablityPieChart(data.chart_data);
+ }
}
function data_trends(widget_name, data) {
- for (var data_id in data) {
- this.el = $('#'+data_id);
- this.el.html(data[data_id].value);
- if (data[data_id].way === 'up') {
- this.el.parent().removeClass('dash_trend_down').removeClass('dash_trend_right').addClass('dash_trend_up');
- }
- else if (data[data_id].way === 'down') {
- this.el.parent().removeClass('dash_trend_up').removeClass('dash_trend_right').addClass('dash_trend_down');
- }
- else {
- this.el.parent().removeClass('dash_trend_down').removeClass('dash_trend_up').addClass('dash_trend_right');
- }
- this.el.closest('section').removeClass('loading');
- }
+ for (var data_id in data) {
+ this.el = $('#' + data_id);
+ this.el.html(data[data_id].value);
+ if (data[data_id].way === 'up') {
+ this.el.parent().removeClass('dash_trend_down').removeClass('dash_trend_right').addClass('dash_trend_up');
+ } else if (data[data_id].way === 'down') {
+ this.el.parent().removeClass('dash_trend_up').removeClass('dash_trend_right').addClass('dash_trend_down');
+ } else {
+ this.el.parent().removeClass('dash_trend_down').removeClass('dash_trend_up').addClass('dash_trend_right');
+ }
+ this.el.closest('section').removeClass('loading');
+ }
}
function data_table(widget_name, data) {
- for (var data_id in data) {
- //fill header
- var tr = '';
- for (var header in data[data_id].header) {
- var head = data[data_id].header[header];
- var th = '';
- th += (head.wrapper_start ? ' '+head.wrapper_start+' ' : '' );
- th += head.title;
- th += (head.wrapper_stop ? ' '+head.wrapper_stop+' ' : '' );
- th += ' ';
- tr += th;
- }
- tr += ' ';
- $('#'+data_id+' thead').html(tr);
+ for (var data_id in data) {
+ //fill header
+ var tr = '';
+ for (var header in data[data_id].header) {
+ var head = data[data_id].header[header];
+ var th = '';
+ th += (head.wrapper_start ? ' ' + head.wrapper_start + ' ' : '');
+ th += head.title;
+ th += (head.wrapper_stop ? ' ' + head.wrapper_stop + ' ' : '');
+ th += ' ';
+ tr += th;
+ }
+ tr += ' ';
+ $('#' + data_id + ' thead').html(tr);
- //fill body
- $('#'+data_id+' tbody').html('');
+ //fill body
+ $('#' + data_id + ' tbody').html('');
- if(typeof data[data_id].body === 'string') {
- $('#'+data_id+' tbody').html('
'+data[data_id].body+'';
- for (var body_content in data[data_id].body[body_content_id]) {
- var body = data[data_id].body[body_content_id][body_content];
- var td = '';
- td += (body.wrapper_start ? ' '+body.wrapper_start+' ' : '' );
- td += body.value;
- td += (body.wrapper_stop ? ' '+body.wrapper_stop+' ' : '' );
- td += ' ';
- tr += td;
- }
- tr += ' ';
- $('#'+data_id+' tbody').append(tr);
- }
- }
- else {
- $('#'+data_id+' tbody').html(''+no_results_translation+'
' + data[data_id].body + '';
+ for (var body_content in data[data_id].body[body_content_id]) {
+ var body = data[data_id].body[body_content_id][body_content];
+ var td = '';
+ td += (body.wrapper_start ? ' ' + body.wrapper_start + ' ' : '');
+ td += body.value;
+ td += (body.wrapper_stop ? ' ' + body.wrapper_stop + ' ' : '');
+ td += ' ';
+ tr += td;
+ }
+ tr += ' ';
+ $('#' + data_id + ' tbody').append(tr);
+ }
+ } else {
+ $('#' + data_id + ' tbody').html('' + no_results_translation + ' '+item+''+data[data_id][item]+' ');
- }
- $('#'+data_id+', #'+widget_name).closest('section').removeClass('loading');
- }
+ for (var data_id in data) {
+ $('#' + data_id).html('');
+ for (var item in data[data_id]) {
+ $('#' + data_id).append('' + item + '' + data[data_id][item] + ' ');
+ }
+ $('#' + data_id + ', #' + widget_name).closest('section').removeClass('loading');
+ }
}
function getBlogRss() {
- $.ajax({
- url : dashboard_ajax_url,
- data : {
- ajax:true,
- action:'getBlogRss'
- },
- dataType: 'json',
- success : function(jsonData) {
- if (typeof jsonData !== 'undefined' && jsonData !== null && !jsonData.has_errors) {
- for (var article in jsonData.rss) {
- var article_html = '
'; - $('.dash_news .dash_news_content').append(article_html); - } - } - else { - $('.dash_news').hide(); - } - } - }); + $.ajax({ + url: dashboard_ajax_url, + data: { + ajax: true, + action: 'getBlogRss' + }, + dataType: 'json', + success: function(jsonData) { + if (typeof jsonData !== 'undefined' && jsonData !== null && !jsonData.has_errors) { + for (var article in jsonData.rss) { + var article_html = '
'; + $('.dash_news .dash_news_content').append(article_html); + } + } else { + $('.dash_news').hide(); + } + } + }); } function toggleDashConfig(widget) { - var func_name = widget + '_toggleDashConfig'; - if ($('#'+widget+' section.dash_config').hasClass('hide')) - { - $('#'+widget+' section').not('.dash_config').slideUp(500, function () { - $('#'+widget+' section.dash_config').fadeIn(500).removeClass('hide'); - if (window[func_name] != undefined) - window[func_name](); - }); - } - else - { - $('#'+widget+' section.dash_config').slideUp(500, function () { - $('#'+widget+' section').not('.dash_config').slideDown(500).removeClass('hide'); - $('#'+widget+' section.dash_config').addClass('hide'); - if (window[func_name] != undefined) - window[func_name](); - }); - } + var func_name = widget + '_toggleDashConfig'; + if ($('#' + widget + ' section.dash_config').hasClass('hide')) { + $('#' + widget + ' section').not('.dash_config').slideUp(500, function() { + $('#' + widget + ' section.dash_config').fadeIn(500).removeClass('hide'); + if (window[func_name] != undefined) + window[func_name](); + }); + } else { + $('#' + widget + ' section.dash_config').slideUp(500, function() { + $('#' + widget + ' section').not('.dash_config').slideDown(500).removeClass('hide'); + $('#' + widget + ' section.dash_config').addClass('hide'); + if (window[func_name] != undefined) + window[func_name](); + }); + } } function bindSubmitDashConfig() { - $('.submit_dash_config').on('click', function () { - saveDashConfig($(this).closest('section.widget').attr('id')); - return false; - }); + $('.submit_dash_config').on('click', function() { + saveDashConfig($(this).closest('section.widget').attr('id')); + return false; + }); } function bindCancelDashConfig() { - $('.cancel_dash_config').on('click', function () { - toggleDashConfig($(this).closest('section.widget').attr('id')); - return false; - }); + $('.cancel_dash_config').on('click', function() { + toggleDashConfig($(this).closest('section.widget').attr('id')); + return false; + }); } function saveDashConfig(widget_name) { - $('section#'+widget_name+' .form-group').removeClass('has-error'); - $('#'+widget_name+'_errors').remove(); - configs = ''; + $('section#' + widget_name + ' .form-group').removeClass('has-error'); + $('#' + widget_name + '_errors').remove(); + configs = ''; - $('#'+widget_name+' form input, #'+widget_name+' form textarea , #'+widget_name+' form select').each( function () { - if ($(this).attr('type') === 'radio' && !$(this).attr('checked')) { - return; - } - configs += '&configs['+$(this).attr('name')+']='+$(this).val(); - }); + $('#' + widget_name + ' form input, #' + widget_name + ' form textarea , #' + widget_name + ' form select').each(function() { + if ($(this).attr('type') === 'radio' && !$(this).attr('checked')) { + return; + } + configs += '&configs[' + $(this).attr('name') + ']=' + $(this).val(); + }); - data = 'ajax=true&action=saveDashConfig&module='+widget_name+configs+'&hook='+$('#'+widget_name).closest('[id^=hook]').attr('id'); + data = 'ajax=true&action=saveDashConfig&module=' + widget_name + configs + '&hook=' + $('#' + widget_name).closest('[id^=hook]').attr('id'); - $.ajax({ - url : dashboard_ajax_url, - data : data, - dataType: 'json', - error: function(XMLHttpRequest, textStatus, errorThrown) { - jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus); - }, - success : function(jsonData){ + $.ajax({ + url: dashboard_ajax_url, + data: data, + dataType: 'json', + error: function(XMLHttpRequest, textStatus, errorThrown) { + jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus); + }, + success: function(jsonData) { - if (!jsonData.has_errors) - { - $('#'+widget_name).find('section').not('.dash_config').remove(); - $('#'+widget_name).append($(jsonData.widget_html).find('section').not('.dash_config')); - refreshDashboard(widget_name); - toggleDashConfig(widget_name); - } - else - { - errors_str = '
';
- }
- }
- });
+ if (!jsonData.has_errors) {
+ if (widget_name == 'dashactivity') {
+ location.reload();
+ } else {
+ $('#' + widget_name).find('section').not('.dash_config').remove();
+ $('#' + widget_name).append($(jsonData.widget_html).find('section').not('.dash_config'));
+ }
+ refreshDashboard(widget_name);
+ toggleDashConfig(widget_name);
+ } else {
+ errors_str = ''+data[data_id].body+'
' + data[data_id].body + '
'; - $('.dash_news .dash_news_content').append(article_html); - } - } - else { - $('.dash_news').hide(); - } - } - }); + $.ajax({ + url: dashboard_ajax_url, + data: { + ajax: true, + action: 'getBlogRss' + }, + dataType: 'json', + success: function(jsonData) { + if (typeof jsonData !== 'undefined' && jsonData !== null && !jsonData.has_errors) { + for (var article in jsonData.rss) { + var article_html = '
' + jsonData.rss[article].title + '
' + jsonData.rss[article].date + '' + jsonData.rss[article].short_desc + ' ' + read_more + '
'; + $('.dash_news .dash_news_content').append(article_html); + } + } else { + $('.dash_news').hide(); + } + } + }); } function toggleDashConfig(widget) { - var func_name = widget + '_toggleDashConfig'; - if ($('#'+widget+' section.dash_config').hasClass('hide')) - { - $('#'+widget+' section').not('.dash_config').slideUp(500, function () { - $('#'+widget+' section.dash_config').fadeIn(500).removeClass('hide'); - if (window[func_name] != undefined) - window[func_name](); - }); - } - else - { - $('#'+widget+' section.dash_config').slideUp(500, function () { - $('#'+widget+' section').not('.dash_config').slideDown(500).removeClass('hide'); - $('#'+widget+' section.dash_config').addClass('hide'); - if (window[func_name] != undefined) - window[func_name](); - }); - } + var func_name = widget + '_toggleDashConfig'; + if ($('#' + widget + ' section.dash_config').hasClass('hide')) { + $('#' + widget + ' section').not('.dash_config').slideUp(500, function() { + $('#' + widget + ' section.dash_config').fadeIn(500).removeClass('hide'); + if (window[func_name] != undefined) + window[func_name](); + }); + } else { + $('#' + widget + ' section.dash_config').slideUp(500, function() { + $('#' + widget + ' section').not('.dash_config').slideDown(500).removeClass('hide'); + $('#' + widget + ' section.dash_config').addClass('hide'); + if (window[func_name] != undefined) + window[func_name](); + }); + } } function bindSubmitDashConfig() { - $('.submit_dash_config').on('click', function () { - saveDashConfig($(this).closest('section.widget').attr('id')); - return false; - }); + $('.submit_dash_config').on('click', function() { + saveDashConfig($(this).closest('section.widget').attr('id')); + return false; + }); } function bindCancelDashConfig() { - $('.cancel_dash_config').on('click', function () { - toggleDashConfig($(this).closest('section.widget').attr('id')); - return false; - }); + $('.cancel_dash_config').on('click', function() { + toggleDashConfig($(this).closest('section.widget').attr('id')); + return false; + }); } function saveDashConfig(widget_name) { - $('section#'+widget_name+' .form-group').removeClass('has-error'); - $('#'+widget_name+'_errors').remove(); - configs = ''; + $('section#' + widget_name + ' .form-group').removeClass('has-error'); + $('#' + widget_name + '_errors').remove(); + configs = ''; - $('#'+widget_name+' form input, #'+widget_name+' form textarea , #'+widget_name+' form select').each( function () { - if ($(this).attr('type') === 'radio' && !$(this).attr('checked')) { - return; - } - configs += '&configs['+$(this).attr('name')+']='+$(this).val(); - }); + $('#' + widget_name + ' form input, #' + widget_name + ' form textarea , #' + widget_name + ' form select').each(function() { + if ($(this).attr('type') === 'radio' && !$(this).attr('checked')) { + return; + } + configs += '&configs[' + $(this).attr('name') + ']=' + $(this).val(); + }); - data = 'ajax=true&action=saveDashConfig&module='+widget_name+configs+'&hook='+$('#'+widget_name).closest('[id^=hook]').attr('id'); + data = 'ajax=true&action=saveDashConfig&module=' + widget_name + configs + '&hook=' + $('#' + widget_name).closest('[id^=hook]').attr('id'); - $.ajax({ - url : dashboard_ajax_url, - data : data, - dataType: 'json', - error: function(XMLHttpRequest, textStatus, errorThrown) { - jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus); - }, - success : function(jsonData){ + $.ajax({ + url: dashboard_ajax_url, + data: data, + dataType: 'json', + error: function(XMLHttpRequest, textStatus, errorThrown) { + jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus); + }, + success: function(jsonData) { - if (!jsonData.has_errors) - { - $('#'+widget_name).find('section').not('.dash_config').remove(); - $('#'+widget_name).append($(jsonData.widget_html).find('section').not('.dash_config')); - refreshDashboard(widget_name); - toggleDashConfig(widget_name); - } - else - { - errors_str = '
';
- for (error in jsonData.errors)
- {
- errors_str += jsonData.errors[error]+'
'; - $('#'+error).closest('.form-group').addClass('has-error'); - } - errors_str += '
';
- $('section#'+widget_name+'_config header').after(errors_str);
- errors_str += ''; - $('#'+error).closest('.form-group').addClass('has-error'); - } - errors_str += '
';
+ for (error in jsonData.errors) {
+ errors_str += jsonData.errors[error] + '
'; + $('#' + error).closest('.form-group').addClass('has-error'); + } + errors_str += '
';
+ $('section#' + widget_name + '_config header').after(errors_str);
+ errors_str += ''; + $('#' + error).closest('.form-group').addClass('has-error'); + } + errors_str += '
- {l s='Activity overview' mod='dashactivity'}
-
-
-
-
-
-
-
-
+
+
+
- {l s='Configuration' mod='dashactivity'}
- {$dashactivity_config_form}
-
-
-
-
- {l s='Currently Pending' mod='dashactivity'}
-
diff --git a/modules/dashavailability/CHANGELOG.txt b/modules/dashavailability/CHANGELOG.txt
new file mode 100644
index 000000000..4f29acabf
--- /dev/null
+++ b/modules/dashavailability/CHANGELOG.txt
@@ -0,0 +1,4 @@
+Changelog
+
+v1.0.0
+- first release
diff --git a/modules/dashavailability/CustomizationPolicy.txt b/modules/dashavailability/CustomizationPolicy.txt
new file mode 100644
index 000000000..7a688847f
--- /dev/null
+++ b/modules/dashavailability/CustomizationPolicy.txt
@@ -0,0 +1,80 @@
+1. Definitions
+--------------
+"Webkul" means Webkul Software Pvt. Ltd.
+"Customization" means those services by which functionality / features are added to a product that are not included in the base installation of a product, which are aimed to suit the specific needs of the customer.
+"Module" means the custom add-on module to be developed and provided by Webkul to you in accordance with this policy and the Order Form.
+"Order Form" means the order form (electronic or hard copy), accepted by Webkul, through which you ordered the Module to be developed and provided by Webkul and which sets out the details, specifications and parameters of the customized Module to be provided.
+"Software" means the software licensed by Webkul to you pursuant to the terms and conditions of a Webkul Software License Agreement.
+
+
+2. Module Development
+---------------------
+All customization Services and use of the Module are subject to the terms and conditions of Webkul’s Software Licence Agreement, found on Webkul’s website, and are also subject to the terms and conditions set forth in the Order Form, as well as the customization parameters. No other customization services will be provided unless expressly agreed upon by you and Webkul in writing, signed by authorized representatives of you and Webkul.
+
+
+3. Customization Services
+-------------------------
+Customization Services will be provided in accordance with the terms of the Order Form and subject to the conditions set forth on the Order Form including full payment of all fees and adherence to all time limits and scheduling restrictions.
+If expressly stated on the Order Form, the Customization Services and Module shall be subject to acceptance by you in accordance with the acceptance criteria set forth in the Order Form. Where there is no acceptance criteria set forth on the Order Form, acceptance shall be deemed to occur upon the earliest of:
+completion of the acceptance criteria,
+Webkul's completion of the Customization Services and written notification to you of such completion,
+your use of the Module in other than a test environment.
+Notwithstanding the foregoing, if acceptance testing, delivery or completion is delayed by thirty (30) days or more for reasons not related to Webkul’s performance, you must pay the value of any milestone that is contingent on acceptance. Such acceptance does not negate any warranty rights that you may have respecting the Module, as set forth herein. You are solely responsible for preparing your facilities and equipment for installation of the Module, where applicable.
+Webkul will make reasonable efforts to accommodate your time and deadline requirements with respect to the performance of Customization Services; however, meeting such requirements is subject to availability of resources, both human and equipment at the time of your request and is dependent on your availability to provide input and to perform necessary actions. Webkul shall not be liable in any way for any delay or damage arising from Webkul’s failure to meet such of your requirements or any deadlines.
+Any changes to the Customization Services or Module requirements after execution of the Order Form will be subject to a cost and delivery re-assessment, and a written change order or re-quote that has been mutually agreed upon by you and Webkul in writing. Webkul reserves the right to make changes in the design of its Software without the obligation to make equivalent changes to the Module.
+If, pursuant to your request, Webkul reviews drawings and documents prepared by others in connection with the Customization Services, including your personnel and other consultants, contractors, and suppliers, Webkul’s review of such drawings and documents shall be only to confirm general compliance with the intent of the design and information given, and shall not constitute acceptance by Webkul of any responsibility for correctness of specifications or details of such drawings and documentation. Webkul shall be entitled to rely on all information provided, and decisions and approvals made, by you in connection with Webkul’s work hereunder. You agree that Webkul and its personnel shall not be subject to any liability or costs relating to the Customization Services to the extent such liability and costs are attributable to any information provided by you that is not complete, accurate or current in all material respects.
+The Module, and all parts thereof, shall at all times be treated as Software licensed to you under the terms and conditions of the Licence Agreement.
+
+
+4. Term and Termination
+-----------------------
+The term of the Development Services, if any, shall be as set out on the Order Form.
+Customization Services may be terminated by Webkul immediately upon notice for cause if:
+you materially breach any agreement entered into between you and Webkul, including Webkul’s Licence Agreement and/or any User / software license agreement relating to Webkul’s products (or you consistently fail to properly perform and observe your obligations under such agreements or any applicable Webkul Software policy), and you fail to rectify the situation within ten (10) calendar days of notice from Webkul; or
+you become insolvent, or a receiver or receiver-manager is appointed for any part of your property, or you make an assignment, proposal or arrangement for the benefit of your creditors or you file an assignment in bankruptcy, or any proceedings under any bankruptcy or insolvency laws are commenced against you.
+Webkul shall have the right to terminate Customization Services immediately upon notice to you, without penalty or refund, if any agreement relating to the Software is terminated for any reason.
+Each party shall have the right to terminate the Development Services for convenience upon ninety (90) days’ notice to the other party.
+Termination of the Customization Services or any agreement shall not affect your payment obligation for any Customization Services performed by Webkul prior to the date of termination, regardless of whether you have had, as at the date of termination, any use of the Module or part thereof. In the event that the Customization Services are terminated prior to the delivery of the Module to you, Webkul shall not be obligated to deliver any work-in-progress or any portion of the Module to you, unless otherwise expressly agreed by the parties in writing.
+
+
+5. Fees
+-------
+You shall pay fees for the Customization Services and Module license in accordance with the fee schedule set forth in the Order Form. Webkul shall submit invoices to you for all fees and payments due, including applicable expenses, on a monthly basis in arrears. You shall pay to Webkul the full amount of each invoice received from Webkul within seven (7) days of receipt of the invoice. All invoices shall detail the nature of the Customization Services performed, the fees payable, and the basis on which the calculation of the fees has been made.
+You are responsible for, and shall pay all taxes relating to the Customization Services and the Module. Unless otherwise indicated, all amounts payable by you under an Order Form are exclusive of any tax, duty, levy, or similar government charge that may be assessed by any jurisdiction, whether based on gross revenue, the delivery, possession or use of the Module, other Software or Customization Services, or otherwise.
+If you fail to pay any amount due within thirty (30) days of such payment becoming due and payable, in addition to any other rights and remedies available to Webkul, Webkul shall be entitled to charge interest on all outstanding amounts at the lesser of 18% per annum or the maximum rate permitted by law, such interest commencing as of the due date for such payment. You shall also be responsible for paying for all reasonable fees and costs incurred by Webkul, including legal fees, in collecting any overdue amounts or enforcing any provision of any agreement entered into between you and Webkul.
+Pricing is subject to Webkul’s understanding of the project requirements, the terms of this policy and the Order Form. Webkul reserves the right to invoice you for additional Customization Services requested by you, or that are required based on incomplete details or specifications provided by you, that are not specified in the Order Form but are provided by Webkul to you, provided that Webkul provides you with notice that such additional Customization Services are not included in the Order Form and are subject to Webkul’s then current time and materials fee schedule for such Customization Services. Invoices for such additional Customization Services shall be subject to payment in accordance with this Section.
+
+
+6. Intellectual Property Rights
+-------------------------------
+Webkul shall own all intellectual property rights (whether or not patentable or registrable under copyright, trade-mark or similar legislation or subject to analogous protection) in and to the Module, and all work conceived, created, invented, produced, designed or reduced to practice by Webkul and its personnel as a result of or with respect to any and all Customization Services provided to you. Your rights and obligations relating to the use of the Module shall be governed by the terms of the applicable Webkul Software License Agreement regardless of whether you may have contributed to any Module in any way. The foregoing shall not be deemed to transfer ownership to Webkul of any pre-existing intellectual property rights that you may have in the materials that you provide to Webkul in order to permit Webkul to perform the Customization Services; however, to the extent that you have provided such materials to Webkul, you hereby grant Webkul a non-exclusive, non-transferable, royalty-free license to use all such materials for the purposes of performing the Customization Services and providing you with the Module.
+
+
+7. Limited Warranty and Limitation of Liability
+-----------------------------------------------
+Limited Warranty: Webkul warrants that all services provided by Webkul shall be provided in a competent, professional manner by persons who are fully trained and qualified to perform the Customization Services. Webkul does not represent or warrant that the Customization Services or Module provided hereunder will be capable of achieving a particular result for your business, or that the operation of the Module will be error free or uninterrupted, or that all errors in the Module can be found or corrected, although Webkul shall use commercially reasonable efforts to do so. Without limiting the foregoing, this warranty is valid only for the six (6) months following the acceptance date as set forth in Section 3(b). The above warranty shall not apply to defects or non-conformities resulting from:
+improper or inadequate maintenance or installation of the Module
+use of the Module in combination with software, interfaces, or other materials that are not supplied or specifically authorized by Webkul,
+unauthorized or improper use or modification of the Module, including use that is not contemplated in the Order Form or instructions provided by Webkul,
+abuse, negligence, accident, or other damage from external sources, or
+improper preparation of your facilities or equipment for installation and use or the Module.
+Limitation of Liability:
+save as otherwise provided in a written agreement between you and Webkul, and to the maximum extent permitted by applicable law, Webkul makes no warranty or condition, express or implied, statutory or otherwise, with respect to the module or the Customization services, including, without limitation, the implied warranties or conditions of merchantability and fitness for a particular purpose.
+in no event shall Webkul be liable to you or any other person for any indirect, special, punitive, exemplary, consequential or incidental damages (including without limitation, damages for loss of revenues or profits, business interruption, loss of business information, and the like) arising out of the use, inability to use or the performance or non-performance of, the module or the provision of the Customization services, even if Webkul has been advised of the possibility of such damage or claim, or it is foreseeable.
+in no event shall Webkul’s maximum aggregate liability to you for direct damages exceed the total amount paid by you for the Customization services performed by Webkul within the six (6) months preceding the date on which the claim arose.
+
+
+8. General Terms and Conditions
+-------------------------------
+As Webkul is primarily a plugin and app development company and its main focus is on constant plugin development fulfilling various latest requirements and keeping up with the latest trends, Webkul has all the right to release the same customized plugin as a new plugin in future to be available to all its customers. The same may include few or every feature of the customisation. Webkul reserve all the rights to do the same as the customisation done for the client is Intellectual property of Webkul.
+The customization undertaken by Webkul would be identical to the discussed requirements, and would not include any sort of additional changes or alterations. Any additional changes or alterations would be considered as a separate project and would be charged separately.
+Webkul would be providing customization support for only one month from the delivery of the project. For any further support extended to you, the same shall be charged separately which includes specifically any further help or bug /error fix.
+The cost of customization doesn’t include the cost of extension installation or exchange of the extension, if it has not been specifically quoted within the project cost.
+During the project customization, you ought not to edit or change any of the files and it is also advisable to have a backup every-time a change is made. If you, on your own, are making certain changes, it is advisable to back up the files, folder and database. Before doing anything on your own, you need to inform Webkul if Webkul is working on the project or your support period is subsisting.
+The customization charge will include a single template. Any time during or after the customization if you change the template, you shall be wholly and solely liable for any loss or damage emanating from the same. Webkul will not be responsible for any loss or damage done due to the same.
+All the communication will take place through Webkul’s help desk system only. If the need arises, the issues can be discussed via Skype once in week or month. Webkul does not allow screen sharing and remote desktop.
+Customization cost will not include any free consulting beyond the scope of the project.
+If while making any changes by yourself or by your team, something gets damaged, then Webkul will not be responsible for it. This includes any issues faced by you for your own fault even during the support period of the module or project.
+Webkul will not be responsible for any damages during the customization. It is advised that you must have a proper backup management system deployed.
+The terms and conditions of this Policy shall be governed by Indian Laws, and the courts in Delhi alone shall only have exclusive jurisdiction to resolve/ adjudicate upon any disputes.
+If any dispute arises between webkul and you/Licensee at any time, in connection with the validity, interpretation, implementation or alleged breach of any provision of this Agreement, the same shall be referred to a sole Arbitrator who shall be an independent and neutral third party appointed exclusively by Webkul. You shall not object to the appointment of the Arbitrator so appointed by Webkul. The place of arbitration shall be Delhi, India. The Arbitration & Conciliation Act, 1996 as amended by The Arbitration & Conciliation (Amendment) Act, 2015, shall govern the arbitration proceedings. The arbitration proceedings shall be held in the English language.
diff --git a/modules/dashavailability/LICENSE.txt b/modules/dashavailability/LICENSE.txt
new file mode 100644
index 000000000..44b1b399c
--- /dev/null
+++ b/modules/dashavailability/LICENSE.txt
@@ -0,0 +1,223 @@
+SOFTWARE LICENCE AGREEMENT
+===============================
+
+This AGREEMENT is made effective on the date of the purchase of the software between Webkul Software Pvt. Ltd.,Company incorporated under the Companies Act, 1956 (hereinafter referred to as “Licensor"), and the purchaser of the software/ product (hereinafter referred to as "Licensee").
+
+Preamble
+==================
+Licensor is a web and mobile product based organization engaged in the business of developing and marketing software for enterprise level e-commerce businesses. It is an ISO and NSR (NASSCOM) certified organization having a team of more than 150 creative engineers which come from different backgrounds. It has developed more than 700 web extensions and apps in the past few years for open source platforms which are used and trusted globally. Licensee now wishes to obtain license, and Licensor wishes to grant a license, to allow use of the software so purchased in developing the e-commerce business website/ mobile app of the Licensee, subject to the terms and conditions set forth herein.
+
+
+THEREFORE, with the intent to be legally bound, the parties hereby agree as follows:
+
+
+Agreement
+================
+
+1.Definitions :
+------------------
+As used in this Agreement, the following capitalized terms shall have the definitions set forth below:
+
+
+"Derivative Works" are works developed by Licensee, its officers, agents, contractors or employees, which are based upon, in whole or in part, the Source Code and/or the Documentation and may also be based upon and/or incorporate one or more other preexisting works of the Licensor. Derivative Works may be any improvement, revision, modification, translation (including compilation or recapitulation by computer), abridgment, condensation, expansion, or any other form in which such a preexisting work may be recast, transformed, or adapted. For purposes hereof, a Derivative Work shall also include any compilation that incorporates such a preexisting work.
+
+
+"Documentation" is written, printed or otherwise recorded or stored (digital or paper) material relating to the Software and/or Source Code, including technical specifications and instructions for its use including Software/ Source Code annotations and other descriptions of the principles of its operation and instructions for its use.
+
+
+"Improvements" shall mean, with respect to the Software, all modifications and changes made, developed, acquired or conceived after the date hereof and during the entire term of this Agreement.
+
+
+"Source Code" is the computer programming source code form of the Software in the form maintained by the Licensor, and includes all non-third-party executables, libraries, components, and Documentation created or used in the creation, development, maintenance, and support of the Software as well as all updates, error corrections and revisions thereto provided by Licensor, in whole or in part.
+
+
+2. Software License.
+-------------------------
+
+(a)Grant of License. For the consideration set forth below, Licensor hereby grants to Licensee, and Licensee hereby accepts the worldwide, non-exclusive, perpetual, royalty-free rights and licenses set forth below:
+
+
+(i)The right and license to use and incorporate the software, in whole or in part, to develop its website/ mobile app (including the integration of all or part of the Licensor’s software into Licensee's own software) on one domain ( Except Joomla modules , listed on store are entitled to be used on unlimited domain as per the standard guidelines ) only, solely for the own personal or business use of the Licensee. However, the License does not authorize the Licensee to compile, copy or distribute the said Software or its Derivative Works.
+
+
+(ii)The right and license does not authorize the Licensee to make any backup or archival copies of the Software and / or the Source Code and Documentation.
+
+(iii)The right and license does not authorize the Licensee to migrate the domain license to another domain.
+
+
+(b)Scope; Rights and Responsibilities.
+
+
+(i)Licensor shall enable the Licensee to download one complete copy of the Software.
+
+
+(ii)The Software is intended for the sole use of the Licensee in development of its own website/ mobile app.
+
+
+(iii)Licensee does not have the right to hand over, sell, distribute, sub-license, rent, lease or lend any portion of the Software or Documentation, whether modified or unmodified, to anyone. Licensee should not place the Software on a server so that it becomes accessible via a public network such as the Internet for distribution purposes. In case the Licensee is using any source code management system like github, it can use the code there only when it has paid subscription from such management system.
+
+
+(iv)Licensee is not authorized to appoint, or work with, third parties to perform any development services using the Source Code, the source code to Derivative Works and/or the Documentation on behalf of, or working with, the Licensee. Release of Source Code, Derivative Work source code and/or Documentation to any third party shall be considered as violation of the Agreement, inter-alia entailing forthwith termination and legal action.
+
+
+
+(c)Ownership.
+
+
+(i)Software and Source Code. All right, title, copyright, and interest in the Software, Source Code, Software Modifications and Error corrections will be and remain the property of Licensor.
+
+
+(ii)Derivative Works. As creation of Derivative Works by the Licensee is prohibited, thus, all right, title, copyright, and interest in any and/or all Derivative Works and Improvements created by, or on behalf of, Licensee will also be deemed to the property of Licensor. Licensor shall be entitled to protect copyright / intellectual property in all such Derivative Works and Improvements also in any country as it may deem fit including without limitation seeking copyright and/or patent protection.
+
+
+3.Consideration.
+--------------------
+
+(a)Licensee shall pay to Licensor the amount as mentioned on the website from where the order is placed, as one-time, upfront fees in consideration for the licenses and rights granted hereunder (hereinafter referred to as the "License Fee"). The License Fee to be paid by Licensee shall be paid upfront at the time of placing the order, and no credit will be allowed under any circumstances.
+
+
+(b)Once paid, the License Fees shall be non-refundable. The Licensee has fully satisfied itself about the Software and has seen the demonstration, and only thereafter has placed the order. Thus, the License Fees or any part thereof is non-refundable. No claim for refund of the Licence Fees shall be entertained under any circumstances.
+
+
+
+4.Representations and Warranties.
+-------------------------------------
+
+(a)Mutual. Each of the parties represents and warrants to the other as follows.
+
+
+(i)such party is a legal entity duly organized, validly existing and in good standing;
+
+
+(ii)such party has the power and authority to conduct its business as presently conducted and to enter into, execute, deliver and perform this Agreement.
+
+
+(iii)This Agreement has been duly and validly accepted by such party and constitutes the legal, valid and binding obligations of such party respectively, enforceable against such party in accordance with their respective terms;
+
+
+(iv)the acceptance, execution, delivery and performance of this Agreement does not and will not violate such party's charter or by-laws; nor require any consent, authorization, approval, exemption or other action by any third party or governmental entity.
+
+
+(b)Licensor warrants that, at the time of purchase of the Software:
+
+
+the Software will function materially as set forth in the website or published functionality provided by Licensor to customers and potential customers describing the Software; and
+
+
+Software add-ons, if purchased by the Licensee from the Licensor, will not materially diminish the features or functions of or the specifications of the Software as they existed as of the execution of this Agreement.
+
+
+
+(c)Title. Licensor represents and warrants that it is the exclusive owner of all copyright/ intellectual property in the Software (including the Source Code) and has good and marketable title to the Software (including the Source Code) free and clear of all liens, claims and encumbrances of any nature whatsoever (collectively, "Liens"). Licensor's grant of license and rights to Licensee hereunder does not, and will not infringe any third party's property, intellectual property or personal rights.
+
+
+
+5.Term.
+-------------
+
+(a)Subject to Licensee's payment obligations, this Agreement shall commence as on the date of making payment of the Software by the Licensee to the Licensor, and shall continue until terminated by either party.
+
+
+(b)The Licensor retains the right to terminate the license at any time, if the Licensee is not abiding by any of the terms of the Agreement. The Licensee may terminate the Agreement at any time at its own discretion by uninstalling the Software and /or by destroying the said Software (or any copies thereof). However, the Licensee shall not be entitled to seek any refund of the amount paid by it to the Licensor, under any circumstances.
+
+
+(c)Survival. In the event this Agreement is terminated for any reason, the provisions set forth in Sections 2(a), 2(b), and 2(c) shall survive.
+
+
+
+
+6. Indemnification
+----------------------
+
+The Licensee release the Licensor from, and agree to indemnify, defend and hold harmless the Licensor (and its officers, directors, employees, agents and Affiliates) against, any claim, loss, damage, settlement, cost, taxes, expense or other liability (including, without limitation, attorneys' fees) (each, a "Claim") arising from or related to: (a) any actual or alleged breach of any obligations in this Agreement; (b) any refund, adjustment, or return of Software,(c) any claim for actual or alleged infringement of any Intellectual Property Rights made by any third party or damages related thereto; or (d) Taxes.
+
+
+7. Limitation of Liability
+------------------------------
+
+The Licensor will not be liable for any direct, indirect, incidental, special, consequential or exemplary damages, including but not limited to, damages for loss of profits, goodwill, use, data or other intangible losses arising out of or in connection with the Software, whether in contract, warranty, tort etc. (including negligence, software liability, any type of civil responsibility or other theory or otherwise) to the Licensee or any other person for cost of software, cover, recovery or recoupment of any investment made by the Licensee or its affiliates in connection with this Agreement, or for any other loss of profit, revenue, business, or data or punitive or consequential damages arising out of or relating to this Agreement. Further, the aggregate liability of the Licensor, arising out of or in connection with this Agreement or the transactions contemplated hereby will not exceed at any time, or under any circumstances, the total amounts received by the Licensor from the Licensee in connection with the particular software giving rise to the claim.
+
+
+8. Force Majeure
+---------------------
+
+The Licensor will not be liable for any delay or failure to perform any of its obligations under this Agreement by reasons, events or other matters beyond its reasonable control.
+
+
+9. Relationship of Parties
+------------------------------
+
+The Licensor and Licensee are independent legal entities, and nothing in this Agreement will be construed to create a partnership, joint venture, association of persons, agency, franchise, sales representative, or employment relationship between the parties. The Licensee will have no authority to make or accept any offers or representations on behalf of the Licensor. The relationship between the parties is that of Licensor and Licensee only, and the rights, duties, liabilities of each party shall be governed by this Agreement.
+
+
+10. Modification
+------------------------
+
+The Licensor may amend any of the terms and conditions contained in this Agreement at any time and solely at its discretion. Any changes will be effective upon the posting of such changes on the Portal/ website, and the Licensee is responsible for reviewing these changes and informing itself of all applicable changes or notices. The continued use of a software by the Licensee after posting of any changes by the Licensor, will constitute the acceptance of such changes or modifications by the Licensee.
+
+
+
+11.Miscellaneous.
+-----------------------
+
+(a)General Provisions. This Agreement: (i) may be amended only by a writing signed by each of the parties; (ii) may be executed in several counterparts, each of which shall be deemed an original but all of which shall constitute one and the same instrument; (iii) contains the entire agreement of the parties with respect to the transactions contemplated hereby and supersedes all prior written and oral agreements, and all contemporaneous oral agreements, relating to such transactions; (iv) shall be governed by, and construed and enforced in accordance with, the laws of India; and (v) shall be binding upon, and inure to the benefit of, the parties and their respective successors and permitted assigns. Each of the parties hereby irrevocably submits to the jurisdiction of the Courts at Delhi, India, for the purposes of any action or proceeding arising out of or relating to this Agreement or the subject matter hereof and brought by any other party.
+
+
+(b)Assignment. Licensee cannot assign, pledge or otherwise transfer, whether by operation of law or otherwise, this Agreement, or any of its obligations hereunder, without the prior written consent of Licensor, which consent shall not be unreasonably withheld.
+
+
+(c)Notices. Unless otherwise specifically provided herein, all notices, consents, requests, demands and other communications required or permitted hereunder:
+
+
+(i)shall be in writing;
+
+
+(ii)shall be sent by messenger, certified or registered mail/email, or reliable express delivery service, to the appropriate address(es) set forth below; and
+
+
+(iii)shall be deemed to have been given on the date of receipt by the addressee, as evidenced by a receipt executed by the addressee (or a responsible person in his or her office), the records of the Party delivering such communication or a notice to the effect that such addressee refused to claim or accept such communication, if sent by messenger, mail or express delivery service.
+
+
+All such communications shall be sent to the following addresses or numbers, or to such other addresses or numbers as any party may inform the others by giving five days' prior notice:
+
+
+If to Webkul Software Pvt. Ltd.:
+
+
+
+Webkul Software Pvt. Ltd.
+
+H-28, ARV Park, Sector 63, NOIDA – 201301,
+
+Uttar Pradesh, India
+
+
+If to Licensee:
+
+At the address mentioned by the Licensee
+
+(at the time of placing order of generating Invoice)
+
+
+(d)Severability. It is the intent of the parties that the provisions of this Agreement be enforced to the fullest extent permissible under the laws and public policies of India in which enforcement hereof is sought. In furtherance of the foregoing, each provision hereof shall be severable from each other provision, and any provision hereof which is/ becomes unenforceable shall be subject to the following: (i) if such provision is contrary to or conflicts with any requirement of any statute, rule or regulation in effect, then such requirement shall be incorporated into, or substituted for, such unenforceable provision to the minimum extent necessary to make such provision enforceable; (ii) the court, agency or arbitrator considering the matter is hereby authorized to (or, if such court, agency or arbitrator is unwilling or fails to do so, then the parties shall) amend such provision to the minimum extent necessary to make such provision enforceable, and the parties hereby consent to the entry of an order so amending such provision; and (iii) if any such provision cannot be or is not reformed and made enforceable pursuant to clause (i) or (ii) above, then such provision shall be ineffective to the minimum extent necessary to make the remainder of this Agreement enforceable. Any application of the foregoing provisions to any provision hereof shall not effect the validity or enforceability of any other provision hereof.
+
+
+(e)By purchasing the Software, the Licensee acknowledge that it has read this Agreement, and that it agrees to the content of the Agreement, its terms and agree to use the Software in compliance with this Agreement.
+
+
+(f)The Licensor holds the sole copyright of the Software. The Software or any portion thereof is a copyrightable matter and is liable to be protected by the applicable laws. Copyright infringement in any manner can lead to prosecution according to the current law. The Licensor reserves the right to revoke the license of any user who is not holding any license or is holding an invalid license.
+
+
+(g)This Agreement gives the right to use only one copy of the Software on one domain solely for the own personal or business use of the Licensee, subject to all the terms and conditions of this Agreement. A separate License has to be purchased for each new Software installation. Any distribution of the Software without the written consent of the Licensor (including non-commercial distribution) is regarded as violation of this Agreement, and will entail immediate termination of the Agreement and may invite liability, both civil and criminal, as per applicable laws.
+
+
+(h)The Licensor reserves the rights to publish a selected list of users/ Licensees of its Software, and no permission of any Licensee is needed in this regard. The Licensee agrees that the Licensor may, in its sole discretion, disclose or make available any information provided or submitted by the Licensee or related to it under this Agreement to any judicial, quasi-judicial, governmental, regulatory or any other authority as may be required by the Licensor to co-operate and / or comply with any of their orders, instructions or directions or to fulfill any requirements under applicable Laws.
+
+
+(i)If the Licensee continues to use the Software even after the sending of the notice by the Licensor for termination, the Licensee agree to accept an injunction to restrain itself from its further use, and to pay all costs (including but not limited to reasonable attorney fees) to enforce injunction or to revoke the License, and any damages suffered by the Licensor because of the misuse of the Software by the Licensee.
+
+
+12. Arbitration
+-----------------------
+
+If any dispute arises between the Licensor and the Licensee at any time, in connection with the validity, interpretation, implementation or alleged breach of any provision of this Agreement, the same shall be referred to a sole Arbitrator who shall be an independent and neutral third party appointed exclusively by the Licensor. The Licensee shall not object to the appointment of the Arbitrator so appointed by the Licensor. The place of arbitration shall be Delhi, India. The Arbitration & Conciliation Act, 1996 as amended by The Arbitration & Conciliation (Amendment) Act, 2015, shall govern the arbitration proceedings. The arbitration proceedings shall be held in the English language.
diff --git a/modules/dashavailability/controllers/index.php b/modules/dashavailability/controllers/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashavailability/controllers/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashavailability/dashavailability.php b/modules/dashavailability/dashavailability.php
new file mode 100644
index 000000000..f5ddb5f6b
--- /dev/null
+++ b/modules/dashavailability/dashavailability.php
@@ -0,0 +1,128 @@
+name = 'dashavailability';
+ $this->tab = 'dashboard';
+ $this->version = '1.0.0';
+ $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6');
+ $this->author = 'Webkul';
+ $this->bootstrap = true;
+ parent::__construct();
+ $this->displayName = $this->l('Dashboard Availability');
+ $this->description = $this->l('Adds a block with a graphical representation of availability of your hotel`s room.');
+ $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+
+ $this->allow_push = true;
+
+ }
+
+ public function install()
+ {
+ return (parent::install()
+ && $this->registerHook('dashboardZoneTwo')
+ && $this->registerHook('dashboardData')
+ && $this->registerHook('actionAdminControllerSetMedia')
+ );
+ }
+
+ public function hookActionAdminControllerSetMedia()
+ {
+ if (get_class($this->context->controller) == 'AdminDashboardController') {
+ $this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
+ }
+ $this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
+ }
+
+ public function hookDashboardZoneTwo($params)
+ {
+ Media::addJsDef(array(
+ 'dashAvailAajaxUrl' => $this->context->link->getModuleLink($this->name, 'chartdata'),
+ ));
+ $this->context->smarty->assign(array(
+ 'dateFromBar' => date('Y-m-d', strtotime('now')),
+ ));
+ return $this->display(__FILE__, 'dashboard_zone_two.tpl');
+ }
+
+ public function hookDashboardData($params)
+ {
+ $days = $params["dashboard_use_push"];
+ if (!$days) {
+ $days = 5;
+ }
+ $dateFrom = $params["extra"];
+ if (!$dateFrom || $dateFrom == 'undefined') {
+ $dateFrom = $params["date_from"];
+ }
+ if (Configuration::get("PS_DASHBOARD_SIMULATION")) {
+ $from = strtotime($dateFrom." 00:00:00");
+ $to = min(time(), strtotime($dateFrom."+".$days." days 23:59:59"));
+
+ $data = array();
+ for ($date = $from; $date <= $to; $date = strtotime("+1 days", $date)) {
+ $availability_data["values"][] = array($date, round(rand(0, 20)));
+ }
+ $availability_data = array_merge(
+ $availability_data,
+ array(
+ "id" => "availabilities",
+ "key" => $this->l("Availabilities"),
+ "border_color" => "#11f0fc",
+ "color" => "#72C3F0",
+ ),
+ );
+ $data[] = $availability_data;
+
+ } else {
+ $availability_data = AdminStatsController::getAvailBarChartData(
+ $days,
+ $dateFrom
+ );
+ $availability_data = array_merge(
+ $availability_data,
+ array(
+ "id" => "availabilities",
+ "key" => $this->l("Availabilities"),
+ "border_color" => "#11f0fc",
+ "color" => "#72C3F0",
+ ),
+ );
+ $data[] = $availability_data;
+ }
+
+ $data = array(
+ 'chart_type' => 'line_chart_availability',
+ 'date_format' => $this->context->language->date_format_lite,
+ 'data' => $data
+ );
+ return array(
+ 'data_chart' => array('availableBarChart' => $data),
+ );
+ }
+
+}
diff --git a/modules/dashavailability/index.php b/modules/dashavailability/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashavailability/index.php
@@ -0,0 +1,29 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashavailability/views/js/dashavailability.js b/modules/dashavailability/views/js/dashavailability.js
new file mode 100644
index 000000000..af3e506a9
--- /dev/null
+++ b/modules/dashavailability/views/js/dashavailability.js
@@ -0,0 +1,91 @@
+/**
+ * 2010-2021 Webkul.
+ *
+ * NOTICE OF LICENSE
+ *
+ * All right is reserved,
+ * Please go through LICENSE.txt file inside our module
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please refer to CustomizationPolicy.txt file inside our module for more information.
+ *
+ * @author Webkul IN
+ * @copyright 2010-2021 Webkul IN
+ * @license LICENSE.txt
+ */
+
+var dashtrends_data;
+var dashtrends_chart;
+
+function line_chart_availability(widget_name, chart_details) {
+ nv.addGraph(function() {
+ var chart = nv.models.lineChart()
+ .useInteractiveGuideline(true)
+ .x(function(d) { return (d !== undefined ? d[0] : 0); })
+ .y(function(d) { return (d !== undefined ? parseInt(d[1]) : 0); })
+ .margin({
+ left: 30,
+ right: 30,
+ });
+
+ chart.xAxis.tickFormat(function(d) {
+ date = new Date(d * 1000);
+ return date.format(chart_details['date_format']);
+ });
+
+ chart.yAxis.tickFormat(function(d) {
+ return parseInt(d);
+ });
+
+ dashtrends_data = chart_details.data;
+ dashtrends_chart = chart;
+ d3.select('#availableBarChart svg')
+ .datum(dashtrends_data)
+ .call(chart);
+ nv.utils.windowResize(chart.update);
+
+ return chart;
+ });
+}
+
+// select fetch bar chart data
+function fetchAvailablityBarData(days, date_from = false) {
+ if (!date_from) {
+ date_from = $("#bardate").val();
+ }
+ $(".avail-bar-btn").removeClass('bar-btn-active');
+ $("#avail_bar_day_" + days).addClass('bar-btn-active');
+ refreshDashboard('dashavailability', days, date_from);
+}
+
+
+function availDatePicker() {
+ $('#bardate').datepicker('show');
+}
+
+$(document).ready(function() {
+ $("#bardate").val($("#date-start").val());
+ $(".bar-date").find("strong").text($("#date-start").val());
+
+ fetchAvailablityBarData(5, $("#bardate").val());
+
+ $("#bardate").datepicker({
+ dateFormat: 'yy-mm-dd',
+ beforeShow: function(input, inst) {
+ setTimeout(function() {
+ inst.dpDiv.css({
+ top: $(".datepicker").offset().top + 35,
+ left: $(".datepicker").offset().left
+ });
+ }, 0);
+ },
+ onSelect: function(date) {
+ $(".bar-date").find("strong").text(date);
+ fetchAvailablityBarData(5, $("#bardate").val());
+ }
+ });
+
+});
\ No newline at end of file
diff --git a/modules/dashavailability/views/js/index.php b/modules/dashavailability/views/js/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashavailability/views/js/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashavailability/views/templates/hook/dashboard_zone_two.tpl b/modules/dashavailability/views/templates/hook/dashboard_zone_two.tpl
new file mode 100644
index 000000000..84611e7f7
--- /dev/null
+++ b/modules/dashavailability/views/templates/hook/dashboard_zone_two.tpl
@@ -0,0 +1,66 @@
+{**
+* 2010-2021 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through LICENSE.txt file inside our module
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to CustomizationPolicy.txt file inside our module for more information.
+*
+* @author Webkul IN
+* @copyright 2010-2021 Webkul IN
+* @license LICENSE.txt
+*}
+
+
+* @copyright 2007-2015 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+/* start */
+.bootstrap #dashboard #dashgoals svg {
+ height: 250px;
+}
+/* end */
+
+.bootstrap #dashboard #dashgoals .dashgoals {
+ margin-top: 30px;
+ padding: 0 20%;
+}
+
+@media (max-width: 500px) {
+ .bootstrap #dashboard #dashgoals .dashgoals {
+ padding: 0 5%;
+ }
+}
+
+.bootstrap #dashboard #dashgoals .dashgoals label.btn {
+ margin: 0 5px;
+ padding: 12px 0;
+ width: 100%;
+ border-radius: 7px;
+ color: #FFF;
+}
+
+.bootstrap #dashboard #dashgoals .dashgoals label.btn input[type="radio"] {
+ position: absolute;
+ z-index: -1;
+ opacity: 0;
+}
+
+.bootstrap #dashboard #dashgoals .dashgoals label.btn.btn-default:hover {
+ border: 1px solid #DDD;
+ opacity: 0.8;
+}
+
+.bootstrap #dashboard #dashgoals.panel .panel-heading span.btn-group {
+ margin-top: -6px;
+}
\ No newline at end of file
diff --git a/modules/dashgoals/views/css/index.php b/modules/dashgoals/views/css/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashgoals/views/css/index.php
@@ -0,0 +1,29 @@
+
-
+
+
+
+ {l s="Configuration" mod="dashactivity"}
+ {$dashactivity_config_form}
+
+
+
+
+
+ {l s="Online Visitors" mod="dashactivity"}
+
+
+
+
+
+
+
+
+
+
+ {l s="Active Booking Carts" mod="dashactivity"}
+
+
+
+
+
+
+
+
+
+ {l s="Currently Pending" mod="dashactivity"}
+
+
-
+
+ {l s="in the last %d minutes" sprintf=$DASHACTIVITY_VISITOR_ONLINE|intval mod="dashactivity"}
+
+
+
+
+ {l s="in the last %d minutes" sprintf=$DASHACTIVITY_CART_ACTIVE|intval mod="dashactivity"}
+
+
+ -
+
- + + + {l s="Bookings" mod="dashactivity"} + + + + + + +
- + + + {l s="Refunds" mod="dashactivity"} + + + + + + +
- + + + {l s="Abandoned Carts" mod="dashactivity"} + + + + + + +
-
-
-
-
- {l s='Online Visitors' mod='dashactivity'}
-
- {l s='in the last %d minutes' sprintf=$DASHACTIVITY_VISITOR_ONLINE|intval mod='dashactivity'} - - - - - -
- -
-
- {l s='Active Shopping Carts' mod='dashactivity'}
-
- {l s='in the last %d minutes' sprintf=$DASHACTIVITY_CART_ACTIVE|intval mod='dashactivity'} - - - - - -
-
-
-
- - {l s='Orders' mod='dashactivity'} - - - - -
- - {l s='Return/Exchanges' mod='dashactivity'} - - - - -
- - {l s='Abandoned Carts' mod='dashactivity'} - - - - - {if isset($stock_management) && $stock_management} + +
- - {l s='Out of Stock Products' mod='dashactivity'} - - + + + {l s="New Customers" mod="dashactivity"} + + + + - {/if} -
- - {l s='New Messages' mod='dashactivity'} - - - - - {if Module::isInstalled('productcomments')}
- - {l s='Product Reviews' mod='dashactivity'} - - + + + {l s="New Subscriptions" mod="dashactivity"} + + + + - {/if} -
- - {l s='New Customers' mod='dashactivity'} - - - - -
- - {l s='New Subscriptions' mod='dashactivity'} - - - - -
- - {l s='Total Subscribers' mod='dashactivity'} - - - - -
-
-
-
{l s='Link to your Google Analytics account' mod='dashactivity'}
+
+
+ {l s="Total Subscribers" mod="dashactivity"}
+
+
+
+
- {/if}
- - - {l s='Visits' mod='dashactivity'} - - - - -
- - {l s='Unique Visitors' mod='dashactivity'} - - - - -
-
- {l s='Traffic Sources' mod='dashactivity'}
-
-
-
- --
- - + + + {l s="Visits" mod="dashactivity"} + + + + + + +
- + + + {l s="Unique Visitors" mod="dashactivity"} + + + + + + +
-
+
+
+ {l s="Traffic Sources" mod="dashactivity"}
+
+
+
+ + ++
+
+
+
+ {l s="Customers & Newsletters" mod="dashactivity"}
+
+
-
- {l s='Notifications' mod='dashactivity'}
-
-
- {l s='Customers & Newsletters' mod='dashactivity'}
-
-
-
- {l s='Traffic' mod='dashactivity'}
-
-
+
+
+
+
+
+ {l s="Traffic" mod="dashactivity"}
+
+
+
+ {l s="Activity overview" mod="dashactivity"}
+
+
+
+
+
+
+
+
+
+
+ -
-
-
-
-
- {if $gapi_mode}
+
+
+ -
+
+
+
+
+ {l s="Availability" mod="dashavailability"}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/dashavailability/views/templates/hook/index.php b/modules/dashavailability/views/templates/hook/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashavailability/views/templates/hook/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashavailability/views/templates/index.php b/modules/dashavailability/views/templates/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashavailability/views/templates/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashgoals/dashgoals.php b/modules/dashgoals/dashgoals.php
index 01b16d3f8..ab8f52137 100644
--- a/modules/dashgoals/dashgoals.php
+++ b/modules/dashgoals/dashgoals.php
@@ -27,7 +27,7 @@
if (!defined('_PS_VERSION_'))
exit;
-class DashGoals extends Module
+class Dashgoals extends Module
{
protected static $month_labels = array();
protected static $types = array('traffic', 'conversion', 'avg_cart_value');
@@ -40,7 +40,7 @@ public function __construct()
{
$this->name = 'dashgoals';
$this->tab = 'dashboard';
- $this->version = '1.0.0';
+ $this->version = '1.0.1';
$this->author = 'PrestaShop';
parent::__construct();
@@ -114,8 +114,10 @@ public function uninstall()
public function hookActionAdminControllerSetMedia()
{
- if (get_class($this->context->controller) == 'AdminDashboardController')
- $this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
+ if (get_class($this->context->controller) == 'AdminDashboardController') {
+ $this->context->controller->addJS($this->_path.'views/js/'.$this->name.'.js');
+ $this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
+ }
}
public function setMonths($year)
diff --git a/modules/dashgoals/translations/en.php b/modules/dashgoals/translations/en.php
new file mode 100644
index 000000000..a73980fc0
--- /dev/null
+++ b/modules/dashgoals/translations/en.php
@@ -0,0 +1,43 @@
+dashgoals_50698c5b8ffaf2b7dd089898a244a668'] = 'Dashboard Goals';
+$_MODULE['<{dashgoals}prestashop>dashgoals_14089da5dd6132b674d9829b136efff9'] = 'Adds a block with your store\'s forecast.';
+$_MODULE['<{dashgoals}prestashop>dashgoals_86f5978d9b80124f509bdb71786e929e'] = 'January';
+$_MODULE['<{dashgoals}prestashop>dashgoals_659e59f062c75f81259d22786d6c44aa'] = 'February';
+$_MODULE['<{dashgoals}prestashop>dashgoals_fa3e5edac607a88d8fd7ecb9d6d67424'] = 'March';
+$_MODULE['<{dashgoals}prestashop>dashgoals_3fcf026bbfffb63fb24b8de9d0446949'] = 'April';
+$_MODULE['<{dashgoals}prestashop>dashgoals_195fbb57ffe7449796d23466085ce6d8'] = 'May';
+$_MODULE['<{dashgoals}prestashop>dashgoals_688937ccaf2a2b0c45a1c9bbba09698d'] = 'June';
+$_MODULE['<{dashgoals}prestashop>dashgoals_1b539f6f34e8503c97f6d3421346b63c'] = 'July';
+$_MODULE['<{dashgoals}prestashop>dashgoals_41ba70891fb6f39327d8ccb9b1dafb84'] = 'August';
+$_MODULE['<{dashgoals}prestashop>dashgoals_cc5d90569e1c8313c2b1c2aab1401174'] = 'September';
+$_MODULE['<{dashgoals}prestashop>dashgoals_eca60ae8611369fe28a02e2ab8c5d12e'] = 'October';
+$_MODULE['<{dashgoals}prestashop>dashgoals_7e823b37564da492ca1629b4732289a8'] = 'November';
+$_MODULE['<{dashgoals}prestashop>dashgoals_82331503174acbae012b2004f6431fa5'] = 'December';
+$_MODULE['<{dashgoals}prestashop>dashgoals_e7935ae6c516d89405ec532359d2d75a'] = 'Traffic';
+$_MODULE['<{dashgoals}prestashop>dashgoals_233d48e63da77b092da350559d2f8382'] = 'visits';
+$_MODULE['<{dashgoals}prestashop>dashgoals_3bb1503332637805beddb73a2dd1fe1b'] = 'Conversion';
+$_MODULE['<{dashgoals}prestashop>dashgoals_71241798130f714cbd2786df3da2cf0b'] = 'Average cart value';
+$_MODULE['<{dashgoals}prestashop>dashgoals_11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales';
+$_MODULE['<{dashgoals}prestashop>dashgoals_9ac642c5ef334ea05256563f921bb304'] = 'Goal exceeded';
+$_MODULE['<{dashgoals}prestashop>dashgoals_7c103c9bbbaecee07ca898ed65667cbf'] = 'Goal not reached';
+$_MODULE['<{dashgoals}prestashop>dashgoals_eb233580dc419f03df5905f175606e4d'] = 'Goal set:';
+$_MODULE['<{dashgoals}prestashop>config_254f642527b45bc260048e30704edb39'] = 'Configuration';
+$_MODULE['<{dashgoals}prestashop>config_e7935ae6c516d89405ec532359d2d75a'] = 'Traffic';
+$_MODULE['<{dashgoals}prestashop>config_e4c3da18c66c0147144767efeb59198f'] = 'Conversion Rate';
+$_MODULE['<{dashgoals}prestashop>config_8c804960da61b637c548c951652b0cac'] = 'Average Cart Value';
+$_MODULE['<{dashgoals}prestashop>config_11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales';
+$_MODULE['<{dashgoals}prestashop>config_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
+$_MODULE['<{dashgoals}prestashop>dashboard_zone_two_89c1265be62d3ba835a3d963db5956b0'] = 'Forecast';
+$_MODULE['<{dashgoals}prestashop>dashboard_zone_two_f1206f9fadc5ce41694f69129aecac26'] = 'Configure';
+$_MODULE['<{dashgoals}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Refresh';
+$_MODULE['<{dashgoals}prestashop>dashboard_zone_two_e7935ae6c516d89405ec532359d2d75a'] = 'Traffic';
+$_MODULE['<{dashgoals}prestashop>dashboard_zone_two_3bb1503332637805beddb73a2dd1fe1b'] = 'Conversion';
+$_MODULE['<{dashgoals}prestashop>dashboard_zone_two_8c804960da61b637c548c951652b0cac'] = 'Average Cart Value';
+$_MODULE['<{dashgoals}prestashop>dashboard_zone_two_11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales';
+
+
+return $_MODULE;
diff --git a/modules/dashgoals/views/css/dashgoals.css b/modules/dashgoals/views/css/dashgoals.css
new file mode 100644
index 000000000..6dc729e0d
--- /dev/null
+++ b/modules/dashgoals/views/css/dashgoals.css
@@ -0,0 +1,64 @@
+/**
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author PrestaShop SA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {l s='Forecast' mod='dashgoals'}
- {$goals_year}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {include file='./config.tpl'}
-
-
+
+
+ {l s='Target' mod='dashgoals'}
+ {$goals_year}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {include file='./config.tpl'}
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/modules/dashguestcycle/CHANGELOG.txt b/modules/dashguestcycle/CHANGELOG.txt
new file mode 100644
index 000000000..4f29acabf
--- /dev/null
+++ b/modules/dashguestcycle/CHANGELOG.txt
@@ -0,0 +1,4 @@
+Changelog
+
+v1.0.0
+- first release
diff --git a/modules/dashguestcycle/CustomizationPolicy.txt b/modules/dashguestcycle/CustomizationPolicy.txt
new file mode 100644
index 000000000..7a688847f
--- /dev/null
+++ b/modules/dashguestcycle/CustomizationPolicy.txt
@@ -0,0 +1,80 @@
+1. Definitions
+--------------
+"Webkul" means Webkul Software Pvt. Ltd.
+"Customization" means those services by which functionality / features are added to a product that are not included in the base installation of a product, which are aimed to suit the specific needs of the customer.
+"Module" means the custom add-on module to be developed and provided by Webkul to you in accordance with this policy and the Order Form.
+"Order Form" means the order form (electronic or hard copy), accepted by Webkul, through which you ordered the Module to be developed and provided by Webkul and which sets out the details, specifications and parameters of the customized Module to be provided.
+"Software" means the software licensed by Webkul to you pursuant to the terms and conditions of a Webkul Software License Agreement.
+
+
+2. Module Development
+---------------------
+All customization Services and use of the Module are subject to the terms and conditions of Webkul’s Software Licence Agreement, found on Webkul’s website, and are also subject to the terms and conditions set forth in the Order Form, as well as the customization parameters. No other customization services will be provided unless expressly agreed upon by you and Webkul in writing, signed by authorized representatives of you and Webkul.
+
+
+3. Customization Services
+-------------------------
+Customization Services will be provided in accordance with the terms of the Order Form and subject to the conditions set forth on the Order Form including full payment of all fees and adherence to all time limits and scheduling restrictions.
+If expressly stated on the Order Form, the Customization Services and Module shall be subject to acceptance by you in accordance with the acceptance criteria set forth in the Order Form. Where there is no acceptance criteria set forth on the Order Form, acceptance shall be deemed to occur upon the earliest of:
+completion of the acceptance criteria,
+Webkul's completion of the Customization Services and written notification to you of such completion,
+your use of the Module in other than a test environment.
+Notwithstanding the foregoing, if acceptance testing, delivery or completion is delayed by thirty (30) days or more for reasons not related to Webkul’s performance, you must pay the value of any milestone that is contingent on acceptance. Such acceptance does not negate any warranty rights that you may have respecting the Module, as set forth herein. You are solely responsible for preparing your facilities and equipment for installation of the Module, where applicable.
+Webkul will make reasonable efforts to accommodate your time and deadline requirements with respect to the performance of Customization Services; however, meeting such requirements is subject to availability of resources, both human and equipment at the time of your request and is dependent on your availability to provide input and to perform necessary actions. Webkul shall not be liable in any way for any delay or damage arising from Webkul’s failure to meet such of your requirements or any deadlines.
+Any changes to the Customization Services or Module requirements after execution of the Order Form will be subject to a cost and delivery re-assessment, and a written change order or re-quote that has been mutually agreed upon by you and Webkul in writing. Webkul reserves the right to make changes in the design of its Software without the obligation to make equivalent changes to the Module.
+If, pursuant to your request, Webkul reviews drawings and documents prepared by others in connection with the Customization Services, including your personnel and other consultants, contractors, and suppliers, Webkul’s review of such drawings and documents shall be only to confirm general compliance with the intent of the design and information given, and shall not constitute acceptance by Webkul of any responsibility for correctness of specifications or details of such drawings and documentation. Webkul shall be entitled to rely on all information provided, and decisions and approvals made, by you in connection with Webkul’s work hereunder. You agree that Webkul and its personnel shall not be subject to any liability or costs relating to the Customization Services to the extent such liability and costs are attributable to any information provided by you that is not complete, accurate or current in all material respects.
+The Module, and all parts thereof, shall at all times be treated as Software licensed to you under the terms and conditions of the Licence Agreement.
+
+
+4. Term and Termination
+-----------------------
+The term of the Development Services, if any, shall be as set out on the Order Form.
+Customization Services may be terminated by Webkul immediately upon notice for cause if:
+you materially breach any agreement entered into between you and Webkul, including Webkul’s Licence Agreement and/or any User / software license agreement relating to Webkul’s products (or you consistently fail to properly perform and observe your obligations under such agreements or any applicable Webkul Software policy), and you fail to rectify the situation within ten (10) calendar days of notice from Webkul; or
+you become insolvent, or a receiver or receiver-manager is appointed for any part of your property, or you make an assignment, proposal or arrangement for the benefit of your creditors or you file an assignment in bankruptcy, or any proceedings under any bankruptcy or insolvency laws are commenced against you.
+Webkul shall have the right to terminate Customization Services immediately upon notice to you, without penalty or refund, if any agreement relating to the Software is terminated for any reason.
+Each party shall have the right to terminate the Development Services for convenience upon ninety (90) days’ notice to the other party.
+Termination of the Customization Services or any agreement shall not affect your payment obligation for any Customization Services performed by Webkul prior to the date of termination, regardless of whether you have had, as at the date of termination, any use of the Module or part thereof. In the event that the Customization Services are terminated prior to the delivery of the Module to you, Webkul shall not be obligated to deliver any work-in-progress or any portion of the Module to you, unless otherwise expressly agreed by the parties in writing.
+
+
+5. Fees
+-------
+You shall pay fees for the Customization Services and Module license in accordance with the fee schedule set forth in the Order Form. Webkul shall submit invoices to you for all fees and payments due, including applicable expenses, on a monthly basis in arrears. You shall pay to Webkul the full amount of each invoice received from Webkul within seven (7) days of receipt of the invoice. All invoices shall detail the nature of the Customization Services performed, the fees payable, and the basis on which the calculation of the fees has been made.
+You are responsible for, and shall pay all taxes relating to the Customization Services and the Module. Unless otherwise indicated, all amounts payable by you under an Order Form are exclusive of any tax, duty, levy, or similar government charge that may be assessed by any jurisdiction, whether based on gross revenue, the delivery, possession or use of the Module, other Software or Customization Services, or otherwise.
+If you fail to pay any amount due within thirty (30) days of such payment becoming due and payable, in addition to any other rights and remedies available to Webkul, Webkul shall be entitled to charge interest on all outstanding amounts at the lesser of 18% per annum or the maximum rate permitted by law, such interest commencing as of the due date for such payment. You shall also be responsible for paying for all reasonable fees and costs incurred by Webkul, including legal fees, in collecting any overdue amounts or enforcing any provision of any agreement entered into between you and Webkul.
+Pricing is subject to Webkul’s understanding of the project requirements, the terms of this policy and the Order Form. Webkul reserves the right to invoice you for additional Customization Services requested by you, or that are required based on incomplete details or specifications provided by you, that are not specified in the Order Form but are provided by Webkul to you, provided that Webkul provides you with notice that such additional Customization Services are not included in the Order Form and are subject to Webkul’s then current time and materials fee schedule for such Customization Services. Invoices for such additional Customization Services shall be subject to payment in accordance with this Section.
+
+
+6. Intellectual Property Rights
+-------------------------------
+Webkul shall own all intellectual property rights (whether or not patentable or registrable under copyright, trade-mark or similar legislation or subject to analogous protection) in and to the Module, and all work conceived, created, invented, produced, designed or reduced to practice by Webkul and its personnel as a result of or with respect to any and all Customization Services provided to you. Your rights and obligations relating to the use of the Module shall be governed by the terms of the applicable Webkul Software License Agreement regardless of whether you may have contributed to any Module in any way. The foregoing shall not be deemed to transfer ownership to Webkul of any pre-existing intellectual property rights that you may have in the materials that you provide to Webkul in order to permit Webkul to perform the Customization Services; however, to the extent that you have provided such materials to Webkul, you hereby grant Webkul a non-exclusive, non-transferable, royalty-free license to use all such materials for the purposes of performing the Customization Services and providing you with the Module.
+
+
+7. Limited Warranty and Limitation of Liability
+-----------------------------------------------
+Limited Warranty: Webkul warrants that all services provided by Webkul shall be provided in a competent, professional manner by persons who are fully trained and qualified to perform the Customization Services. Webkul does not represent or warrant that the Customization Services or Module provided hereunder will be capable of achieving a particular result for your business, or that the operation of the Module will be error free or uninterrupted, or that all errors in the Module can be found or corrected, although Webkul shall use commercially reasonable efforts to do so. Without limiting the foregoing, this warranty is valid only for the six (6) months following the acceptance date as set forth in Section 3(b). The above warranty shall not apply to defects or non-conformities resulting from:
+improper or inadequate maintenance or installation of the Module
+use of the Module in combination with software, interfaces, or other materials that are not supplied or specifically authorized by Webkul,
+unauthorized or improper use or modification of the Module, including use that is not contemplated in the Order Form or instructions provided by Webkul,
+abuse, negligence, accident, or other damage from external sources, or
+improper preparation of your facilities or equipment for installation and use or the Module.
+Limitation of Liability:
+save as otherwise provided in a written agreement between you and Webkul, and to the maximum extent permitted by applicable law, Webkul makes no warranty or condition, express or implied, statutory or otherwise, with respect to the module or the Customization services, including, without limitation, the implied warranties or conditions of merchantability and fitness for a particular purpose.
+in no event shall Webkul be liable to you or any other person for any indirect, special, punitive, exemplary, consequential or incidental damages (including without limitation, damages for loss of revenues or profits, business interruption, loss of business information, and the like) arising out of the use, inability to use or the performance or non-performance of, the module or the provision of the Customization services, even if Webkul has been advised of the possibility of such damage or claim, or it is foreseeable.
+in no event shall Webkul’s maximum aggregate liability to you for direct damages exceed the total amount paid by you for the Customization services performed by Webkul within the six (6) months preceding the date on which the claim arose.
+
+
+8. General Terms and Conditions
+-------------------------------
+As Webkul is primarily a plugin and app development company and its main focus is on constant plugin development fulfilling various latest requirements and keeping up with the latest trends, Webkul has all the right to release the same customized plugin as a new plugin in future to be available to all its customers. The same may include few or every feature of the customisation. Webkul reserve all the rights to do the same as the customisation done for the client is Intellectual property of Webkul.
+The customization undertaken by Webkul would be identical to the discussed requirements, and would not include any sort of additional changes or alterations. Any additional changes or alterations would be considered as a separate project and would be charged separately.
+Webkul would be providing customization support for only one month from the delivery of the project. For any further support extended to you, the same shall be charged separately which includes specifically any further help or bug /error fix.
+The cost of customization doesn’t include the cost of extension installation or exchange of the extension, if it has not been specifically quoted within the project cost.
+During the project customization, you ought not to edit or change any of the files and it is also advisable to have a backup every-time a change is made. If you, on your own, are making certain changes, it is advisable to back up the files, folder and database. Before doing anything on your own, you need to inform Webkul if Webkul is working on the project or your support period is subsisting.
+The customization charge will include a single template. Any time during or after the customization if you change the template, you shall be wholly and solely liable for any loss or damage emanating from the same. Webkul will not be responsible for any loss or damage done due to the same.
+All the communication will take place through Webkul’s help desk system only. If the need arises, the issues can be discussed via Skype once in week or month. Webkul does not allow screen sharing and remote desktop.
+Customization cost will not include any free consulting beyond the scope of the project.
+If while making any changes by yourself or by your team, something gets damaged, then Webkul will not be responsible for it. This includes any issues faced by you for your own fault even during the support period of the module or project.
+Webkul will not be responsible for any damages during the customization. It is advised that you must have a proper backup management system deployed.
+The terms and conditions of this Policy shall be governed by Indian Laws, and the courts in Delhi alone shall only have exclusive jurisdiction to resolve/ adjudicate upon any disputes.
+If any dispute arises between webkul and you/Licensee at any time, in connection with the validity, interpretation, implementation or alleged breach of any provision of this Agreement, the same shall be referred to a sole Arbitrator who shall be an independent and neutral third party appointed exclusively by Webkul. You shall not object to the appointment of the Arbitrator so appointed by Webkul. The place of arbitration shall be Delhi, India. The Arbitration & Conciliation Act, 1996 as amended by The Arbitration & Conciliation (Amendment) Act, 2015, shall govern the arbitration proceedings. The arbitration proceedings shall be held in the English language.
diff --git a/modules/dashguestcycle/LICENSE.txt b/modules/dashguestcycle/LICENSE.txt
new file mode 100644
index 000000000..44b1b399c
--- /dev/null
+++ b/modules/dashguestcycle/LICENSE.txt
@@ -0,0 +1,223 @@
+SOFTWARE LICENCE AGREEMENT
+===============================
+
+This AGREEMENT is made effective on the date of the purchase of the software between Webkul Software Pvt. Ltd.,Company incorporated under the Companies Act, 1956 (hereinafter referred to as “Licensor"), and the purchaser of the software/ product (hereinafter referred to as "Licensee").
+
+Preamble
+==================
+Licensor is a web and mobile product based organization engaged in the business of developing and marketing software for enterprise level e-commerce businesses. It is an ISO and NSR (NASSCOM) certified organization having a team of more than 150 creative engineers which come from different backgrounds. It has developed more than 700 web extensions and apps in the past few years for open source platforms which are used and trusted globally. Licensee now wishes to obtain license, and Licensor wishes to grant a license, to allow use of the software so purchased in developing the e-commerce business website/ mobile app of the Licensee, subject to the terms and conditions set forth herein.
+
+
+THEREFORE, with the intent to be legally bound, the parties hereby agree as follows:
+
+
+Agreement
+================
+
+1.Definitions :
+------------------
+As used in this Agreement, the following capitalized terms shall have the definitions set forth below:
+
+
+"Derivative Works" are works developed by Licensee, its officers, agents, contractors or employees, which are based upon, in whole or in part, the Source Code and/or the Documentation and may also be based upon and/or incorporate one or more other preexisting works of the Licensor. Derivative Works may be any improvement, revision, modification, translation (including compilation or recapitulation by computer), abridgment, condensation, expansion, or any other form in which such a preexisting work may be recast, transformed, or adapted. For purposes hereof, a Derivative Work shall also include any compilation that incorporates such a preexisting work.
+
+
+"Documentation" is written, printed or otherwise recorded or stored (digital or paper) material relating to the Software and/or Source Code, including technical specifications and instructions for its use including Software/ Source Code annotations and other descriptions of the principles of its operation and instructions for its use.
+
+
+"Improvements" shall mean, with respect to the Software, all modifications and changes made, developed, acquired or conceived after the date hereof and during the entire term of this Agreement.
+
+
+"Source Code" is the computer programming source code form of the Software in the form maintained by the Licensor, and includes all non-third-party executables, libraries, components, and Documentation created or used in the creation, development, maintenance, and support of the Software as well as all updates, error corrections and revisions thereto provided by Licensor, in whole or in part.
+
+
+2. Software License.
+-------------------------
+
+(a)Grant of License. For the consideration set forth below, Licensor hereby grants to Licensee, and Licensee hereby accepts the worldwide, non-exclusive, perpetual, royalty-free rights and licenses set forth below:
+
+
+(i)The right and license to use and incorporate the software, in whole or in part, to develop its website/ mobile app (including the integration of all or part of the Licensor’s software into Licensee's own software) on one domain ( Except Joomla modules , listed on store are entitled to be used on unlimited domain as per the standard guidelines ) only, solely for the own personal or business use of the Licensee. However, the License does not authorize the Licensee to compile, copy or distribute the said Software or its Derivative Works.
+
+
+(ii)The right and license does not authorize the Licensee to make any backup or archival copies of the Software and / or the Source Code and Documentation.
+
+(iii)The right and license does not authorize the Licensee to migrate the domain license to another domain.
+
+
+(b)Scope; Rights and Responsibilities.
+
+
+(i)Licensor shall enable the Licensee to download one complete copy of the Software.
+
+
+(ii)The Software is intended for the sole use of the Licensee in development of its own website/ mobile app.
+
+
+(iii)Licensee does not have the right to hand over, sell, distribute, sub-license, rent, lease or lend any portion of the Software or Documentation, whether modified or unmodified, to anyone. Licensee should not place the Software on a server so that it becomes accessible via a public network such as the Internet for distribution purposes. In case the Licensee is using any source code management system like github, it can use the code there only when it has paid subscription from such management system.
+
+
+(iv)Licensee is not authorized to appoint, or work with, third parties to perform any development services using the Source Code, the source code to Derivative Works and/or the Documentation on behalf of, or working with, the Licensee. Release of Source Code, Derivative Work source code and/or Documentation to any third party shall be considered as violation of the Agreement, inter-alia entailing forthwith termination and legal action.
+
+
+
+(c)Ownership.
+
+
+(i)Software and Source Code. All right, title, copyright, and interest in the Software, Source Code, Software Modifications and Error corrections will be and remain the property of Licensor.
+
+
+(ii)Derivative Works. As creation of Derivative Works by the Licensee is prohibited, thus, all right, title, copyright, and interest in any and/or all Derivative Works and Improvements created by, or on behalf of, Licensee will also be deemed to the property of Licensor. Licensor shall be entitled to protect copyright / intellectual property in all such Derivative Works and Improvements also in any country as it may deem fit including without limitation seeking copyright and/or patent protection.
+
+
+3.Consideration.
+--------------------
+
+(a)Licensee shall pay to Licensor the amount as mentioned on the website from where the order is placed, as one-time, upfront fees in consideration for the licenses and rights granted hereunder (hereinafter referred to as the "License Fee"). The License Fee to be paid by Licensee shall be paid upfront at the time of placing the order, and no credit will be allowed under any circumstances.
+
+
+(b)Once paid, the License Fees shall be non-refundable. The Licensee has fully satisfied itself about the Software and has seen the demonstration, and only thereafter has placed the order. Thus, the License Fees or any part thereof is non-refundable. No claim for refund of the Licence Fees shall be entertained under any circumstances.
+
+
+
+4.Representations and Warranties.
+-------------------------------------
+
+(a)Mutual. Each of the parties represents and warrants to the other as follows.
+
+
+(i)such party is a legal entity duly organized, validly existing and in good standing;
+
+
+(ii)such party has the power and authority to conduct its business as presently conducted and to enter into, execute, deliver and perform this Agreement.
+
+
+(iii)This Agreement has been duly and validly accepted by such party and constitutes the legal, valid and binding obligations of such party respectively, enforceable against such party in accordance with their respective terms;
+
+
+(iv)the acceptance, execution, delivery and performance of this Agreement does not and will not violate such party's charter or by-laws; nor require any consent, authorization, approval, exemption or other action by any third party or governmental entity.
+
+
+(b)Licensor warrants that, at the time of purchase of the Software:
+
+
+the Software will function materially as set forth in the website or published functionality provided by Licensor to customers and potential customers describing the Software; and
+
+
+Software add-ons, if purchased by the Licensee from the Licensor, will not materially diminish the features or functions of or the specifications of the Software as they existed as of the execution of this Agreement.
+
+
+
+(c)Title. Licensor represents and warrants that it is the exclusive owner of all copyright/ intellectual property in the Software (including the Source Code) and has good and marketable title to the Software (including the Source Code) free and clear of all liens, claims and encumbrances of any nature whatsoever (collectively, "Liens"). Licensor's grant of license and rights to Licensee hereunder does not, and will not infringe any third party's property, intellectual property or personal rights.
+
+
+
+5.Term.
+-------------
+
+(a)Subject to Licensee's payment obligations, this Agreement shall commence as on the date of making payment of the Software by the Licensee to the Licensor, and shall continue until terminated by either party.
+
+
+(b)The Licensor retains the right to terminate the license at any time, if the Licensee is not abiding by any of the terms of the Agreement. The Licensee may terminate the Agreement at any time at its own discretion by uninstalling the Software and /or by destroying the said Software (or any copies thereof). However, the Licensee shall not be entitled to seek any refund of the amount paid by it to the Licensor, under any circumstances.
+
+
+(c)Survival. In the event this Agreement is terminated for any reason, the provisions set forth in Sections 2(a), 2(b), and 2(c) shall survive.
+
+
+
+
+6. Indemnification
+----------------------
+
+The Licensee release the Licensor from, and agree to indemnify, defend and hold harmless the Licensor (and its officers, directors, employees, agents and Affiliates) against, any claim, loss, damage, settlement, cost, taxes, expense or other liability (including, without limitation, attorneys' fees) (each, a "Claim") arising from or related to: (a) any actual or alleged breach of any obligations in this Agreement; (b) any refund, adjustment, or return of Software,(c) any claim for actual or alleged infringement of any Intellectual Property Rights made by any third party or damages related thereto; or (d) Taxes.
+
+
+7. Limitation of Liability
+------------------------------
+
+The Licensor will not be liable for any direct, indirect, incidental, special, consequential or exemplary damages, including but not limited to, damages for loss of profits, goodwill, use, data or other intangible losses arising out of or in connection with the Software, whether in contract, warranty, tort etc. (including negligence, software liability, any type of civil responsibility or other theory or otherwise) to the Licensee or any other person for cost of software, cover, recovery or recoupment of any investment made by the Licensee or its affiliates in connection with this Agreement, or for any other loss of profit, revenue, business, or data or punitive or consequential damages arising out of or relating to this Agreement. Further, the aggregate liability of the Licensor, arising out of or in connection with this Agreement or the transactions contemplated hereby will not exceed at any time, or under any circumstances, the total amounts received by the Licensor from the Licensee in connection with the particular software giving rise to the claim.
+
+
+8. Force Majeure
+---------------------
+
+The Licensor will not be liable for any delay or failure to perform any of its obligations under this Agreement by reasons, events or other matters beyond its reasonable control.
+
+
+9. Relationship of Parties
+------------------------------
+
+The Licensor and Licensee are independent legal entities, and nothing in this Agreement will be construed to create a partnership, joint venture, association of persons, agency, franchise, sales representative, or employment relationship between the parties. The Licensee will have no authority to make or accept any offers or representations on behalf of the Licensor. The relationship between the parties is that of Licensor and Licensee only, and the rights, duties, liabilities of each party shall be governed by this Agreement.
+
+
+10. Modification
+------------------------
+
+The Licensor may amend any of the terms and conditions contained in this Agreement at any time and solely at its discretion. Any changes will be effective upon the posting of such changes on the Portal/ website, and the Licensee is responsible for reviewing these changes and informing itself of all applicable changes or notices. The continued use of a software by the Licensee after posting of any changes by the Licensor, will constitute the acceptance of such changes or modifications by the Licensee.
+
+
+
+11.Miscellaneous.
+-----------------------
+
+(a)General Provisions. This Agreement: (i) may be amended only by a writing signed by each of the parties; (ii) may be executed in several counterparts, each of which shall be deemed an original but all of which shall constitute one and the same instrument; (iii) contains the entire agreement of the parties with respect to the transactions contemplated hereby and supersedes all prior written and oral agreements, and all contemporaneous oral agreements, relating to such transactions; (iv) shall be governed by, and construed and enforced in accordance with, the laws of India; and (v) shall be binding upon, and inure to the benefit of, the parties and their respective successors and permitted assigns. Each of the parties hereby irrevocably submits to the jurisdiction of the Courts at Delhi, India, for the purposes of any action or proceeding arising out of or relating to this Agreement or the subject matter hereof and brought by any other party.
+
+
+(b)Assignment. Licensee cannot assign, pledge or otherwise transfer, whether by operation of law or otherwise, this Agreement, or any of its obligations hereunder, without the prior written consent of Licensor, which consent shall not be unreasonably withheld.
+
+
+(c)Notices. Unless otherwise specifically provided herein, all notices, consents, requests, demands and other communications required or permitted hereunder:
+
+
+(i)shall be in writing;
+
+
+(ii)shall be sent by messenger, certified or registered mail/email, or reliable express delivery service, to the appropriate address(es) set forth below; and
+
+
+(iii)shall be deemed to have been given on the date of receipt by the addressee, as evidenced by a receipt executed by the addressee (or a responsible person in his or her office), the records of the Party delivering such communication or a notice to the effect that such addressee refused to claim or accept such communication, if sent by messenger, mail or express delivery service.
+
+
+All such communications shall be sent to the following addresses or numbers, or to such other addresses or numbers as any party may inform the others by giving five days' prior notice:
+
+
+If to Webkul Software Pvt. Ltd.:
+
+
+
+Webkul Software Pvt. Ltd.
+
+H-28, ARV Park, Sector 63, NOIDA – 201301,
+
+Uttar Pradesh, India
+
+
+If to Licensee:
+
+At the address mentioned by the Licensee
+
+(at the time of placing order of generating Invoice)
+
+
+(d)Severability. It is the intent of the parties that the provisions of this Agreement be enforced to the fullest extent permissible under the laws and public policies of India in which enforcement hereof is sought. In furtherance of the foregoing, each provision hereof shall be severable from each other provision, and any provision hereof which is/ becomes unenforceable shall be subject to the following: (i) if such provision is contrary to or conflicts with any requirement of any statute, rule or regulation in effect, then such requirement shall be incorporated into, or substituted for, such unenforceable provision to the minimum extent necessary to make such provision enforceable; (ii) the court, agency or arbitrator considering the matter is hereby authorized to (or, if such court, agency or arbitrator is unwilling or fails to do so, then the parties shall) amend such provision to the minimum extent necessary to make such provision enforceable, and the parties hereby consent to the entry of an order so amending such provision; and (iii) if any such provision cannot be or is not reformed and made enforceable pursuant to clause (i) or (ii) above, then such provision shall be ineffective to the minimum extent necessary to make the remainder of this Agreement enforceable. Any application of the foregoing provisions to any provision hereof shall not effect the validity or enforceability of any other provision hereof.
+
+
+(e)By purchasing the Software, the Licensee acknowledge that it has read this Agreement, and that it agrees to the content of the Agreement, its terms and agree to use the Software in compliance with this Agreement.
+
+
+(f)The Licensor holds the sole copyright of the Software. The Software or any portion thereof is a copyrightable matter and is liable to be protected by the applicable laws. Copyright infringement in any manner can lead to prosecution according to the current law. The Licensor reserves the right to revoke the license of any user who is not holding any license or is holding an invalid license.
+
+
+(g)This Agreement gives the right to use only one copy of the Software on one domain solely for the own personal or business use of the Licensee, subject to all the terms and conditions of this Agreement. A separate License has to be purchased for each new Software installation. Any distribution of the Software without the written consent of the Licensor (including non-commercial distribution) is regarded as violation of this Agreement, and will entail immediate termination of the Agreement and may invite liability, both civil and criminal, as per applicable laws.
+
+
+(h)The Licensor reserves the rights to publish a selected list of users/ Licensees of its Software, and no permission of any Licensee is needed in this regard. The Licensee agrees that the Licensor may, in its sole discretion, disclose or make available any information provided or submitted by the Licensee or related to it under this Agreement to any judicial, quasi-judicial, governmental, regulatory or any other authority as may be required by the Licensor to co-operate and / or comply with any of their orders, instructions or directions or to fulfill any requirements under applicable Laws.
+
+
+(i)If the Licensee continues to use the Software even after the sending of the notice by the Licensor for termination, the Licensee agree to accept an injunction to restrain itself from its further use, and to pay all costs (including but not limited to reasonable attorney fees) to enforce injunction or to revoke the License, and any damages suffered by the Licensor because of the misuse of the Software by the Licensee.
+
+
+12. Arbitration
+-----------------------
+
+If any dispute arises between the Licensor and the Licensee at any time, in connection with the validity, interpretation, implementation or alleged breach of any provision of this Agreement, the same shall be referred to a sole Arbitrator who shall be an independent and neutral third party appointed exclusively by the Licensor. The Licensee shall not object to the appointment of the Arbitrator so appointed by the Licensor. The place of arbitration shall be Delhi, India. The Arbitration & Conciliation Act, 1996 as amended by The Arbitration & Conciliation (Amendment) Act, 2015, shall govern the arbitration proceedings. The arbitration proceedings shall be held in the English language.
diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php
new file mode 100644
index 000000000..b43b308ff
--- /dev/null
+++ b/modules/dashguestcycle/dashguestcycle.php
@@ -0,0 +1,97 @@
+name = 'dashguestcycle';
+ $this->tab = 'dashboard';
+ $this->version = '1.0.0';
+ $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6');
+ $this->author = 'Webkul';
+ $this->bootstrap = true;
+ parent::__construct();
+ $this->displayName = $this->l('Dashboard Guest Cycle');
+ $this->description = $this->l('Adds a block with a graphical representation of guest cycle stats.');
+ $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+
+ $this->allow_push = true;
+ }
+
+ public function install()
+ {
+ return (parent::install()
+ && $this->registerHook('dashboardUnnamedOne')
+ && $this->registerHook('dashboardData')
+ && $this->registerHook('actionAdminControllerSetMedia')
+ );
+ }
+
+ public function hookActionAdminControllerSetMedia()
+ {
+ if (Tools::getValue('controller') == 'AdminDashboard') {
+ $this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
+ }
+ }
+
+ public function hookDashboardUnnamedOne($params)
+ {
+ return $this->display(__FILE__, 'dashboard-top.tpl');
+ }
+
+ public function hookDashboardData($params)
+ {
+ $data = array();
+ if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
+ $data['dgc_total_arrivals'] = sprintf('%02d', rand(100, 1000));
+ $data['dgc_arrived'] = sprintf('%02d', rand(0, $data['dgc_total_arrivals']));
+ $data['dgc_total_departures'] = sprintf('%02d', rand(100, 1000));
+ $data['dgc_departed'] = sprintf('%02d', rand(0, $data['dgc_total_departures']));
+ $data['dgc_new_bookings'] = sprintf('%02d', rand(10, 500));
+ $data['dgc_stay_overs'] = sprintf('%02d', rand(10, 500));
+ $data['dgc_new_messages'] = sprintf('%02d', rand(0, 20));
+ $data['dgc_cancelled_bookings'] = sprintf('%02d', rand(0, 20));
+ $data['dgc_guests_adults'] = sprintf('%02d', rand(100, 1000));
+ $data['dgc_guests_children'] = sprintf('%02d', rand(0, $data['dgc_guests_adults']));
+ } else {
+ $dateToday = date('Y-m-d');
+ $arrivalsData = AdminStatsController::getArrivalsByDate($dateToday);
+ $departuresData = AdminStatsController::getDeparturesByDate($dateToday);
+ $guestsData = AdminStatsController::getGuestsByDate($dateToday);
+ $data['dgc_arrived'] = sprintf('%02d', $arrivalsData['arrived']);
+ $data['dgc_total_arrivals'] = sprintf('%02d', $arrivalsData['total_arrivals']);
+ $data['dgc_departed'] = sprintf('%02d', $departuresData['departed']);
+ $data['dgc_total_departures'] = sprintf('%02d', $departuresData['total_departures']);
+ $data['dgc_new_bookings'] = sprintf('%02d', AdminStatsController::getBookingsByDate($dateToday));
+ $data['dgc_stay_overs'] = sprintf('%02d', AdminStatsController::getStayOversByDate($dateToday));
+ $data['dgc_new_messages'] = sprintf('%02d', CustomerMessage::getMessagesByDate($dateToday));
+ $data['dgc_cancelled_bookings'] = sprintf('%02d', AdminStatsController::getCancelledBookingsByDate($dateToday));
+ $data['dgc_guests_adults'] = sprintf('%02d', $guestsData['adults']);
+ $data['dgc_guests_children'] = sprintf('%02d', $guestsData['children']);
+ }
+
+ return array('data_value' => $data);
+ }
+}
diff --git a/modules/dashguestcycle/index.php b/modules/dashguestcycle/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashguestcycle/index.php
@@ -0,0 +1,29 @@
+dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Dashboard-Gästezyklus';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Fügt einen Block mit einer grafischen Darstellung der Gästezyklusstatistiken hinzu.';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Bist du sicher, dass du es deinstallieren willst?';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Ankunft';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Abflüge';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Neue Buchungen';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Übernachten';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Gastnachrichten';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Stornierte Buchungen';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Gäste (Erwachsene/Kinder)';
diff --git a/modules/dashguestcycle/translations/es.php b/modules/dashguestcycle/translations/es.php
new file mode 100644
index 000000000..f7288e0b2
--- /dev/null
+++ b/modules/dashguestcycle/translations/es.php
@@ -0,0 +1,14 @@
+dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Ciclo de invitado del panel';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Agrega un bloque con una representación gráfica de las estadísticas del ciclo de invitados.';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = '¿Estas seguro que lo quieres desinstalar?';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Llegadas';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Salidas';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nuevas reservas';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Stay Overs';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Mensajes de invitados';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Reservas canceladas';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Invitados (Adultos / Niños)';
diff --git a/modules/dashguestcycle/translations/fr.php b/modules/dashguestcycle/translations/fr.php
new file mode 100644
index 000000000..9d0f23019
--- /dev/null
+++ b/modules/dashguestcycle/translations/fr.php
@@ -0,0 +1,14 @@
+dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Cycle d\'invité du tableau de bord';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Ajoute un bloc avec une représentation graphique des statistiques du cycle des invités.';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Êtes-vous sur de vouloir désinstaller?';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Arrivées';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'départs';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nouvelles réservations';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Séjour Overs';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Messages d\'invité';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Réservations annulées';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Invités (adultes/enfants)';
diff --git a/modules/dashguestcycle/translations/index.php b/modules/dashguestcycle/translations/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashguestcycle/translations/index.php
@@ -0,0 +1,29 @@
+dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Ciclo ospite del cruscotto';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Aggiunge un blocco con una rappresentazione grafica delle statistiche del ciclo degli ospiti.';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Sei sicuro di voler disinstallare?';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Arrivi';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Partenze';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nuove prenotazioni';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Soggiorno Overs';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Messaggi degli ospiti';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Prenotazioni annullate';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Ospiti (Adulti/Bambini)';
diff --git a/modules/dashguestcycle/translations/nl.php b/modules/dashguestcycle/translations/nl.php
new file mode 100644
index 000000000..10ec41c6a
--- /dev/null
+++ b/modules/dashguestcycle/translations/nl.php
@@ -0,0 +1,14 @@
+dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Dashboard gastcyclus';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Voegt een blok toe met een grafische weergave van gastcyclusstatistieken.';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Weet u zeker dat u de installatie ongedaan wilt maken?';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Aankomsten';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Vertrek';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nieuwe boekingen';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Overblijven';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Gastberichten';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Geannuleerde boekingen';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Gasten (Volwassenen/Kinderen)';
diff --git a/modules/dashguestcycle/translations/pl.php b/modules/dashguestcycle/translations/pl.php
new file mode 100644
index 000000000..de84f9286
--- /dev/null
+++ b/modules/dashguestcycle/translations/pl.php
@@ -0,0 +1,14 @@
+dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Cykl gościa pulpitu nawigacyjnego';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Dodaje blok z graficzną reprezentacją statystyk cyklu gościa.';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Jesteś pewien, że chcesz odinstalować?';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Przyloty';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Odloty';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Nowe rezerwacje';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Zostań na dłużej';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Wiadomości dla gości';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Anulowane rezerwacje';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Goście (dorośli/dzieci)';
diff --git a/modules/dashguestcycle/translations/pt.php b/modules/dashguestcycle/translations/pt.php
new file mode 100644
index 000000000..211445ab3
--- /dev/null
+++ b/modules/dashguestcycle/translations/pt.php
@@ -0,0 +1,14 @@
+dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Ciclo de convidado do painel';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Adiciona um bloco com uma representação gráfica das estatísticas do ciclo do convidado.';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Você tem certeza que quer desinstalar?';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Chegadas';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Partidas';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Novas Reservas';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Fique Overs';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Mensagens de Convidados';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Reservas canceladas';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Convidados (adultos / crianças)';
diff --git a/modules/dashguestcycle/translations/ru.php b/modules/dashguestcycle/translations/ru.php
new file mode 100644
index 000000000..6311834fa
--- /dev/null
+++ b/modules/dashguestcycle/translations/ru.php
@@ -0,0 +1,14 @@
+dashguestcycle_e3771f089b24e39f54de4f6c7cb5ae71'] = 'Гостевой цикл панели инструментов';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_efbce5905c871f6ee2a35e27cd8387ca'] = 'Добавляет блок с графическим представлением статистики гостевого цикла.';
+$_MODULE['<{dashguestcycle}prestashop>dashguestcycle_876f23178c29dc2552c0b48bf23cd9bd'] = 'Вы уверены, что хотите удалить?';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_90d11386ef0c90f27fb7ff65f1fcff83'] = 'Прибытие';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_5201bc1c95fed6725def30cb27c01b1a'] = 'Отправления';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_1998e47006c71d5217e8fb534b0d6cf6'] = 'Новые заказы';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_a1f1cb8acf3d5563fae235c3a472c2f2'] = 'Остаться на ночь';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_707e4ef7452b8f415c36af6996052f0e'] = 'Гостевые сообщения';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_36c162d08af759b84421db4bcb76bde5'] = 'Отмененные бронирования';
+$_MODULE['<{dashguestcycle}prestashop>dashboard-top_15068fa48d844fd3a21a460650f81145'] = 'Гости (Взрослые / Дети)';
diff --git a/modules/dashguestcycle/views/css/dashguestcycle.css b/modules/dashguestcycle/views/css/dashguestcycle.css
new file mode 100644
index 000000000..5dbf79889
--- /dev/null
+++ b/modules/dashguestcycle/views/css/dashguestcycle.css
@@ -0,0 +1,108 @@
+/**
+* 2010-2021 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through LICENSE.txt file inside our module
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to CustomizationPolicy.txt file inside our module for more information.
+*
+* @author Webkul IN
+* @copyright 2010-2021 Webkul IN
+* @license LICENSE.txt
+*/
+
+/* scrollbar design - start */
+#dashguestcycle ::-webkit-scrollbar {
+ height: 12px;
+ margin-bottom: 5px;
+}
+
+#dashguestcycle ::-webkit-scrollbar-track {
+ background-color: #DDD;
+ margin: 0 6px;
+ border-radius: 10px;
+}
+
+#dashguestcycle ::-webkit-scrollbar-thumb {
+ background-color: #BBB;
+ border-radius: 10px;
+ margin-bottom: 5px;
+
+}
+/* scrollbar design - end */
+
+#dashguestcycle {
+ padding-bottom: 5px;
+}
+
+#dashguestcycle .badges-wrapper {
+ white-space: nowrap;
+ overflow: auto;
+ margin: -5px;
+ margin-bottom: 0px;
+ padding-bottom: 10px;
+ font-size: 0;
+}
+
+#dashguestcycle .badge-wrapper {
+ display: inline-block;
+ width: 14.28%;
+ min-width: 145px;
+ padding: 5px;
+}
+
+#dashguestcycle .badge-item {
+ position: relative;
+ min-width: 135px;
+ height: 80px;
+ border-radius: 10px;
+ background: #FFFFFF;
+ box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.15);
+}
+
+#dashguestcycle .badge-strip {
+ position: absolute;
+ width: 10px;
+ height: 100%;
+ border-top-left-radius: 10px;
+ border-bottom-left-radius: 10px;
+}
+
+#dashguestcycle .badge-content-wrapper {
+ height: 100%;
+}
+
+#dashguestcycle .badge-content-wrapper p {
+ color: #00AFF0;
+ margin-bottom: 0;
+}
+
+#dashguestcycle .title-wrapper, #dashguestcycle .value-wrapper {
+ display: table;
+ width: 100%;
+ height: 50%;
+ padding: 0 10px;
+}
+
+#dashguestcycle .title-wrapper p {
+ display: table-cell;
+ vertical-align: middle;
+ font-weight: normal;
+ font-size: 13px;
+ line-height: 15px;
+ white-space: normal;
+}
+
+#dashguestcycle .value-wrapper p {
+ display: table-cell;
+ vertical-align: top;
+ font-weight: bold;
+ font-size: 24px;
+ line-height: 30px;
+}
\ No newline at end of file
diff --git a/modules/dashguestcycle/views/css/index.php b/modules/dashguestcycle/views/css/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashguestcycle/views/css/index.php
@@ -0,0 +1,29 @@
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {hook h='displayDashboardBadgeListBefore'}
+
+
+
+
+
+
+
+
+
+
+ {l s='Arrivals' mod='dashguestcycle'}
+
+
+ + / +
+
+
+
+
+
+
+
+
+
+ {l s='Departures' mod='dashguestcycle'}
+
+
+ + / +
+
+
+
+
+
+
+
+
+
+ {l s='New Bookings' mod='dashguestcycle'}
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ {l s='Stay Overs' mod='dashguestcycle'}
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ + {l s='Guest Messages' mod='dashguestcycle'} +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ + {l s='Cancelled Bookings' mod='dashguestcycle'} +
+
+
+ + +
+
+
+ {hook h='displayDashboardBadgeListAfter'}
+
+
+
+
+
+
+
+ + {l s='Guests (Adults/Children)' mod='dashguestcycle'} +
+
+
+ + / +
+
+
+
+
+
+ {l s='Occupancy' mod='dashoccupancy'}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/dashoccupancy/views/templates/hook/index.php b/modules/dashoccupancy/views/templates/hook/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashoccupancy/views/templates/hook/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashoccupancy/views/templates/index.php b/modules/dashoccupancy/views/templates/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashoccupancy/views/templates/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashperformance/CHANGELOG.txt b/modules/dashperformance/CHANGELOG.txt
new file mode 100644
index 000000000..4f29acabf
--- /dev/null
+++ b/modules/dashperformance/CHANGELOG.txt
@@ -0,0 +1,4 @@
+Changelog
+
+v1.0.0
+- first release
diff --git a/modules/dashperformance/CustomizationPolicy.txt b/modules/dashperformance/CustomizationPolicy.txt
new file mode 100644
index 000000000..7a688847f
--- /dev/null
+++ b/modules/dashperformance/CustomizationPolicy.txt
@@ -0,0 +1,80 @@
+1. Definitions
+--------------
+"Webkul" means Webkul Software Pvt. Ltd.
+"Customization" means those services by which functionality / features are added to a product that are not included in the base installation of a product, which are aimed to suit the specific needs of the customer.
+"Module" means the custom add-on module to be developed and provided by Webkul to you in accordance with this policy and the Order Form.
+"Order Form" means the order form (electronic or hard copy), accepted by Webkul, through which you ordered the Module to be developed and provided by Webkul and which sets out the details, specifications and parameters of the customized Module to be provided.
+"Software" means the software licensed by Webkul to you pursuant to the terms and conditions of a Webkul Software License Agreement.
+
+
+2. Module Development
+---------------------
+All customization Services and use of the Module are subject to the terms and conditions of Webkul’s Software Licence Agreement, found on Webkul’s website, and are also subject to the terms and conditions set forth in the Order Form, as well as the customization parameters. No other customization services will be provided unless expressly agreed upon by you and Webkul in writing, signed by authorized representatives of you and Webkul.
+
+
+3. Customization Services
+-------------------------
+Customization Services will be provided in accordance with the terms of the Order Form and subject to the conditions set forth on the Order Form including full payment of all fees and adherence to all time limits and scheduling restrictions.
+If expressly stated on the Order Form, the Customization Services and Module shall be subject to acceptance by you in accordance with the acceptance criteria set forth in the Order Form. Where there is no acceptance criteria set forth on the Order Form, acceptance shall be deemed to occur upon the earliest of:
+completion of the acceptance criteria,
+Webkul's completion of the Customization Services and written notification to you of such completion,
+your use of the Module in other than a test environment.
+Notwithstanding the foregoing, if acceptance testing, delivery or completion is delayed by thirty (30) days or more for reasons not related to Webkul’s performance, you must pay the value of any milestone that is contingent on acceptance. Such acceptance does not negate any warranty rights that you may have respecting the Module, as set forth herein. You are solely responsible for preparing your facilities and equipment for installation of the Module, where applicable.
+Webkul will make reasonable efforts to accommodate your time and deadline requirements with respect to the performance of Customization Services; however, meeting such requirements is subject to availability of resources, both human and equipment at the time of your request and is dependent on your availability to provide input and to perform necessary actions. Webkul shall not be liable in any way for any delay or damage arising from Webkul’s failure to meet such of your requirements or any deadlines.
+Any changes to the Customization Services or Module requirements after execution of the Order Form will be subject to a cost and delivery re-assessment, and a written change order or re-quote that has been mutually agreed upon by you and Webkul in writing. Webkul reserves the right to make changes in the design of its Software without the obligation to make equivalent changes to the Module.
+If, pursuant to your request, Webkul reviews drawings and documents prepared by others in connection with the Customization Services, including your personnel and other consultants, contractors, and suppliers, Webkul’s review of such drawings and documents shall be only to confirm general compliance with the intent of the design and information given, and shall not constitute acceptance by Webkul of any responsibility for correctness of specifications or details of such drawings and documentation. Webkul shall be entitled to rely on all information provided, and decisions and approvals made, by you in connection with Webkul’s work hereunder. You agree that Webkul and its personnel shall not be subject to any liability or costs relating to the Customization Services to the extent such liability and costs are attributable to any information provided by you that is not complete, accurate or current in all material respects.
+The Module, and all parts thereof, shall at all times be treated as Software licensed to you under the terms and conditions of the Licence Agreement.
+
+
+4. Term and Termination
+-----------------------
+The term of the Development Services, if any, shall be as set out on the Order Form.
+Customization Services may be terminated by Webkul immediately upon notice for cause if:
+you materially breach any agreement entered into between you and Webkul, including Webkul’s Licence Agreement and/or any User / software license agreement relating to Webkul’s products (or you consistently fail to properly perform and observe your obligations under such agreements or any applicable Webkul Software policy), and you fail to rectify the situation within ten (10) calendar days of notice from Webkul; or
+you become insolvent, or a receiver or receiver-manager is appointed for any part of your property, or you make an assignment, proposal or arrangement for the benefit of your creditors or you file an assignment in bankruptcy, or any proceedings under any bankruptcy or insolvency laws are commenced against you.
+Webkul shall have the right to terminate Customization Services immediately upon notice to you, without penalty or refund, if any agreement relating to the Software is terminated for any reason.
+Each party shall have the right to terminate the Development Services for convenience upon ninety (90) days’ notice to the other party.
+Termination of the Customization Services or any agreement shall not affect your payment obligation for any Customization Services performed by Webkul prior to the date of termination, regardless of whether you have had, as at the date of termination, any use of the Module or part thereof. In the event that the Customization Services are terminated prior to the delivery of the Module to you, Webkul shall not be obligated to deliver any work-in-progress or any portion of the Module to you, unless otherwise expressly agreed by the parties in writing.
+
+
+5. Fees
+-------
+You shall pay fees for the Customization Services and Module license in accordance with the fee schedule set forth in the Order Form. Webkul shall submit invoices to you for all fees and payments due, including applicable expenses, on a monthly basis in arrears. You shall pay to Webkul the full amount of each invoice received from Webkul within seven (7) days of receipt of the invoice. All invoices shall detail the nature of the Customization Services performed, the fees payable, and the basis on which the calculation of the fees has been made.
+You are responsible for, and shall pay all taxes relating to the Customization Services and the Module. Unless otherwise indicated, all amounts payable by you under an Order Form are exclusive of any tax, duty, levy, or similar government charge that may be assessed by any jurisdiction, whether based on gross revenue, the delivery, possession or use of the Module, other Software or Customization Services, or otherwise.
+If you fail to pay any amount due within thirty (30) days of such payment becoming due and payable, in addition to any other rights and remedies available to Webkul, Webkul shall be entitled to charge interest on all outstanding amounts at the lesser of 18% per annum or the maximum rate permitted by law, such interest commencing as of the due date for such payment. You shall also be responsible for paying for all reasonable fees and costs incurred by Webkul, including legal fees, in collecting any overdue amounts or enforcing any provision of any agreement entered into between you and Webkul.
+Pricing is subject to Webkul’s understanding of the project requirements, the terms of this policy and the Order Form. Webkul reserves the right to invoice you for additional Customization Services requested by you, or that are required based on incomplete details or specifications provided by you, that are not specified in the Order Form but are provided by Webkul to you, provided that Webkul provides you with notice that such additional Customization Services are not included in the Order Form and are subject to Webkul’s then current time and materials fee schedule for such Customization Services. Invoices for such additional Customization Services shall be subject to payment in accordance with this Section.
+
+
+6. Intellectual Property Rights
+-------------------------------
+Webkul shall own all intellectual property rights (whether or not patentable or registrable under copyright, trade-mark or similar legislation or subject to analogous protection) in and to the Module, and all work conceived, created, invented, produced, designed or reduced to practice by Webkul and its personnel as a result of or with respect to any and all Customization Services provided to you. Your rights and obligations relating to the use of the Module shall be governed by the terms of the applicable Webkul Software License Agreement regardless of whether you may have contributed to any Module in any way. The foregoing shall not be deemed to transfer ownership to Webkul of any pre-existing intellectual property rights that you may have in the materials that you provide to Webkul in order to permit Webkul to perform the Customization Services; however, to the extent that you have provided such materials to Webkul, you hereby grant Webkul a non-exclusive, non-transferable, royalty-free license to use all such materials for the purposes of performing the Customization Services and providing you with the Module.
+
+
+7. Limited Warranty and Limitation of Liability
+-----------------------------------------------
+Limited Warranty: Webkul warrants that all services provided by Webkul shall be provided in a competent, professional manner by persons who are fully trained and qualified to perform the Customization Services. Webkul does not represent or warrant that the Customization Services or Module provided hereunder will be capable of achieving a particular result for your business, or that the operation of the Module will be error free or uninterrupted, or that all errors in the Module can be found or corrected, although Webkul shall use commercially reasonable efforts to do so. Without limiting the foregoing, this warranty is valid only for the six (6) months following the acceptance date as set forth in Section 3(b). The above warranty shall not apply to defects or non-conformities resulting from:
+improper or inadequate maintenance or installation of the Module
+use of the Module in combination with software, interfaces, or other materials that are not supplied or specifically authorized by Webkul,
+unauthorized or improper use or modification of the Module, including use that is not contemplated in the Order Form or instructions provided by Webkul,
+abuse, negligence, accident, or other damage from external sources, or
+improper preparation of your facilities or equipment for installation and use or the Module.
+Limitation of Liability:
+save as otherwise provided in a written agreement between you and Webkul, and to the maximum extent permitted by applicable law, Webkul makes no warranty or condition, express or implied, statutory or otherwise, with respect to the module or the Customization services, including, without limitation, the implied warranties or conditions of merchantability and fitness for a particular purpose.
+in no event shall Webkul be liable to you or any other person for any indirect, special, punitive, exemplary, consequential or incidental damages (including without limitation, damages for loss of revenues or profits, business interruption, loss of business information, and the like) arising out of the use, inability to use or the performance or non-performance of, the module or the provision of the Customization services, even if Webkul has been advised of the possibility of such damage or claim, or it is foreseeable.
+in no event shall Webkul’s maximum aggregate liability to you for direct damages exceed the total amount paid by you for the Customization services performed by Webkul within the six (6) months preceding the date on which the claim arose.
+
+
+8. General Terms and Conditions
+-------------------------------
+As Webkul is primarily a plugin and app development company and its main focus is on constant plugin development fulfilling various latest requirements and keeping up with the latest trends, Webkul has all the right to release the same customized plugin as a new plugin in future to be available to all its customers. The same may include few or every feature of the customisation. Webkul reserve all the rights to do the same as the customisation done for the client is Intellectual property of Webkul.
+The customization undertaken by Webkul would be identical to the discussed requirements, and would not include any sort of additional changes or alterations. Any additional changes or alterations would be considered as a separate project and would be charged separately.
+Webkul would be providing customization support for only one month from the delivery of the project. For any further support extended to you, the same shall be charged separately which includes specifically any further help or bug /error fix.
+The cost of customization doesn’t include the cost of extension installation or exchange of the extension, if it has not been specifically quoted within the project cost.
+During the project customization, you ought not to edit or change any of the files and it is also advisable to have a backup every-time a change is made. If you, on your own, are making certain changes, it is advisable to back up the files, folder and database. Before doing anything on your own, you need to inform Webkul if Webkul is working on the project or your support period is subsisting.
+The customization charge will include a single template. Any time during or after the customization if you change the template, you shall be wholly and solely liable for any loss or damage emanating from the same. Webkul will not be responsible for any loss or damage done due to the same.
+All the communication will take place through Webkul’s help desk system only. If the need arises, the issues can be discussed via Skype once in week or month. Webkul does not allow screen sharing and remote desktop.
+Customization cost will not include any free consulting beyond the scope of the project.
+If while making any changes by yourself or by your team, something gets damaged, then Webkul will not be responsible for it. This includes any issues faced by you for your own fault even during the support period of the module or project.
+Webkul will not be responsible for any damages during the customization. It is advised that you must have a proper backup management system deployed.
+The terms and conditions of this Policy shall be governed by Indian Laws, and the courts in Delhi alone shall only have exclusive jurisdiction to resolve/ adjudicate upon any disputes.
+If any dispute arises between webkul and you/Licensee at any time, in connection with the validity, interpretation, implementation or alleged breach of any provision of this Agreement, the same shall be referred to a sole Arbitrator who shall be an independent and neutral third party appointed exclusively by Webkul. You shall not object to the appointment of the Arbitrator so appointed by Webkul. The place of arbitration shall be Delhi, India. The Arbitration & Conciliation Act, 1996 as amended by The Arbitration & Conciliation (Amendment) Act, 2015, shall govern the arbitration proceedings. The arbitration proceedings shall be held in the English language.
diff --git a/modules/dashperformance/LICENSE.txt b/modules/dashperformance/LICENSE.txt
new file mode 100644
index 000000000..44b1b399c
--- /dev/null
+++ b/modules/dashperformance/LICENSE.txt
@@ -0,0 +1,223 @@
+SOFTWARE LICENCE AGREEMENT
+===============================
+
+This AGREEMENT is made effective on the date of the purchase of the software between Webkul Software Pvt. Ltd.,Company incorporated under the Companies Act, 1956 (hereinafter referred to as “Licensor"), and the purchaser of the software/ product (hereinafter referred to as "Licensee").
+
+Preamble
+==================
+Licensor is a web and mobile product based organization engaged in the business of developing and marketing software for enterprise level e-commerce businesses. It is an ISO and NSR (NASSCOM) certified organization having a team of more than 150 creative engineers which come from different backgrounds. It has developed more than 700 web extensions and apps in the past few years for open source platforms which are used and trusted globally. Licensee now wishes to obtain license, and Licensor wishes to grant a license, to allow use of the software so purchased in developing the e-commerce business website/ mobile app of the Licensee, subject to the terms and conditions set forth herein.
+
+
+THEREFORE, with the intent to be legally bound, the parties hereby agree as follows:
+
+
+Agreement
+================
+
+1.Definitions :
+------------------
+As used in this Agreement, the following capitalized terms shall have the definitions set forth below:
+
+
+"Derivative Works" are works developed by Licensee, its officers, agents, contractors or employees, which are based upon, in whole or in part, the Source Code and/or the Documentation and may also be based upon and/or incorporate one or more other preexisting works of the Licensor. Derivative Works may be any improvement, revision, modification, translation (including compilation or recapitulation by computer), abridgment, condensation, expansion, or any other form in which such a preexisting work may be recast, transformed, or adapted. For purposes hereof, a Derivative Work shall also include any compilation that incorporates such a preexisting work.
+
+
+"Documentation" is written, printed or otherwise recorded or stored (digital or paper) material relating to the Software and/or Source Code, including technical specifications and instructions for its use including Software/ Source Code annotations and other descriptions of the principles of its operation and instructions for its use.
+
+
+"Improvements" shall mean, with respect to the Software, all modifications and changes made, developed, acquired or conceived after the date hereof and during the entire term of this Agreement.
+
+
+"Source Code" is the computer programming source code form of the Software in the form maintained by the Licensor, and includes all non-third-party executables, libraries, components, and Documentation created or used in the creation, development, maintenance, and support of the Software as well as all updates, error corrections and revisions thereto provided by Licensor, in whole or in part.
+
+
+2. Software License.
+-------------------------
+
+(a)Grant of License. For the consideration set forth below, Licensor hereby grants to Licensee, and Licensee hereby accepts the worldwide, non-exclusive, perpetual, royalty-free rights and licenses set forth below:
+
+
+(i)The right and license to use and incorporate the software, in whole or in part, to develop its website/ mobile app (including the integration of all or part of the Licensor’s software into Licensee's own software) on one domain ( Except Joomla modules , listed on store are entitled to be used on unlimited domain as per the standard guidelines ) only, solely for the own personal or business use of the Licensee. However, the License does not authorize the Licensee to compile, copy or distribute the said Software or its Derivative Works.
+
+
+(ii)The right and license does not authorize the Licensee to make any backup or archival copies of the Software and / or the Source Code and Documentation.
+
+(iii)The right and license does not authorize the Licensee to migrate the domain license to another domain.
+
+
+(b)Scope; Rights and Responsibilities.
+
+
+(i)Licensor shall enable the Licensee to download one complete copy of the Software.
+
+
+(ii)The Software is intended for the sole use of the Licensee in development of its own website/ mobile app.
+
+
+(iii)Licensee does not have the right to hand over, sell, distribute, sub-license, rent, lease or lend any portion of the Software or Documentation, whether modified or unmodified, to anyone. Licensee should not place the Software on a server so that it becomes accessible via a public network such as the Internet for distribution purposes. In case the Licensee is using any source code management system like github, it can use the code there only when it has paid subscription from such management system.
+
+
+(iv)Licensee is not authorized to appoint, or work with, third parties to perform any development services using the Source Code, the source code to Derivative Works and/or the Documentation on behalf of, or working with, the Licensee. Release of Source Code, Derivative Work source code and/or Documentation to any third party shall be considered as violation of the Agreement, inter-alia entailing forthwith termination and legal action.
+
+
+
+(c)Ownership.
+
+
+(i)Software and Source Code. All right, title, copyright, and interest in the Software, Source Code, Software Modifications and Error corrections will be and remain the property of Licensor.
+
+
+(ii)Derivative Works. As creation of Derivative Works by the Licensee is prohibited, thus, all right, title, copyright, and interest in any and/or all Derivative Works and Improvements created by, or on behalf of, Licensee will also be deemed to the property of Licensor. Licensor shall be entitled to protect copyright / intellectual property in all such Derivative Works and Improvements also in any country as it may deem fit including without limitation seeking copyright and/or patent protection.
+
+
+3.Consideration.
+--------------------
+
+(a)Licensee shall pay to Licensor the amount as mentioned on the website from where the order is placed, as one-time, upfront fees in consideration for the licenses and rights granted hereunder (hereinafter referred to as the "License Fee"). The License Fee to be paid by Licensee shall be paid upfront at the time of placing the order, and no credit will be allowed under any circumstances.
+
+
+(b)Once paid, the License Fees shall be non-refundable. The Licensee has fully satisfied itself about the Software and has seen the demonstration, and only thereafter has placed the order. Thus, the License Fees or any part thereof is non-refundable. No claim for refund of the Licence Fees shall be entertained under any circumstances.
+
+
+
+4.Representations and Warranties.
+-------------------------------------
+
+(a)Mutual. Each of the parties represents and warrants to the other as follows.
+
+
+(i)such party is a legal entity duly organized, validly existing and in good standing;
+
+
+(ii)such party has the power and authority to conduct its business as presently conducted and to enter into, execute, deliver and perform this Agreement.
+
+
+(iii)This Agreement has been duly and validly accepted by such party and constitutes the legal, valid and binding obligations of such party respectively, enforceable against such party in accordance with their respective terms;
+
+
+(iv)the acceptance, execution, delivery and performance of this Agreement does not and will not violate such party's charter or by-laws; nor require any consent, authorization, approval, exemption or other action by any third party or governmental entity.
+
+
+(b)Licensor warrants that, at the time of purchase of the Software:
+
+
+the Software will function materially as set forth in the website or published functionality provided by Licensor to customers and potential customers describing the Software; and
+
+
+Software add-ons, if purchased by the Licensee from the Licensor, will not materially diminish the features or functions of or the specifications of the Software as they existed as of the execution of this Agreement.
+
+
+
+(c)Title. Licensor represents and warrants that it is the exclusive owner of all copyright/ intellectual property in the Software (including the Source Code) and has good and marketable title to the Software (including the Source Code) free and clear of all liens, claims and encumbrances of any nature whatsoever (collectively, "Liens"). Licensor's grant of license and rights to Licensee hereunder does not, and will not infringe any third party's property, intellectual property or personal rights.
+
+
+
+5.Term.
+-------------
+
+(a)Subject to Licensee's payment obligations, this Agreement shall commence as on the date of making payment of the Software by the Licensee to the Licensor, and shall continue until terminated by either party.
+
+
+(b)The Licensor retains the right to terminate the license at any time, if the Licensee is not abiding by any of the terms of the Agreement. The Licensee may terminate the Agreement at any time at its own discretion by uninstalling the Software and /or by destroying the said Software (or any copies thereof). However, the Licensee shall not be entitled to seek any refund of the amount paid by it to the Licensor, under any circumstances.
+
+
+(c)Survival. In the event this Agreement is terminated for any reason, the provisions set forth in Sections 2(a), 2(b), and 2(c) shall survive.
+
+
+
+
+6. Indemnification
+----------------------
+
+The Licensee release the Licensor from, and agree to indemnify, defend and hold harmless the Licensor (and its officers, directors, employees, agents and Affiliates) against, any claim, loss, damage, settlement, cost, taxes, expense or other liability (including, without limitation, attorneys' fees) (each, a "Claim") arising from or related to: (a) any actual or alleged breach of any obligations in this Agreement; (b) any refund, adjustment, or return of Software,(c) any claim for actual or alleged infringement of any Intellectual Property Rights made by any third party or damages related thereto; or (d) Taxes.
+
+
+7. Limitation of Liability
+------------------------------
+
+The Licensor will not be liable for any direct, indirect, incidental, special, consequential or exemplary damages, including but not limited to, damages for loss of profits, goodwill, use, data or other intangible losses arising out of or in connection with the Software, whether in contract, warranty, tort etc. (including negligence, software liability, any type of civil responsibility or other theory or otherwise) to the Licensee or any other person for cost of software, cover, recovery or recoupment of any investment made by the Licensee or its affiliates in connection with this Agreement, or for any other loss of profit, revenue, business, or data or punitive or consequential damages arising out of or relating to this Agreement. Further, the aggregate liability of the Licensor, arising out of or in connection with this Agreement or the transactions contemplated hereby will not exceed at any time, or under any circumstances, the total amounts received by the Licensor from the Licensee in connection with the particular software giving rise to the claim.
+
+
+8. Force Majeure
+---------------------
+
+The Licensor will not be liable for any delay or failure to perform any of its obligations under this Agreement by reasons, events or other matters beyond its reasonable control.
+
+
+9. Relationship of Parties
+------------------------------
+
+The Licensor and Licensee are independent legal entities, and nothing in this Agreement will be construed to create a partnership, joint venture, association of persons, agency, franchise, sales representative, or employment relationship between the parties. The Licensee will have no authority to make or accept any offers or representations on behalf of the Licensor. The relationship between the parties is that of Licensor and Licensee only, and the rights, duties, liabilities of each party shall be governed by this Agreement.
+
+
+10. Modification
+------------------------
+
+The Licensor may amend any of the terms and conditions contained in this Agreement at any time and solely at its discretion. Any changes will be effective upon the posting of such changes on the Portal/ website, and the Licensee is responsible for reviewing these changes and informing itself of all applicable changes or notices. The continued use of a software by the Licensee after posting of any changes by the Licensor, will constitute the acceptance of such changes or modifications by the Licensee.
+
+
+
+11.Miscellaneous.
+-----------------------
+
+(a)General Provisions. This Agreement: (i) may be amended only by a writing signed by each of the parties; (ii) may be executed in several counterparts, each of which shall be deemed an original but all of which shall constitute one and the same instrument; (iii) contains the entire agreement of the parties with respect to the transactions contemplated hereby and supersedes all prior written and oral agreements, and all contemporaneous oral agreements, relating to such transactions; (iv) shall be governed by, and construed and enforced in accordance with, the laws of India; and (v) shall be binding upon, and inure to the benefit of, the parties and their respective successors and permitted assigns. Each of the parties hereby irrevocably submits to the jurisdiction of the Courts at Delhi, India, for the purposes of any action or proceeding arising out of or relating to this Agreement or the subject matter hereof and brought by any other party.
+
+
+(b)Assignment. Licensee cannot assign, pledge or otherwise transfer, whether by operation of law or otherwise, this Agreement, or any of its obligations hereunder, without the prior written consent of Licensor, which consent shall not be unreasonably withheld.
+
+
+(c)Notices. Unless otherwise specifically provided herein, all notices, consents, requests, demands and other communications required or permitted hereunder:
+
+
+(i)shall be in writing;
+
+
+(ii)shall be sent by messenger, certified or registered mail/email, or reliable express delivery service, to the appropriate address(es) set forth below; and
+
+
+(iii)shall be deemed to have been given on the date of receipt by the addressee, as evidenced by a receipt executed by the addressee (or a responsible person in his or her office), the records of the Party delivering such communication or a notice to the effect that such addressee refused to claim or accept such communication, if sent by messenger, mail or express delivery service.
+
+
+All such communications shall be sent to the following addresses or numbers, or to such other addresses or numbers as any party may inform the others by giving five days' prior notice:
+
+
+If to Webkul Software Pvt. Ltd.:
+
+
+
+Webkul Software Pvt. Ltd.
+
+H-28, ARV Park, Sector 63, NOIDA – 201301,
+
+Uttar Pradesh, India
+
+
+If to Licensee:
+
+At the address mentioned by the Licensee
+
+(at the time of placing order of generating Invoice)
+
+
+(d)Severability. It is the intent of the parties that the provisions of this Agreement be enforced to the fullest extent permissible under the laws and public policies of India in which enforcement hereof is sought. In furtherance of the foregoing, each provision hereof shall be severable from each other provision, and any provision hereof which is/ becomes unenforceable shall be subject to the following: (i) if such provision is contrary to or conflicts with any requirement of any statute, rule or regulation in effect, then such requirement shall be incorporated into, or substituted for, such unenforceable provision to the minimum extent necessary to make such provision enforceable; (ii) the court, agency or arbitrator considering the matter is hereby authorized to (or, if such court, agency or arbitrator is unwilling or fails to do so, then the parties shall) amend such provision to the minimum extent necessary to make such provision enforceable, and the parties hereby consent to the entry of an order so amending such provision; and (iii) if any such provision cannot be or is not reformed and made enforceable pursuant to clause (i) or (ii) above, then such provision shall be ineffective to the minimum extent necessary to make the remainder of this Agreement enforceable. Any application of the foregoing provisions to any provision hereof shall not effect the validity or enforceability of any other provision hereof.
+
+
+(e)By purchasing the Software, the Licensee acknowledge that it has read this Agreement, and that it agrees to the content of the Agreement, its terms and agree to use the Software in compliance with this Agreement.
+
+
+(f)The Licensor holds the sole copyright of the Software. The Software or any portion thereof is a copyrightable matter and is liable to be protected by the applicable laws. Copyright infringement in any manner can lead to prosecution according to the current law. The Licensor reserves the right to revoke the license of any user who is not holding any license or is holding an invalid license.
+
+
+(g)This Agreement gives the right to use only one copy of the Software on one domain solely for the own personal or business use of the Licensee, subject to all the terms and conditions of this Agreement. A separate License has to be purchased for each new Software installation. Any distribution of the Software without the written consent of the Licensor (including non-commercial distribution) is regarded as violation of this Agreement, and will entail immediate termination of the Agreement and may invite liability, both civil and criminal, as per applicable laws.
+
+
+(h)The Licensor reserves the rights to publish a selected list of users/ Licensees of its Software, and no permission of any Licensee is needed in this regard. The Licensee agrees that the Licensor may, in its sole discretion, disclose or make available any information provided or submitted by the Licensee or related to it under this Agreement to any judicial, quasi-judicial, governmental, regulatory or any other authority as may be required by the Licensor to co-operate and / or comply with any of their orders, instructions or directions or to fulfill any requirements under applicable Laws.
+
+
+(i)If the Licensee continues to use the Software even after the sending of the notice by the Licensor for termination, the Licensee agree to accept an injunction to restrain itself from its further use, and to pay all costs (including but not limited to reasonable attorney fees) to enforce injunction or to revoke the License, and any damages suffered by the Licensor because of the misuse of the Software by the Licensee.
+
+
+12. Arbitration
+-----------------------
+
+If any dispute arises between the Licensor and the Licensee at any time, in connection with the validity, interpretation, implementation or alleged breach of any provision of this Agreement, the same shall be referred to a sole Arbitrator who shall be an independent and neutral third party appointed exclusively by the Licensor. The Licensee shall not object to the appointment of the Arbitrator so appointed by the Licensor. The place of arbitration shall be Delhi, India. The Arbitration & Conciliation Act, 1996 as amended by The Arbitration & Conciliation (Amendment) Act, 2015, shall govern the arbitration proceedings. The arbitration proceedings shall be held in the English language.
diff --git a/modules/dashperformance/dashperformance.php b/modules/dashperformance/dashperformance.php
new file mode 100644
index 000000000..c7199a4c7
--- /dev/null
+++ b/modules/dashperformance/dashperformance.php
@@ -0,0 +1,94 @@
+name = 'dashperformance';
+ $this->tab = 'dashboard';
+ $this->version = '1.0.0';
+ $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6');
+ $this->author = 'Webkul';
+ $this->bootstrap = true;
+ parent::__construct();
+ $this->displayName = $this->l('Dashboard Performance');
+ $this->description = $this->l('Adds a block with a graphical representation of performance of your website.');
+ $this->confirmUnsinstall = $this->l('Are you sure you want to uninstall?');
+
+ $this->allow_push = true;
+ }
+
+ public function install()
+ {
+ return (parent::install()
+ && $this->registerHook('dashboardZoneTwo')
+ && $this->registerHook('dashboardData')
+ && $this->registerHook('actionAdminControllerSetMedia')
+ );
+ }
+
+ public function hookActionAdminControllerSetMedia()
+ {
+ if (get_class($this->context->controller) == 'AdminDashboardController') {
+ $this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
+ }
+ $this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
+ }
+
+ public function hookDashboardZoneTwo($params)
+ {
+ return $this->display(__FILE__, 'dashboard_zone_two.tpl');
+ }
+
+ public function hookDashboardData($params)
+ {
+ $data = array();
+ if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
+ $data['dp_average_daily_rate'] = Tools::displayPrice(round(rand(2000, 20000)));
+ $data['dp_cancellation_rate'] = (round(rand(1, 1000), 2) / 100).'%';
+ $data['dp_revenue'] = Tools::displayPrice(round(rand(20000, 70000)));
+ $data['dp_nights_stayed'] = rand(100, 1000);
+ } else {
+ $data['dp_average_daily_rate'] = AdminStatsController::getAverageDailyRate(
+ $params['date_from'],
+ $params['date_to']
+ );
+ $data['dp_cancellation_rate'] = AdminStatsController::getCancellationRate(
+ $params['date_from'],
+ $params['date_to']
+ );
+ $data['dp_revenue'] = AdminStatsController::getRevenue(
+ $params['date_from'],
+ $params['date_to']
+ );
+ $data['dp_nights_stayed'] = AdminStatsController::getNightsStayed(
+ $params['date_from'],
+ $params['date_to']
+ );
+ }
+
+ return array('data_value' => $data);
+ }
+}
diff --git a/modules/dashperformance/index.php b/modules/dashperformance/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashperformance/index.php
@@ -0,0 +1,29 @@
+dashperformance_2b87a85adc13f4bbd555376e5875b360'] = 'Dashboard-Leistung';
+$_MODULE['<{dashperformance}prestashop>dashperformance_01a59802a9fc001df283e6b2eb5382ca'] = 'Fügt einen Block mit einer grafischen Darstellung der Leistung Ihrer Website hinzu.';
+$_MODULE['<{dashperformance}prestashop>dashperformance_876f23178c29dc2552c0b48bf23cd9bd'] = 'Bist du sicher, dass du es deinstallieren willst?';
+$_MODULE['<{dashperformance}prestashop>chartdata_bbd86c81e760279d9731d5cac811ba50'] = 'Besetzt';
+$_MODULE['<{dashperformance}prestashop>chartdata_78945de8de090e90045d299651a68a9b'] = 'Erhältlich';
+$_MODULE['<{dashperformance}prestashop>chartdata_145e4e82f20061446c56546e3a0501e7'] = 'Inaktiv / Wartung';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_9446a98ad14416153cc4d45ab8b531bf'] = 'Leistung';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Aktualisierung';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Aufbau';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_93d459c645acd52c3d15d72e5ece52de'] = 'Durchschn. ';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_6c9fc730f967097688d1c43d1f2889e7'] = 'Stornierungsrate';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_54358a914f51e1af19df8520159fe607'] = 'Einnahmen';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_e7c3c94086501fb4cac569b5624ddb12'] = 'Übernachtungen';
diff --git a/modules/dashperformance/translations/es.php b/modules/dashperformance/translations/es.php
new file mode 100644
index 000000000..090ad497f
--- /dev/null
+++ b/modules/dashperformance/translations/es.php
@@ -0,0 +1,17 @@
+dashperformance_2b87a85adc13f4bbd555376e5875b360'] = 'Rendimiento del panel';
+$_MODULE['<{dashperformance}prestashop>dashperformance_01a59802a9fc001df283e6b2eb5382ca'] = 'Agrega un bloque con una representación gráfica del rendimiento de su sitio web.';
+$_MODULE['<{dashperformance}prestashop>dashperformance_876f23178c29dc2552c0b48bf23cd9bd'] = '¿Estas seguro que lo quieres desinstalar?';
+$_MODULE['<{dashperformance}prestashop>chartdata_bbd86c81e760279d9731d5cac811ba50'] = 'Ocupado';
+$_MODULE['<{dashperformance}prestashop>chartdata_78945de8de090e90045d299651a68a9b'] = 'Disponible';
+$_MODULE['<{dashperformance}prestashop>chartdata_145e4e82f20061446c56546e3a0501e7'] = 'Inactivo / mantenimiento';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_9446a98ad14416153cc4d45ab8b531bf'] = 'Rendimiento';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Actualizar';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Configuración';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_93d459c645acd52c3d15d72e5ece52de'] = 'Promedio ';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_6c9fc730f967097688d1c43d1f2889e7'] = 'Tasa de cancelación';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_54358a914f51e1af19df8520159fe607'] = 'Ingresos';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_e7c3c94086501fb4cac569b5624ddb12'] = 'Noches alojadas';
diff --git a/modules/dashperformance/translations/fr.php b/modules/dashperformance/translations/fr.php
new file mode 100644
index 000000000..c9ade62b7
--- /dev/null
+++ b/modules/dashperformance/translations/fr.php
@@ -0,0 +1,17 @@
+dashperformance_2b87a85adc13f4bbd555376e5875b360'] = 'Performances du tableau de bord';
+$_MODULE['<{dashperformance}prestashop>dashperformance_01a59802a9fc001df283e6b2eb5382ca'] = 'Ajoute un bloc avec une représentation graphique des performances de votre site Web.';
+$_MODULE['<{dashperformance}prestashop>dashperformance_876f23178c29dc2552c0b48bf23cd9bd'] = 'Êtes-vous sur de vouloir désinstaller?';
+$_MODULE['<{dashperformance}prestashop>chartdata_bbd86c81e760279d9731d5cac811ba50'] = 'Occupé';
+$_MODULE['<{dashperformance}prestashop>chartdata_78945de8de090e90045d299651a68a9b'] = 'Disponible';
+$_MODULE['<{dashperformance}prestashop>chartdata_145e4e82f20061446c56546e3a0501e7'] = 'Inactif/maintenance';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_9446a98ad14416153cc4d45ab8b531bf'] = 'Performance';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Rafraîchir';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Configuration';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_93d459c645acd52c3d15d72e5ece52de'] = 'Moy. ';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_6c9fc730f967097688d1c43d1f2889e7'] = 'Taux d\'annulation';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_54358a914f51e1af19df8520159fe607'] = 'Revenu';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_e7c3c94086501fb4cac569b5624ddb12'] = 'Nuits passées';
diff --git a/modules/dashperformance/translations/index.php b/modules/dashperformance/translations/index.php
new file mode 100644
index 000000000..370358388
--- /dev/null
+++ b/modules/dashperformance/translations/index.php
@@ -0,0 +1,29 @@
+dashperformance_2b87a85adc13f4bbd555376e5875b360'] = 'Prestazioni del cruscotto';
+$_MODULE['<{dashperformance}prestashop>dashperformance_01a59802a9fc001df283e6b2eb5382ca'] = 'Aggiunge un blocco con una rappresentazione grafica delle prestazioni del tuo sito web.';
+$_MODULE['<{dashperformance}prestashop>dashperformance_876f23178c29dc2552c0b48bf23cd9bd'] = 'Sei sicuro di voler disinstallare?';
+$_MODULE['<{dashperformance}prestashop>chartdata_bbd86c81e760279d9731d5cac811ba50'] = 'Occupato';
+$_MODULE['<{dashperformance}prestashop>chartdata_78945de8de090e90045d299651a68a9b'] = 'A disposizione';
+$_MODULE['<{dashperformance}prestashop>chartdata_145e4e82f20061446c56546e3a0501e7'] = 'Inattivo/manutenzione';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_9446a98ad14416153cc4d45ab8b531bf'] = 'Prestazione';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'ricaricare';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Configurazione';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_93d459c645acd52c3d15d72e5ece52de'] = 'Media ';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_6c9fc730f967097688d1c43d1f2889e7'] = 'Tasso di cancellazione';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_54358a914f51e1af19df8520159fe607'] = 'Reddito';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_e7c3c94086501fb4cac569b5624ddb12'] = 'Pernottamenti';
diff --git a/modules/dashperformance/translations/nl.php b/modules/dashperformance/translations/nl.php
new file mode 100644
index 000000000..0fff0cc6c
--- /dev/null
+++ b/modules/dashperformance/translations/nl.php
@@ -0,0 +1,17 @@
+dashperformance_2b87a85adc13f4bbd555376e5875b360'] = 'Dashboardprestaties';
+$_MODULE['<{dashperformance}prestashop>dashperformance_01a59802a9fc001df283e6b2eb5382ca'] = 'Voegt een blok toe met een grafische weergave van de prestaties van uw website.';
+$_MODULE['<{dashperformance}prestashop>dashperformance_876f23178c29dc2552c0b48bf23cd9bd'] = 'Weet u zeker dat u de installatie ongedaan wilt maken?';
+$_MODULE['<{dashperformance}prestashop>chartdata_bbd86c81e760279d9731d5cac811ba50'] = 'Bezet';
+$_MODULE['<{dashperformance}prestashop>chartdata_78945de8de090e90045d299651a68a9b'] = 'Beschikbaar';
+$_MODULE['<{dashperformance}prestashop>chartdata_145e4e82f20061446c56546e3a0501e7'] = 'Inactief/ onderhoud';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_9446a98ad14416153cc4d45ab8b531bf'] = 'Uitvoering';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Vernieuwen';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Configuratie';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_93d459c645acd52c3d15d72e5ece52de'] = 'Gem. ';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_6c9fc730f967097688d1c43d1f2889e7'] = 'Annuleringstarief';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_54358a914f51e1af19df8520159fe607'] = 'Winst';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_e7c3c94086501fb4cac569b5624ddb12'] = 'Nachten verbleven';
diff --git a/modules/dashperformance/translations/pl.php b/modules/dashperformance/translations/pl.php
new file mode 100644
index 000000000..7fd2e82e5
--- /dev/null
+++ b/modules/dashperformance/translations/pl.php
@@ -0,0 +1,17 @@
+dashperformance_2b87a85adc13f4bbd555376e5875b360'] = 'Wydajność deski rozdzielczej';
+$_MODULE['<{dashperformance}prestashop>dashperformance_01a59802a9fc001df283e6b2eb5382ca'] = 'Dodaje blok z graficzną reprezentacją wydajności Twojej witryny.';
+$_MODULE['<{dashperformance}prestashop>dashperformance_876f23178c29dc2552c0b48bf23cd9bd'] = 'Jesteś pewien, że chcesz odinstalować?';
+$_MODULE['<{dashperformance}prestashop>chartdata_bbd86c81e760279d9731d5cac811ba50'] = 'Zajęty';
+$_MODULE['<{dashperformance}prestashop>chartdata_78945de8de090e90045d299651a68a9b'] = 'Do dyspozycji';
+$_MODULE['<{dashperformance}prestashop>chartdata_145e4e82f20061446c56546e3a0501e7'] = 'Nieaktywny/utrzymany';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_9446a98ad14416153cc4d45ab8b531bf'] = 'Wydajność';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Odświeżać';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Konfiguracja';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_93d459c645acd52c3d15d72e5ece52de'] = 'Śr. ';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_6c9fc730f967097688d1c43d1f2889e7'] = 'Wskaźnik anulowania';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_54358a914f51e1af19df8520159fe607'] = 'Przychód';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_e7c3c94086501fb4cac569b5624ddb12'] = 'Przebywane noce';
diff --git a/modules/dashperformance/translations/pt.php b/modules/dashperformance/translations/pt.php
new file mode 100644
index 000000000..ea62a916e
--- /dev/null
+++ b/modules/dashperformance/translations/pt.php
@@ -0,0 +1,17 @@
+dashperformance_2b87a85adc13f4bbd555376e5875b360'] = 'Desempenho do painel';
+$_MODULE['<{dashperformance}prestashop>dashperformance_01a59802a9fc001df283e6b2eb5382ca'] = 'Adiciona um bloco com uma representação gráfica do desempenho do seu site.';
+$_MODULE['<{dashperformance}prestashop>dashperformance_876f23178c29dc2552c0b48bf23cd9bd'] = 'Você tem certeza que quer desinstalar?';
+$_MODULE['<{dashperformance}prestashop>chartdata_bbd86c81e760279d9731d5cac811ba50'] = 'Ocupado';
+$_MODULE['<{dashperformance}prestashop>chartdata_78945de8de090e90045d299651a68a9b'] = 'Disponível';
+$_MODULE['<{dashperformance}prestashop>chartdata_145e4e82f20061446c56546e3a0501e7'] = 'Inativo / manutenção';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_9446a98ad14416153cc4d45ab8b531bf'] = 'atuação';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Refrescar';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Configuração';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_93d459c645acd52c3d15d72e5ece52de'] = 'Média ';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_6c9fc730f967097688d1c43d1f2889e7'] = 'Taxa de cancelamento';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_54358a914f51e1af19df8520159fe607'] = 'Receita';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_e7c3c94086501fb4cac569b5624ddb12'] = 'Noites hospedadas';
diff --git a/modules/dashperformance/translations/ru.php b/modules/dashperformance/translations/ru.php
new file mode 100644
index 000000000..2be6429e1
--- /dev/null
+++ b/modules/dashperformance/translations/ru.php
@@ -0,0 +1,17 @@
+dashperformance_2b87a85adc13f4bbd555376e5875b360'] = 'Производительность приборной панели';
+$_MODULE['<{dashperformance}prestashop>dashperformance_01a59802a9fc001df283e6b2eb5382ca'] = 'Добавляет блок с графическим представлением производительности вашего сайта.';
+$_MODULE['<{dashperformance}prestashop>dashperformance_876f23178c29dc2552c0b48bf23cd9bd'] = 'Вы уверены, что хотите удалить?';
+$_MODULE['<{dashperformance}prestashop>chartdata_bbd86c81e760279d9731d5cac811ba50'] = 'Занят';
+$_MODULE['<{dashperformance}prestashop>chartdata_78945de8de090e90045d299651a68a9b'] = 'Доступный';
+$_MODULE['<{dashperformance}prestashop>chartdata_145e4e82f20061446c56546e3a0501e7'] = 'Неактивный / обслуживание';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_9446a98ad14416153cc4d45ab8b531bf'] = 'Представление';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Обновить';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_254f642527b45bc260048e30704edb39'] = 'Конфигурация';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_93d459c645acd52c3d15d72e5ece52de'] = 'Средн. ';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_6c9fc730f967097688d1c43d1f2889e7'] = 'Скорость отмены';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_54358a914f51e1af19df8520159fe607'] = 'Доход';
+$_MODULE['<{dashperformance}prestashop>dashboard_zone_two_e7c3c94086501fb4cac569b5624ddb12'] = 'Ночей Остались';
diff --git a/modules/dashperformance/views/css/dashperformance.css b/modules/dashperformance/views/css/dashperformance.css
new file mode 100644
index 000000000..c725b20ef
--- /dev/null
+++ b/modules/dashperformance/views/css/dashperformance.css
@@ -0,0 +1,60 @@
+/**
+* 2010-2021 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through LICENSE.txt file inside our module
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to CustomizationPolicy.txt file inside our module for more information.
+*
+* @author Webkul IN
+* @copyright 2010-2021 Webkul IN
+* @license LICENSE.txt
+*/
+
+/* square columns setup - start */
+#dashperformance .circles-wrapper > div {
+ padding: 15px !important;
+}
+
+#dashperformance .circle-wrapper {
+ position: relative;
+ width: 100%;
+ padding-bottom: 100%;
+}
+
+#dashperformance .circle {
+ position: absolute;
+}
+/* square columns setup - end */
+
+#dashperformance .circle {
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ cursor: pointer;
+}
+
+#dashperformance .circle-content-wrapper {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+}
+
+#dashperformance .title-wrapper p {
+ font-weight: bold;
+ font-size: 14px;
+ line-height: 18px;
+}
+
+#dashperformance .value-wrapper p {
+ font-weight: bold;
+ font-size: 24px;
+ line-height: 30px;
+}
\ No newline at end of file
diff --git a/modules/dashperformance/views/index.php b/modules/dashperformance/views/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashperformance/views/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl b/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
new file mode 100644
index 000000000..011cc790f
--- /dev/null
+++ b/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
@@ -0,0 +1,122 @@
+{**
+* 2010-2021 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through LICENSE.txt file inside our module
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to CustomizationPolicy.txt file inside our module for more information.
+*
+* @author Webkul IN
+* @copyright 2010-2021 Webkul IN
+* @license LICENSE.txt
+*}
+
+
+
+
+
+
+
+
+
+
+
+ + {l s='Occupied' mod='dashoccupancy'} +
+
+
+ + {$occupiedRooms|escape:'htmlall':'UTF-8'}/{$totalRooms|escape:'htmlall':'UTF-8'} +
+
+
+
+
+
+
+
+
+ + {l s='Available' mod='dashoccupancy'} +
+
+
+ + {$availableRooms|escape:'htmlall':'UTF-8'} +
+
+
+
+
+
+
+
+
+ + {l s='Inactive/ maintainance' mod='dashoccupancy'} +
+
+
+ + {$inactiveRooms|escape:'htmlall':'UTF-8'} +
+
+
+
+
+
+
+ {l s="Performance" mod="dashperformance"}
+
+
+
+
+
+
+
+
+
+
+ {l s="Configuration" mod="dashperformance"}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/dashperformance/views/templates/hook/index.php b/modules/dashperformance/views/templates/hook/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashperformance/views/templates/hook/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashperformance/views/templates/index.php b/modules/dashperformance/views/templates/index.php
new file mode 100644
index 000000000..8761a003e
--- /dev/null
+++ b/modules/dashperformance/views/templates/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2016 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;
\ No newline at end of file
diff --git a/modules/dashproducts/dashproducts.php b/modules/dashproducts/dashproducts.php
index d59645b9a..642df314e 100644
--- a/modules/dashproducts/dashproducts.php
+++ b/modules/dashproducts/dashproducts.php
@@ -33,7 +33,7 @@ public function __construct()
{
$this->name = 'dashproducts';
$this->tab = 'dashboard';
- $this->version = '1.0.0';
+ $this->version = '1.0.1';
$this->author = 'PrestaShop';
$this->push_filename = _PS_CACHE_DIR_.'push/activity';
@@ -55,11 +55,19 @@ public function install()
return (parent::install()
&& $this->registerHook('dashboardZoneTwo')
&& $this->registerHook('dashboardData')
+ && $this->registerHook('actionAdminControllerSetMedia')
&& $this->registerHook('actionObjectOrderAddAfter')
&& $this->registerHook('actionSearch')
);
}
+ public function hookActionAdminControllerSetMedia()
+ {
+ if (Tools::getValue('controller') == 'AdminDashboard') {
+ $this->context->controller->addCSS($this->_path.'views/css/dashproducts.css');
+ }
+ }
+
public function hookDashboardZoneTwo($params)
{
$this->context->smarty->assign(
@@ -101,10 +109,12 @@ public function getTableRecentOrders()
{
$header = array(
array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
- array('title' => $this->l('Products'), 'class' => 'text-center'),
- array('title' => $this->l('Total').' '.$this->l('Tax excl.'), 'class' => 'text-center'),
- array('title' => $this->l('Date'), 'class' => 'text-center'),
- array('title' => $this->l('Status'), 'class' => 'text-center'),
+ array('title' => $this->l('Total Rooms'), 'class' => 'text-left'),
+ array('title' => $this->l('Order'), 'class' => 'text-left'),
+ array('title' => $this->l('Hotel'), 'class' => 'text-left'),
+ array('title' => $this->l('Total').' '.$this->l('Tax excl.'), 'class' => 'text-left'),
+ array('title' => $this->l('Date'), 'class' => 'text-left'),
+ array('title' => $this->l('Status'), 'class' => 'text-left'),
array('title' => '', 'class' => 'text-right'),
);
@@ -112,8 +122,13 @@ public function getTableRecentOrders()
$orders = Order::getOrdersWithInformations($limit);
$body = array();
- foreach ($orders as $order)
- {
+ foreach ($orders as $order) {
+ $bookingInfo = Db::getInstance()->getRow(
+ 'SELECT COUNT(*) AS `total_rooms`, hbd.`id_hotel`, hbd.`hotel_name`
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ WHERE `id_order` = '.(int)$order['id_order']
+ );
+
$currency = Currency::getCurrency((int)$order['id_currency']);
$tr = array();
$tr[] = array(
@@ -123,25 +138,38 @@ public function getTableRecentOrders()
);
$tr[] = array(
'id' => 'total_products',
- 'value' => count(OrderDetail::getList((int)$order['id_order'])),
- 'class' => 'text-center',
+ 'value' => $bookingInfo['total_rooms'],
+ 'class' => 'text-left',
+ );
+ $tr[] = array(
+ 'id' => 'order',
+ 'value' => '#'.$order['id_order'].'',
+ 'class' => 'text-left',
+ );
+ $tr[] = array(
+ 'id' => 'hotel',
+ 'value' => ''.
+ Tools::htmlentitiesUTF8($bookingInfo['hotel_name']).'',
+ 'class' => 'text-left',
);
$tr[] = array(
'id' => 'total_paid',
'value' => Tools::displayPrice((float)$order['total_paid'], $currency),
- 'class' => 'text-center',
+ 'class' => 'text-left',
'wrapper_start' => $order['valid'] ? '' : '',
'wrapper_end' => '',
);
$tr[] = array(
'id' => 'date_add',
'value' => Tools::displayDate($order['date_add']),
- 'class' => 'text-center',
+ 'class' => 'text-left',
);
$tr[] = array(
'id' => 'status',
'value' => Tools::htmlentitiesUTF8($order['state_name']),
- 'class' => 'text-center',
+ 'class' => 'text-left',
);
$tr[] = array(
'id' => 'details',
@@ -167,17 +195,17 @@ public function getTableBestSellers($date_from, $date_to)
),
array(
'id' => 'product',
- 'title' => $this->l('Product'),
+ 'title' => $this->l('Room type'),
'class' => 'text-center',
),
array(
'id' => 'category',
- 'title' => $this->l('Category'),
+ 'title' => $this->l('Hotel'),
'class' => 'text-center',
),
array(
'id' => 'total_sold',
- 'title' => $this->l('Total sold'),
+ 'title' => $this->l('Total bookings'),
'class' => 'text-center',
),
array(
@@ -185,42 +213,33 @@ public function getTableBestSellers($date_from, $date_to)
'title' => $this->l('Sales'),
'class' => 'text-center',
),
- array(
- 'id' => 'net_profit',
- 'title' => $this->l('Net profit'),
- 'class' => 'text-center',
- )
);
$products = Db::getInstance()->ExecuteS(
- '
- SELECT
- product_id,
- product_name,
- SUM(product_quantity) as total,
- p.price as price,
- pa.price as price_attribute,
- SUM(total_price_tax_excl / conversion_rate) as sales,
- SUM(product_quantity * purchase_supplier_price / conversion_rate) as expenses
- FROM `'._DB_PREFIX_.'orders` o
- LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON o.id_order = od.id_order
- LEFT JOIN `'._DB_PREFIX_.'product` p ON p.id_product = product_id
- LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON pa.id_product_attribute = od.product_attribute_id
- WHERE `invoice_date` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"
- AND valid = 1
- '.Shop::addSqlRestriction(false, 'o').'
- GROUP BY product_id, product_attribute_id
- ORDER BY total DESC
- LIMIT '.(int)Configuration::get('DASHPRODUCT_NBR_SHOW_BEST_SELLER', 10)
+ 'SELECT
+ hbd.`id_product`,
+ hbd.`room_type_name` AS `product_name`,
+ COUNT(hbd.`id_room`) AS `total`,
+ hbd.`total_price_tax_excl` AS `price`,
+ SUM(hbd.`total_price_tax_excl`) AS `sales`
+ FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
+ LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`)
+ WHERE o.`invoice_date` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"
+ AND o.`valid` = 1 AND hbd.`is_refunded` = 0
+ GROUP BY hbd.`id_product`
+ ORDER BY `sales` DESC
+ LIMIT '.(int)Configuration::get('DASHPRODUCT_NBR_SHOW_BEST_SELLER', 10)
);
$body = array();
- foreach ($products as $product)
- {
- $product_obj = new Product((int)$product['product_id'], false, $this->context->language->id);
- if (!Validate::isLoadedObject($product_obj))
+ foreach ($products as $product) {
+ $product_obj = new Product((int)$product['id_product'], false, $this->context->language->id);
+ if (!Validate::isLoadedObject($product_obj)) {
continue;
- $category = new Category($product_obj->getDefaultCategory(), $this->context->language->id);
+ }
+
+ $objHotelRoomType = new HotelRoomType();
+ $roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($product_obj->id);
$img = '';
if (($row_image = Product::getCover($product_obj->id)) && $row_image['id_image'])
@@ -231,9 +250,6 @@ public function getTableBestSellers($date_from, $date_to)
}
$productPrice = $product['price'];
- if (isset($product['price_attribute']) && $product['price_attribute'] != '0.000000') {
- $productPrice = $product['price_attribute'];
- }
$body[] = array(
array(
@@ -243,12 +259,17 @@ public function getTableBestSellers($date_from, $date_to)
),
array(
'id' => 'product',
- 'value' => ''.Tools::htmlentitiesUTF8($product['product_name']).''.'
+
+
+
+
+
+
+
+
+
+
+
+ + {l s="Avg. Daily Rate" mod="dashperformance"} +
+
+
+ + {if isset($average_daily_rate)}{$average_daily_rate|escape:"html":"UTF-8"}{/if} +
+
+
+
+
+
+
+
+
+
+
+ + {l s="Cancellation Rate" mod="dashperformance"} +
+
+
+ + {if isset($cancellation_rate)}{$cancellation_rate|escape:"html":"UTF-8"}{/if} +
+
+
+
+
+
+
+
+
+
+
+ + {l s="Revenue" mod="dashperformance"} +
+
+
+ + {if isset($revenue)}{$revenue|escape:"html":"UTF-8"}{/if} +
+
+
+
+
+
+
+
+
+
+
+ + {l s="Nights Stayed" mod="dashperformance"} +
+
+
+ + {if isset($nights_stayed)}{$nights_stayed|escape:"html":"UTF-8"}{/if} +
+'.Tools::displayPrice($productPrice), + 'value' => ''. + Tools::htmlentitiesUTF8($product['product_name']).''. + '
'.Tools::displayPrice($productPrice), 'class' => 'text-center' ), array( 'id' => 'category', - 'value' => $category->name, + 'value' => ''. + Tools::htmlentitiesUTF8($roomTypeInfo['hotel_name']).'', 'class' => 'text-center' ), array( @@ -261,11 +282,6 @@ public function getTableBestSellers($date_from, $date_to) 'value' => Tools::displayPrice($product['sales']), 'class' => 'text-center' ), - array( - 'id' => 'net_profit', - 'value' => Tools::displayPrice($product['sales'] - $product['expenses']), - 'class' => 'text-center' - ) ); } @@ -282,7 +298,12 @@ public function getTableMostViewed($date_from, $date_to) ), array( 'id' => 'product', - 'title' => $this->l('Product'), + 'title' => $this->l('Room type'), + 'class' => 'text-center', + ), + array( + 'id' => 'hotel', + 'title' => $this->l('Hotel'), 'class' => 'text-center', ), array( @@ -297,35 +318,36 @@ public function getTableMostViewed($date_from, $date_to) ), array( 'id' => 'purchased', - 'title' => $this->l('Purchased'), + 'title' => $this->l('Booked'), 'class' => 'text-center', ), array( 'id' => 'rate', - 'title' => $this->l('Percentage'), + 'title' => $this->l('Conversion rate'), 'class' => 'text-center', ) ); - if (Configuration::get('PS_STATSDATA_PAGESVIEWS')) - { + if (Configuration::get('PS_STATSDATA_PAGESVIEWS')) { $products = $this->getTotalViewed($date_from, $date_to, (int)Configuration::get('DASHPRODUCT_NBR_SHOW_MOST_VIEWED')); $body = array(); - if (is_array($products) && count($products)) - foreach ($products as $product) - { + if (is_array($products) && count($products)) { + foreach ($products as $product) { $product_obj = new Product((int)$product['id_object'], true, $this->context->language->id); - if (!Validate::isLoadedObject($product_obj)) + if (!Validate::isLoadedObject($product_obj)) { continue; + } $img = ''; - if (($row_image = Product::getCover($product_obj->id)) && $row_image['id_image']) - { + if (($row_image = Product::getCover($product_obj->id)) && $row_image['id_image']) { $image = new Image($row_image['id_image']); $path_to_image = _PS_PROD_IMG_DIR_.$image->getExistingImgPath().'.'.$this->context->controller->imageType; $img = ImageManager::thumbnail($path_to_image, 'product_mini_'.$product_obj->id.'.'.$this->context->controller->imageType, 45, $this->context->controller->imageType); } + $objHRT = new HotelRoomType($product_obj->id); + $objHBI = new HotelBranchInformation($objHRT->id_hotel, $this->context->language->id); + $tr = array(); $tr[] = array( 'id' => 'product', @@ -334,7 +356,17 @@ public function getTableMostViewed($date_from, $date_to) ); $tr[] = array( 'id' => 'product', - 'value' => Tools::htmlentitiesUTF8($product_obj->name).'
'.Tools::displayPrice(Product::getPriceStatic((int)$product_obj->id)), + 'value' => ''. + Tools::htmlentitiesUTF8($product_obj->name).''.'
'. + Tools::displayPrice(Product::getPriceStatic((int)$product_obj->id)), + 'class' => 'text-center', + ); + $tr[] = array( + 'id' => 'hotel', + 'value' => ''. + Tools::htmlentitiesUTF8($objHBI->hotel_name).'', 'class' => 'text-center', ); $tr[] = array( @@ -351,7 +383,7 @@ public function getTableMostViewed($date_from, $date_to) $purchased = $this->getTotalProductPurchased($date_from, $date_to, (int)$product_obj->id); $tr[] = array( 'id' => 'purchased', - 'value' => $this->getTotalProductPurchased($date_from, $date_to, (int)$product_obj->id), + 'value' => $purchased, 'class' => 'text-center', ); $tr[] = array( @@ -361,9 +393,10 @@ public function getTableMostViewed($date_from, $date_to) ); $body[] = $tr; } + } } else - $body = '
'.$this->l('You must enable the "Save global page views" option from the "Data mining for statistics" module in order to display the most viewed products, or use the Google Analytics module.').'
';
+ $body = ''.$this->l('You must enable the "Save global page views" option from the "Data mining for statistics" module in order to display the most viewed room types, or use the Google Analytics module.').'
';
return array('header' => $header, 'body' => $body);
}
@@ -372,48 +405,92 @@ public function getTableTop10MostSearch($date_from, $date_to)
$header = array(
array(
'id' => 'reference',
- 'title' => $this->l('Term'),
- 'class' => 'text-left'
+ 'title' => $this->l('Hotel'),
+ 'class' => 'text-center'
),
array(
- 'id' => 'name',
- 'title' => $this->l('Search'),
+ 'id' => 'image',
+ 'title' => $this->l('Cover image'),
'class' => 'text-center'
),
array(
- 'id' => 'totalQuantitySold',
- 'title' => $this->l('Results'),
+ 'id' => 'location',
+ 'title' => $this->l('Location'),
'class' => 'text-center'
- )
+ ),
+ array(
+ 'id' => 'count',
+ 'title' => $this->l('Count'),
+ 'class' => 'text-center'
+ ),
+ // array(
+ // 'id' => 'totalQuantitySold',
+ // 'title' => $this->l('Results'),
+ // 'class' => 'text-center'
+ // )
);
- $terms = $this->getMostSearchTerms($date_from, $date_to, (int)Configuration::get('DASHPRODUCT_NBR_SHOW_TOP_SEARCH'));
- $body = array();
- if (is_array($terms) && count($terms))
- foreach ($terms as $term)
- {
- $tr = array();
- $tr[] = array(
- 'id' => 'product',
- 'value' => $term['keywords'],
- 'class' => 'text-left',
- );
- $tr[] = array(
- 'id' => 'product',
- 'value' => $term['count_keywords'],
- 'class' => 'text-center',
- );
- $tr[] = array(
- 'id' => 'product',
- 'value' => $term['results'],
- 'class' => 'text-center',
- );
- $body[] = $tr;
- }
+ if (Configuration::get('PS_STATSDATA_PAGESVIEWS')) {
+ $hotels = $this->getMostSearchedHotels(
+ $date_from,
+ $date_to,
+ (int)Configuration::get('DASHPRODUCT_NBR_SHOW_TOP_SEARCH')
+ );
+
+ $body = array();
+ if (is_array($hotels) && count($hotels))
+ foreach ($hotels as $hotel) {
+ $objHBI = new HotelBranchInformation($hotel['id_hotel'], $this->context->language->id);
+ $tr = array();
+ $tr[] = array(
+ 'id' => 'reference',
+ 'value' => ''.
+ Tools::htmlentitiesUTF8($hotel['hotel_name']).'',
+ 'class' => 'text-center',
+ );
+ $tr[] = array(
+ 'id' => 'image',
+ 'value' => $this->getHotelImage($objHBI->id),
+ 'class' => 'text-center',
+ );
+ $tr[] = array(
+ 'id' => 'location',
+ 'value' => $objHBI->address,
+ 'class' => 'text-center',
+ );
+ $tr[] = array(
+ 'id' => 'views',
+ 'value' => $hotel['views'],
+ 'class' => 'text-center',
+ );
+ $body[] = $tr;
+ }
+ } else {
+ $body = ''.
+ $this->l('You must enable the "Save global page views" option from the "Data mining for statistics" module in order to display the most viewed room types, or use the Google Analytics module.').
+ '
';
+ }
return array('header' => $header, 'body' => $body);
}
+ public function getHotelImage($idHotel)
+ {
+ $imageDir = _MODULE_DIR_.'hotelreservationsystem/views/img/hotel_img/';
+ $noPictureImagePath = _PS_IMG_.'p/en.jpg';
+ $hotelImage = HotelImage::getCover($idHotel);
+ $imgLink = '';
+ if (is_array($hotelImage) && count($hotelImage)) {
+ $imagePath = $imageDir.$hotelImage['hotel_image_id'].'.jpg';
+ $imgLink = $imagePath;
+ } else {
+ $imgLink = $noPictureImagePath;
+ }
+
+ return '
+
+
+ {l s='Sales' mod='dashproducts'}
+
+
+
+
+
+
+
+
+
-
- {l s='Configuration' mod='dashproducts'}
- {$dashproducts_config_form}
-
+
+ {l s='Configuration' mod='dashproducts'}
+ {$dashproducts_config_form}
+
-
-
+
+
-
-
-
{l s='Last %d orders' sprintf=$DASHPRODUCT_NBR_SHOW_LAST_ORDER|intval mod='dashproducts'}
-
-
-
-
-
+
+
-
+
- {l s="Last %d bookings" sprintf=$DASHPRODUCT_NBR_SHOW_LAST_ORDER|intval mod="dashproducts"}
+
+
+
+
+
+
-
'.$this->l('tax excl.').''; } protected function translateCompareData($normal, $compare) @@ -317,17 +314,18 @@ public function getChartTrends() 'net_profits' => $this->l('Net Profit') ); - $gfx_color = array('#1777B6','#2CA121','#E61409','#FF7F00','#6B399C','#B3591F'); - $gfx_color_compare = array('#A5CEE4','#B1E086','#FD9997','#FFC068','#CAB1D7','#D2A689'); + $gfx_color = array('#72C3F0','#56CE56','#FF4036','#FF7F0E','#A569DF','#AF8A42'); + $gfx_color_border = array('#11f0fc','#118c11','#9e1010','#af5c13','#681daf','#845c0d'); + $gfx_color_compare = array('#1777B6','#19900d','#b9140c','#bf6307','#6B399C','#B3591F'); $i = 0; $data = array('chart_type' => 'line_chart_trends', 'date_format' => $this->context->language->date_format_lite, 'data' => array()); - foreach ($charts as $key => $title) - { + foreach ($charts as $key => $title) { $data['data'][] = array( 'id' => $key, 'key' => $title, 'color' => $gfx_color[$i], + 'border_color' => $gfx_color_border[$i], 'values' => $chart_data[$key], 'disabled' => ($key == 'sales' ? false : true) ); diff --git a/modules/dashtrends/translations/en.php b/modules/dashtrends/translations/en.php new file mode 100644 index 000000000..dfcc7539d --- /dev/null +++ b/modules/dashtrends/translations/en.php @@ -0,0 +1,34 @@ +dashtrends_ee653ade5f520037ef95e9dc2a42364c'] = 'Dashboard Trends'; +$_MODULE['<{dashtrends}prestashop>dashtrends_f2d0efa68eb71bfd5209abeb9f4b0943'] = 'Adds a block with a graphical representation of the development of your store(s) based on selected key data.'; +$_MODULE['<{dashtrends}prestashop>dashtrends_2d125dc25b158f28a1960bd96a9fa8d1'] = '%s points'; +$_MODULE['<{dashtrends}prestashop>dashtrends_887ee91702c962a70b87cbef07bbcaec'] = 'tax excl.'; +$_MODULE['<{dashtrends}prestashop>dashtrends_11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales'; +$_MODULE['<{dashtrends}prestashop>dashtrends_7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders'; +$_MODULE['<{dashtrends}prestashop>dashtrends_8c804960da61b637c548c951652b0cac'] = 'Average Cart Value'; +$_MODULE['<{dashtrends}prestashop>dashtrends_d7e637a6e9ff116de2fa89551240a94d'] = 'Visits'; +$_MODULE['<{dashtrends}prestashop>dashtrends_e4c3da18c66c0147144767efeb59198f'] = 'Conversion Rate'; +$_MODULE['<{dashtrends}prestashop>dashtrends_43d729c7b81bfa5fc10e756660d877d1'] = 'Net Profit'; +$_MODULE['<{dashtrends}prestashop>dashtrends_46418a037045b91e6715c4da91a2a269'] = '%s (previous period)'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_2938c7f7e560ed972f8a4f68e80ff834'] = 'Dashboard'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_f1206f9fadc5ce41694f69129aecac26'] = 'Configure'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Refresh'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_e537825dd409a90ef70d8c2eb56122a1'] = 'Sum of revenue (excl. tax) generated within the date range by orders considered validated.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_8bc1c5ca521b99b87908db0bcd33ec76'] = 'Total number of orders received within the date range that are considered validated.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_f15f2a2bf99d3dcad2cba1a2c615b9dc'] = 'Average Cart Value is a metric representing the value of an average order within the date range. It is calculated by dividing Sales by Orders.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_791d6355d34dfaf60d68ef04d1ee5767'] = 'Cart Value'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_4f631447981c5fa240006a5ae2c4b267'] = 'Total number of visits within the date range. A visit is the period of time a user is actively engaged with your website.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_d7e637a6e9ff116de2fa89551240a94d'] = 'Visits'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_7a6e858f8c7c0b78fb4d43cefcb8c017'] = 'Ecommerce Conversion Rate is the percentage of visits that resulted in an validated order.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_e4c3da18c66c0147144767efeb59198f'] = 'Conversion Rate'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_8dedc1b3ee3a92212fb5b5acad7f207f'] = 'Net profit is a measure of the profitability of a venture after accounting for all Ecommerce costs. You can provide these costs by clicking on the configuration icon right above here.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_43d729c7b81bfa5fc10e756660d877d1'] = 'Net Profit'; + + +return $_MODULE; diff --git a/modules/dashtrends/views/css/dashtrends.css b/modules/dashtrends/views/css/dashtrends.css new file mode 100644 index 000000000..cd2c84ad1 --- /dev/null +++ b/modules/dashtrends/views/css/dashtrends.css @@ -0,0 +1,177 @@ +/** +* 2007-2015 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA
+* @copyright 2007-2015 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+
+/* start */
+#dashtrends header {
+ margin-bottom: 0;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar {
+ margin: 0 -16px 10px;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl {
+ -webkit-box-shadow: 0 0 0 2px white inset;
+ box-shadow: 0 0 0 2px white inset;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dt {
+ color: #777;
+ padding: 0;
+ margin: 0;
+ height: 2.6em;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dd.data_value {
+ color: #aaa;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dd.data_value small {
+ font-size: 0.5em;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dd.dash_trend {
+ background-color: white;
+ width: 80px;
+ margin: 0 auto;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl:hover dt, .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl:hover dd.data_value {
+ color: #00aff0;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl:hover dt {
+ text-decoration: underline;
+ }
+ .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl.active dt, .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl.active dd.data_value {
+ color: white;
+ }
+ .bootstrap #dashboard #dashtrends dl {
+ cursor: pointer;
+ margin: 0;
+ min-height: 70px;
+ text-align: center;
+ background-color: white;
+ padding: 10px;
+ border-bottom: 1px solid #ddd;
+ border-left: 1px solid #ddd;
+ }
+ .bootstrap #dashboard #dashtrends dl:first-child {
+ border-left: none;
+ }
+ .bootstrap #dashboard #dashtrends dl.active {
+ background-color: #00aff0;
+ -webkit-box-shadow: white 0 0 0 2px inset;
+ box-shadow: white 0 0 0 2px inset;
+ }
+ .bootstrap #dashboard #dashtrends dl.active dt {
+ color: white;
+ }
+ .bootstrap #dashboard #dashtrends dt {
+ text-align: center;
+ height: 37px;
+ line-height: 1em;
+ font: 400 1.1em/120% "Ubuntu Condensed", Helvetica, Arial, sans-serif;
+ }
+ .bootstrap #dashboard #dashtrends dd span {
+ font-size: 0.9em;
+ white-space: nowrap;
+ }
+ .bootstrap #dashboard #dashtrends svg {
+ height: 350px;
+ }
+
+ .bootstrap .clearfix:before, .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dd.data_value:before, .bootstrap .clearfix:after, .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dd.data_value:after {
+ content: " ";
+ display: table;
+ }
+ .bootstrap .clearfix:after, .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dd.data_value:after {
+ clear: both;
+ }
+/* end */
+
+
+/*revenue chart*/
+.bootstrap #dashboard #dashtrends dl {
+ border-radius: 10px;
+ min-height: 85px;
+ border: 1px solid #fff;
+}
+
+.bootstrap #dashboard #dashtrends #dashtrends_toolbar dl {
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+ margin: 1px;
+}
+
+.bootstrap #dashboard #dashtrends #dashtrends_toolbar {
+ padding-top: 5%;
+ padding-left: 5%;
+ padding-bottom: 5%;
+ margin: 0 -16px -16px;
+}
+
+.bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dt{
+ padding: 8px;
+ height: 1.4rem;
+ color: #ffffff;
+}
+
+.bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dt:hover {
+ text-decoration: none !important;
+ color: #ffffff;
+}
+
+.bootstrap #dashboard #dashtrends #dashtrends_toolbar dl:hover dt{
+ text-decoration: none !important;
+ color: #ffffff;
+}
+
+.bootstrap dt, .bootstrap dd {
+ line-height: 0.6 !important;
+}
+
+.bootstrap #dashboard #dashtrends dd span {
+ font-weight: bold;
+ color: #ffffff;
+}
+
+.bootstrap #dashboard #dashtrends #dashtrends_toolbar dl dt, .bootstrap #dashboard #dashtrends #dashtrends_toolbar dl.active dd.data_value {
+ height: 30px;
+}
+
+.bootstrap #dashboard #dashtrends dl.active {
+ border : 1px solid #113cfc !important;
+}
+
+.bootstrap #dashboard #dashtrends div#dash_trends_chart1 {
+ padding: 60px;
+}
+
+.bootstrap #dashboard #dashtrends dl:first-child {
+ border-left: 1px solid #fff;
+}
+
+.bootstrap #dashboard #dashtrends #dashtrends_toolbar .label-tooltip {
+ width: 15%;
+}
+
+#dashtrends p.no-chart-info {
+ margin-top: 10px;
+ display: none;
+}
\ No newline at end of file
diff --git a/modules/dashtrends/views/js/dashtrends.js b/modules/dashtrends/views/js/dashtrends.js
index 2e53be609..73315373b 100644
--- a/modules/dashtrends/views/js/dashtrends.js
+++ b/modules/dashtrends/views/js/dashtrends.js
@@ -3,16 +3,22 @@ var dashtrends_chart;
function line_chart_trends(widget_name, chart_details)
{
- if (chart_details.data[0].values.length <= 1)
+ if (chart_details.data[0].values.length <= 1) {
$('#dash_trends_chart1').hide();
- else
+ $('#no-chart-info').show();
+ } else {
$('#dash_trends_chart1').show();
+ $('#no-chart-info').hide();
+ }
nv.addGraph(function() {
var chart = nv.models.lineChart()
.useInteractiveGuideline(true)
.x(function(d) { return (d !== undefined ? d[0] : 0); })
.y(function(d) { return (d !== undefined ? parseInt(d[1]) : 0); })
- .margin({left: 80});
+ .margin({
+ left: 70,
+ right: 30,
+ });
chart.xAxis.tickFormat(function(d) {
date = new Date(d*1000);
@@ -23,8 +29,10 @@ function line_chart_trends(widget_name, chart_details)
$.each(chart_details.data, function(index, value) {
if (value.id == 'sales' || value.id == 'sales_compare')
{
- if (value.id == 'sales')
- $('#dashtrends_toolbar dl:first').css('background-color', chart_details.data[index].color).addClass('active');
+ if (value.id == 'sales'){
+ $('#dashtrends_toolbar dl:first').css("border-color", value.border_color);
+ // $('#dashtrends_toolbar dl:first').addClass('active');
+ }
first_data.push(chart_details.data[index]);
}
});
@@ -35,7 +43,6 @@ function line_chart_trends(widget_name, chart_details)
dashtrends_data = chart_details.data;
dashtrends_chart = chart;
-
d3.select('#dash_trends_chart1 svg')
.datum(first_data)
.call(chart);
@@ -47,15 +54,15 @@ function line_chart_trends(widget_name, chart_details)
function selectDashtrendsChart(element, type)
{
- $('#dashtrends_toolbar dl').removeClass('active');
+ // $('#dashtrends_toolbar dl').removeClass('active');
current_charts = new Array();
$.each(dashtrends_data, function(index, value) {
if (value.id == type || value.id == type + '_compare')
{
if (value.id == type)
{
- $(element).siblings().css('background-color', 'none').removeClass('active');
- $(element).css('background-color', dashtrends_data[index].color).addClass('active');
+ $(element).siblings().css("border-color", '#fff');
+ $(element).css("border-color", value.border_color);
}
current_charts.push(dashtrends_data[index]);
diff --git a/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl b/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl
index 99d6efbb5..5797281b4 100644
--- a/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl
+++ b/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl
@@ -22,58 +22,74 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
-
-
-
-
- {l s='Dashboard' mod='dashtrends'}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- {l s='Top %d products' sprintf=$DASHPRODUCT_NBR_SHOW_BEST_SELLER|intval mod='dashproducts'} - {l s="From" mod='dashproducts'} {$date_from} {l s="to" mod='dashproducts'} {$date_to} -
-
-
-
-
-
+
-
+
- + {l s="Top %d room types" sprintf=$DASHPRODUCT_NBR_SHOW_BEST_SELLER|intval mod="dashproducts"} + {l s="From" mod="dashproducts"} {$date_from} {l s="to" mod="dashproducts"} {$date_to} +
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/modules/dashtrends/dashtrends.php b/modules/dashtrends/dashtrends.php
index d3fe77ea0..983817ae3 100644
--- a/modules/dashtrends/dashtrends.php
+++ b/modules/dashtrends/dashtrends.php
@@ -39,7 +39,7 @@ public function __construct()
{
$this->name = 'dashtrends';
$this->tab = 'dashboard';
- $this->version = '1.0.0';
+ $this->version = '1.0.1';
$this->author = 'PrestaShop';
$this->push_filename = _PS_CACHE_DIR_.'push/trends';
@@ -65,13 +65,14 @@ public function hookActionAdminControllerSetMedia()
{
if (get_class($this->context->controller) == 'AdminDashboardController')
$this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
+ $this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
}
public function hookDashboardZoneTwo($params)
{
$this->context->smarty->assign(array(
'currency' => $this->context->currency,
- '_PS_PRICE_DISPLAY_PRECISION_' => _PS_PRICE_DISPLAY_PRECISION_
+ '_PS_PRICE_DISPLAY_PRECISION_' => _PS_PRICE_DISPLAY_PRECISION_,
));
return $this->display(__FILE__, 'dashboard_zone_two.tpl');
}
@@ -87,12 +88,10 @@ protected function getData($date_from, $date_to)
'total_expenses' => array()
);
- if (Configuration::get('PS_DASHBOARD_SIMULATION'))
- {
+ if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
$from = strtotime($date_from.' 00:00:00');
$to = min(time(), strtotime($date_to.' 23:59:59'));
- for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date))
- {
+ for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) {
$tmp_data['visits'][$date] = round(rand(2000, 20000));
$tmp_data['conversion_rate'][$date] = rand(80, 250) / 100;
$tmp_data['average_cart_value'][$date] = round(rand(60, 200), 2);
@@ -101,9 +100,7 @@ protected function getData($date_from, $date_to)
$tmp_data['total_purchases'][$date] = $tmp_data['total_paid_tax_excl'][$date] * rand(50, 70) / 100;
$tmp_data['total_expenses'][$date] = $tmp_data['total_paid_tax_excl'][$date] * rand(0, 10) / 100;
}
- }
- else
- {
+ } else {
$tmp_data['visits'] = AdminStatsController::getVisits(false, $date_from, $date_to, 'day');
$tmp_data['orders'] = AdminStatsController::getOrders($date_from, $date_to, 'day');
$tmp_data['total_paid_tax_excl'] = AdminStatsController::getTotalSales($date_from, $date_to, 'day');
@@ -248,7 +245,7 @@ public function hookDashboardData($params)
protected function addTaxSuffix()
{
- return ' '.$this->l('tax excl.').'';
+ return ' - {l s="Most Viewed" mod='dashproducts'} - {l s="From" mod='dashproducts'} {$date_from} {l s="to" mod='dashproducts'} {$date_to} -
-
-
-
-
-
+
-
+
- + {l s="Most Viewed" mod="dashproducts"} + {l s="From" mod="dashproducts"} {$date_from} {l s="to" mod="dashproducts"} {$date_to} +
+
+
+
+
+
+
-
-
+
-
+- {l s='Top %d most search terms' sprintf=$DASHPRODUCT_NBR_SHOW_TOP_SEARCH|intval mod='dashproducts'} - {l s="From" mod='dashproducts'} {$date_from} {l s="to" mod='dashproducts'} {$date_to} -
-
-
-
-
-
+
-
+
+ {l s="Top %d most searched hotels" sprintf=$DASHPRODUCT_NBR_SHOW_TOP_SEARCH|intval mod="dashproducts"} + {l s="From" mod="dashproducts"} {$date_from} {l s="to" mod="dashproducts"} {$date_to} +
+
+
+
+
+
+
'.$this->l('tax excl.').''; } protected function translateCompareData($normal, $compare) @@ -317,17 +314,18 @@ public function getChartTrends() 'net_profits' => $this->l('Net Profit') ); - $gfx_color = array('#1777B6','#2CA121','#E61409','#FF7F00','#6B399C','#B3591F'); - $gfx_color_compare = array('#A5CEE4','#B1E086','#FD9997','#FFC068','#CAB1D7','#D2A689'); + $gfx_color = array('#72C3F0','#56CE56','#FF4036','#FF7F0E','#A569DF','#AF8A42'); + $gfx_color_border = array('#11f0fc','#118c11','#9e1010','#af5c13','#681daf','#845c0d'); + $gfx_color_compare = array('#1777B6','#19900d','#b9140c','#bf6307','#6B399C','#B3591F'); $i = 0; $data = array('chart_type' => 'line_chart_trends', 'date_format' => $this->context->language->date_format_lite, 'data' => array()); - foreach ($charts as $key => $title) - { + foreach ($charts as $key => $title) { $data['data'][] = array( 'id' => $key, 'key' => $title, 'color' => $gfx_color[$i], + 'border_color' => $gfx_color_border[$i], 'values' => $chart_data[$key], 'disabled' => ($key == 'sales' ? false : true) ); diff --git a/modules/dashtrends/translations/en.php b/modules/dashtrends/translations/en.php new file mode 100644 index 000000000..dfcc7539d --- /dev/null +++ b/modules/dashtrends/translations/en.php @@ -0,0 +1,34 @@ +dashtrends_ee653ade5f520037ef95e9dc2a42364c'] = 'Dashboard Trends'; +$_MODULE['<{dashtrends}prestashop>dashtrends_f2d0efa68eb71bfd5209abeb9f4b0943'] = 'Adds a block with a graphical representation of the development of your store(s) based on selected key data.'; +$_MODULE['<{dashtrends}prestashop>dashtrends_2d125dc25b158f28a1960bd96a9fa8d1'] = '%s points'; +$_MODULE['<{dashtrends}prestashop>dashtrends_887ee91702c962a70b87cbef07bbcaec'] = 'tax excl.'; +$_MODULE['<{dashtrends}prestashop>dashtrends_11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales'; +$_MODULE['<{dashtrends}prestashop>dashtrends_7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders'; +$_MODULE['<{dashtrends}prestashop>dashtrends_8c804960da61b637c548c951652b0cac'] = 'Average Cart Value'; +$_MODULE['<{dashtrends}prestashop>dashtrends_d7e637a6e9ff116de2fa89551240a94d'] = 'Visits'; +$_MODULE['<{dashtrends}prestashop>dashtrends_e4c3da18c66c0147144767efeb59198f'] = 'Conversion Rate'; +$_MODULE['<{dashtrends}prestashop>dashtrends_43d729c7b81bfa5fc10e756660d877d1'] = 'Net Profit'; +$_MODULE['<{dashtrends}prestashop>dashtrends_46418a037045b91e6715c4da91a2a269'] = '%s (previous period)'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_2938c7f7e560ed972f8a4f68e80ff834'] = 'Dashboard'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_f1206f9fadc5ce41694f69129aecac26'] = 'Configure'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_63a6a88c066880c5ac42394a22803ca6'] = 'Refresh'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_e537825dd409a90ef70d8c2eb56122a1'] = 'Sum of revenue (excl. tax) generated within the date range by orders considered validated.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_11ff9f68afb6b8b5b8eda218d7c83a65'] = 'Sales'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_8bc1c5ca521b99b87908db0bcd33ec76'] = 'Total number of orders received within the date range that are considered validated.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_f15f2a2bf99d3dcad2cba1a2c615b9dc'] = 'Average Cart Value is a metric representing the value of an average order within the date range. It is calculated by dividing Sales by Orders.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_791d6355d34dfaf60d68ef04d1ee5767'] = 'Cart Value'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_4f631447981c5fa240006a5ae2c4b267'] = 'Total number of visits within the date range. A visit is the period of time a user is actively engaged with your website.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_d7e637a6e9ff116de2fa89551240a94d'] = 'Visits'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_7a6e858f8c7c0b78fb4d43cefcb8c017'] = 'Ecommerce Conversion Rate is the percentage of visits that resulted in an validated order.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_e4c3da18c66c0147144767efeb59198f'] = 'Conversion Rate'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_8dedc1b3ee3a92212fb5b5acad7f207f'] = 'Net profit is a measure of the profitability of a venture after accounting for all Ecommerce costs. You can provide these costs by clicking on the configuration icon right above here.'; +$_MODULE['<{dashtrends}prestashop>dashboard_zone_two_43d729c7b81bfa5fc10e756660d877d1'] = 'Net Profit'; + + +return $_MODULE; diff --git a/modules/dashtrends/views/css/dashtrends.css b/modules/dashtrends/views/css/dashtrends.css new file mode 100644 index 000000000..cd2c84ad1 --- /dev/null +++ b/modules/dashtrends/views/css/dashtrends.css @@ -0,0 +1,177 @@ +/** +* 2007-2015 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA
-
- -
-
- {l s='Sales' mod='dashtrends'} -
- -
- -
-
-
- {l s='Orders' mod='dashtrends'} -
- -
- -
-
-
- {l s='Cart Value' mod='dashtrends'} -
- -
- -
-
-
- {l s='Visits' mod='dashtrends'} -
- -
- -
-
-
- {l s='Conversion Rate' mod='dashtrends'} -
- -
- -
-
-
- {l s='Net Profit' mod='dashtrends'} -
- -
- -
-
-
-
+
+
+
+
+ {l s='Revenue' mod='dashtrends'}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
+
+
+ -
+
- {l s='Sales' mod='dashtrends'} +
- +
-
+
- {l s='Booking' mod='dashtrends'} +
- +
-
+
- {l s='Cart Value' mod='dashtrends'} +
- +
-
+
- {l s='Visits' mod='dashtrends'} +
- +
-
+
- {l s='Conversion Rate' mod='dashtrends'} +
- +
-
+
- {l s='Net Profit' mod='dashtrends'} +
- +
+
+
+
+
+
+ + {l s='The graph is unavilable when selecting a date range of a single day. Select another date range for graph.' mod='dashtrends'} +
+