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

// Adding RTL to calendar helper

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-10-14 09:14:18 +02:00
1 parent 892516342e
commit 80c8605264
2 files changed
+30 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/helpers/calendar/calendar.tpl
+7 -2
View File
@@ -2,8 +2,13 @@
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-8">
<div class="datepickers-container"> <div class="datepickers-container">
<div class="datepicker1" data-date="{$from_date}" data-date-format="{$date_format}"></div> {if $is_rtl}
<div class="datepicker2" data-date="{$to_date}" data-date-format="{$date_format}"></div> <div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
{else}
<div class="datepicker1" data-date="{$date_from}" data-date-format="{$date_format}"></div>
<div class="datepicker2" data-date="{$date_to}" data-date-format="{$date_format}"></div>
{/if}
</div> </div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
classes/helper/HelperCalendar.php
+23 -7
View File
@@ -34,6 +34,7 @@ class HelperCalendarCore extends Helper
private $_date_format; private $_date_format;
private $_date_from; private $_date_from;
private $_date_to; private $_date_to;
private $_rtl;
public function __construct() public function __construct()
{ {
@@ -62,7 +63,7 @@ class HelperCalendarCore extends Helper
public function setCompareDateFrom($value) public function setCompareDateFrom($value)
{ {
if (!isset($value) || $value == ''); if (!isset($value) || $value == '');
$value = date('d-m-Y', strtotime("-31 days")); $value = date('Y-m-d', strtotime("-31 days"));
if (!is_string($value)) if (!is_string($value))
throw new PrestaShopException('Date must be string'); throw new PrestaShopException('Date must be string');
@@ -74,7 +75,7 @@ class HelperCalendarCore extends Helper
public function getCompareDateFrom() public function getCompareDateFrom()
{ {
if (!isset($this->_compare_date_from)) if (!isset($this->_compare_date_from))
$this->_compare_date_from = date('d-m-Y', strtotime("-31 days")); $this->_compare_date_from = date('Y-m-d', strtotime("-31 days"));
return $this->_compare_date_from; return $this->_compare_date_from;
} }
@@ -94,7 +95,7 @@ class HelperCalendarCore extends Helper
public function getCompareDateTo() public function getCompareDateTo()
{ {
if (!isset($this->_compare_date_to)) if (!isset($this->_compare_date_to))
$this->_compare_date_to = date('d-m-Y'); $this->_compare_date_to = date('Y-m-d');
return $this->_compare_date_to; return $this->_compare_date_to;
} }
@@ -119,7 +120,7 @@ class HelperCalendarCore extends Helper
public function setDateFrom($value) public function setDateFrom($value)
{ {
if (!isset($value) || $value == '') if (!isset($value) || $value == '')
$value = date('d-m-Y', strtotime("-31 days")); $value = date('Y-m-d', strtotime("-31 days"));
if (!is_string($value)) if (!is_string($value))
throw new PrestaShopException('Date must be string'); throw new PrestaShopException('Date must be string');
@@ -131,7 +132,7 @@ class HelperCalendarCore extends Helper
public function getDateFrom() public function getDateFrom()
{ {
if (!isset($this->_date_from)) if (!isset($this->_date_from))
$this->_date_from = date('d-m-Y', strtotime("-31 days")); $this->_date_from = date('Y-m-d', strtotime("-31 days"));
return $this->_date_from; return $this->_date_from;
} }
@@ -151,11 +152,17 @@ class HelperCalendarCore extends Helper
public function getDateTo() public function getDateTo()
{ {
if (!isset($this->_date_to)) if (!isset($this->_date_to))
$this->_date_to = date('d-m-Y'); $this->_date_to = date('Y-m-d');
return $this->_date_to; return $this->_date_to;
} }
public function setRTL($value)
{
$this->_rtl = (bool)$value;
return $this;
}
public function addAction($action) public function addAction($action)
{ {
if (!isset($this->_actions)) if (!isset($this->_actions))
@@ -195,10 +202,19 @@ class HelperCalendarCore extends Helper
'date_to' => $this->getDateTo(), 'date_to' => $this->getDateTo(),
'compare_date_from' => $this->getCompareDateFrom(), 'compare_date_from' => $this->getCompareDateFrom(),
'compare_date_to' => $this->getCompareDateTo(), 'compare_date_to' => $this->getCompareDateTo(),
'actions' => $this->getActions() 'actions' => $this->getActions(),
'is_rtl' => $this->isRTL()
)); ));
$html .= parent::generate(); $html .= parent::generate();
return $html; return $html;
} }
public function isRTL()
{
if (!isset($this->_rtl))
$this->_rtl = Context::getContext()->language->is_rtl;
return $this->_rtl;
}
} }