Skip to content

Commit ce98040

Browse files
committed
1 parent 2fca368 commit ce98040

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ public function processData(): array
165165
$d = $dateStart->toString('yyyy-MM-dd');
166166
$dateStart->addDay(1);
167167
break;
168+
case '3m':
169+
case '6m':
170+
$date = $dateStart->toString('yyyy-MM-dd');
171+
$dateStart->addWeek(1);
172+
break;
168173
case '1y':
169174
case '2y':
170175
$d = $dateStart->toString('yyyy-MM');

app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ public function getDatePeriods()
5656
'24h' => $this->__('Last 24 Hours'),
5757
'7d' => $this->__('Last 7 Days'),
5858
'1m' => $this->__('Current Month'),
59+
'3m' => $this->__('Last 3 Month'),
60+
'6m' => $this->__('Last 6 Month'),
5961
'1y' => $this->__('YTD'),
6062
'2y' => $this->__('2YTD'),
6163
];

app/code/core/Mage/Eav/Model/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ protected function _loadEntityTypes()
196196
$fqEntityModelClass = Mage::getConfig()->getModelClassName($entityModelClass);
197197
if (!class_exists($fqEntityModelClass)) {
198198
if (Mage::getIsDeveloperMode()) {
199-
throw new Exception('Failed loading of eav entity type because it does not exist: ' . $entityModelClass);
199+
//throw new Exception('Failed loading of eav entity type because it does not exist: ' . $entityModelClass);
200200
} else {
201201
Mage::log('Skipped loading of eav entity type because it does not exist: ' . $entityModelClass);
202202
}

app/code/core/Mage/Reports/Model/Resource/Order/Collection.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,16 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
329329
$dateStart->setDay(Mage::getStoreConfig('reports/dashboard/mtd_start'));
330330
break;
331331

332+
case '3m':
333+
$dateStart->setDay(Mage::getStoreConfig('reports/dashboard/mtd_start'));
334+
$dateStart->subMonth(2);
335+
break;
336+
337+
case '6m':
338+
$dateStart->setDay(Mage::getStoreConfig('reports/dashboard/mtd_start'));
339+
$dateStart->subMonth(5);
340+
break;
341+
332342
case 'custom':
333343
$dateStart = $customStart ?: $dateEnd;
334344
$dateEnd = $customEnd ?: $dateEnd;

app/locale/en_US/Mage_Adminhtml.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,8 @@
535535
"Key %s does not contain scalar value","Key %s does not contain scalar value"
536536
"Key %s does not exist in array","Key %s does not exist in array"
537537
"Last 24 Hours","Last 24 Hours"
538+
"Last 3 Months","Last 3 Months"
539+
"Last 6 Months","Last 6 Months"
538540
"Last 5 Orders","Last 5 Orders"
539541
"Last 5 Search Terms","Last 5 Search Terms"
540542
"Last 7 Days","Last 7 Days"

0 commit comments

Comments
 (0)