dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/template/helpers/calendar/calendar.tpl
This commit is contained in:
Kevin Granger
2013-10-17 09:24:09 +02:00
parent 561c036240 6a7990869a
commit 334d0a01bd
2 changed files with 138 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+109 -11
View File
@@ -23,15 +23,15 @@
<span class="title">{l s='Date range'}</span>
{if isset($actions) && $actions|count > 0}
{if $actions|count > 1}
<div class='btn btn-default btn-xs pull-right dropdown-toggle' data-toggle='dropdown'>
<button class='btn btn-default btn-xs pull-right dropdown-toggle' data-toggle='dropdown' type="button">
{l s='Custom'}
<i class='icon-angle-down'></i>
<ul class='dropdown-menu'>
{foreach from=$actions item=action}
<li><a{if isset($action.href)} href="{$action.href}"{/if}{if isset($action.class)} class="{$action.class}"{/if}>{if isset($action.icon)}<i class="{$action.icon}"> {/if}{$action.label}</a></li>
{/foreach}
</ul>
</div>
</button>
<ul class='dropdown-menu'>
{foreach from=$actions item=action}
<li><a{if isset($action.href)} href="{$action.href}"{/if}{if isset($action.class)} class="{$action.class}"{/if}>{if isset($action.icon)}<i class="{$action.icon}"></i> {/if}{$action.label}</a></li>
{/foreach}
</ul>
{else}
<a{if isset($actions[0].href)} href="{$actions[0].href}"{/if} class="btn btn-default btn-xs pull-right{if isset($actions[0].class)} {$actions[0].class}{/if}">{if isset($actions[0].icon)}<i class="{$actions[0].icon}"></i> {/if}{$actions[0].label}</a>
{/if}
@@ -53,10 +53,21 @@
{l s='Compare to'}
</label>
</span>
<button class='btn btn-default btn-xs pull-right dropdown-toggle' data-toggle='dropdown'>
Custom
<i class='icon-angle-down'></i>
<button class='btn btn-default btn-xs pull-right dropdown-toggle' data-toggle='dropdown' type="button">
{l s='Select'}
<i class='icon-angle-down'></i>
</button>
<ul class='dropdown-menu'>
<li>
<a href="javascript:void(0);" onclick="$('#date-start-compare').focus();"><i class="icon-cogs"></i> {l s='Custom'}</a>
</li>
<li>
<a href="javascript:void(0);" onclick="setPreviousPeriod()"><i class="icon-cogs"></i> {l s='Previous period'}</a>
</li>
<li>
<a href="javascript:void(0);" onclick="setPreviousYear()"><i class="icon-cogs"></i> {l s='Previous Year'}</a>
</li>
</ul>
</div>
<div class="form-date-body" id="form-date-body-compare" style="display: none;">
<label>{l s='From'}</label>
@@ -80,6 +91,93 @@
</div>
</div>
<script type="text/javascript">
{literal}
function parseFormat(format){
var separator = format.match(/[.\/\-\s].*?/),
parts = format.split(/\W+/);
if (!separator || !parts || parts.length === 0){
throw new Error("Invalid date format.");
}
return {separator: separator, parts: parts};
}
function parseDate(date, format) {
var parts = date.split(format.separator),
date = new Date(),
val;
date.setHours(0);
date.setMinutes(0);
date.setSeconds(0);
date.setMilliseconds(0);
if (parts.length === format.parts.length) {
var year = date.getFullYear(), day = date.getDate(), month = date.getMonth();
for (var i=0, cnt = format.parts.length; i < cnt; i++) {
val = parseInt(parts[i], 10)||1;
switch(format.parts[i]) {
case 'dd':
case 'd':
day = val;
date.setDate(val);
break;
case 'mm':
case 'm':
month = val - 1;
date.setMonth(val - 1);
break;
case 'yy':
case 'y':
year = 2000 + val;
date.setFullYear(2000 + val);
break;
case 'yyyy':
case 'Y':
year = val;
date.setFullYear(val);
break;
}
}
date = new Date(year, month, day, 0 ,0 ,0);
}
return date;
}
function formatDate(date, format){
var val = {
d: date.getDate(),
m: date.getMonth() + 1,
yy: date.getFullYear().toString().substring(2),
y: date.getFullYear().toString().substring(2),
yyyy: date.getFullYear(),
Y: date.getFullYear()
};
val.d = (val.d < 10 ? '0' : '') + val.d;
val.m = (val.m < 10 ? '0' : '') + val.m;
var date = [];
for (var i=0, cnt = format.parts.length; i < cnt; i++) {
date.push(val[format.parts[i]]);
}
return date.join(format.separator);
}
{/literal}
function setPreviousPeriod() {
startDate = parseDate($("#date-start").val(), parseFormat('{$date_format}'));
endDate = parseDate($("#date-end").val(), parseFormat('{$date_format}'));
diff = endDate.getTime() - startDate.getTime();
startDateCompare = startDate.getTime()-diff;
$("#date-end-compare").val($("#date-start").val());
$("#date-start-compare").val(formatDate(new Date(startDateCompare), parseFormat('{$date_format}')));
}
function setPreviousYear() {
startDate = parseDate($("#date-start").val(), parseFormat('{$date_format}'));
startDate = startDate.setFullYear(startDate.getFullYear() - 1);
endDate = parseDate($("#date-end").val(), parseFormat('{$date_format}'));
endDate = endDate.setFullYear(endDate.getFullYear() - 1);
$("#date-start-compare").val(formatDate(new Date(startDate), parseFormat('{$date_format}')));
$("#date-end-compare").val(formatDate(new Date(endDate), parseFormat('{$date_format}')));
}
$(function() {
var translated_dates = {
days: ["{l s='Sunday'}", "{l s='Monday'}", "{l s='Tuesday'}", "{l s='Wednesday'}", "{l s='Thursday'}", "{l s='Friday'}", "{l s='Saturday'}", "{l s='Sunday'}"],
@@ -110,7 +208,7 @@
if (ev.date.valueOf() <= datepickerStart.date.valueOf()){
datepickerStart.setValue(ev.date.setMonth(ev.date.getMonth()-1));
}
}).data('datepicker');
}).data('datepicker');
$("#date-start").focus(function() {
datepickerStart.setCompare(false);
classes/helper/HelperCalendar.php
+29
View File
@@ -29,6 +29,7 @@ class HelperCalendarCore extends Helper
const DEFAULT_DATE_FORMAT = 'Y-m-d';
private $_actions;
private $_compare_actions;
private $_compare_date_from;
private $_compare_date_to;
private $_date_format;
@@ -60,6 +61,23 @@ class HelperCalendarCore extends Helper
return $this->_actions;
}
public function setCompareActions($value)
{
if (!is_array($value) && !$value instanceof Traversable)
throw new PrestaShopException('Actions value must be an traversable array');
$this->_compare_actions = $value;
return $this;
}
public function getCompareActions()
{
if (!isset($this->_compare_actions))
$this->_compare_actions = array();
return $this->_compare_actions;
}
public function setCompareDateFrom($value)
{
if (!isset($value) || $value == '')
@@ -173,6 +191,16 @@ class HelperCalendarCore extends Helper
return $this;
}
public function addCompareAction($action)
{
if (!isset($this->_compare_actions))
$this->_compare_actions = array();
$this->_compare_actions[] = $action;
return $this;
}
public function generate()
{
$context = Context::getContext();
@@ -203,6 +231,7 @@ class HelperCalendarCore extends Helper
'compare_date_from' => $this->getCompareDateFrom(),
'compare_date_to' => $this->getCompareDateTo(),
'actions' => $this->getActions(),
'compare_actions' => $this->getCompareActions(),
'is_rtl' => $this->isRTL()
));