File tree Expand file tree Collapse file tree 3 files changed +25
-5
lines changed Expand file tree Collapse file tree 3 files changed +25
-5
lines changed Original file line number Diff line number Diff line change @@ -50,10 +50,32 @@ protected function _prepareColumns()
50
50
'frame_callback ' => array ($ this , 'decorateMime ' ),
51
51
));
52
52
53
+ $ emailTemplates = array ();
54
+ $ _emailTemplates = Mage_Core_Model_Email_Template::getDefaultTemplatesAsOptionsArray ();
55
+ foreach ($ _emailTemplates as $ _emailTemplate ) {
56
+ $ emailTemplates [$ _emailTemplate ['value ' ]] = $ _emailTemplate ['label ' ];
57
+ }
58
+ $ _emailTemplates = Mage::getSingleton ('adminhtml/system_config_source_email_template ' )->toOptionArray ();
59
+ foreach ($ _emailTemplates as $ _emailTemplate ) {
60
+ $ emailTemplates [$ _emailTemplate ['value ' ]] = $ _emailTemplate ['label ' ];
61
+ }
62
+
63
+ $ emailTemplates ['' ] = 'Default Email Template ' ;
64
+
53
65
$ this ->addColumn ('template_id ' , array (
54
66
'header ' => Mage::helper ('tm_email ' )->__ ('Template ' ),
55
67
'align ' => 'left ' ,
56
68
'index ' => 'template_id ' ,
69
+ 'type ' => 'options ' ,
70
+ 'options ' => $ emailTemplates
71
+ ));
72
+
73
+ $ this ->addColumn ('created_at ' , array (
74
+ 'header ' => Mage::helper ('tm_abandoned ' )->__ ('Created date ' ),
75
+ 'align ' => 'left ' ,
76
+ 'type ' => 'date ' ,
77
+ 'width ' => '100px ' ,
78
+ 'index ' => 'created_at ' ,
57
79
));
58
80
59
81
$ this ->addColumn ('actions ' , array (
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ public function render(Varien_Object $row)
15
15
16
16
$ title = Mage::helper ('tm_email ' )->__ ('View Email ' );
17
17
$ script = '
18
- var changesUrl = \'' . $ this ->getUrl ('*/*/preview ' , array ('id ' => $ row ->getId ())) . '\';
18
+ var changesUrl = \'' . $ this ->getUrl ('*/*/view ' , array ('id ' => $ row ->getId ())) . '\';
19
19
Dialog.info(null, {
20
20
draggable:true,
21
21
resizable:true,
Original file line number Diff line number Diff line change 38
38
// 'unsigned' => true,
39
39
// 'nullable' => false,
40
40
// ), 'Transport ID')
41
- ->addColumn ('created_at ' , Varien_Db_Ddl_Table::TYPE_INTEGER , 10 , array (
42
- 'unsigned ' => true ,
43
- 'nullable ' => false ,
44
- ), 'Created ' )
41
+ ->addColumn ('created_at ' , Varien_Db_Ddl_Table::TYPE_DATE , null , array (
42
+ ), 'Date ' )
45
43
;
46
44
$ installer ->getConnection ()->createTable ($ table );
47
45
You can’t perform that action at this time.
0 commit comments