straker-translations-easy-translation-platform - Version 1.3.7

Version Notes

1) add 'sku' and 'attribute set' to product grid
2) fix bugs in job management page

Download this release

Release Info

Developer Chris
Extension straker-translations-easy-translation-platform
Version 1.3.7
Comparing to
See all releases


Code changes from version 1.3.6 to 1.3.7

Files changed (63) hide show
  1. app/code/community/StrakerTranslations/EasyTranslationPlatform/.DS_Store +0 -0
  2. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Attribute/Grid.php +32 -5
  3. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Category/Grid.php +33 -4
  4. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Cms/Block/Grid.php +39 -11
  5. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Cms/Page/Grid.php +66 -38
  6. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Grid.php +51 -45
  7. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Product/Grid.php +50 -7
  8. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Attribute/Confirm/Grid.php +25 -5
  9. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Attribute/Grid.php +51 -8
  10. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Category/Confirm/Grid.php +26 -5
  11. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Category/Tree.php +5 -2
  12. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Cms/Block/Confirm/Grid.php +44 -8
  13. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Cms/Block/Grid.php +18 -5
  14. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Cms/Page/Confirm/Grid.php +23 -8
  15. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Cms/Page/Grid.php +19 -4
  16. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Confirm/Grid.php +0 -1
  17. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Products/Confirm/Grid.php +51 -5
  18. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Products/Grid.php +38 -5
  19. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/Action.php +2 -1
  20. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/CmsVersion.php +1 -1
  21. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/Frontend.php +2 -2
  22. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/Language.php +13 -0
  23. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/PageGridAction.php +37 -0
  24. app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/Status.php +2 -4
  25. app/code/community/StrakerTranslations/EasyTranslationPlatform/Helper/Data.php +10 -0
  26. app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Api.php +81 -7
  27. app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Attribute/Translate.php +3 -3
  28. app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Cms/Page/Translate.php +4 -6
  29. app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Job.php +25 -17
  30. app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Job/Status.php +1 -1
  31. app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Job/Type.php +7 -0
  32. app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/AttributeController.php +100 -3
  33. app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/CategoryController.php +76 -12
  34. app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/Cms/BlockController.php +87 -9
  35. app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/Cms/PageController.php +89 -9
  36. app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/JobController.php +12 -0
  37. app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/ProductController.php +88 -9
  38. app/code/community/StrakerTranslations/EasyTranslationPlatform/data/strakertranslations_easytranslationplatform_setup/data-upgrade-1.3.6-1.3.7.php +19 -0
  39. app/code/community/StrakerTranslations/EasyTranslationPlatform/etc/config.xml +7 -7
  40. app/code/community/StrakerTranslations/EasyTranslationPlatform/etc/system.xml +117 -100
  41. app/code/community/StrakerTranslations/EasyTranslationPlatform/sql/strakertranslations_easytranslationplatform_setup/upgrade-1.3.0-1.3.1.php +2 -0
  42. app/code/community/StrakerTranslations/EasyTranslationPlatform/sql/strakertranslations_easytranslationplatform_setup/upgrade-1.3.3-1.3.4.php +2 -0
  43. app/code/community/StrakerTranslations/EasyTranslationPlatform/sql/strakertranslations_easytranslationplatform_setup/upgrade-1.3.6-1.3.7.php +36 -0
  44. app/design/adminhtml/default/straker/template/straker/new/attribute.phtml +7 -2
  45. app/design/adminhtml/default/straker/template/straker/new/attribute/confirm.phtml +6 -4
  46. app/design/adminhtml/default/straker/template/straker/new/attribute/massaction.phtml +145 -80
  47. app/design/adminhtml/default/straker/template/straker/new/category/attributes.phtml +1 -1
  48. app/design/adminhtml/default/straker/template/straker/new/category/confirm.phtml +4 -3
  49. app/design/adminhtml/default/straker/template/straker/new/category/tree.phtml +1 -1
  50. app/design/adminhtml/default/straker/template/straker/new/cms/block.phtml +7 -2
  51. app/design/adminhtml/default/straker/template/straker/new/cms/block/attributes.phtml +1 -1
  52. app/design/adminhtml/default/straker/template/straker/new/cms/block/confirm.phtml +4 -3
  53. app/design/adminhtml/default/straker/template/straker/new/cms/page.phtml +6 -1
  54. app/design/adminhtml/default/straker/template/straker/new/cms/page/attributes.phtml +1 -1
  55. app/design/adminhtml/default/straker/template/straker/new/cms/page/confirm.phtml +4 -3
  56. app/design/adminhtml/default/straker/template/straker/new/products.phtml +6 -1
  57. app/design/adminhtml/default/straker/template/straker/new/products/attributes.phtml +1 -1
  58. app/design/adminhtml/default/straker/template/straker/new/products/confirm.phtml +3 -3
  59. app/design/adminhtml/default/straker/template/straker/new/type.phtml +1 -1
  60. package.xml +7 -6
  61. skin/adminhtml/default/straker/.DS_Store +0 -0
  62. skin/adminhtml/default/straker/css/straker.css +14 -0
  63. skin/adminhtml/default/straker/css/straker.less +16 -0
app/code/community/StrakerTranslations/EasyTranslationPlatform/.DS_Store CHANGED
Binary file
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Attribute/Grid.php CHANGED
@@ -5,7 +5,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Attribute_
5
  public function __construct() {
6
  parent::__construct();
7
  $this->setId('strakerJobAttributeGrid');
8
- $this->setSaveParametersInSession(true);
 
9
  }
10
 
11
  protected function _prepareLayout()
@@ -51,15 +52,19 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Attribute_
51
  protected function _prepareColumns() {
52
  $this->addColumn('id', array(
53
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('ID'),
 
54
  'align' => 'right',
55
  'width' => '50px',
56
  'index' => 'id',
 
57
  ));
58
 
59
  $this->addColumn('attribute_id', array(
60
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Attribute ID'),
 
61
  'align' => 'left',
62
  'index' => 'attribute_id',
 
63
  ));
64
 
65
  $this->addColumn('attribute_code', array(
@@ -105,13 +110,18 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Attribute_
105
  'filter' => false,
106
  ));
107
 
108
- if ($this->getStatusId() == '4'){
109
  $this->addColumn('version', array(
110
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
111
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Version',
112
  'align' => 'center',
113
- 'index' => false,
114
- 'filter' => false,
 
 
 
 
 
115
  ));
116
  }
117
 
@@ -127,10 +137,22 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Attribute_
127
  }
128
 
129
  public function getRowUrl($row) {
130
- // return $this->getUrl('*/*/edit', array('id' => $row->getId()));
131
  return '';
132
  }
133
 
 
 
 
 
 
 
 
 
 
 
 
 
 
134
  protected function _prepareMassaction()
135
  {
136
  if ($this->getStatusId() == '4') {
@@ -198,4 +220,9 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Attribute_
198
  }
199
  return $html;
200
  }
 
 
 
 
 
201
  }
5
  public function __construct() {
6
  parent::__construct();
7
  $this->setId('strakerJobAttributeGrid');
8
+ $this->setUseAjax(true);
9
+ $this->setVarNameFilter('straker_job_attribute_filter');
10
  }
11
 
12
  protected function _prepareLayout()
52
  protected function _prepareColumns() {
53
  $this->addColumn('id', array(
54
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('ID'),
55
+ 'type' => 'number',
56
  'align' => 'right',
57
  'width' => '50px',
58
  'index' => 'id',
59
+ 'filter_index' => 'main_table.id'
60
  ));
61
 
62
  $this->addColumn('attribute_id', array(
63
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Attribute ID'),
64
+ 'type' => 'number',
65
  'align' => 'left',
66
  'index' => 'attribute_id',
67
+ 'filter_index' => 'main_table.attribute_id'
68
  ));
69
 
70
  $this->addColumn('attribute_code', array(
110
  'filter' => false,
111
  ));
112
 
113
+ if ($this->getStatusId() == '4' || $this->getStatusId() == '5'){
114
  $this->addColumn('version', array(
115
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
116
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Version',
117
  'align' => 'center',
118
+ 'index' => 'version',
119
+ 'filter_condition_callback' => [$this, '_filterVersion'],
120
+ 'options' => [
121
+ '0' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
122
+ '1' => Mage::helper('strakertranslations_easytranslationplatform')->__('Not Published')
123
+ ],
124
+ 'width' => '20%'
125
  ));
126
  }
127
 
137
  }
138
 
139
  public function getRowUrl($row) {
 
140
  return '';
141
  }
142
 
143
+ protected function _filterVersion($collection, $column)
144
+ {
145
+ if ( ($value = $column->getFilter()->getValue()) === FALSE ) {
146
+ return $this;
147
+ }
148
+ if ($value === '1' ){
149
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NULL');
150
+ } else {
151
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NOT NULL');
152
+ }
153
+ return $this;
154
+ }
155
+
156
  protected function _prepareMassaction()
157
  {
158
  if ($this->getStatusId() == '4') {
220
  }
221
  return $html;
222
  }
223
+
224
+ public function getGridUrl()
225
+ {
226
+ return $this->getUrl('*/*/jobGrid', array('_current' => true));
227
+ }
228
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Category/Grid.php CHANGED
@@ -7,7 +7,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Category_G
7
  {
8
  parent::__construct();
9
  $this->setId('strakerJobCategoryGrid');
10
- $this->setSaveParametersInSession(true);
 
11
  }
12
 
13
  protected function _prepareLayout()
@@ -64,6 +65,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Category_G
64
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Category ID'),
65
  'align' => 'left',
66
  'index' => 'category_id',
 
 
67
  ));
68
 
69
  // $this->addColumn('job_id', array(
@@ -83,22 +86,30 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Category_G
83
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('%s - Source', $attrModel->getFrontendLabel()),
84
  'align' => 'left',
85
  'index' => $attributeCode . '_original',
 
86
  ));
87
 
88
  $this->addColumn($attributeCode . '_translate', array(
89
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('%s - Target', $attrModel->getFrontendLabel()),
90
  'align' => 'left',
91
  'index' => $attributeCode . '_translate',
 
92
  ));
93
  }
94
 
95
- if ($this->getStatusId() == '4') {
96
  $this->addColumn('version', array(
97
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
98
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Version',
99
  'align' => 'center',
100
- 'index' => false,
101
- 'filter' => false,
 
 
 
 
 
 
102
  ));
103
  }
104
 
@@ -127,6 +138,19 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Category_G
127
  return '';
128
  }
129
 
 
 
 
 
 
 
 
 
 
 
 
 
 
130
  protected function _prepareMassaction()
131
  {
132
  if ($this->getStatusId() == '4') {
@@ -193,4 +217,9 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Category_G
193
  }
194
  return $html;
195
  }
 
 
 
 
 
196
  }
7
  {
8
  parent::__construct();
9
  $this->setId('strakerJobCategoryGrid');
10
+ $this->setUseAjax(true);
11
+ $this->setVarNameFilter('straker_job_category_filter');
12
  }
13
 
14
  protected function _prepareLayout()
65
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Category ID'),
66
  'align' => 'left',
67
  'index' => 'category_id',
68
+ 'type' => 'number',
69
+ 'filter_index' => 'main_table.category_id'
70
  ));
71
 
72
  // $this->addColumn('job_id', array(
86
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('%s - Source', $attrModel->getFrontendLabel()),
87
  'align' => 'left',
88
  'index' => $attributeCode . '_original',
89
+ 'filter_index' => $attributeCode.'.original'
90
  ));
91
 
92
  $this->addColumn($attributeCode . '_translate', array(
93
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('%s - Target', $attrModel->getFrontendLabel()),
94
  'align' => 'left',
95
  'index' => $attributeCode . '_translate',
96
+ 'filter_index' => $attributeCode.'.translate'
97
  ));
98
  }
99
 
100
+ if ($this->getStatusId() == '4' || $this->getStatusId() == '5'){
101
  $this->addColumn('version', array(
102
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
103
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Version',
104
  'align' => 'center',
105
+ 'type' => 'options',
106
+ 'index' => 'version',
107
+ 'filter_condition_callback' => [$this, '_filterVersion'],
108
+ 'options' => [
109
+ '0' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
110
+ '1' => Mage::helper('strakertranslations_easytranslationplatform')->__('Not Published')
111
+ ],
112
+ 'width' => '20%'
113
  ));
114
  }
115
 
138
  return '';
139
  }
140
 
141
+ protected function _filterVersion($collection, $column)
142
+ {
143
+ if ( ($value = $column->getFilter()->getValue()) === FALSE ) {
144
+ return $this;
145
+ }
146
+ if ($value === '1' ){
147
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NULL');
148
+ } else {
149
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NOT NULL');
150
+ }
151
+ return $this;
152
+ }
153
+
154
  protected function _prepareMassaction()
155
  {
156
  if ($this->getStatusId() == '4') {
217
  }
218
  return $html;
219
  }
220
+
221
+ public function getGridUrl()
222
+ {
223
+ return $this->getUrl('*/*/jobGrid', array('_current' => true));
224
+ }
225
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Cms/Block/Grid.php CHANGED
@@ -7,7 +7,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Block_
7
  public function __construct() {
8
  parent::__construct();
9
  $this->setId('strakerJobCmsBlockGrid');
10
- $this->setSaveParametersInSession(true);
 
11
  }
12
 
13
  protected function _prepareLayout()
@@ -37,22 +38,31 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Block_
37
  }
38
 
39
  protected function _prepareColumns() {
40
- $this->addColumn('title', array(
41
- 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Title'),
42
- 'align' => 'center',
43
- 'index' => 'origin',
44
- 'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_CmsOriginTitle',
45
- 'sortable' => false,
46
- 'filter' => false,
47
- ));
 
 
 
48
 
49
  if ($this->getStatusId() == '4' || $this->getStatusId() == '5'){
50
  $this->addColumn('version', array(
51
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
52
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_CmsVersion',
53
  'align' => 'center',
54
- 'index' => false,
55
- 'filter' => false,
 
 
 
 
 
 
56
  ));
57
  }
58
 
@@ -64,6 +74,19 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Block_
64
  return '';
65
  }
66
 
 
 
 
 
 
 
 
 
 
 
 
 
 
67
  protected function _prepareMassaction()
68
  {
69
  if ($this->getStatusId() == '4') {
@@ -138,4 +161,9 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Block_
138
  }
139
  return $this->_attributes;
140
  }
 
 
 
 
 
141
  }
7
  public function __construct() {
8
  parent::__construct();
9
  $this->setId('strakerJobCmsBlockGrid');
10
+ $this->setUseAjax(true);
11
+ $this->setVarNameFilter('straker_job_cms_block_filter');
12
  }
13
 
14
  protected function _prepareLayout()
38
  }
39
 
40
  protected function _prepareColumns() {
41
+ $this->addColumn('title', array(
42
+ 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Title'),
43
+ 'align' => 'center',
44
+ 'index' => 'title'
45
+ ));
46
+
47
+ $this->addColumn('identifier', array(
48
+ 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Identifier'),
49
+ 'align' => 'center',
50
+ 'index' => 'identifier'
51
+ ));
52
 
53
  if ($this->getStatusId() == '4' || $this->getStatusId() == '5'){
54
  $this->addColumn('version', array(
55
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
56
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_CmsVersion',
57
  'align' => 'center',
58
+ 'type' => 'options',
59
+ 'index' => 'version',
60
+ 'filter_condition_callback' => [$this, '_filterVersion'],
61
+ 'options' => [
62
+ '0' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
63
+ '1' => Mage::helper('strakertranslations_easytranslationplatform')->__('Not Published')
64
+ ],
65
+ 'width' => '20%'
66
  ));
67
  }
68
 
74
  return '';
75
  }
76
 
77
+ protected function _filterVersion($collection, $column)
78
+ {
79
+ if ( ($value = $column->getFilter()->getValue()) === FALSE ) {
80
+ return $this;
81
+ }
82
+ if ($value === '1' ){
83
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NULL');
84
+ } else {
85
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NOT NULL');
86
+ }
87
+ return $this;
88
+ }
89
+
90
  protected function _prepareMassaction()
91
  {
92
  if ($this->getStatusId() == '4') {
161
  }
162
  return $this->_attributes;
163
  }
164
+
165
+ public function getGridUrl()
166
+ {
167
+ return $this->getUrl('*/*/jobGrid', array('_current' => true));
168
+ }
169
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Cms/Page/Grid.php CHANGED
@@ -7,7 +7,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Page_G
7
  public function __construct() {
8
  parent::__construct();
9
  $this->setId('strakerJobCmsPageGrid');
10
- $this->setSaveParametersInSession(true);
 
11
  }
12
 
13
  protected function _prepareLayout()
@@ -40,10 +41,13 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Page_G
40
  $this->addColumn('title', array(
41
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Title'),
42
  'align' => 'center',
43
- 'index' => 'origin',
44
- 'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_CmsOriginTitle',
45
- 'sortable' => false,
46
- 'filter' => false,
 
 
 
47
  ));
48
 
49
  if ($this->getStatusId() == '4' || $this->getStatusId() == '5'){
@@ -51,8 +55,14 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Page_G
51
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
52
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_CmsVersion',
53
  'align' => 'center',
54
- 'index' => false,
55
- 'filter' => false,
 
 
 
 
 
 
56
  ));
57
  }
58
 
@@ -64,6 +74,19 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Page_G
64
  return '';
65
  }
66
 
 
 
 
 
 
 
 
 
 
 
 
 
 
67
  protected function _prepareMassaction()
68
  {
69
  if ($this->getStatusId() == '4') {
@@ -84,40 +107,40 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Page_G
84
 
85
 
86
  // Mage::dispatchEvent('adminhtml_strakertranslation_job_product_grid_prepare_massaction', array('block' => $this));
87
- return $this;
88
  }
 
89
  }
90
 
91
- protected function _prepareMassactionColumn()
92
- {
93
- if ($this->getStatusId() == '4') {
94
- $columnId = 'massaction';
95
- $massactionColumn = $this->getLayout()->createBlock('adminhtml/widget_grid_column')
96
- ->setData(array(
97
- 'index' => $this->getMassactionIdField(),
98
- 'use_index' => $this->getMassactionIdField(),
99
- 'filter_index' => $this->getMassactionIdFilter(),
100
- 'type' => 'massaction',
101
- 'name' => $this->getMassactionBlock()->getFormFieldName(),
102
- 'align' => 'center',
103
- 'is_system' => true
104
- ));
105
-
106
- if ($this->getNoFilterMassactionColumn()) {
107
- $massactionColumn->setData('filter', false);
108
- }
109
-
110
- $massactionColumn->setSelected($this->getMassactionBlock()->getSelected())
111
- ->setGrid($this)
112
- ->setId($columnId);
113
-
114
- $oldColumns = $this->_columns;
115
- $this->_columns = array();
116
- $this->_columns[$columnId] = $massactionColumn;
117
- $this->_columns = array_merge($this->_columns, $oldColumns);
118
- return $this;
119
- }
120
- }
121
 
122
  public function getMainButtonsHtml()
123
  {
@@ -138,4 +161,9 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Cms_Page_G
138
  }
139
  return $this->_attributes;
140
  }
 
 
 
 
 
141
  }
7
  public function __construct() {
8
  parent::__construct();
9
  $this->setId('strakerJobCmsPageGrid');
10
+ $this->setUseAjax(true);
11
+ $this->setVarNameFilter('straker_job_cms_page_filter');
12
  }
13
 
14
  protected function _prepareLayout()
41
  $this->addColumn('title', array(
42
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Title'),
43
  'align' => 'center',
44
+ 'index' => 'title'
45
+ ));
46
+
47
+ $this->addColumn('identifier', array(
48
+ 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Identifier'),
49
+ 'align' => 'center',
50
+ 'index' => 'identifier'
51
  ));
52
 
53
  if ($this->getStatusId() == '4' || $this->getStatusId() == '5'){
55
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
56
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_CmsVersion',
57
  'align' => 'center',
58
+ 'type' => 'options',
59
+ 'index' => 'version',
60
+ 'filter_condition_callback' => [$this, '_filterVersion'],
61
+ 'options' => [
62
+ '0' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
63
+ '1' => Mage::helper('strakertranslations_easytranslationplatform')->__('Not Published')
64
+ ],
65
+ 'width' => '20%'
66
  ));
67
  }
68
 
74
  return '';
75
  }
76
 
77
+ protected function _filterVersion($collection, $column)
78
+ {
79
+ if ( ($value = $column->getFilter()->getValue()) === FALSE ) {
80
+ return $this;
81
+ }
82
+ if ($value === '1' ){
83
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NULL');
84
+ } else {
85
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NOT NULL');
86
+ }
87
+ return $this;
88
+ }
89
+
90
  protected function _prepareMassaction()
91
  {
92
  if ($this->getStatusId() == '4') {
107
 
108
 
109
  // Mage::dispatchEvent('adminhtml_strakertranslation_job_product_grid_prepare_massaction', array('block' => $this));
 
110
  }
111
+ return $this;
112
  }
113
 
114
+ // protected function _prepareMassactionColumn()
115
+ // {
116
+ // if ($this->getStatusId() == '4') {
117
+ // $columnId = 'massaction';
118
+ // $massactionColumn = $this->getLayout()->createBlock('adminhtml/widget_grid_column')
119
+ // ->setData(array(
120
+ // 'index' => $this->getMassactionIdField(),
121
+ // 'use_index' => $this->getMassactionIdField(),
122
+ // 'filter_index' => $this->getMassactionIdFilter(),
123
+ // 'type' => 'massaction',
124
+ // 'name' => $this->getMassactionBlock()->getFormFieldName(),
125
+ // 'align' => 'center',
126
+ // 'is_system' => true
127
+ // ));
128
+ //
129
+ // if ($this->getNoFilterMassactionColumn()) {
130
+ // $massactionColumn->setData('filter', false);
131
+ // }
132
+ //
133
+ // $massactionColumn->setSelected($this->getMassactionBlock()->getSelected())
134
+ // ->setGrid($this)
135
+ // ->setId($columnId);
136
+ //
137
+ // $oldColumns = $this->_columns;
138
+ // $this->_columns = array();
139
+ // $this->_columns[$columnId] = $massactionColumn;
140
+ // $this->_columns = array_merge($this->_columns, $oldColumns);
141
+ // return $this;
142
+ // }
143
+ // }
144
 
145
  public function getMainButtonsHtml()
146
  {
161
  }
162
  return $this->_attributes;
163
  }
164
+
165
+ public function getGridUrl()
166
+ {
167
+ return $this->getUrl('*/*/jobGrid', array('_current' => true));
168
+ }
169
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Grid.php CHANGED
@@ -1,27 +1,27 @@
1
  <?php
2
 
3
- class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Grid extends Mage_Adminhtml_Block_Widget_Grid {
4
-
5
- public function __construct() {
 
6
  parent::__construct();
7
  $this->setId('strakerJobGrid');
8
  $this->setDefaultSort('id');
9
  $this->setDefaultDir('DESC');
10
- $this->setSaveParametersInSession(true);
 
11
  }
12
 
13
- protected function _prepareCollection() {
14
- /** @var $collection StrakerTranslations_EasyTranslationPlatform_Model_Resource_Job_Collection*/
 
15
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/job')->getCollection();
16
-
17
  foreach($collection as $jobModel){
18
  if($jobModel->getStatusId() == 4){
19
  $jobModel->load($jobModel->getId())->isPublished();
20
  }
21
  }
22
-
23
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/job')->getCollection();
24
-
25
  /** @var $helper StrakerTranslations_EasyTranslationPlatform_Helper_Data */
26
  $helper = Mage::helper('strakertranslations_easytranslationplatform');
27
  if($helper->isSandboxMode()){
@@ -29,112 +29,118 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Grid exten
29
  }else{
30
  $collection->addFieldToFilter('is_test_job', ['eq' => false]);
31
  }
32
-
33
  $collection->getSelect()->joinLeft(
34
  Mage::getSingleton('core/resource')->getTableName('strakertranslations_easytranslationplatform/job_type'),
35
- Mage::getSingleton('core/resource')->getTableName('strakertranslations_easytranslationplatform/job_type').'.type_id = main_table.type_id',
36
  'type_name'
37
  );
38
  $collection->getSelect()->joinLeft(
39
  Mage::getSingleton('core/resource')->getTableName('strakertranslations_easytranslationplatform/job_status'),
40
- Mage::getSingleton('core/resource')->getTableName('strakertranslations_easytranslationplatform/job_status').'.status_id = main_table.status_id',
41
  'status_name'
42
  );
43
  $collection->getSelect()->joinLeft(
44
  Mage::getSingleton('core/resource')->getTableName('core/store'),
45
- Mage::getSingleton('core/resource')->getTableName('core/store').'.store_id = main_table.store_id',
46
  'name'
47
  );
48
  $this->setCollection($collection);
49
  return parent::_prepareCollection();
50
  }
51
 
52
- protected function _prepareColumns() {
 
53
  $this->addColumn('id', array(
54
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('ID'),
55
  'align' => 'right',
56
  'width' => '50px',
 
57
  'index' => 'id',
58
  ));
59
-
60
  $this->addColumn('tj_number', array(
61
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Straker Ref.'),
62
  'align' => 'left',
63
  'index' => 'tj_number',
64
  ));
65
-
66
  $this->addColumn('created_at', array(
67
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Created At'),
68
  'align' => 'left',
69
  'type' => 'datetime',
70
  'index' => 'created_at',
71
  ));
72
-
73
  $this->addColumn('updated_at', array(
74
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Updated At'),
75
  'align' => 'left',
76
  'type' => 'datetime',
77
  'index' => 'updated_at',
78
  ));
79
-
80
- $this->addColumn('type_name', array(
81
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Content Type'),
82
  'align' => 'left',
83
- 'index' => 'type_name',
 
 
 
84
  ));
85
-
86
  $this->addColumn('selected', array(
87
- 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Content Selected'),
88
- 'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Selected',
89
- 'align' => 'center',
90
- 'filter' => false,
 
91
  ));
92
-
93
- $this->addColumn('name', array(
94
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Store View'),
95
  'align' => 'left',
96
- 'index' => 'name',
97
- 'filter_index' => Mage::getSingleton('core/resource')->getTableName('core/store').'.name',
 
 
98
  ));
99
-
100
  $this->addColumn('sl', array(
101
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Source Language'),
 
102
  'align' => 'left',
103
  'index' => 'sl',
 
 
104
  ));
105
-
106
  $this->addColumn('tl', array(
107
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Target Language'),
 
108
  'align' => 'left',
109
  'index' => 'tl',
 
 
110
  ));
111
-
112
  $this->addColumn('refresh', array(
113
- 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Refresh'),
114
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Refresh',
115
- 'align' => 'center',
116
- 'filter' => false,
117
  ));
118
-
119
  $this->addColumn('status', array(
120
- 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Status'),
121
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Status',
122
- 'align' => 'center',
123
- 'filter' => false,
124
  ));
125
-
126
  $this->addColumn('action', array(
127
- 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Action'),
128
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Action',
129
- 'align' => 'center',
130
- 'filter' => false,
131
  ));
132
-
133
  return parent::_prepareColumns();
134
  }
135
 
136
- public function getRowUrl($row) {
 
137
  return '';
138
  }
139
 
 
 
 
 
140
  }
1
  <?php
2
 
3
+ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Grid extends Mage_Adminhtml_Block_Widget_Grid
4
+ {
5
+ public function __construct()
6
+ {
7
  parent::__construct();
8
  $this->setId('strakerJobGrid');
9
  $this->setDefaultSort('id');
10
  $this->setDefaultDir('DESC');
11
+ $this->setUseAjax(true);
12
+ $this->setVarNameFilter('straker_job_filter');
13
  }
14
 
15
+ protected function _prepareCollection()
16
+ {
17
+ /** @var $collection StrakerTranslations_EasyTranslationPlatform_Model_Resource_Job_Collection */
18
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/job')->getCollection();
 
19
  foreach($collection as $jobModel){
20
  if($jobModel->getStatusId() == 4){
21
  $jobModel->load($jobModel->getId())->isPublished();
22
  }
23
  }
 
24
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/job')->getCollection();
 
25
  /** @var $helper StrakerTranslations_EasyTranslationPlatform_Helper_Data */
26
  $helper = Mage::helper('strakertranslations_easytranslationplatform');
27
  if($helper->isSandboxMode()){
29
  }else{
30
  $collection->addFieldToFilter('is_test_job', ['eq' => false]);
31
  }
 
32
  $collection->getSelect()->joinLeft(
33
  Mage::getSingleton('core/resource')->getTableName('strakertranslations_easytranslationplatform/job_type'),
34
+ Mage::getSingleton('core/resource')->getTableName('strakertranslations_easytranslationplatform/job_type') . '.type_id = main_table.type_id',
35
  'type_name'
36
  );
37
  $collection->getSelect()->joinLeft(
38
  Mage::getSingleton('core/resource')->getTableName('strakertranslations_easytranslationplatform/job_status'),
39
+ Mage::getSingleton('core/resource')->getTableName('strakertranslations_easytranslationplatform/job_status') . '.status_id = main_table.status_id',
40
  'status_name'
41
  );
42
  $collection->getSelect()->joinLeft(
43
  Mage::getSingleton('core/resource')->getTableName('core/store'),
44
+ Mage::getSingleton('core/resource')->getTableName('core/store') . '.store_id = main_table.store_id',
45
  'name'
46
  );
47
  $this->setCollection($collection);
48
  return parent::_prepareCollection();
49
  }
50
 
51
+ protected function _prepareColumns()
52
+ {
53
  $this->addColumn('id', array(
54
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('ID'),
55
  'align' => 'right',
56
  'width' => '50px',
57
+ 'type' => 'number',
58
  'index' => 'id',
59
  ));
 
60
  $this->addColumn('tj_number', array(
61
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Straker Ref.'),
62
  'align' => 'left',
63
  'index' => 'tj_number',
64
  ));
 
65
  $this->addColumn('created_at', array(
66
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Created At'),
67
  'align' => 'left',
68
  'type' => 'datetime',
69
  'index' => 'created_at',
70
  ));
 
71
  $this->addColumn('updated_at', array(
72
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Updated At'),
73
  'align' => 'left',
74
  'type' => 'datetime',
75
  'index' => 'updated_at',
76
  ));
77
+ $this->addColumn('type_id', array(
 
78
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Content Type'),
79
  'align' => 'left',
80
+ 'index' => 'type_id',
81
+ 'filter_index' => 'main_table.type_id',
82
+ 'type' => 'options',
83
+ 'options' => Mage::getModel('strakertranslations_easytranslationplatform/job_type')->getOptionArray()
84
  ));
 
85
  $this->addColumn('selected', array(
86
+ 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Content Selected'),
87
+ 'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Selected',
88
+ 'align' => 'center',
89
+ 'filter' => false,
90
+ 'sortable' => false
91
  ));
92
+ $this->addColumn('store_id', array(
 
93
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Store View'),
94
  'align' => 'left',
95
+ 'index' => 'store_id',
96
+ 'filter_index' => Mage::getSingleton('core/resource')->getTableName('core/store') . '.store_id',
97
+ 'type' => 'options',
98
+ 'options' => Mage::getModel('strakertranslations_easytranslationplatform/job')->_getStoreOptionArray()
99
  ));
 
100
  $this->addColumn('sl', array(
101
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Source Language'),
102
+ 'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Language',
103
  'align' => 'left',
104
  'index' => 'sl',
105
+ 'type' => 'options',
106
+ 'options' => Mage::getModel('strakertranslations_easytranslationplatform/job')->languageOptionArray('sl')
107
  ));
 
108
  $this->addColumn('tl', array(
109
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Target Language'),
110
+ 'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Language',
111
  'align' => 'left',
112
  'index' => 'tl',
113
+ 'type' => 'options',
114
+ 'options' => Mage::getModel('strakertranslations_easytranslationplatform/job')->languageOptionArray('tl')
115
  ));
 
116
  $this->addColumn('refresh', array(
117
+ 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Refresh'),
118
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Refresh',
119
+ 'align' => 'center',
120
+ 'filter' => false,
121
  ));
 
122
  $this->addColumn('status', array(
123
+ 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Status'),
124
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Status',
125
+ 'align' => 'center',
126
+ 'filter' => false,
127
  ));
 
128
  $this->addColumn('action', array(
129
+ 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Action'),
130
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Action',
131
+ 'align' => 'center',
132
+ 'filter' => false,
133
  ));
 
134
  return parent::_prepareColumns();
135
  }
136
 
137
+ public function getRowUrl($row)
138
+ {
139
  return '';
140
  }
141
 
142
+ public function getGridUrl()
143
+ {
144
+ return $this->getUrl('*/*/grid', array('_current' => true));
145
+ }
146
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Job/Product/Grid.php CHANGED
@@ -7,7 +7,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Product_Gr
7
  {
8
  parent::__construct();
9
  $this->setId('strakerJobProductGrid');
10
- $this->setSaveParametersInSession(true);
 
11
  }
12
 
13
  protected function _prepareLayout()
@@ -34,6 +35,12 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Product_Gr
34
  /** @var StrakerTranslations_EasyTranslationPlatform_Model_Resource_Job_Product_Collection $collection */
35
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/job_product')->getCollection()->addFieldToFilter('main_table.job_id', $job->getId());
36
 
 
 
 
 
 
 
37
  //loop through this job's attributes and join them to the collection
38
  foreach ($jobAttributes as $jobAttribute) {
39
  $attributeCode = Mage::getModel('eav/entity_attribute')->load($jobAttribute->getAttributeId())->getAttributeCode();
@@ -45,8 +52,9 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Product_Gr
45
  array($attributeCode . '_original' => 'original', $attributeCode . '_translate' => 'translate')
46
  );
47
  }
48
- //echo $collection->getSelect()->__toString();
49
- //die();
 
50
  $this->setCollection($collection);
51
  return parent::_prepareCollection();
52
  }
@@ -55,15 +63,25 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Product_Gr
55
  {
56
  $this->addColumn('id', array(
57
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('ID'),
 
58
  'align' => 'right',
59
  'width' => '50px',
60
  'index' => 'id',
 
61
  ));
62
 
63
  $this->addColumn('product_id', array(
64
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Product ID'),
 
65
  'align' => 'left',
66
  'index' => 'product_id',
 
 
 
 
 
 
 
67
  ));
68
 
69
  // $this->addColumn('job_id', array(
@@ -83,22 +101,30 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Product_Gr
83
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('%s - Source', $attrModel->getFrontendLabel()),
84
  'align' => 'left',
85
  'index' => $attributeCode . '_original',
 
86
  ));
87
 
88
  $this->addColumn($attributeCode . '_translate', array(
89
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('%s - Target', $attrModel->getFrontendLabel()),
90
  'align' => 'left',
91
  'index' => $attributeCode . '_translate',
 
92
  ));
93
  }
94
 
95
- if ($this->getStatusId() == '4') {
96
  $this->addColumn('version', array(
97
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
98
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Version',
99
  'align' => 'center',
100
- 'index' => false,
101
- 'filter' => false,
 
 
 
 
 
 
102
  ));
103
  }
104
 
@@ -123,10 +149,22 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Product_Gr
123
 
124
  public function getRowUrl($row)
125
  {
126
- // return $this->getUrl('*/*/edit', array('id' => $row->getId()));
127
  return '';
128
  }
129
 
 
 
 
 
 
 
 
 
 
 
 
 
 
130
  protected function _prepareMassaction()
131
  {
132
  if ($this->getStatusId() == '4') {
@@ -193,4 +231,9 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Job_Product_Gr
193
  }
194
  return $html;
195
  }
 
 
 
 
 
196
  }
7
  {
8
  parent::__construct();
9
  $this->setId('strakerJobProductGrid');
10
+ $this->setUseAjax(true);
11
+ $this->setVarNameFilter('straker_job_product_filter');
12
  }
13
 
14
  protected function _prepareLayout()
35
  /** @var StrakerTranslations_EasyTranslationPlatform_Model_Resource_Job_Product_Collection $collection */
36
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/job_product')->getCollection()->addFieldToFilter('main_table.job_id', $job->getId());
37
 
38
+ $collection->getSelect()
39
+ ->joinLeft(
40
+ ['product' => $collection->getTable('catalog/product') ],
41
+ 'product.entity_id = main_table.product_id',
42
+ ['sku']
43
+ );
44
  //loop through this job's attributes and join them to the collection
45
  foreach ($jobAttributes as $jobAttribute) {
46
  $attributeCode = Mage::getModel('eav/entity_attribute')->load($jobAttribute->getAttributeId())->getAttributeCode();
52
  array($attributeCode . '_original' => 'original', $attributeCode . '_translate' => 'translate')
53
  );
54
  }
55
+ // $collection->loadData();
56
+ // echo $collection->getSelect()->__toString();
57
+ // die();
58
  $this->setCollection($collection);
59
  return parent::_prepareCollection();
60
  }
63
  {
64
  $this->addColumn('id', array(
65
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('ID'),
66
+ 'type' => 'number',
67
  'align' => 'right',
68
  'width' => '50px',
69
  'index' => 'id',
70
+ 'filter_index' => 'main_table.id'
71
  ));
72
 
73
  $this->addColumn('product_id', array(
74
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Product ID'),
75
+ 'type' => 'number',
76
  'align' => 'left',
77
  'index' => 'product_id',
78
+ 'filter_index' => 'main_table.product_id'
79
+ ));
80
+
81
+ $this->addColumn('sku', array(
82
+ 'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Sku'),
83
+ 'align' => 'left',
84
+ 'index' => 'sku',
85
  ));
86
 
87
  // $this->addColumn('job_id', array(
101
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('%s - Source', $attrModel->getFrontendLabel()),
102
  'align' => 'left',
103
  'index' => $attributeCode . '_original',
104
+ 'filter_index' => $attributeCode.'.original',
105
  ));
106
 
107
  $this->addColumn($attributeCode . '_translate', array(
108
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('%s - Target', $attrModel->getFrontendLabel()),
109
  'align' => 'left',
110
  'index' => $attributeCode . '_translate',
111
+ 'filter_index' => $attributeCode.'.translate'
112
  ));
113
  }
114
 
115
+ if ($this->getStatusId() == '4' || $this->getStatusId() == '5'){
116
  $this->addColumn('version', array(
117
  'header' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
118
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Version',
119
  'align' => 'center',
120
+ 'type' => 'options',
121
+ 'index' => 'version',
122
+ 'filter_condition_callback' => [$this, '_filterVersion'],
123
+ 'options' => [
124
+ '0' => Mage::helper('strakertranslations_easytranslationplatform')->__('Published'),
125
+ '1' => Mage::helper('strakertranslations_easytranslationplatform')->__('Not Published')
126
+ ],
127
+ 'width' => '20%'
128
  ));
129
  }
130
 
149
 
150
  public function getRowUrl($row)
151
  {
 
152
  return '';
153
  }
154
 
155
+ protected function _filterVersion($collection, $column)
156
+ {
157
+ if ( ($value = $column->getFilter()->getValue()) === FALSE ) {
158
+ return $this;
159
+ }
160
+ if ($value === '1' ){
161
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NULL');
162
+ } else {
163
+ $this->getCollection()->getSelect()->where('`main_table`.`version` IS NOT NULL');
164
+ }
165
+ return $this;
166
+ }
167
+
168
  protected function _prepareMassaction()
169
  {
170
  if ($this->getStatusId() == '4') {
231
  }
232
  return $html;
233
  }
234
+
235
+ public function getGridUrl()
236
+ {
237
+ return $this->getUrl('*/*/jobGrid', array('_current' => true));
238
+ }
239
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Attribute/Confirm/Grid.php CHANGED
@@ -5,11 +5,11 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
5
  public function __construct()
6
  {
7
  parent::__construct();
8
- $this->setId('strakerAttribute');
9
  $this->setDefaultSort('attribute_code');
10
  $this->setDefaultDir('ASC');
11
- $this->setSaveParametersInSession(true);
12
- $this->setUseAjax(false);
13
  }
14
 
15
  protected function _prepareLayout()
@@ -21,7 +21,6 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
21
  {
22
  parent::_prepareColumns();
23
 
24
-
25
  $this->addColumn('attribute_code', array(
26
  'header'=>Mage::helper('strakertranslations_easytranslationplatform')->__('Attribute Code'),
27
  'sortable'=>true,
@@ -67,6 +66,27 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
67
  'align' => 'center',
68
  ));
69
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
70
  return $this;
71
  }
72
 
@@ -93,7 +113,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
93
 
94
  public function getGridUrl()
95
  {
96
- return $this->getUrl('*/*/addtoconfirm', array('_current'=>true));
97
  }
98
 
99
  public function getRowUrl($row)
5
  public function __construct()
6
  {
7
  parent::__construct();
8
+ $this->setId('strakerAttributeConfirm');
9
  $this->setDefaultSort('attribute_code');
10
  $this->setDefaultDir('ASC');
11
+ $this->setVarNameFilter('attribute_confirm_filter');
12
+ $this->setUseAjax(true);
13
  }
14
 
15
  protected function _prepareLayout()
21
  {
22
  parent::_prepareColumns();
23
 
 
24
  $this->addColumn('attribute_code', array(
25
  'header'=>Mage::helper('strakertranslations_easytranslationplatform')->__('Attribute Code'),
26
  'sortable'=>true,
66
  'align' => 'center',
67
  ));
68
 
69
+ $this->addColumn(
70
+ 'action',
71
+ [
72
+ 'header' => Mage::helper('catalog')->__('Action'),
73
+ 'width' => '50px',
74
+ 'type' => 'action',
75
+ 'getter' => 'getAttributeId',
76
+ 'actions' => array(
77
+ array(
78
+ 'caption' => $this->__('Remove'),
79
+ 'url' => [
80
+ 'base'=>'*/*/removeFromCart',
81
+ ],
82
+ 'field' => 'attribute_id'
83
+ )
84
+ ),
85
+ 'filter' => false,
86
+ 'sortable' => false,
87
+ 'index' => 'attribute_id'
88
+ ]
89
+ );
90
  return $this;
91
  }
92
 
113
 
114
  public function getGridUrl()
115
  {
116
+ return $this->getUrl('*/*/confirmGrid', array('_current'=>true));
117
  }
118
 
119
  public function getRowUrl($row)
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Attribute/Grid.php CHANGED
@@ -7,6 +7,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
7
  $this->setId('attributeGrid');
8
  $this->setDefaultSort('attribute_code');
9
  $this->setDefaultDir('ASC');
 
 
10
  }
11
 
12
  protected function _getStore()
@@ -76,7 +78,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
76
  /**
77
  * Prepare product attributes grid columns
78
  *
79
- * @return Mage_Adminhtml_Block_Catalog_Product_Attribute_Grid
80
  */
81
  protected function _prepareColumns()
82
  {
@@ -87,22 +89,29 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
87
  'header'=>Mage::helper('strakertranslations_easytranslationplatform')->__('Attribute Code'),
88
  'sortable'=>true,
89
  'index'=>'attribute_code',
90
- 'filter' => false
91
  ));
92
 
93
  $this->addColumn('frontend_label', array(
94
  'header'=>Mage::helper('strakertranslations_easytranslationplatform')->__('Attribute Label'),
95
  'sortable'=>true,
96
- 'index'=>'frontend_label'
 
97
  ));
98
 
99
  $this->addColumn('translate_options', array(
100
  'header'=>Mage::helper('strakertranslations_easytranslationplatform')->__('Translate Attribute Options'),
101
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_TranslateOptions',
102
  'align' => 'center',
103
- 'index' => false,
104
  'sortable'=> false,
105
- 'filter' => false,
 
 
 
 
 
 
106
  ));
107
 
108
  $this->addColumn('is_visible', array(
@@ -115,6 +124,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
115
  '0' => Mage::helper('catalog')->__('No'),
116
  ),
117
  'align' => 'center',
 
118
  ));
119
 
120
  $this->addColumn('version',
@@ -151,6 +161,21 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
151
  return $this;
152
  }
153
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
154
  protected function _prepareMassaction()
155
  {
156
  $this->setMassactionIdField('attribute_id');
@@ -163,9 +188,17 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
163
  'selected' => 1
164
  ));
165
  $this->getMassactionBlock()->setTemplate('straker/new/attribute/massaction.phtml');
166
-
 
 
 
 
 
 
167
  //todo: refine this
168
- $hiddenParams = '<input type="hidden" name="store" value="'.$this->getRequest()->getParam('store').'" /><input type="hidden" name="option" value="'.$this->getRequest()->getParam('internal_option').'" />';
 
 
169
  $this->getMassactionBlock()->setHiddenParams($hiddenParams);
170
 
171
  Mage::dispatchEvent('adminhtml_strakertranslation_new_products_grid_prepare_massaction', array('block' => $this));
@@ -187,11 +220,21 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_
187
 
188
  public function getGridUrl()
189
  {
190
- return $this->getUrl('*/*/new', array('_current'=>true));
191
  }
192
 
193
  public function getRowUrl($row)
194
  {
195
  return '';
196
  }
 
 
 
 
 
 
 
 
 
 
197
  }
7
  $this->setId('attributeGrid');
8
  $this->setDefaultSort('attribute_code');
9
  $this->setDefaultDir('ASC');
10
+ $this->setUseAjax(true);
11
+ $this->setVarNameFilter('straker_attribute_filter');
12
  }
13
 
14
  protected function _getStore()
78
  /**
79
  * Prepare product attributes grid columns
80
  *
81
+ * @return StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Attribute_Grid
82
  */
83
  protected function _prepareColumns()
84
  {
89
  'header'=>Mage::helper('strakertranslations_easytranslationplatform')->__('Attribute Code'),
90
  'sortable'=>true,
91
  'index'=>'attribute_code',
92
+ 'width' => '22%'
93
  ));
94
 
95
  $this->addColumn('frontend_label', array(
96
  'header'=>Mage::helper('strakertranslations_easytranslationplatform')->__('Attribute Label'),
97
  'sortable'=>true,
98
+ 'index'=>'frontend_label',
99
+ 'width' => '22%'
100
  ));
101
 
102
  $this->addColumn('translate_options', array(
103
  'header'=>Mage::helper('strakertranslations_easytranslationplatform')->__('Translate Attribute Options'),
104
  'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_TranslateOptions',
105
  'align' => 'center',
106
+ 'index' => 'frontend_input',
107
  'sortable'=> false,
108
+ 'type' => 'options',
109
+ 'options' => [
110
+ 'no' => Mage::helper('catalog')->__('No Options'),
111
+ 'select' => Mage::helper('catalog')->__('Has Options')
112
+ ],
113
+ 'filter_condition_callback' => array($this, '_optionsFilter'),
114
+ 'width' => '22%'
115
  ));
116
 
117
  $this->addColumn('is_visible', array(
124
  '0' => Mage::helper('catalog')->__('No'),
125
  ),
126
  'align' => 'center',
127
+ 'width' => '22%'
128
  ));
129
 
130
  $this->addColumn('version',
161
  return $this;
162
  }
163
 
164
+ protected function _optionsFilter($collection, $column)
165
+ {
166
+ if (!$value = $column->getFilter()->getValue()) {
167
+ return $this;
168
+ }
169
+
170
+ if ($value == 'select' ){
171
+ $collection->getSelect()->where('frontend_input=?', 'select');
172
+ } else {
173
+ $collection->getSelect()->where('frontend_input<>?', 'select');
174
+ }
175
+
176
+ return $this;
177
+ }
178
+
179
  protected function _prepareMassaction()
180
  {
181
  $this->setMassactionIdField('attribute_id');
188
  'selected' => 1
189
  ));
190
  $this->getMassactionBlock()->setTemplate('straker/new/attribute/massaction.phtml');
191
+ $data['attribute'] = Mage::getSingleton('adminhtml/session')->getData('straker_new_attribute');
192
+ $optionParam = $this->getRequest()->getParam('internal_option');
193
+ if( !empty($optionParam) ){
194
+ Mage::getSingleton('adminhtml/session')->setData('straker_new_option', $optionParam);
195
+ }
196
+ $internalOption = Mage::getSingleton('adminhtml/session')->getData('straker_new_option');
197
+ $internalOption = empty($internalOption) ? '' : $internalOption;
198
  //todo: refine this
199
+ // $hiddenParams = '<input type="hidden" name="store" value="'.$this->getRequest()->getParam('store').'" /><input type="hidden" name="option" value="'.$this->getRequest()->getParam('internal_option').'" />';
200
+ $hiddenParams = '<input type="hidden" name="store" value="'.$this->getRequest()->getParam('store').'" /><input type="hidden" name="option" value="'. $internalOption .'" />';
201
+
202
  $this->getMassactionBlock()->setHiddenParams($hiddenParams);
203
 
204
  Mage::dispatchEvent('adminhtml_strakertranslation_new_products_grid_prepare_massaction', array('block' => $this));
220
 
221
  public function getGridUrl()
222
  {
223
+ return $this->getUrl('*/*/grid', array('_current'=>true));
224
  }
225
 
226
  public function getRowUrl($row)
227
  {
228
  return '';
229
  }
230
+
231
+ public function getMassactionBlockJsObjName()
232
+ {
233
+ return $this->getMassactionBlock()->getJsObjectName(); // TODO: Change the autogenerated stub
234
+ }
235
+
236
+ public function getSelectedIds(){
237
+ $selectedIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_attribute');
238
+ return empty($selectedIds) ? [] : $selectedIds;
239
+ }
240
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Category/Confirm/Grid.php CHANGED
@@ -5,12 +5,11 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Category_C
5
  public function __construct()
6
  {
7
  parent::__construct();
8
- $this->setId('strakerCategories');
9
  $this->setDefaultSort('entity_id');
10
  $this->setDefaultDir('DESC');
11
- $this->setSaveParametersInSession(true);
12
- $this->setUseAjax(false);
13
- $this->setVarNameFilter('category_filter');
14
  $this->setTemplate('straker/new/category/confirm/grid.phtml');
15
  }
16
 
@@ -19,6 +18,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Category_C
19
  $storeId = (int) $this->getRequest()->getParam('store', 0);
20
  return Mage::app()->getStore($storeId);
21
  }
 
22
  protected function _prepareLayout()
23
  {
24
  return $this;
@@ -160,13 +160,34 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Category_C
160
  )
161
  ));
162
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
163
 
164
  return parent::_prepareColumns();
165
  }
166
 
167
  public function getGridUrl()
168
  {
169
- return $this->getUrl('*/*/confirmCategory', array('_current'=>true));
170
  }
171
 
172
  public function getRowUrl($row)
5
  public function __construct()
6
  {
7
  parent::__construct();
8
+ $this->setId('strakerCategoriesConfirm');
9
  $this->setDefaultSort('entity_id');
10
  $this->setDefaultDir('DESC');
11
+ $this->setUseAjax(true);
12
+ $this->setVarNameFilter('category_confirm_filter');
 
13
  $this->setTemplate('straker/new/category/confirm/grid.phtml');
14
  }
15
 
18
  $storeId = (int) $this->getRequest()->getParam('store', 0);
19
  return Mage::app()->getStore($storeId);
20
  }
21
+
22
  protected function _prepareLayout()
23
  {
24
  return $this;
160
  )
161
  ));
162
 
163
+ $this->addColumn(
164
+ 'action',
165
+ [
166
+ 'header' => Mage::helper('catalog')->__('Action'),
167
+ 'width' => '50px',
168
+ 'type' => 'action',
169
+ 'getter' => 'getEntityId',
170
+ 'actions' => array(
171
+ array(
172
+ 'caption' => $this->__('Remove'),
173
+ 'url' => [
174
+ 'base'=>'*/*/removeFromCart'
175
+ ],
176
+ 'field' => 'entity_id'
177
+ )
178
+ ),
179
+ 'filter' => false,
180
+ 'sortable' => false,
181
+ 'index' => 'entity_id'
182
+ ]
183
+ );
184
 
185
  return parent::_prepareColumns();
186
  }
187
 
188
  public function getGridUrl()
189
  {
190
+ return $this->getUrl('*/*/confirmGrid', array('_current'=>true));
191
  }
192
 
193
  public function getRowUrl($row)
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Category/Tree.php CHANGED
@@ -27,11 +27,14 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Category_T
27
  */
28
  protected function getCategoryIds()
29
  {
30
- $categories = $this->getRequest()->getParam('internal_category');
 
31
  if (empty($categories)){
32
  return array();
33
  }
34
- else {
 
 
35
  return explode(',', $categories);
36
  }
37
  // return $this->getProduct()->getCategoryIds();
27
  */
28
  protected function getCategoryIds()
29
  {
30
+ // $categories = $this->getRequest()->getParam('internal_category');
31
+ $categories = Mage::getSingleton('adminhtml/session')->getData('straker_new_category');
32
  if (empty($categories)){
33
  return array();
34
  }
35
+ else if(is_array($categories)){
36
+ return $categories;
37
+ }else{
38
  return explode(',', $categories);
39
  }
40
  // return $this->getProduct()->getCategoryIds();
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Cms/Block/Confirm/Grid.php CHANGED
@@ -5,13 +5,18 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
5
  public function __construct()
6
  {
7
  parent::__construct();
8
- $this->setId('strakerCmsBlocks');
9
  $this->setDefaultSort('identifier');
10
  $this->setDefaultDir('ASC');
11
- $this->setUseAjax(false);
12
- $this->setFilterVisibility(false);
 
13
  }
14
 
 
 
 
 
15
 
16
  protected function _prepareCollection()
17
  {
@@ -23,18 +28,18 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
23
 
24
  protected function _prepareColumns()
25
  {
26
- $baseUrl = $this->getUrl();
27
-
28
  $this->addColumn('title', array(
29
  'header' => Mage::helper('cms')->__('Title'),
30
  'align' => 'left',
31
  'index' => 'title',
 
32
  ));
33
 
34
  $this->addColumn('identifier', array(
35
  'header' => Mage::helper('cms')->__('Identifier'),
36
  'align' => 'left',
37
- 'index' => 'identifier'
 
38
  ));
39
 
40
  if (!Mage::app()->isSingleStoreMode()) {
@@ -45,8 +50,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
45
  'store_all' => true,
46
  'store_view' => true,
47
  'sortable' => false,
48
- 'filter_condition_callback'
49
- => array($this, '_filterStoreCondition'),
50
  ));
51
  }
52
 
@@ -58,20 +63,45 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
58
  0 => Mage::helper('cms')->__('Disabled'),
59
  1 => Mage::helper('cms')->__('Enabled')
60
  ),
 
61
  ));
62
 
63
  $this->addColumn('creation_time', array(
64
  'header' => Mage::helper('cms')->__('Date Created'),
65
  'index' => 'creation_time',
66
  'type' => 'datetime',
 
67
  ));
68
 
69
  $this->addColumn('update_time', array(
70
  'header' => Mage::helper('cms')->__('Last Modified'),
71
  'index' => 'update_time',
72
  'type' => 'datetime',
 
73
  ));
74
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
75
  return parent::_prepareColumns();
76
  }
77
 
@@ -89,6 +119,12 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
89
 
90
  $this->getCollection()->addStoreFilter($value);
91
  }
 
 
 
 
 
 
92
  public function getRowUrl($row)
93
  {
94
  return '';
5
  public function __construct()
6
  {
7
  parent::__construct();
8
+ $this->setId('strakerCmsBlocksConfirm');
9
  $this->setDefaultSort('identifier');
10
  $this->setDefaultDir('ASC');
11
+ $this->setUseAjax(true);
12
+ $this->setVarNameFilter('cms_block_confirm_filter');
13
+ // $this->setFilterVisibility(false);
14
  }
15
 
16
+ protected function _prepareLayout()
17
+ {
18
+ return $this;
19
+ }
20
 
21
  protected function _prepareCollection()
22
  {
28
 
29
  protected function _prepareColumns()
30
  {
 
 
31
  $this->addColumn('title', array(
32
  'header' => Mage::helper('cms')->__('Title'),
33
  'align' => 'left',
34
  'index' => 'title',
35
+ 'filter' => false,
36
  ));
37
 
38
  $this->addColumn('identifier', array(
39
  'header' => Mage::helper('cms')->__('Identifier'),
40
  'align' => 'left',
41
+ 'index' => 'identifier',
42
+ 'filter' => false,
43
  ));
44
 
45
  if (!Mage::app()->isSingleStoreMode()) {
50
  'store_all' => true,
51
  'store_view' => true,
52
  'sortable' => false,
53
+ // 'filter_condition_callback'
54
+ // => array($this, '_filterStoreCondition'),
55
  ));
56
  }
57
 
63
  0 => Mage::helper('cms')->__('Disabled'),
64
  1 => Mage::helper('cms')->__('Enabled')
65
  ),
66
+ 'filter' => false,
67
  ));
68
 
69
  $this->addColumn('creation_time', array(
70
  'header' => Mage::helper('cms')->__('Date Created'),
71
  'index' => 'creation_time',
72
  'type' => 'datetime',
73
+ 'filter' => false,
74
  ));
75
 
76
  $this->addColumn('update_time', array(
77
  'header' => Mage::helper('cms')->__('Last Modified'),
78
  'index' => 'update_time',
79
  'type' => 'datetime',
80
+ 'filter' => false,
81
  ));
82
 
83
+ $this->addColumn(
84
+ 'action',
85
+ [
86
+ 'header' => Mage::helper('catalog')->__('Action'),
87
+ 'width' => '50px',
88
+ 'type' => 'action',
89
+ 'getter' => 'getBlockId',
90
+ 'actions' => array(
91
+ array(
92
+ 'caption' => $this->__('Remove'),
93
+ 'url' => [
94
+ 'base'=>'*/*/removeFromCart'
95
+ ],
96
+ 'field' => 'block_id'
97
+ )
98
+ ),
99
+ 'filter' => false,
100
+ 'sortable' => false,
101
+ 'index' => 'block_id'
102
+ ]
103
+ );
104
+
105
  return parent::_prepareColumns();
106
  }
107
 
119
 
120
  $this->getCollection()->addStoreFilter($value);
121
  }
122
+
123
+ public function getGridUrl()
124
+ {
125
+ return $this->getUrl('*/*/ConfirmGrid', array('_current'=>true));
126
+ }
127
+
128
  public function getRowUrl($row)
129
  {
130
  return '';
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Cms/Block/Grid.php CHANGED
@@ -8,8 +8,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
8
  $this->setId('strakerCmsBlocks');
9
  $this->setDefaultSort('block_identifier');
10
  $this->setDefaultDir('ASC');
11
- $this->setSaveParametersInSession(true);
12
- $this->setUseAjax(false);
13
  }
14
 
15
  protected function _prepareCollection()
@@ -22,8 +22,6 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
22
 
23
  protected function _prepareColumns()
24
  {
25
- $baseUrl = $this->getUrl();
26
-
27
  $this->addColumn('title', array(
28
  'header' => Mage::helper('cms')->__('Title'),
29
  'align' => 'left',
@@ -99,7 +97,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
99
  'url' => $this->getUrl('*/*/addtoconfirm'),
100
  'selected' => 1
101
  ));
102
- $this->getMassactionBlock()->setTemplate('straker/new/cms/page/massaction.phtml');
103
 
104
  //todo: refine this
105
  $hiddenParams = '<input type="hidden" name="store" value="'.$this->_getStore()->getId().'" />';
@@ -121,4 +119,19 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Block_
121
  $storeId = (int) $this->getRequest()->getParam('store', 0);
122
  return Mage::app()->getStore($storeId);
123
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
124
  }
8
  $this->setId('strakerCmsBlocks');
9
  $this->setDefaultSort('block_identifier');
10
  $this->setDefaultDir('ASC');
11
+ $this->setUseAjax(true);
12
+ $this->setVarNameFilter('straker_cmd_block_filter');
13
  }
14
 
15
  protected function _prepareCollection()
22
 
23
  protected function _prepareColumns()
24
  {
 
 
25
  $this->addColumn('title', array(
26
  'header' => Mage::helper('cms')->__('Title'),
27
  'align' => 'left',
97
  'url' => $this->getUrl('*/*/addtoconfirm'),
98
  'selected' => 1
99
  ));
100
+ $this->getMassactionBlock()->setTemplate('straker/new/cms/block/massaction.phtml');
101
 
102
  //todo: refine this
103
  $hiddenParams = '<input type="hidden" name="store" value="'.$this->_getStore()->getId().'" />';
119
  $storeId = (int) $this->getRequest()->getParam('store', 0);
120
  return Mage::app()->getStore($storeId);
121
  }
122
+
123
+ public function getGridUrl()
124
+ {
125
+ return $this->getUrl('*/*/grid', array('_current'=>true));
126
+ }
127
+
128
+ public function getMassactionBlockJsObjName()
129
+ {
130
+ return $this->getMassactionBlock()->getJsObjectName(); // TODO: Change the autogenerated stub
131
+ }
132
+
133
+ public function getSelectedIds(){
134
+ $selectedIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_cms_block');
135
+ return empty($selectedIds) ? [] : $selectedIds;
136
+ }
137
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Cms/Page/Confirm/Grid.php CHANGED
@@ -5,11 +5,17 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_C
5
  public function __construct()
6
  {
7
  parent::__construct();
8
- $this->setId('strakerCmsPages');
9
  $this->setDefaultSort('identifier');
10
  $this->setDefaultDir('ASC');
11
- $this->setUseAjax(false);
12
- $this->setFilterVisibility(false);
 
 
 
 
 
 
13
  }
14
 
15
  protected function _prepareCollection()
@@ -18,24 +24,23 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_C
18
  /* @var $collection Mage_Cms_Model_Mysql4_Page_Collection */
19
  $collection->setFirstStoreFlag(true);
20
  $this->setCollection($collection);
21
-
22
  return parent::_prepareCollection();
23
  }
24
 
25
  protected function _prepareColumns()
26
  {
27
- $baseUrl = $this->getUrl();
28
-
29
  $this->addColumn('title', array(
30
  'header' => Mage::helper('cms')->__('Title'),
31
  'align' => 'left',
32
  'index' => 'title',
 
33
  ));
34
 
35
  $this->addColumn('identifier', array(
36
  'header' => Mage::helper('cms')->__('URL Key'),
37
  'align' => 'left',
38
  'index' => 'identifier',
 
39
  ));
40
 
41
  /**
@@ -48,7 +53,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_C
48
  'type' => 'store',
49
  'store_all' => true,
50
  'store_view' => true,
51
- 'sortable' => false,
52
  ));
53
  }
54
 
@@ -57,25 +62,30 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_C
57
  'index' => 'is_active',
58
  'type' => 'options',
59
  'options' => Mage::getSingleton('cms/page')->getAvailableStatuses(),
 
60
  ));
61
 
62
  $this->addColumn('creation_time', array(
63
  'header' => Mage::helper('cms')->__('Date Created'),
64
  'index' => 'creation_time',
65
  'type' => 'datetime',
 
66
  ));
67
 
68
  $this->addColumn('update_time', array(
69
  'header' => Mage::helper('cms')->__('Last Modified'),
70
  'index' => 'update_time',
71
  'type' => 'datetime',
 
72
  ));
73
 
74
  $this->addColumn('page_actions', array(
75
  'header' => Mage::helper('cms')->__('Action'),
76
  'width' => 10,
77
  'sortable' => false,
78
- 'renderer' => 'adminhtml/cms_page_grid_renderer_action',
 
 
79
  ));
80
 
81
  return parent::_prepareColumns();
@@ -96,6 +106,11 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_C
96
  $this->getCollection()->addStoreFilter($value);
97
  }
98
 
 
 
 
 
 
99
  public function getRowUrl($row)
100
  {
101
  return '';
5
  public function __construct()
6
  {
7
  parent::__construct();
8
+ $this->setId('strakerCmsPagesConfirm');
9
  $this->setDefaultSort('identifier');
10
  $this->setDefaultDir('ASC');
11
+ $this->setUseAjax(true);
12
+ $this->setVarNameFilter('cms_page_confirm_filter');
13
+ // $this->setFilterVisibility(false);
14
+ }
15
+
16
+ protected function _prepareLayout()
17
+ {
18
+ return $this;
19
  }
20
 
21
  protected function _prepareCollection()
24
  /* @var $collection Mage_Cms_Model_Mysql4_Page_Collection */
25
  $collection->setFirstStoreFlag(true);
26
  $this->setCollection($collection);
 
27
  return parent::_prepareCollection();
28
  }
29
 
30
  protected function _prepareColumns()
31
  {
 
 
32
  $this->addColumn('title', array(
33
  'header' => Mage::helper('cms')->__('Title'),
34
  'align' => 'left',
35
  'index' => 'title',
36
+ 'filter' => false
37
  ));
38
 
39
  $this->addColumn('identifier', array(
40
  'header' => Mage::helper('cms')->__('URL Key'),
41
  'align' => 'left',
42
  'index' => 'identifier',
43
+ 'filter' => false
44
  ));
45
 
46
  /**
53
  'type' => 'store',
54
  'store_all' => true,
55
  'store_view' => true,
56
+ 'filter' => false
57
  ));
58
  }
59
 
62
  'index' => 'is_active',
63
  'type' => 'options',
64
  'options' => Mage::getSingleton('cms/page')->getAvailableStatuses(),
65
+ 'filter' => false
66
  ));
67
 
68
  $this->addColumn('creation_time', array(
69
  'header' => Mage::helper('cms')->__('Date Created'),
70
  'index' => 'creation_time',
71
  'type' => 'datetime',
72
+ 'filter' => false
73
  ));
74
 
75
  $this->addColumn('update_time', array(
76
  'header' => Mage::helper('cms')->__('Last Modified'),
77
  'index' => 'update_time',
78
  'type' => 'datetime',
79
+ 'filter' => false
80
  ));
81
 
82
  $this->addColumn('page_actions', array(
83
  'header' => Mage::helper('cms')->__('Action'),
84
  'width' => 10,
85
  'sortable' => false,
86
+ 'filter' => false,
87
+ // 'renderer' => 'adminhtml/cms_page_grid_renderer_action',
88
+ 'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_PageGridAction'
89
  ));
90
 
91
  return parent::_prepareColumns();
106
  $this->getCollection()->addStoreFilter($value);
107
  }
108
 
109
+ public function getGridUrl()
110
+ {
111
+ return $this->getUrl('*/*/ConfirmGrid', array('_current'=>true));
112
+ }
113
+
114
  public function getRowUrl($row)
115
  {
116
  return '';
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Cms/Page/Grid.php CHANGED
@@ -8,8 +8,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_G
8
  $this->setId('strakerCmsPages');
9
  $this->setDefaultSort('identifier');
10
  $this->setDefaultDir('ASC');
11
- $this->setSaveParametersInSession(true);
12
- $this->setUseAjax(false);
13
  }
14
 
15
  protected function _prepareCollection()
@@ -26,8 +26,6 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_G
26
 
27
  protected function _prepareColumns()
28
  {
29
- $baseUrl = $this->getUrl();
30
-
31
  $this->addColumn('title', array(
32
  'header' => Mage::helper('cms')->__('Title'),
33
  'align' => 'left',
@@ -81,6 +79,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_G
81
  'sortable' => false,
82
  'filter' => false,
83
  'renderer' => 'adminhtml/cms_page_grid_renderer_action',
 
 
84
  ));
85
 
86
  return parent::_prepareColumns();
@@ -133,4 +133,19 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Cms_Page_G
133
  $storeId = (int) $this->getRequest()->getParam('store', 0);
134
  return Mage::app()->getStore($storeId);
135
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
136
  }
8
  $this->setId('strakerCmsPages');
9
  $this->setDefaultSort('identifier');
10
  $this->setDefaultDir('ASC');
11
+ $this->setUseAjax(true);
12
+ $this->setVarNameFilter('straker_cmd_page_filter');
13
  }
14
 
15
  protected function _prepareCollection()
26
 
27
  protected function _prepareColumns()
28
  {
 
 
29
  $this->addColumn('title', array(
30
  'header' => Mage::helper('cms')->__('Title'),
31
  'align' => 'left',
79
  'sortable' => false,
80
  'filter' => false,
81
  'renderer' => 'adminhtml/cms_page_grid_renderer_action',
82
+ // 'renderer' => 'StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_PageGridAction'
83
+
84
  ));
85
 
86
  return parent::_prepareColumns();
133
  $storeId = (int) $this->getRequest()->getParam('store', 0);
134
  return Mage::app()->getStore($storeId);
135
  }
136
+
137
+ public function getGridUrl()
138
+ {
139
+ return $this->getUrl('*/*/grid', array('_current'=>true));
140
+ }
141
+
142
+ public function getMassactionBlockJsObjName()
143
+ {
144
+ return $this->getMassactionBlock()->getJsObjectName(); // TODO: Change the autogenerated stub
145
+ }
146
+
147
+ public function getSelectedIds(){
148
+ $selectedIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_cms_page');
149
+ return empty($selectedIds) ? [] : $selectedIds;
150
+ }
151
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Confirm/Grid.php CHANGED
@@ -8,7 +8,6 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Confirm_Gr
8
  $this->setId('strakerProducts');
9
  $this->setDefaultSort('entity_id');
10
  $this->setDefaultDir('DESC');
11
- $this->setSaveParametersInSession(true);
12
  $this->setUseAjax(false);
13
  $this->setVarNameFilter('product_filter');
14
  }
8
  $this->setId('strakerProducts');
9
  $this->setDefaultSort('entity_id');
10
  $this->setDefaultDir('DESC');
 
11
  $this->setUseAjax(false);
12
  $this->setVarNameFilter('product_filter');
13
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Products/Confirm/Grid.php CHANGED
@@ -5,12 +5,11 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Products_C
5
  public function __construct()
6
  {
7
  parent::__construct();
8
- $this->setId('strakerProducts');
9
  $this->setDefaultSort('entity_id');
10
  $this->setDefaultDir('DESC');
11
- $this->setSaveParametersInSession(true);
12
- $this->setUseAjax(false);
13
- $this->setVarNameFilter('product_filter');
14
  }
15
 
16
  protected function _getStore()
@@ -119,6 +118,31 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Products_C
119
  ));
120
  }
121
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
122
  foreach ($this->getAttrArray() as $attr){
123
  if ($attr!='name') {
124
  $attrModel = Mage::getModel('eav/entity_attribute')->loadByCode(4, $attr);
@@ -131,12 +155,34 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Products_C
131
  }
132
  }
133
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
134
  return parent::_prepareColumns();
135
  }
136
 
137
  public function getGridUrl()
138
  {
139
- return $this->getUrl('*/*/addtoconfirm', array('_current'=>true));
140
  }
141
 
142
  public function getRowUrl($row)
5
  public function __construct()
6
  {
7
  parent::__construct();
8
+ $this->setId('strakerProductsConfirm');
9
  $this->setDefaultSort('entity_id');
10
  $this->setDefaultDir('DESC');
11
+ $this->setUseAjax(true);
12
+ $this->setVarNameFilter('product_confirm_filter');
 
13
  }
14
 
15
  protected function _getStore()
118
  ));
119
  }
120
 
121
+ // required by IMA-159
122
+ $this->addColumn(
123
+ 'sku',
124
+ array(
125
+ 'header' => Mage::helper('catalog')->__('Sku'),
126
+ 'index' => 'sku',
127
+ 'filter' => false
128
+ )
129
+ );
130
+
131
+ $sets = Mage::getResourceModel('eav/entity_attribute_set_collection')
132
+ ->setEntityTypeFilter(Mage::getModel('catalog/product')->getResource()->getTypeId())
133
+ ->load()
134
+ ->toOptionHash();
135
+
136
+ $this->addColumn('set_name',
137
+ array(
138
+ 'header'=> Mage::helper('catalog')->__('Attrib. Set Name'),
139
+ 'width' => '100px',
140
+ 'index' => 'attribute_set_id',
141
+ 'type' => 'options',
142
+ 'options' => $sets,
143
+ 'filter' => false
144
+ ));
145
+
146
  foreach ($this->getAttrArray() as $attr){
147
  if ($attr!='name') {
148
  $attrModel = Mage::getModel('eav/entity_attribute')->loadByCode(4, $attr);
155
  }
156
  }
157
 
158
+ $this->addColumn(
159
+ 'action',
160
+ [
161
+ 'header' => Mage::helper('catalog')->__('Action'),
162
+ 'width' => '50px',
163
+ 'type' => 'action',
164
+ 'getter' => 'getEntityId',
165
+ 'actions' => array(
166
+ array(
167
+ 'caption' => $this->__('Remove'),
168
+ 'url' => [
169
+ 'base'=>'*/*/removeFromCart'
170
+ ],
171
+ 'field' => 'entity_id'
172
+ )
173
+ ),
174
+ 'filter' => false,
175
+ 'sortable' => false,
176
+ 'index' => 'entity_id'
177
+ ]
178
+ );
179
+
180
  return parent::_prepareColumns();
181
  }
182
 
183
  public function getGridUrl()
184
  {
185
+ return $this->getUrl('*/*/confirmGrid', array('_current'=>true));
186
  }
187
 
188
  public function getRowUrl($row)
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/New/Products/Grid.php CHANGED
@@ -8,9 +8,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Products_G
8
  $this->setId('strakerProducts');
9
  $this->setDefaultSort('entity_id');
10
  $this->setDefaultDir('DESC');
11
- $this->setSaveParametersInSession(true);
12
- $this->setUseAjax(false);
13
- $this->setVarNameFilter('product_filter');
14
  }
15
 
16
  protected function _getStore()
@@ -157,6 +156,30 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Products_G
157
  'index' => 'name',
158
  ));
159
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
160
  foreach ($this->getAttrArray() as $attr){
161
  if ($attr!='name') {
162
  $attrModel = Mage::getModel('eav/entity_attribute')->loadByCode(4, $attr);
@@ -249,6 +272,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Products_G
249
  'url' => $this->getUrl('*/*/addtoconfirm'),
250
  'selected' => 1
251
  ));
 
252
  $this->getMassactionBlock()->setTemplate('straker/new/products/massaction.phtml');
253
 
254
  //todo: refine this
@@ -256,14 +280,13 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Products_G
256
  $hiddenParams .= '<input type="hidden" name="attr" value="'.$this->getAttr().'" />';
257
  $this->getMassactionBlock()->setHiddenParams($hiddenParams);
258
 
259
-
260
  Mage::dispatchEvent('adminhtml_strakertranslation_new_products_grid_prepare_massaction', array('block' => $this));
261
  return $this;
262
  }
263
 
264
  public function getGridUrl()
265
  {
266
- return $this->getUrl('*/*/new', array('_current'=>true));
267
  }
268
 
269
  public function getRowUrl($row)
@@ -274,4 +297,14 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_New_Products_G
274
  public function getAttrArray(){
275
  return explode(',', $this->getAttr());
276
  }
 
 
 
 
 
 
 
 
 
 
277
  }
8
  $this->setId('strakerProducts');
9
  $this->setDefaultSort('entity_id');
10
  $this->setDefaultDir('DESC');
11
+ $this->setUseAjax(true);
12
+ $this->setVarNameFilter('straker_product_filter');
 
13
  }
14
 
15
  protected function _getStore()
156
  'index' => 'name',
157
  ));
158
  }
159
+
160
+ // required by IMA-159
161
+ $this->addColumn(
162
+ 'sku',
163
+ array(
164
+ 'header' => Mage::helper('catalog')->__('Sku'),
165
+ 'index' => 'sku'
166
+ )
167
+ );
168
+
169
+ $sets = Mage::getResourceModel('eav/entity_attribute_set_collection')
170
+ ->setEntityTypeFilter(Mage::getModel('catalog/product')->getResource()->getTypeId())
171
+ ->load()
172
+ ->toOptionHash();
173
+
174
+ $this->addColumn('set_name',
175
+ array(
176
+ 'header'=> Mage::helper('catalog')->__('Attrib. Set Name'),
177
+ 'width' => '100px',
178
+ 'index' => 'attribute_set_id',
179
+ 'type' => 'options',
180
+ 'options' => $sets,
181
+ ));
182
+
183
  foreach ($this->getAttrArray() as $attr){
184
  if ($attr!='name') {
185
  $attrModel = Mage::getModel('eav/entity_attribute')->loadByCode(4, $attr);
272
  'url' => $this->getUrl('*/*/addtoconfirm'),
273
  'selected' => 1
274
  ));
275
+
276
  $this->getMassactionBlock()->setTemplate('straker/new/products/massaction.phtml');
277
 
278
  //todo: refine this
280
  $hiddenParams .= '<input type="hidden" name="attr" value="'.$this->getAttr().'" />';
281
  $this->getMassactionBlock()->setHiddenParams($hiddenParams);
282
 
 
283
  Mage::dispatchEvent('adminhtml_strakertranslation_new_products_grid_prepare_massaction', array('block' => $this));
284
  return $this;
285
  }
286
 
287
  public function getGridUrl()
288
  {
289
+ return $this->getUrl('*/*/grid', array('_current'=>true));
290
  }
291
 
292
  public function getRowUrl($row)
297
  public function getAttrArray(){
298
  return explode(',', $this->getAttr());
299
  }
300
+
301
+ public function getMassactionBlockJsObjName()
302
+ {
303
+ return $this->getMassactionBlock()->getJsObjectName(); // TODO: Change the autogenerated stub
304
+ }
305
+
306
+ public function getSelectedIds(){
307
+ $selectedIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_product');
308
+ return empty($selectedIds) ? [] : $selectedIds;
309
+ }
310
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/Action.php CHANGED
@@ -4,12 +4,13 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_
4
  {
5
  public function render(Varien_Object $row)
6
  {
 
7
  if (get_class($row) == get_class(Mage::getModel('strakertranslations_easytranslationplatform/job'))) {
8
 
9
  $buttonText = $row->getStatusId() == 4 ? $this->__('Confirm') : $this->__('View');
10
 
11
  $out = '<button id="button-update-'.$row->getId().'" style="margin: 5px; display: block;" onclick="event.stopPropagation(); setLocation(\'' . Mage::helper("adminhtml")->getUrl("adminhtml/straker_".str_replace(' ', '_', strtolower($row->getTypeName())).'/', array('job_id' => $row->getId())) . '\')" title="View" type="button" style="">'.$buttonText.'</button>';
12
- return $out;
13
  }
 
14
  }
15
  }
4
  {
5
  public function render(Varien_Object $row)
6
  {
7
+ $out = '';
8
  if (get_class($row) == get_class(Mage::getModel('strakertranslations_easytranslationplatform/job'))) {
9
 
10
  $buttonText = $row->getStatusId() == 4 ? $this->__('Confirm') : $this->__('View');
11
 
12
  $out = '<button id="button-update-'.$row->getId().'" style="margin: 5px; display: block;" onclick="event.stopPropagation(); setLocation(\'' . Mage::helper("adminhtml")->getUrl("adminhtml/straker_".str_replace(' ', '_', strtolower($row->getTypeName())).'/', array('job_id' => $row->getId())) . '\')" title="View" type="button" style="">'.$buttonText.'</button>';
 
13
  }
14
+ return $out;
15
  }
16
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/CmsVersion.php CHANGED
@@ -11,7 +11,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_
11
  else{
12
  $link = Mage::helper("adminhtml")->getUrl("adminhtml/cms_page/edit",array("page_id"=>$row->getNewEntityId()));
13
  }
14
- return '<a href="'.$link.'">View Published</a>';
15
  }
16
  else{
17
  return 'Not Published';
11
  else{
12
  $link = Mage::helper("adminhtml")->getUrl("adminhtml/cms_page/edit",array("page_id"=>$row->getNewEntityId()));
13
  }
14
+ return '<a href="'.$link.'" target="_blank">View Published</a>';
15
  }
16
  else{
17
  return 'Not Published';
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/Frontend.php CHANGED
@@ -18,8 +18,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_
18
  }
19
  }
20
  elseif($row->getCategoryId()){
21
- $category = Mage::getModel('catalog/category')->setStoreId($this->getStoreId($row))->load($row->getCategoryId());
22
- $html .= '<a target="_blank" href="' . $category->getUrl() . '">' . $this->__('View Category in Frontend') . '</a>';
23
  }
24
  return $html;
25
  }
18
  }
19
  }
20
  elseif($row->getCategoryId()){
21
+ $url = $this->getUrl('catalog/category/view', ['id' => $row->getCategoryId(), '_nosid' => true, '_query' => ['___store' => $this->getStoreId($row) ]]);
22
+ $html .= '<a target="_blank" href="' . $url . '">' . $this->__('View Category in Frontend') . '</a>';
23
  }
24
  return $html;
25
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/Language.php ADDED
@@ -0,0 +1,13 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_Language
3
+ extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
4
+ {
5
+ public function render(Varien_Object $row)
6
+ {
7
+ $index = $this->getColumn()->getIndex();
8
+ $languageCode = $row->getData($index);
9
+ /** @var $helper StrakerTranslations_EasyTranslationPlatform_Model_Api */
10
+ $helper = Mage::getModel('strakertranslations_easytranslationplatform/api');
11
+ return $helper->_getLanguageName($languageCode);
12
+ }
13
+ }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/PageGridAction.php ADDED
@@ -0,0 +1,37 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_Renderer_PageGridAction
3
+ extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Action
4
+ // extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
5
+ {
6
+ public function render(Varien_Object $row)
7
+ {
8
+ // $actions = [];
9
+ Mage::dispatchEvent('adminhtml_cms_page_grid_renderer_action_before_render', array('row' => $row));
10
+ if ($row->getPreviewUrl()) {
11
+ $href = $row->getPreviewUrl();
12
+ } else {
13
+ $urlModel = Mage::getModel('core/url')->setStore($row->getData('_first_store_id'));
14
+ $href = $urlModel->getUrl(
15
+ $row->getIdentifier(), array(
16
+ '_current' => false,
17
+ '_query' => '___store=' . $row->getStoreCode(),
18
+ )
19
+ );
20
+ }
21
+
22
+ // $actions[] = [
23
+ // 'url' => $href,
24
+ // 'target' => '_blank',
25
+ // 'caption' => Mage::helper('newsletter')->__('Preview')
26
+ // ];
27
+
28
+ $actions[] = [
29
+ 'url' => $this->getUrl('*/*/removeFromCart', ['page_id' => $row->getPageId()] ),
30
+ 'caption' => Mage::helper('newsletter')->__('Remove')
31
+ ];
32
+
33
+ $this->getColumn()->setActions($actions);
34
+ return parent::render($row);
35
+ // return '<a href="' . $href . '" target="_blank">' . $this->__('Preview') . '</a>';
36
+ }
37
+ }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Block/Adminhtml/Template/Grid/Renderer/Status.php CHANGED
@@ -3,9 +3,8 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_
3
  extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
4
  {
5
  public function render(Varien_Object $row){
 
6
  if (get_class($row) == get_class(Mage::getModel('strakertranslations_easytranslationplatform/job') )) {
7
- $html = '';
8
-
9
  //if status is QUEUED
10
  if ($row->getStatusName() == 'QUEUED') {
11
  $quote = $row->getQuote();
@@ -26,8 +25,7 @@ class StrakerTranslations_EasyTranslationPlatform_Block_Adminhtml_Template_Grid_
26
  elseif ($row->getStatusName() == 'PUBLISHED') {
27
  $html = $this->__('Published');
28
  }
29
- return $html;
30
  }
31
-
32
  }
33
  }
3
  extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
4
  {
5
  public function render(Varien_Object $row){
6
+ $html = '';
7
  if (get_class($row) == get_class(Mage::getModel('strakertranslations_easytranslationplatform/job') )) {
 
 
8
  //if status is QUEUED
9
  if ($row->getStatusName() == 'QUEUED') {
10
  $quote = $row->getQuote();
25
  elseif ($row->getStatusName() == 'PUBLISHED') {
26
  $html = $this->__('Published');
27
  }
 
28
  }
29
+ return $html;
30
  }
31
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Helper/Data.php CHANGED
@@ -86,4 +86,14 @@ class StrakerTranslations_EasyTranslationPlatform_Helper_Data extends Mage_Core_
86
  public function clearSiteMode(){
87
  return Mage::getModel('core/config')->deleteConfig('straker/general/site_mode', 'default', 0);
88
  }
 
 
 
 
 
 
 
 
 
 
89
  }
86
  public function clearSiteMode(){
87
  return Mage::getModel('core/config')->deleteConfig('straker/general/site_mode', 'default', 0);
88
  }
89
+
90
+ public function getDataFilePath()
91
+ {
92
+ return $this->getStrakerPath(). DIRECTORY_SEPARATOR . 'data';
93
+ }
94
+
95
+ public function getStrakerPath()
96
+ {
97
+ return Mage::getBaseDir('var').DIRECTORY_SEPARATOR.'straker';
98
+ }
99
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Api.php CHANGED
@@ -156,7 +156,7 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Api extends Mage_Core_Mo
156
  return Mage::getStoreConfig('straker/api_url/languages');
157
  }
158
 
159
- protected function _getCountiresUrl(){
160
  return Mage::getStoreConfig('straker/api_url/countries');
161
  }
162
 
@@ -211,14 +211,88 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Api extends Mage_Core_Mo
211
  return $this->_call($downloadUrl,'get',array(),true);
212
  }
213
 
214
- public function getCountries(){
215
- $result = $this->_call($this->_getCountiresUrl());
216
- return $result->country ? $result->country : false;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
217
  }
218
 
219
- public function getLanguages(){
220
- $result = $this->_call($this->_getLanguagesUrl());
221
- return $result->languages ? $result->languages : false;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
222
  }
223
 
224
  public function saveAppKey($appKey){
156
  return Mage::getStoreConfig('straker/api_url/languages');
157
  }
158
 
159
+ protected function _getCountriesUrl(){
160
  return Mage::getStoreConfig('straker/api_url/countries');
161
  }
162
 
211
  return $this->_call($downloadUrl,'get',array(),true);
212
  }
213
 
214
+ // public function getCountries(){
215
+ // $result = $this->_call($this->_getCountiresUrl());
216
+ // return $result->country ? $result->country : false;
217
+ // }
218
+ //
219
+ // public function getLanguages(){
220
+ // $result = $this->_call($this->_getLanguagesUrl());
221
+ // return $result->languages ? $result->languages : false;
222
+ // }
223
+
224
+ public function getCountries()
225
+ {
226
+ /** @var $helper StrakerTranslations_EasyTranslationPlatform_Helper_Data */
227
+ $helper = Mage::helper('strakertranslations_easytranslationplatform');
228
+ $filePath = $helper->getDataFilePath();
229
+ $fileName = 'countries.json';
230
+
231
+ if (!file_exists($filePath)) {
232
+ mkdir($filePath, 0777, true);
233
+ }
234
+
235
+ $fileFullPath = $filePath . DIRECTORY_SEPARATOR . $fileName;
236
+
237
+ if (file_exists($fileFullPath)) {
238
+ $result = json_decode(file_get_contents($fileFullPath));
239
+ } else {
240
+ $result = $this->_call($this->_getCountriesUrl());
241
+ if (!empty($result)) {
242
+ file_put_contents($fileFullPath, json_encode($result));
243
+ }
244
+ }
245
+ return isset($result->country) ? $result->country : [];
246
+ }
247
+
248
+ public function getLanguages()
249
+ {
250
+ /** @var $helper StrakerTranslations_EasyTranslationPlatform_Helper_Data */
251
+ $helper = Mage::helper('strakertranslations_easytranslationplatform');
252
+ $filePath = $helper->getDataFilePath();
253
+ $fileName = 'languages.json';
254
+
255
+ if (!file_exists($filePath)) {
256
+ mkdir($filePath, 0777, true);
257
+ }
258
+
259
+ $fileFullPath = $filePath . DIRECTORY_SEPARATOR . $fileName;
260
+
261
+ if (file_exists($fileFullPath)) {
262
+ $result = json_decode(file_get_contents($fileFullPath));
263
+ } else {
264
+ $result = $this->_call($this->_getLanguagesUrl());
265
+ if (!empty($result)) {
266
+ file_put_contents($fileFullPath, json_encode($result));
267
+ }
268
+ }
269
+ return isset($result->languages) ? $result->languages : [];
270
  }
271
 
272
+ public function _getLanguageName($code = '')
273
+ {
274
+ $languages = $this->getLanguages();
275
+ $languageName = '';
276
+ $isArray = is_array($code) ? true : false;
277
+ foreach ($languages as $k => $val) {
278
+ if( $isArray ){
279
+ if ( ($key = array_search($val->code, $code)) !== false ) {
280
+ $languageName[$val->code] = $val->name;
281
+ unset($code[$key]);
282
+ }else{
283
+ continue;
284
+ }
285
+ if( count($code) <= 0 ){
286
+ break;
287
+ }
288
+ }else{
289
+ if ($val->code == $code) {
290
+ $languageName = $val->name;
291
+ break;
292
+ }
293
+ }
294
+ }
295
+ return $languageName;
296
  }
297
 
298
  public function saveAppKey($appKey){
app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Attribute/Translate.php CHANGED
@@ -115,9 +115,9 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Attribute_Translate exte
115
  $newOptionData = [];
116
  foreach ($attribute as $optionId => $optionValue) {
117
  $optionId = str_replace('id_', '',$optionId);
118
- /** @var Mage_Eav_Model_Entity_Attribute_Option $optionModel */
119
- $optionModel = Mage::getModel('eav/entity_attribute_option');
120
- $optionModel->load($optionId);
121
  if( !in_array($optionId, $optionIds)){
122
  array_push(
123
  $newOptionData,
115
  $newOptionData = [];
116
  foreach ($attribute as $optionId => $optionValue) {
117
  $optionId = str_replace('id_', '',$optionId);
118
+ // /** @var Mage_Eav_Model_Entity_Attribute_Option $optionModel */
119
+ // $optionModel = Mage::getModel('eav/entity_attribute_option');
120
+ // $optionModel->load($optionId);
121
  if( !in_array($optionId, $optionIds)){
122
  array_push(
123
  $newOptionData,
app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Cms/Page/Translate.php CHANGED
@@ -33,18 +33,16 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Cms_Page_Translate exten
33
  // }
34
  //
35
  // $this->setIsImported(1)->save();
36
-
37
- if ($this->getTranslate()){
38
-
39
  $model = Mage::getModel('cms/page')->load($newEntityId);
40
  if($model->getId()){
41
- $model->setData($this->getColumnName(), $this->getTranslate());
42
  $model->save();
 
43
  }
44
  }
45
-
46
  $this->setIsImported(1)->save();
47
-
48
  }
49
  //
50
  // private function _getConnection() {
33
  // }
34
  //
35
  // $this->setIsImported(1)->save();
36
+ $translation = $this->getTranslate();
37
+ if( !empty($translation) ){
 
38
  $model = Mage::getModel('cms/page')->load($newEntityId);
39
  if($model->getId()){
40
+ $model->setData($this->getColumnName(), $translation );
41
  $model->save();
42
+ $model->unsetData();
43
  }
44
  }
 
45
  $this->setIsImported(1)->save();
 
46
  }
47
  //
48
  // private function _getConnection() {
app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Job.php CHANGED
@@ -411,7 +411,6 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job extends Mage_Core_Mo
411
  // }
412
  //
413
  // $writeConnection->query($query . implode(',', $queryVals));
414
-
415
  $model = Mage::getModel('strakertranslations_easytranslationplatform/job_cms_' . $type);
416
  //. '` (`' . $type . '_id`, `job_id` , `origin`) VALUES ';
417
 
@@ -421,6 +420,8 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job extends Mage_Core_Mo
421
  $model->setData($type.'_id', $id);
422
  $model->setJobId($this->getId());
423
  $model->setOrigin(json_encode($cmsData));
 
 
424
  $model->save();
425
  $model->unsetData();
426
  }
@@ -912,7 +913,6 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job extends Mage_Core_Mo
912
 
913
  public function applyTranslation($entityIds = array())
914
  {
915
-
916
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/' . $this->_getType() . '_translate')->getCollection()->addFieldToFilter('job_id', $this->getId());
917
 
918
  if ($entityIds) {
@@ -928,9 +928,7 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job extends Mage_Core_Mo
928
 
929
  foreach ($collection as $translation) {
930
  $translation->setStoreId($this->getStoreId())->importTranslation();
931
-
932
  $entityId = call_user_func(array($translation, 'getData'), strtolower(str_replace(' ', '_', $this->getTypeName() . '_id')));
933
-
934
  if (empty($updatedIds[$entityId])) {
935
  $updatedIds[$entityId] = true;
936
  $prefix = Mage::getConfig()->getTablePrefix()->__toString();
@@ -944,21 +942,15 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job extends Mage_Core_Mo
944
  }
945
  }
946
  }
947
-
948
  return true;
949
  }
950
 
951
  protected function createNewCms($entityIds)
952
  {
953
-
954
-
955
  $cmsType = str_replace('cms_', '', $this->_getType());
956
-
957
  $cmsModelName = str_replace('_', '/', $this->_getType());
958
 
959
-
960
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/job_' . $this->_getType())->getCollection();
961
-
962
  $collection->addFieldToFilter('job_id', $this->getId());
963
 
964
  if ($entityIds) {
@@ -966,13 +958,9 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job extends Mage_Core_Mo
966
  }
967
 
968
  foreach ($collection as $jobCms) {
969
-
970
  if (!$jobCms->getNewEntityId()) {
971
-
972
  $cmsModel = Mage::getModel($cmsModelName);
973
-
974
  $cmsData = json_decode($jobCms->getOrigin());
975
-
976
  foreach ($cmsData as $k => $v) {
977
  $cmsModel->setData($k, $v);
978
  }
@@ -980,11 +968,8 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job extends Mage_Core_Mo
980
  // $cmsModel->setStores(array())->save();
981
  $cmsModel->setStores([$this->getStoreId()])->save();
982
  $jobCms->setNewEntityId($cmsModel->getId())->save();
983
-
984
  }
985
-
986
  }
987
-
988
  }
989
 
990
  public function isPublished()
@@ -1040,4 +1025,27 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job extends Mage_Core_Mo
1040
  {
1041
  return Mage::getSingleton('core/resource')->getConnection('core_write');
1042
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1043
  }
411
  // }
412
  //
413
  // $writeConnection->query($query . implode(',', $queryVals));
 
414
  $model = Mage::getModel('strakertranslations_easytranslationplatform/job_cms_' . $type);
415
  //. '` (`' . $type . '_id`, `job_id` , `origin`) VALUES ';
416
 
420
  $model->setData($type.'_id', $id);
421
  $model->setJobId($this->getId());
422
  $model->setOrigin(json_encode($cmsData));
423
+ $model->setData('title', $cmsData['title']);
424
+ $model->setData('identifier', $cmsData['identifier']);
425
  $model->save();
426
  $model->unsetData();
427
  }
913
 
914
  public function applyTranslation($entityIds = array())
915
  {
 
916
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/' . $this->_getType() . '_translate')->getCollection()->addFieldToFilter('job_id', $this->getId());
917
 
918
  if ($entityIds) {
928
 
929
  foreach ($collection as $translation) {
930
  $translation->setStoreId($this->getStoreId())->importTranslation();
 
931
  $entityId = call_user_func(array($translation, 'getData'), strtolower(str_replace(' ', '_', $this->getTypeName() . '_id')));
 
932
  if (empty($updatedIds[$entityId])) {
933
  $updatedIds[$entityId] = true;
934
  $prefix = Mage::getConfig()->getTablePrefix()->__toString();
942
  }
943
  }
944
  }
 
945
  return true;
946
  }
947
 
948
  protected function createNewCms($entityIds)
949
  {
 
 
950
  $cmsType = str_replace('cms_', '', $this->_getType());
 
951
  $cmsModelName = str_replace('_', '/', $this->_getType());
952
 
 
953
  $collection = Mage::getModel('strakertranslations_easytranslationplatform/job_' . $this->_getType())->getCollection();
 
954
  $collection->addFieldToFilter('job_id', $this->getId());
955
 
956
  if ($entityIds) {
958
  }
959
 
960
  foreach ($collection as $jobCms) {
 
961
  if (!$jobCms->getNewEntityId()) {
 
962
  $cmsModel = Mage::getModel($cmsModelName);
 
963
  $cmsData = json_decode($jobCms->getOrigin());
 
964
  foreach ($cmsData as $k => $v) {
965
  $cmsModel->setData($k, $v);
966
  }
968
  // $cmsModel->setStores(array())->save();
969
  $cmsModel->setStores([$this->getStoreId()])->save();
970
  $jobCms->setNewEntityId($cmsModel->getId())->save();
 
971
  }
 
972
  }
 
973
  }
974
 
975
  public function isPublished()
1025
  {
1026
  return Mage::getSingleton('core/resource')->getConnection('core_write');
1027
  }
1028
+
1029
+ public function _getStoreOptionArray(){
1030
+ $data = [];
1031
+ $stores = Mage::getModel('core/store')->getCollection()->getData();
1032
+ foreach($stores as $store ){
1033
+ if( $store['code'] !== 'admin'){
1034
+ $data[$store['store_id']] = $store['name'];
1035
+ }
1036
+ }
1037
+ return $data;
1038
+ }
1039
+
1040
+ public function languageOptionArray( $filter ) {
1041
+ $collection = $this->getCollection();
1042
+ $collection->distinct(true)->addFieldToSelect($filter);
1043
+ $languages = [];
1044
+ foreach ($collection->getData() as $lang) {
1045
+ array_push($languages, $lang[$filter]);
1046
+ }
1047
+ /** @var $helper StrakerTranslations_EasyTranslationPlatform_Model_Api */
1048
+ $helper = Mage::getModel('strakertranslations_easytranslationplatform/api');
1049
+ return $helper->_getLanguageName($languages);
1050
+ }
1051
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Job/Status.php CHANGED
@@ -12,5 +12,5 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job_Status extends Mage_
12
  {
13
  $this->_init('strakertranslations_easytranslationplatform/job_status');
14
  }
 
15
 
16
- }
12
  {
13
  $this->_init('strakertranslations_easytranslationplatform/job_status');
14
  }
15
+ }
16
 
 
app/code/community/StrakerTranslations/EasyTranslationPlatform/Model/Job/Type.php CHANGED
@@ -13,4 +13,11 @@ class StrakerTranslations_EasyTranslationPlatform_Model_Job_Type extends Mage_Co
13
  $this->_init('strakertranslations_easytranslationplatform/job_type');
14
  }
15
 
 
 
 
 
 
 
 
16
  }
13
  $this->_init('strakertranslations_easytranslationplatform/job_type');
14
  }
15
 
16
+ public function getOptionArray(){
17
+ $data = [];
18
+ foreach($this->getCollection()->getData() as $d){
19
+ $data[$d['type_id']] = $d['type_name'];
20
+ }
21
+ return $data;
22
+ }
23
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/AttributeController.php CHANGED
@@ -50,10 +50,12 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_AttributeCon
50
  $params = $this->getRequest()->getParams();
51
  if (empty($params['store'])) {
52
  $this->_redirect('*/straker_new');
53
- return;
54
  }
55
  else{
56
- return $this->_initNewAction()
 
 
 
57
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_attribute','strakertranslations_easytranslationplatform_new_attribute',array('setup_store_id' => $params['store'])))
58
  ->renderLayout();
59
  }
@@ -78,7 +80,10 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_AttributeCon
78
  ->renderLayout();
79
  }
80
  else {
81
- $this->_redirect('*/straker_new/', $data);
 
 
 
82
  }
83
  }
84
 
@@ -198,4 +203,96 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_AttributeCon
198
  $helper->checkSiteMode();
199
  }
200
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
201
  }
50
  $params = $this->getRequest()->getParams();
51
  if (empty($params['store'])) {
52
  $this->_redirect('*/straker_new');
 
53
  }
54
  else{
55
+ if( $this->getRequest()->getParam('from') !== 'confirm'){
56
+ Mage::getSingleton('adminhtml/session')->setData('straker_new_option','');
57
+ }
58
+ $this->_initNewAction()
59
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_attribute','strakertranslations_easytranslationplatform_new_attribute',array('setup_store_id' => $params['store'])))
60
  ->renderLayout();
61
  }
80
  ->renderLayout();
81
  }
82
  else {
83
+ if(array_key_exists('key', $data)){
84
+ unset($data['key']);
85
+ }
86
+ $this->_redirect('*/*/new', $data);
87
  }
88
  }
89
 
203
  $helper->checkSiteMode();
204
  }
205
 
206
+ public function removeFromCartAction(){
207
+ $attributeId = 0;
208
+ if(!empty($this->getRequest()->getParam('attribute_id'))){
209
+ $attributeId = $this->getRequest()->getParam('attribute_id');
210
+ }
211
+ $attributeIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_attribute');
212
+ if(!is_array($attributeIds)){
213
+ $attributeIds = explode(',', trim($attributeIds,','));
214
+ }
215
+ if( ($key = array_search($attributeId, $attributeIds)) !== false ){
216
+ unset($attributeIds[$key]);
217
+ }
218
+ Mage::getSingleton('adminhtml/session')->setData('straker_new_attribute', $attributeIds);
219
+ $optionIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_option');
220
+ if(!is_array($optionIds)){
221
+ $optionIds = explode(',', trim($optionIds,','));
222
+ }
223
+ if( ($key = array_search($attributeId, $optionIds)) !== false ){
224
+ unset($optionIds[$key]);
225
+ }
226
+ // var_dump($attributeIds);
227
+ // var_dump($optionIds);
228
+ // exit;
229
+ Mage::getSingleton('adminhtml/session')->setData('straker_new_option', implode(',', $optionIds));
230
+ $this->_redirect('*/*/addtoconfirm');
231
+ }
232
+
233
+ public function gridAction()
234
+ {
235
+ $params = $this->getRequest()->getParams();
236
+ if (empty($params['store'])) {
237
+ $this->_redirect('*/straker_new');
238
+ }
239
+ $this->loadLayout();
240
+ $this->getResponse()->setBody(
241
+ $this
242
+ ->getLayout()
243
+ ->createBlock(
244
+ 'strakertranslations_easytranslationplatform/adminhtml_new_attribute_grid',
245
+ 'strakertranslations_easytranslationplatform_new_attribute_grid',
246
+ [
247
+ 'setup_store_id' => $params['store']
248
+ ]
249
+ )->toHtml()
250
+ );
251
+ }
252
+
253
+ public function confirmGridAction()
254
+ {
255
+ $data = $this->getRequest()->getParams();
256
+ if(empty($data['attribute']) && empty($data['option'])){
257
+ $data['attribute'] = Mage::getSingleton('adminhtml/session')->getData('straker_new_attribute');
258
+ $data['option'] = Mage::getSingleton('adminhtml/session')->getData('straker_new_option');
259
+ }
260
+ $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
261
+
262
+ $this->loadLayout();
263
+ $this->getResponse()->setBody(
264
+ $this
265
+ ->getLayout()
266
+ ->createBlock(
267
+ 'strakertranslations_easytranslationplatform/adminhtml_new_attribute_confirm_grid',
268
+ 'strakertranslations_easytranslationplatform_new_attribute_confirm_grid',
269
+ [
270
+ 'store' => $data['store'],
271
+ 'attribute' => $data['attribute'],
272
+ 'option' => $data['option']
273
+ ]
274
+ )->toHtml()
275
+ );
276
+ }
277
+
278
+ public function jobGridAction(){
279
+ $jobId = $this->getRequest()->getParam('job_id');
280
+ $job = Mage::getModel('strakertranslations_easytranslationplatform/job')->load($jobId);
281
+ $statusId = $job->getStatusId();
282
+ // var_dump($params);exit;
283
+ $this->loadLayout();
284
+ $this->getResponse()->setBody(
285
+ $this
286
+ ->getLayout()
287
+ ->createBlock(
288
+ 'strakertranslations_easytranslationplatform/adminhtml_job_attribute_grid',
289
+ 'strakertranslations_easytranslationplatform_job_attribute_grid',
290
+ [
291
+ 'job_id' => $jobId
292
+ ]
293
+ )
294
+ ->setStatusId($statusId)
295
+ ->toHtml()
296
+ );
297
+ }
298
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/CategoryController.php CHANGED
@@ -35,16 +35,15 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_CategoryCont
35
  $params = $this->getRequest()->getParams();
36
  if (empty($params['store'])) {
37
  $this->_redirect('*/straker_new');
38
- return;
39
  }
40
  elseif (empty($params['attr'])) {
41
- return $this->_initNewAction()
42
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_category_attribute', 'strakertranslations_easytranslationplatform_new_categories_attribute', array('setup_store_id' => $params['store'])))
43
  ->renderLayout();
44
  }
45
  else{
46
- return $this->_initNewAction()
47
- ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_category_tree', 'strakertranslations_easytranslationplatform_l_new_category_tree', array('setup_store_id' => $params['store'], 'attr' => $params['attr'])))
48
  ->renderLayout();
49
  }
50
  }
@@ -60,20 +59,18 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_CategoryCont
60
  }
61
 
62
  public function confirmCategoryAction(){
63
- $data = $this->getRequest()->getParams();
64
- $data['attr'] = !empty($data['attr']) ? $data['attr'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_attr');
65
- $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
66
- $data['category'] = !empty($data['category']) ? $data['category'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_category');
67
  //format category
68
- $categoryIds = array_filter(array_unique(explode(',', $data['category'])));
 
69
  if(!empty($data['attr']) && !empty($data['store']) && !empty($categoryIds)){
70
  Mage::getSingleton('adminhtml/session')
71
  ->setData('straker_new_attr', $data['attr'])
72
  ->setData('straker_new_store', $data['store'])
73
- ->setData('straker_new_category', $data['category'])
74
  ;
75
  return $this->_initNewAction()
76
- ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_category_confirm', 'strakertranslations_easytranslationplatform__new_category_confirm', array('store' => $data['store'], 'attr' => $data['attr'], 'category' => $categoryIds)))
77
  ->renderLayout();
78
  }
79
  else{
@@ -97,7 +94,8 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_CategoryCont
97
  ));
98
  return;
99
  }
100
- foreach(explode(',', $data['attr']) as $attributeCode){
 
101
  $attr_ids[] = $attribute = Mage::getSingleton('eav/config')
102
  ->getAttribute(Mage_Catalog_Model_Category::ENTITY, $attributeCode)->getAttributeId();
103
  }
@@ -216,4 +214,70 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_CategoryCont
216
  $helper = Mage::helper('strakertranslations_easytranslationplatform');
217
  $helper->checkSiteMode();
218
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
219
  }
35
  $params = $this->getRequest()->getParams();
36
  if (empty($params['store'])) {
37
  $this->_redirect('*/straker_new');
 
38
  }
39
  elseif (empty($params['attr'])) {
40
+ $this->_initNewAction()
41
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_category_attribute', 'strakertranslations_easytranslationplatform_new_categories_attribute', array('setup_store_id' => $params['store'])))
42
  ->renderLayout();
43
  }
44
  else{
45
+ $this->_initNewAction()
46
+ ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_category_tree', 'strakertranslations_easytranslationplatform_new_category_tree', array('setup_store_id' => $params['store'], 'attr' => $params['attr'])))
47
  ->renderLayout();
48
  }
49
  }
59
  }
60
 
61
  public function confirmCategoryAction(){
62
+ $data = $this->_getParamArray();
 
 
 
63
  //format category
64
+ // $categoryIds = array_filter(array_unique(explode(',', $data['category'])));
65
+ $categoryIds = empty($data['category']) ? [] : array_unique(explode(',', $data['category']));
66
  if(!empty($data['attr']) && !empty($data['store']) && !empty($categoryIds)){
67
  Mage::getSingleton('adminhtml/session')
68
  ->setData('straker_new_attr', $data['attr'])
69
  ->setData('straker_new_store', $data['store'])
70
+ ->setData('straker_new_category', $categoryIds)
71
  ;
72
  return $this->_initNewAction()
73
+ ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_category_confirm', 'strakertranslations_easytranslationplatform_new_category_confirm', array('store' => $data['store'], 'attr' => $data['attr'], 'category' => $categoryIds)))
74
  ->renderLayout();
75
  }
76
  else{
94
  ));
95
  return;
96
  }
97
+ $attributeCodes = array_unique(explode(',', $data['attr']));
98
+ foreach( $attributeCodes as $attributeCode){
99
  $attr_ids[] = $attribute = Mage::getSingleton('eav/config')
100
  ->getAttribute(Mage_Catalog_Model_Category::ENTITY, $attributeCode)->getAttributeId();
101
  }
214
  $helper = Mage::helper('strakertranslations_easytranslationplatform');
215
  $helper->checkSiteMode();
216
  }
217
+
218
+ public function confirmGridAction(){
219
+ $data = $this->_getParamArray();
220
+ $categoryIds = array_unique($data['category']);
221
+ $this->loadLayout();
222
+ $this->getResponse()->setBody(
223
+ $this
224
+ ->getLayout()
225
+ ->createBlock(
226
+ 'strakertranslations_easytranslationplatform/adminhtml_new_category_confirm_grid',
227
+ 'strakertranslations_easytranslationplatform_new_category_confirm_grid',
228
+ [
229
+ 'store' => $data['store'], 'attr' => $data['attr'], 'category' => $categoryIds
230
+ ]
231
+ )->toHtml()
232
+ );
233
+ }
234
+
235
+ public function jobGridAction(){
236
+ $jobId = $this->getRequest()->getParam('job_id');
237
+ $job = Mage::getModel('strakertranslations_easytranslationplatform/job')->load($jobId);
238
+ $statusId = $job->getStatusId();
239
+ // var_dump($params);exit;
240
+ $this->loadLayout();
241
+ $this->getResponse()->setBody(
242
+ $this
243
+ ->getLayout()
244
+ ->createBlock(
245
+ 'strakertranslations_easytranslationplatform/adminhtml_job_category_grid',
246
+ 'strakertranslations_easytranslationplatform_job_category_grid',
247
+ [
248
+ 'job_id' => $jobId
249
+ ]
250
+ )
251
+ ->setStatusId($statusId)
252
+ ->toHtml()
253
+ );
254
+ }
255
+
256
+ private function _getParamArray(){
257
+ $data = $this->getRequest()->getParams();
258
+ $data['attr'] = !empty($data['attr']) ? $data['attr'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_attr');
259
+ $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
260
+ $data['category'] = !empty($data['category']) ? trim($data['category'],',') : Mage::getSingleton('adminhtml/session')->getData('straker_new_category');
261
+ return $data;
262
+ }
263
+
264
+ public function removeFromCartAction(){
265
+ $entityId = 0;
266
+ if(!empty($this->getRequest()->getParam('entity_id'))){
267
+ $entityId = $this->getRequest()->getParam('entity_id');
268
+ }
269
+ $categoryIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_category');
270
+ if(!is_array($categoryIds)){
271
+ $categoryIds = explode(',', trim($categoryIds, ','));
272
+ }
273
+ if( ($key = array_search($entityId, $categoryIds)) !== false ){
274
+ unset($categoryIds[$key]);
275
+ }
276
+ if(is_array($categoryIds)){
277
+ $categoryIds = implode(',', $categoryIds);
278
+ }
279
+ Mage::getSingleton('adminhtml/session')->setData('straker_new_category', $categoryIds);
280
+ $this->_redirect('*/*/confirmCategory');
281
+ }
282
+
283
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/Cms/BlockController.php CHANGED
@@ -46,20 +46,19 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_BlockCon
46
  $params = $this->getRequest()->getParams();
47
  if (empty($params['store'])) {
48
  $this->_redirect('*/straker_new');
49
- return;
50
  }
51
  elseif (empty($params['attr'])) {
52
- return $this->_initNewAction()
53
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_block_attribute','strakertranslations_easytranslationplatform_new_cms_block_attribute',array('setup_store_id' => $params['store'])))
54
  ->renderLayout();
55
  }
56
  elseif (empty($params['cms_block'])) {
57
- return $this->_initNewAction()
58
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_block','strakertranslations_easytranslationplatform_new_cms_block',array('setup_store_id' => $params['store'], 'attr' => $params['attr'])))
59
  ->renderLayout();
60
  }
61
  else{
62
- return $this->_initNewAction()
63
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_block_confirm','strakertranslations_easytranslationplatform_new_cms_block_confirm',array('store' => $params['store'], 'cms_block' => $params['cms_block'], 'attr' => $params['attr'])))
64
  ->renderLayout();
65
  }
@@ -76,10 +75,7 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_BlockCon
76
  }
77
 
78
  public function addtoconfirmAction(){
79
- $data = $this->getRequest()->getParams();
80
- $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
81
- $data['attr'] = !empty($data['attr']) ? $data['attr'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_attr');
82
- $data['cms_block'] = !empty($data['cms_block']) ? $data['cms_block'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_cms_block');
83
  if(!empty($data['attr']) && !empty($data['store']) && !empty($data['cms_block'])){
84
  Mage::getSingleton('adminhtml/session')
85
  ->setData('straker_new_attr', $data['attr'])
@@ -91,7 +87,10 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_BlockCon
91
  ->renderLayout();
92
  }
93
  else {
94
- $this->_redirect('*/straker_new/', $data);
 
 
 
95
  }
96
  }
97
 
@@ -183,4 +182,83 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_BlockCon
183
  }
184
 
185
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
186
  }
46
  $params = $this->getRequest()->getParams();
47
  if (empty($params['store'])) {
48
  $this->_redirect('*/straker_new');
 
49
  }
50
  elseif (empty($params['attr'])) {
51
+ $this->_initNewAction()
52
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_block_attribute','strakertranslations_easytranslationplatform_new_cms_block_attribute',array('setup_store_id' => $params['store'])))
53
  ->renderLayout();
54
  }
55
  elseif (empty($params['cms_block'])) {
56
+ $this->_initNewAction()
57
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_block','strakertranslations_easytranslationplatform_new_cms_block',array('setup_store_id' => $params['store'], 'attr' => $params['attr'])))
58
  ->renderLayout();
59
  }
60
  else{
61
+ $this->_initNewAction()
62
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_block_confirm','strakertranslations_easytranslationplatform_new_cms_block_confirm',array('store' => $params['store'], 'cms_block' => $params['cms_block'], 'attr' => $params['attr'])))
63
  ->renderLayout();
64
  }
75
  }
76
 
77
  public function addtoconfirmAction(){
78
+ $data = $this->_getParamArray();
 
 
 
79
  if(!empty($data['attr']) && !empty($data['store']) && !empty($data['cms_block'])){
80
  Mage::getSingleton('adminhtml/session')
81
  ->setData('straker_new_attr', $data['attr'])
87
  ->renderLayout();
88
  }
89
  else {
90
+ if(array_key_exists('key', $data)){
91
+ unset($data['key']);
92
+ }
93
+ $this->_redirect('*/*/new/', $data);
94
  }
95
  }
96
 
182
  }
183
 
184
  }
185
+
186
+ public function gridAction()
187
+ {
188
+ $params = $this->_getParamArray();
189
+ $this->loadLayout();
190
+ $this->getResponse()->setBody(
191
+ $this
192
+ ->getLayout()
193
+ ->createBlock(
194
+ 'strakertranslations_easytranslationplatform/adminhtml_new_cms_block_grid',
195
+ 'strakertranslations_easytranslationplatform_new_cms_block_grid',
196
+ [
197
+ 'store' => $params['store'], 'cms_block' => $params['cms_block'], 'attr' => $params['attr']
198
+ ]
199
+ )->toHtml()
200
+ );
201
+ }
202
+
203
+ public function confirmGridAction()
204
+ {
205
+ $params = $this->_getParamArray();
206
+ $this->loadLayout();
207
+ $this->getResponse()->setBody(
208
+ $this
209
+ ->getLayout()
210
+ ->createBlock(
211
+ 'strakertranslations_easytranslationplatform/adminhtml_new_cms_block_confirm_grid',
212
+ 'strakertranslations_easytranslationplatform_new_cms_block_confirm_grid',
213
+ [
214
+ 'store' => $params['store'], 'cms_block' => $params['cms_block'], 'attr' => $params['attr']
215
+ ]
216
+ )->toHtml()
217
+ );
218
+ }
219
+
220
+ public function jobGridAction(){
221
+ $jobId = $this->getRequest()->getParam('job_id');
222
+ $job = Mage::getModel('strakertranslations_easytranslationplatform/job')->load($jobId);
223
+ $statusId = $job->getStatusId();
224
+ // var_dump($params);exit;
225
+ $this->loadLayout();
226
+ $this->getResponse()->setBody(
227
+ $this
228
+ ->getLayout()
229
+ ->createBlock(
230
+ 'strakertranslations_easytranslationplatform/adminhtml_job_cms_block_grid',
231
+ 'strakertranslations_easytranslationplatform_job_cms_block_grid',
232
+ [
233
+ 'job_id' => $jobId
234
+ ]
235
+ )
236
+ ->setStatusId($statusId)
237
+ ->toHtml()
238
+ );
239
+ }
240
+
241
+ public function removeFromCartAction(){
242
+ $entityId = 0;
243
+ if(!empty($this->getRequest()->getParam('block_id'))){
244
+ $entityId = $this->getRequest()->getParam('block_id');
245
+ }
246
+ $blockIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_cms_block');
247
+ if(!is_array($blockIds)){
248
+ $blockIds = explode(',', trim($blockIds, ','));
249
+ }
250
+ if( ($key = array_search($entityId, $blockIds)) !== false ){
251
+ unset($blockIds[$key]);
252
+ }
253
+ Mage::getSingleton('adminhtml/session')->setData('straker_new_cms_block', $blockIds);
254
+ $this->_redirect('*/*/addtoconfirm');
255
+ }
256
+
257
+ private function _getParamArray(){
258
+ $data = $this->getRequest()->getParams();
259
+ $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
260
+ $data['attr'] = !empty($data['attr']) ? $data['attr'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_attr');
261
+ $data['cms_block'] = !empty($data['cms_block']) ? $data['cms_block'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_cms_block');
262
+ return $data;
263
+ }
264
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/Cms/PageController.php CHANGED
@@ -46,20 +46,19 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_PageCont
46
  $params = $this->getRequest()->getParams();
47
  if (empty($params['store'])) {
48
  $this->_redirect('*/straker_new');
49
- return;
50
  }
51
  elseif (empty($params['attr'])) {
52
- return $this->_initNewAction()
53
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_page_attribute','strakertranslations_easytranslationplatform_new_cms_page_attribute',array('setup_store_id' => $params['store'])))
54
  ->renderLayout();
55
  }
56
  elseif (empty($params['cms_page'])) {
57
- return $this->_initNewAction()
58
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_page','strakertranslations_easytranslationplatform_new_cms_page',array('setup_store_id' => $params['store'], 'attr' => $params['attr'])))
59
  ->renderLayout();
60
  }
61
  else{
62
- return $this->_initNewAction()
63
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_page_confirm','strakertranslations_easytranslationplatform_new_cms_page_confirm',array('store' => $params['store'], 'cms_page' => $params['cms_page'], 'attr' => $params['attr'])))
64
  ->renderLayout();
65
  }
@@ -76,10 +75,7 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_PageCont
76
  }
77
 
78
  public function addtoconfirmAction(){
79
- $data = $this->getRequest()->getParams();
80
- $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
81
- $data['attr'] = !empty($data['attr']) ? $data['attr'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_attr');
82
- $data['cms_page'] = !empty($data['cms_page']) ? $data['cms_page'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_cms_page');
83
  if(!empty($data['attr']) && !empty($data['store']) && !empty($data['cms_page'])){
84
  Mage::getSingleton('adminhtml/session')
85
  ->setData('straker_new_attr', $data['attr'])
@@ -91,13 +87,17 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_PageCont
91
  ->renderLayout();
92
  }
93
  else {
94
- $this->_redirect('*/straker_new/', $data);
 
 
 
95
  }
96
  }
97
 
98
  public function submitjobAction(){
99
  $data = $this->getRequest()->getParams();
100
  if($data['attr'] && $data['store'] && $data['cms_page']){
 
101
  $jobModel = Mage::getModel('strakertranslations_easytranslationplatform/job');
102
  try {
103
  $jobModel->checkAndCreateFolder();
@@ -135,6 +135,7 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_PageCont
135
  }
136
 
137
  public function copyAllAction(){
 
138
  $job = Mage::getModel('strakertranslations_easytranslationplatform/job')->load($this->getRequest()->getParam('job_id'));
139
 
140
  if (!$job->getId()){
@@ -183,4 +184,83 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_Cms_PageCont
183
  }
184
 
185
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
186
  }
46
  $params = $this->getRequest()->getParams();
47
  if (empty($params['store'])) {
48
  $this->_redirect('*/straker_new');
 
49
  }
50
  elseif (empty($params['attr'])) {
51
+ $this->_initNewAction()
52
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_page_attribute','strakertranslations_easytranslationplatform_new_cms_page_attribute',array('setup_store_id' => $params['store'])))
53
  ->renderLayout();
54
  }
55
  elseif (empty($params['cms_page'])) {
56
+ $this->_initNewAction()
57
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_page','strakertranslations_easytranslationplatform_new_cms_page',array('setup_store_id' => $params['store'], 'attr' => $params['attr'])))
58
  ->renderLayout();
59
  }
60
  else{
61
+ $this->_initNewAction()
62
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_cms_page_confirm','strakertranslations_easytranslationplatform_new_cms_page_confirm',array('store' => $params['store'], 'cms_page' => $params['cms_page'], 'attr' => $params['attr'])))
63
  ->renderLayout();
64
  }
75
  }
76
 
77
  public function addtoconfirmAction(){
78
+ $data = $this->_getParamArray();
 
 
 
79
  if(!empty($data['attr']) && !empty($data['store']) && !empty($data['cms_page'])){
80
  Mage::getSingleton('adminhtml/session')
81
  ->setData('straker_new_attr', $data['attr'])
87
  ->renderLayout();
88
  }
89
  else {
90
+ if(array_key_exists('key', $data)){
91
+ unset($data['key']);
92
+ }
93
+ $this->_redirect('*/*/new', $data);
94
  }
95
  }
96
 
97
  public function submitjobAction(){
98
  $data = $this->getRequest()->getParams();
99
  if($data['attr'] && $data['store'] && $data['cms_page']){
100
+ /** @var $jobModel StrakerTranslations_EasyTranslationPlatform_Model_Job */
101
  $jobModel = Mage::getModel('strakertranslations_easytranslationplatform/job');
102
  try {
103
  $jobModel->checkAndCreateFolder();
135
  }
136
 
137
  public function copyAllAction(){
138
+ /** @var $job StrakerTranslations_EasyTranslationPlatform_Model_Job */
139
  $job = Mage::getModel('strakertranslations_easytranslationplatform/job')->load($this->getRequest()->getParam('job_id'));
140
 
141
  if (!$job->getId()){
184
  }
185
 
186
  }
187
+
188
+ public function gridAction()
189
+ {
190
+ $params = $this->_getParamArray();
191
+ $this->loadLayout();
192
+ $this->getResponse()->setBody(
193
+ $this
194
+ ->getLayout()
195
+ ->createBlock(
196
+ 'strakertranslations_easytranslationplatform/adminhtml_new_cms_page_grid',
197
+ 'strakertranslations_easytranslationplatform_new_cms_page_grid',
198
+ [
199
+ 'store' => $params['store'], 'cms_page' => $params['cms_page'], 'attr' => $params['attr']
200
+ ]
201
+ )->toHtml()
202
+ );
203
+ }
204
+
205
+ public function confirmGridAction()
206
+ {
207
+ $params = $this->_getParamArray();
208
+ $this->loadLayout();
209
+ $this->getResponse()->setBody(
210
+ $this
211
+ ->getLayout()
212
+ ->createBlock(
213
+ 'strakertranslations_easytranslationplatform/adminhtml_new_cms_page_confirm_grid',
214
+ 'strakertranslations_easytranslationplatform_new_cms_page_confirm_grid',
215
+ [
216
+ 'store' => $params['store'], 'cms_page' => $params['cms_page'], 'attr' => $params['attr']
217
+ ]
218
+ )->toHtml()
219
+ );
220
+ }
221
+
222
+ public function jobGridAction(){
223
+ $jobId = $this->getRequest()->getParam('job_id');
224
+ $job = Mage::getModel('strakertranslations_easytranslationplatform/job')->load($jobId);
225
+ $statusId = $job->getStatusId();
226
+ // var_dump($params);exit;
227
+ $this->loadLayout();
228
+ $this->getResponse()->setBody(
229
+ $this
230
+ ->getLayout()
231
+ ->createBlock(
232
+ 'strakertranslations_easytranslationplatform/adminhtml_job_cms_page_grid',
233
+ 'strakertranslations_easytranslationplatform_job_cms_page_grid',
234
+ [
235
+ 'job_id' => $jobId
236
+ ]
237
+ )
238
+ ->setStatusId($statusId)
239
+ ->toHtml()
240
+ );
241
+ }
242
+
243
+ public function removeFromCartAction(){
244
+ $entityId = 0;
245
+ if(!empty($this->getRequest()->getParam('page_id'))){
246
+ $entityId = $this->getRequest()->getParam('page_id');
247
+ }
248
+ $pageIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_cms_page');
249
+ if(!is_array($pageIds)){
250
+ $pageIds = explode(',', trim($pageIds, ','));
251
+ }
252
+ if( ($key = array_search($entityId, $pageIds)) !== false ){
253
+ unset($pageIds[$key]);
254
+ }
255
+ Mage::getSingleton('adminhtml/session')->setData('straker_new_cms_page', $pageIds);
256
+ $this->_redirect('*/*/addtoconfirm');
257
+ }
258
+
259
+ private function _getParamArray(){
260
+ $data = $this->getRequest()->getParams();
261
+ $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
262
+ $data['attr'] = !empty($data['attr']) ? $data['attr'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_attr');
263
+ $data['cms_page'] = !empty($data['cms_page']) ? $data['cms_page'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_cms_page');
264
+ return $data;
265
+ }
266
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/JobController.php CHANGED
@@ -128,4 +128,16 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_JobControlle
128
  return;
129
  }
130
 
 
 
 
 
 
 
 
 
 
 
 
 
131
  }
128
  return;
129
  }
130
 
131
+ public function gridAction()
132
+ {
133
+ $this->loadLayout();
134
+ $this->getResponse()->setBody(
135
+ $this
136
+ ->getLayout()
137
+ ->createBlock(
138
+ 'strakertranslations_easytranslationplatform/adminhtml_job_grid',
139
+ 'strakertranslations_easytranslationplatform_adminhtml_job_grid'
140
+ )->toHtml()
141
+ );
142
+ }
143
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/controllers/Adminhtml/Straker/ProductController.php CHANGED
@@ -59,15 +59,14 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_ProductContr
59
  $params = $this->getRequest()->getParams();
60
  if (empty($params['store'])) {
61
  $this->_redirect('*/straker_new');
62
- return;
63
  }
64
  elseif (empty($params['attr'])) {
65
- return $this->_initNewAction()
66
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_products_attribute','strakertranslations_easytranslationplatform_new_products_attribute',array('setup_store_id' => $params['store'])))
67
  ->renderLayout();
68
  }
69
  else{
70
- return $this->_initNewAction()
71
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_products','strakertranslations_easytranslationplatform_new_products',array('setup_store_id' => $params['store'], 'attr' => $params['attr'])))
72
  ->renderLayout();
73
  }
@@ -85,10 +84,7 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_ProductContr
85
  }
86
 
87
  public function addtoconfirmAction(){
88
- $data = $this->getRequest()->getParams();
89
- $data['attr'] = !empty($data['attr']) ? $data['attr'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_attr');
90
- $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
91
- $data['product'] = !empty($data['product']) ? $data['product'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_product');
92
  if(!empty($data['attr']) && !empty($data['store']) && !empty($data['product'])){
93
  Mage::getSingleton('adminhtml/session')
94
  ->setData('straker_new_attr', $data['attr'])
@@ -100,7 +96,10 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_ProductContr
100
  ->renderLayout();
101
  }
102
  else {
103
- $this->_redirect('*/straker_new/', $data);
 
 
 
104
  }
105
  }
106
 
@@ -119,7 +118,8 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_ProductContr
119
  ));
120
  return;
121
  }
122
- foreach(explode(',', $data['attr']) as $attributeCode){
 
123
  $attr_ids[] = $attribute = Mage::getSingleton('eav/config')
124
  ->getAttribute(Mage_Catalog_Model_Product::ENTITY, $attributeCode)->getAttributeId();
125
  }
@@ -204,4 +204,83 @@ Class StrakerTranslations_EasyTranslationPlatform_Adminhtml_Straker_ProductContr
204
  $helper = Mage::helper('strakertranslations_easytranslationplatform');
205
  $helper->checkSiteMode();
206
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
207
  }
59
  $params = $this->getRequest()->getParams();
60
  if (empty($params['store'])) {
61
  $this->_redirect('*/straker_new');
 
62
  }
63
  elseif (empty($params['attr'])) {
64
+ $this->_initNewAction()
65
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_products_attribute','strakertranslations_easytranslationplatform_new_products_attribute',array('setup_store_id' => $params['store'])))
66
  ->renderLayout();
67
  }
68
  else{
69
+ $this->_initNewAction()
70
  ->_addContent(Mage::getSingleton('core/layout')->createBlock('strakertranslations_easytranslationplatform/adminhtml_new_products','strakertranslations_easytranslationplatform_new_products',array('setup_store_id' => $params['store'], 'attr' => $params['attr'])))
71
  ->renderLayout();
72
  }
84
  }
85
 
86
  public function addtoconfirmAction(){
87
+ $data = $this->_getParamArray();
 
 
 
88
  if(!empty($data['attr']) && !empty($data['store']) && !empty($data['product'])){
89
  Mage::getSingleton('adminhtml/session')
90
  ->setData('straker_new_attr', $data['attr'])
96
  ->renderLayout();
97
  }
98
  else {
99
+ if(array_key_exists('key', $data)){
100
+ unset($data['key']);
101
+ }
102
+ $this->_redirect('*/*/new/', $data);
103
  }
104
  }
105
 
118
  ));
119
  return;
120
  }
121
+ $attributeCodes = array_unique(explode(',', $data['attr']));
122
+ foreach($attributeCodes as $attributeCode){
123
  $attr_ids[] = $attribute = Mage::getSingleton('eav/config')
124
  ->getAttribute(Mage_Catalog_Model_Product::ENTITY, $attributeCode)->getAttributeId();
125
  }
204
  $helper = Mage::helper('strakertranslations_easytranslationplatform');
205
  $helper->checkSiteMode();
206
  }
207
+
208
+ public function removeFromCartAction(){
209
+ $entityId = 0;
210
+ if(!empty($this->getRequest()->getParam('entity_id'))){
211
+ $entityId = $this->getRequest()->getParam('entity_id');
212
+ }
213
+ $productIds = Mage::getSingleton('adminhtml/session')->getData('straker_new_product');
214
+ if(!is_array($productIds)){
215
+ $productIds = explode(',', trim($productIds, ','));
216
+ }
217
+ if( ($key = array_search($entityId, $productIds)) !== false ){
218
+ unset($productIds[$key]);
219
+ }
220
+ Mage::getSingleton('adminhtml/session')->setData('straker_new_product', $productIds);
221
+ $this->_redirect('*/*/addtoconfirm');
222
+ }
223
+
224
+ public function gridAction()
225
+ {
226
+ $data = $this->_getParamArray();
227
+ $this->loadLayout();
228
+ $this->getResponse()->setBody(
229
+ $this
230
+ ->getLayout()
231
+ ->createBlock(
232
+ 'strakertranslations_easytranslationplatform/adminhtml_new_products_grid',
233
+ 'strakertranslations_easytranslationplatform_new_products_grid',
234
+ [
235
+ 'store' => $data['store'], 'attr' => $data['attr'], 'product' => $data['product']
236
+ ]
237
+ )->toHtml()
238
+ );
239
+ }
240
+
241
+ public function confirmGridAction()
242
+ {
243
+ $data = $this->_getParamArray();
244
+ $this->loadLayout();
245
+ $this->getResponse()->setBody(
246
+ $this
247
+ ->getLayout()
248
+ ->createBlock(
249
+ 'strakertranslations_easytranslationplatform/adminhtml_new_products_confirm_grid',
250
+ 'strakertranslations_easytranslationplatform_new_products_confirm_grid',
251
+ [
252
+ 'store' => $data['store'], 'attr' => $data['attr'], 'product' => $data['product']
253
+ ]
254
+ )->toHtml()
255
+ );
256
+ }
257
+
258
+ public function jobGridAction(){
259
+ $jobId = $this->getRequest()->getParam('job_id');
260
+ $job = Mage::getModel('strakertranslations_easytranslationplatform/job')->load($jobId);
261
+ $statusId = $job->getStatusId();
262
+ // var_dump($params);exit;
263
+ $this->loadLayout();
264
+ $this->getResponse()->setBody(
265
+ $this
266
+ ->getLayout()
267
+ ->createBlock(
268
+ 'strakertranslations_easytranslationplatform/adminhtml_job_product_grid',
269
+ 'strakertranslations_easytranslationplatform_job_product_grid',
270
+ [
271
+ 'job_id' => $jobId
272
+ ]
273
+ )
274
+ ->setStatusId($statusId)
275
+ ->toHtml()
276
+ );
277
+ }
278
+
279
+ private function _getParamArray(){
280
+ $data = $this->getRequest()->getParams();
281
+ $data['attr'] = !empty($data['attr']) ? $data['attr'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_attr');
282
+ $data['store'] = !empty($data['store']) ? $data['store'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_store');
283
+ $data['product'] = !empty($data['product']) ? $data['product'] : Mage::getSingleton('adminhtml/session')->getData('straker_new_product');
284
+ return $data;
285
+ }
286
  }
app/code/community/StrakerTranslations/EasyTranslationPlatform/data/strakertranslations_easytranslationplatform_setup/data-upgrade-1.3.6-1.3.7.php ADDED
@@ -0,0 +1,19 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /* @var $installer Mage_Core_Model_Resource_Setup */
3
+ $installer = $this;
4
+
5
+ $models = ['page', 'block'];
6
+
7
+ foreach( $models as $model ){
8
+ $data = Mage::getModel('strakertranslations_easytranslationplatform/job_cms_' . $model )->getCollection();
9
+ foreach( $data as $d ){
10
+ $origin = $d->getOrigin() ? json_decode($d->getOrigin(), true) : [];
11
+ if( array_key_exists('title', $origin )){
12
+ $d->setTitle($origin['title']);
13
+ }
14
+ if( array_key_exists('identifier', $origin )){
15
+ $d->setIdentifier($origin['identifier']);
16
+ }
17
+ $d->save();
18
+ }
19
+ }
app/code/community/StrakerTranslations/EasyTranslationPlatform/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <StrakerTranslations_EasyTranslationPlatform>
5
- <version>1.3.6</version>
6
  </StrakerTranslations_EasyTranslationPlatform>
7
  </modules>
8
  <global>
@@ -98,12 +98,12 @@
98
  <admin>
99
  <routers>
100
  <adminhtml>
101
- <args>
102
- <modules>
103
- <StrakerTranslations before="Mage_Adminhtml">StrakerTranslations_EasyTranslationPlatform_Adminhtml</StrakerTranslations>
104
- </modules>
105
- </args>
106
- </adminhtml>
107
  </routers>
108
  </admin>
109
  <frontend>
2
  <config>
3
  <modules>
4
  <StrakerTranslations_EasyTranslationPlatform>
5
+ <version>1.3.7</version>
6
  </StrakerTranslations_EasyTranslationPlatform>
7
  </modules>
8
  <global>
98
  <admin>
99
  <routers>
100
  <adminhtml>
101
+ <args>
102
+ <modules>
103
+ <StrakerTranslations before="Mage_Adminhtml">StrakerTranslations_EasyTranslationPlatform_Adminhtml</StrakerTranslations>
104
+ </modules>
105
+ </args>
106
+ </adminhtml>
107
  </routers>
108
  </admin>
109
  <frontend>
app/code/community/StrakerTranslations/EasyTranslationPlatform/etc/system.xml CHANGED
@@ -24,22 +24,31 @@
24
  <show_in_website>1</show_in_website>
25
  <show_in_store>1</show_in_store>
26
  <fields>
27
- <access_token translate="label comment" >
28
- <label>Access Token</label>
29
- <frontend_type>text</frontend_type>
30
- <sort_order>10</sort_order>
31
- <show_in_default>1</show_in_default>
32
- <show_in_website>1</show_in_website>
33
- <show_in_store>1</show_in_store>
34
- </access_token>
35
- <!--<application_key translate="label comment" >-->
36
- <!--<label>Application Key</label>-->
37
- <!--<frontend_type>text</frontend_type>-->
38
- <!--<sort_order>20</sort_order>-->
39
- <!--<show_in_default>1</show_in_default>-->
40
- <!--<show_in_website>1</show_in_website>-->
41
- <!--<show_in_store>1</show_in_store>-->
42
- <!--</application_key>-->
 
 
 
 
 
 
 
 
 
43
  <clear translate="label">
44
  <label>Clear All Language Settings</label>
45
  <frontend_type>button</frontend_type>
@@ -58,92 +67,100 @@
58
  <show_in_website>1</show_in_website>
59
  <show_in_store>1</show_in_store>
60
  </store>
61
- <!--<backup translate="label">-->
62
- <!--<label>Backup Product Data</label>-->
63
- <!--<frontend_type>button</frontend_type>-->
64
- <!--<frontend_model>strakertranslations_easytranslationplatform/adminhtml_system_config_form_backupbutton</frontend_model>-->
65
- <!--<sort_order>40</sort_order>-->
66
- <!--<show_in_default>1</show_in_default>-->
67
- <!--<show_in_website>1</show_in_website>-->
68
- <!--<show_in_store>1</show_in_store>-->
69
- <!--</backup>-->
70
- <!--<restore translate="label">-->
71
- <!--<label>Backup Product Data</label>-->
72
- <!--<frontend_type>button</frontend_type>-->
73
- <!--<frontend_model>strakertranslations_easytranslationplatform/adminhtml_system_config_form_restorebutton</frontend_model>-->
74
- <!--<sort_order>50</sort_order>-->
75
- <!--<show_in_default>1</show_in_default>-->
76
- <!--<show_in_website>1</show_in_website>-->
77
- <!--<show_in_store>1</show_in_store>-->
78
- <!--</restore>-->
79
  </fields>
80
  </general>
81
- <!--<api_url translate="label">-->
82
- <!--<label>Api Url</label>-->
83
- <!--<frontend_type>text</frontend_type>-->
84
- <!--<sort_order>100</sort_order>-->
85
- <!--<show_in_default>1</show_in_default>-->
86
- <!--<show_in_website>1</show_in_website>-->
87
- <!--<show_in_store>1</show_in_store>-->
88
- <!--<fields>-->
89
- <!--<register translate="label comment" >-->
90
- <!--<label>Register</label>-->
91
- <!--<frontend_type>text</frontend_type>-->
92
- <!--<sort_order>10</sort_order>-->
93
- <!--<show_in_default>1</show_in_default>-->
94
- <!--<show_in_website>1</show_in_website>-->
95
- <!--<show_in_store>1</show_in_store>-->
96
- <!--</register>-->
97
- <!--<languages translate="label comment" >-->
98
- <!--<label>Languages</label>-->
99
- <!--<frontend_type>text</frontend_type>-->
100
- <!--<sort_order>30</sort_order>-->
101
- <!--<show_in_default>1</show_in_default>-->
102
- <!--<show_in_website>1</show_in_website>-->
103
- <!--<show_in_store>1</show_in_store>-->
104
- <!--</languages>-->
105
- <!--<translate translate="label comment" >-->
106
- <!--<label>Translate</label>-->
107
- <!--<frontend_type>text</frontend_type>-->
108
- <!--<sort_order>40</sort_order>-->
109
- <!--<show_in_default>1</show_in_default>-->
110
- <!--<show_in_website>1</show_in_website>-->
111
- <!--<show_in_store>1</show_in_store>-->
112
- <!--</translate>-->
113
- <!--<countries translate="label comment" >-->
114
- <!--<label>Countries</label>-->
115
- <!--<frontend_type>text</frontend_type>-->
116
- <!--<sort_order>20</sort_order>-->
117
- <!--<show_in_default>1</show_in_default>-->
118
- <!--<show_in_website>1</show_in_website>-->
119
- <!--<show_in_store>1</show_in_store>-->
120
- <!--</countries>-->
121
- <!--<quote translate="label comment" >-->
122
- <!--<label>Quote</label>-->
123
- <!--<frontend_type>text</frontend_type>-->
124
- <!--<sort_order>20</sort_order>-->
125
- <!--<show_in_default>1</show_in_default>-->
126
- <!--<show_in_website>1</show_in_website>-->
127
- <!--<show_in_store>1</show_in_store>-->
128
- <!--</quote>-->
129
- <!--<payment translate="label comment" >-->
130
- <!--<label>Payment</label>-->
131
- <!--<frontend_type>text</frontend_type>-->
132
- <!--<sort_order>50</sort_order>-->
133
- <!--<show_in_default>1</show_in_default>-->
134
- <!--<show_in_website>1</show_in_website>-->
135
- <!--<show_in_store>1</show_in_store>-->
136
- <!--</payment>-->
137
- <!--<payment_page translate="label comment" >-->
138
- <!--<label>Payment Page</label>-->
139
- <!--<frontend_type>text</frontend_type>-->
140
- <!--<sort_order>50</sort_order>-->
141
- <!--<show_in_default>1</show_in_default>-->
142
- <!--<show_in_website>1</show_in_website>-->
143
- <!--<show_in_store>1</show_in_store>-->
144
- <!--</payment_page>-->
145
- <!--</fields>-->
146
- <!--</api_url>-->
 
 
 
 
 
 
 
 
147
  </groups>
148
  </straker>
149
  </sections>
24
  <show_in_website>1</show_in_website>
25
  <show_in_store>1</show_in_store>
26
  <fields>
27
+ <!--<site_mode translate="label comment" >-->
28
+ <!--<label>Site Mode</label>-->
29
+ <!--<frontend_type>select</frontend_type>-->
30
+ <!--<sort_order>0</sort_order>-->
31
+ <!--<source_model>strakertranslations_easytranslationplatform/system_config_source_siteMode</source_model>-->
32
+ <!--<show_in_default>1</show_in_default>-->
33
+ <!--<show_in_website>1</show_in_website>-->
34
+ <!--<show_in_store>1</show_in_store>-->
35
+ <!--</site_mode>-->
36
+ <!-- <access_token translate="label comment" > -->
37
+ <!-- <label>Access Token</label> -->
38
+ <!-- <frontend_type>text</frontend_type> -->
39
+ <!-- <sort_order>10</sort_order> -->
40
+ <!-- <show_in_default>1</show_in_default> -->
41
+ <!-- <show_in_website>1</show_in_website> -->
42
+ <!-- <show_in_store>1</show_in_store> -->
43
+ <!-- </access_token> -->
44
+ <!-- <application_key translate="label comment" > -->
45
+ <!-- <label>Application Key</label> -->
46
+ <!-- <frontend_type>text</frontend_type> -->
47
+ <!-- <sort_order>20</sort_order> -->
48
+ <!-- <show_in_default>1</show_in_default> -->
49
+ <!-- <show_in_website>1</show_in_website> -->
50
+ <!-- <show_in_store>1</show_in_store> -->
51
+ <!-- </application_key> -->
52
  <clear translate="label">
53
  <label>Clear All Language Settings</label>
54
  <frontend_type>button</frontend_type>
67
  <show_in_website>1</show_in_website>
68
  <show_in_store>1</show_in_store>
69
  </store>
70
+ <!-- <backup translate="label"> -->
71
+ <!-- <label>Backup Product Data</label> -->
72
+ <!-- <frontend_type>button</frontend_type> -->
73
+ <!-- <frontend_model>strakertranslations_easytranslationplatform/adminhtml_system_config_form_backupbutton</frontend_model> -->
74
+ <!-- <sort_order>50</sort_order> -->
75
+ <!-- <show_in_default>1</show_in_default> -->
76
+ <!-- <show_in_website>1</show_in_website> -->
77
+ <!-- <show_in_store>1</show_in_store> -->
78
+ <!-- </backup> -->
79
+ <!-- <restore translate="label"> -->
80
+ <!-- <label>Backup Product Data</label> -->
81
+ <!-- <frontend_type>button</frontend_type> -->
82
+ <!-- <frontend_model>strakertranslations_easytranslationplatform/adminhtml_system_config_form_restorebutton</frontend_model> -->
83
+ <!-- <sort_order>60</sort_order> -->
84
+ <!-- <show_in_default>1</show_in_default> -->
85
+ <!-- <show_in_website>1</show_in_website> -->
86
+ <!-- <show_in_store>1</show_in_store> -->
87
+ <!-- </restore> -->
88
  </fields>
89
  </general>
90
+ <!-- <api_url translate="label"> -->
91
+ <!-- <label>Api Url</label> -->
92
+ <!-- <frontend_type>text</frontend_type> -->
93
+ <!-- <sort_order>100</sort_order> -->
94
+ <!-- <show_in_default>1</show_in_default> -->
95
+ <!-- <show_in_website>1</show_in_website> -->
96
+ <!-- <show_in_store>1</show_in_store> -->
97
+ <!-- <fields> -->
98
+ <!-- <register translate="label comment" > -->
99
+ <!-- <label>Register</label> -->
100
+ <!-- <frontend_type>text</frontend_type> -->
101
+ <!-- <sort_order>10</sort_order> -->
102
+ <!-- <show_in_default>1</show_in_default> -->
103
+ <!-- <show_in_website>1</show_in_website> -->
104
+ <!-- <show_in_store>1</show_in_store> -->
105
+ <!-- </register> -->
106
+ <!-- <quote translate="label comment" > -->
107
+ <!-- <label>Quote</label> -->
108
+ <!-- <frontend_type>text</frontend_type> -->
109
+ <!-- <sort_order>20</sort_order> -->
110
+ <!-- <show_in_default>1</show_in_default> -->
111
+ <!-- <show_in_website>1</show_in_website> -->
112
+ <!-- <show_in_store>1</show_in_store> -->
113
+ <!-- </quote> -->
114
+ <!-- <countries translate="label comment" > -->
115
+ <!-- <label>Countries</label> -->
116
+ <!-- <frontend_type>text</frontend_type> -->
117
+ <!-- <sort_order>30</sort_order> -->
118
+ <!-- <show_in_default>1</show_in_default> -->
119
+ <!-- <show_in_website>1</show_in_website> -->
120
+ <!-- <show_in_store>1</show_in_store> -->
121
+ <!-- </countries> -->
122
+ <!-- <languages translate="label comment" > -->
123
+ <!-- <label>Languages</label> -->
124
+ <!-- <frontend_type>text</frontend_type> -->
125
+ <!-- <sort_order>40</sort_order> -->
126
+ <!-- <show_in_default>1</show_in_default> -->
127
+ <!-- <show_in_website>1</show_in_website> -->
128
+ <!-- <show_in_store>1</show_in_store> -->
129
+ <!-- </languages> -->
130
+ <!-- <translate translate="label comment" > -->
131
+ <!-- <label>Translate</label> -->
132
+ <!-- <frontend_type>text</frontend_type> -->
133
+ <!-- <sort_order>50</sort_order> -->
134
+ <!-- <show_in_default>1</show_in_default> -->
135
+ <!-- <show_in_website>1</show_in_website> -->
136
+ <!-- <show_in_store>1</show_in_store> -->
137
+ <!-- </translate> -->
138
+ <!-- <translate_sandbox translate="label comment" > -->
139
+ <!-- <label>Translate (Sandbox)</label> -->
140
+ <!-- <frontend_type>text</frontend_type> -->
141
+ <!-- <sort_order>50</sort_order> -->
142
+ <!-- <show_in_default>0</show_in_default> -->
143
+ <!-- <show_in_website>0</show_in_website> -->
144
+ <!-- <show_in_store>0</show_in_store> -->
145
+ <!-- </translate_sandbox> -->
146
+ <!-- <payment_page translate="label comment" > -->
147
+ <!-- <label>Payment Page</label> -->
148
+ <!-- <frontend_type>text</frontend_type> -->
149
+ <!-- <sort_order>70</sort_order> -->
150
+ <!-- <show_in_default>1</show_in_default> -->
151
+ <!-- <show_in_website>1</show_in_website> -->
152
+ <!-- <show_in_store>1</show_in_store> -->
153
+ <!-- </payment_page> -->
154
+ <!-- <payment translate="label comment" > -->
155
+ <!-- <label>Payment</label> -->
156
+ <!-- <frontend_type>text</frontend_type> -->
157
+ <!-- <sort_order>80</sort_order> -->
158
+ <!-- <show_in_default>1</show_in_default> -->
159
+ <!-- <show_in_website>1</show_in_website> -->
160
+ <!-- <show_in_store>1</show_in_store> -->
161
+ <!-- </payment> -->
162
+ <!-- </fields> -->
163
+ <!-- </api_url> -->
164
  </groups>
165
  </straker>
166
  </sections>
app/code/community/StrakerTranslations/EasyTranslationPlatform/sql/strakertranslations_easytranslationplatform_setup/upgrade-1.3.0-1.3.1.php CHANGED
@@ -89,3 +89,5 @@ if ($connection->isTableExists($tableName) == true) {
89
  // }
90
  //
91
  // }
 
 
89
  // }
90
  //
91
  // }
92
+
93
+ $installer->endSetup();
app/code/community/StrakerTranslations/EasyTranslationPlatform/sql/strakertranslations_easytranslationplatform_setup/upgrade-1.3.3-1.3.4.php CHANGED
@@ -78,3 +78,5 @@ $installer->getConnection()
78
  'default' => 0
79
  ]
80
  );
 
 
78
  'default' => 0
79
  ]
80
  );
81
+
82
+ $installer->endSetup();
app/code/community/StrakerTranslations/EasyTranslationPlatform/sql/strakertranslations_easytranslationplatform_setup/upgrade-1.3.6-1.3.7.php ADDED
@@ -0,0 +1,36 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /** @var $installer Mage_Eav_Model_Entity_Setup */
4
+ $installer = $this;
5
+ $connection = $installer->getConnection();
6
+
7
+ $tables = [
8
+ 'straker_job_cmsblock',
9
+ 'straker_job_cmspage'
10
+ ];
11
+
12
+ foreach($tables as $table){
13
+ $tableName = $installer->getTable($table);
14
+ if ($connection->isTableExists($tableName) === true){
15
+ $connection->addColumn( $tableName, 'title',
16
+ [
17
+ 'type' => Varien_Db_Ddl_Table::TYPE_TEXT,
18
+ 'length' => 255,
19
+ 'comment' => 'Title',
20
+ 'nullable' => true,
21
+ 'default' => null
22
+ ]
23
+ );
24
+ $connection->addColumn( $tableName, 'identifier',
25
+ [
26
+ 'type' => Varien_Db_Ddl_Table::TYPE_TEXT,
27
+ 'length' => 100,
28
+ 'comment' => 'Identifier',
29
+ 'nullable' => true,
30
+ 'default' => null
31
+ ]
32
+ );
33
+ }
34
+ }
35
+
36
+ $installer->endSetup();
app/design/adminhtml/default/straker/template/straker/new/attribute.phtml CHANGED
@@ -16,7 +16,7 @@
16
  <ol class="wizard" data-wizard-steps="4">
17
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
18
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
19
- <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
20
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
21
  </ol>
22
  <div>
@@ -28,4 +28,9 @@
28
  $('attributeGrid').insert({after: buttonHtml});
29
  $$('.content-header-floating .content-header td.a-right')[0].insert(buttonHtml);
30
  });
31
- </script>
 
 
 
 
 
16
  <ol class="wizard" data-wizard-steps="4">
17
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
18
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
19
+ <li class="wizard-current"><?php echo $this->__('Select Content') ?></li>
20
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
21
  </ol>
22
  <div>
28
  $('attributeGrid').insert({after: buttonHtml});
29
  $$('.content-header-floating .content-header td.a-right')[0].insert(buttonHtml);
30
  });
31
+ <?php if($this->getRequest()->getParam('from') === 'confirm' ): ?>
32
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.checkedString = '<?php echo join(',', $this->getChild('grid')->getSelectedIds()); ?>';
33
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.checkCheckboxes();
34
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.updateCount();
35
+ <?php endif; ?>
36
+ </script>
app/design/adminhtml/default/straker/template/straker/new/attribute/confirm.phtml CHANGED
@@ -17,12 +17,13 @@
17
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
18
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
19
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
20
- <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
21
  </ol>
22
  <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_attribute/new", array(
23
  'store'=>$this->getStore(),
24
- 'internal_attribute'=>implode(',', $this->getAttribute()),
25
- 'internal_option'=>$this->getOption()
 
26
  ) ) ?>"><?php echo $this->__('Edit Attributes') ?></a>
27
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_attribute/submitjob") ?>" method="post">
28
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
@@ -36,6 +37,7 @@
36
  <script>
37
  Event.observe(window, "load", function() {
38
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
39
- $('strakerAttribute').insert({after: buttonHtml});
40
  });
 
41
  </script>
17
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
18
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
19
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
20
+ <li class="wizard-current"><?php echo $this->__('Confirm Content') ?></li>
21
  </ol>
22
  <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_attribute/new", array(
23
  'store'=>$this->getStore(),
24
+ 'from' => 'confirm'
25
+ // 'internal_attribute'=>implode(',', $this->getAttribute()),
26
+ // 'internal_option'=>$this->getOption()
27
  ) ) ?>"><?php echo $this->__('Edit Attributes') ?></a>
28
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_attribute/submitjob") ?>" method="post">
29
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
37
  <script>
38
  Event.observe(window, "load", function() {
39
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
40
+ $('strakerAttributeConfirm').insert({after: buttonHtml});
41
  });
42
+
43
  </script>
app/design/adminhtml/default/straker/template/straker/new/attribute/massaction.phtml CHANGED
@@ -26,8 +26,8 @@
26
  ?>
27
  <div id="<?php echo $this->getHtmlId() ?>">
28
  <table cellspacing="0" cellpadding="0" class="massaction">
29
- <tr>
30
- <td>
31
  <div id="massaction-attribute-label-wrapper">
32
  <?php if ($this->getUseSelectAll()):?>
33
  <a href="#" onclick="return <?php echo $this->getJsObjectName() ?>.selectAll()"><?php echo $this->__('Select All') ?></a>
@@ -38,23 +38,27 @@
38
  <a href="#" onclick="return <?php echo $this->getJsObjectName() ?>.selectVisible()"><?php echo $this->__('Select Visible') ?></a>
39
  <span class="separator">|</span>
40
  <a href="#" onclick="return <?php echo $this->getJsObjectName() ?>.unselectVisible()"><?php echo $this->__('Unselect Visible') ?></a>
41
- <span class="separator">|</span><br />
42
  <strong id="<?php echo $this->getHtmlId() ?>-count">0</strong> <?php echo $this->__('items selected') ?>
43
  </div>
 
 
44
  <div id="massaction-attribute-option-wrapper">
45
  <?php if ($this->getUseSelectAll()):?>
46
- <a href="#" onclick="selectAllMassActionOptions()"><?php echo $this->__('Select All') ?></a>
47
  <span class="separator">|</span>
48
- <a href="#" onclick="unselectAllMassActionOptions()"><?php echo $this->__('Unselect All') ?></a>
49
  <span class="separator">|</span>
50
  <?php endif; ?>
51
- <a href="#" onclick="selectVisibleMassActionOptions()"><?php echo $this->__('Select Visible') ?></a>
 
 
52
  <span class="separator">|</span>
53
- <a href="#" onclick="unselectVisibleMassActionOptions()"><?php echo $this->__('Unselect Visible') ?></a>
54
- <span class="separator">|</span><br />
55
  <strong id="mass-action-options-count">0</strong> <?php echo $this->__('items selected') ?>
56
  </div>
57
  </td>
 
 
58
  <td>
59
  <div class="right">
60
  <div class="entry-edit">
@@ -75,7 +79,7 @@
75
  </span>
76
  <span class="outer-span" id="<?php echo $this->getHtmlId() ?>-form-hiddens"></span>
77
  <span class="outer-span" id="<?php echo $this->getHtmlId() ?>-form-additional"></span>
78
- <span class="field-row">
79
  <?php echo $this->getApplyButtonHtml() ?>
80
  </span>
81
  </fieldset>
@@ -101,9 +105,10 @@
101
  </script>
102
  <?php endif; ?>
103
  <script>
104
- <?php //JS to control attribute option checkboxes ?>
105
  var allAttributesWithOptions = <?php echo json_encode( $this->getParentBlock()->getAttributesWithOption() ) ?>;
106
- selectAllMassActionOptions = function(){
 
107
  $$('.checkbox-option').each(function(checkbox) {
108
  if(allAttributesWithOptions.indexOf(checkbox.value) !== -1){
109
  checkbox.checked = 1
@@ -112,7 +117,8 @@
112
  $$('#attributeGrid_massaction-form input[name=option]')[0].value = allAttributesWithOptions;
113
  $('mass-action-options-count').update(allAttributesWithOptions.length);
114
  };
115
- unselectAllMassActionOptions = function(){
 
116
  $$('.checkbox-option').each(function(checkbox) {
117
  if(allAttributesWithOptions.indexOf(checkbox.value) !== -1){
118
  checkbox.checked = 0;
@@ -121,8 +127,8 @@
121
  $$('#attributeGrid_massaction-form input[name=option]')[0].value = '';
122
  $('mass-action-options-count').update(0);
123
  };
124
- selectVisibleMassActionOptions = function(){
125
-
126
  var optionArray = $$('#attributeGrid_massaction-form input[name=option]')[0].value === '' ? [] : $$('#attributeGrid_massaction-form input[name=option]')[0].value.split(',');
127
 
128
  $$('.checkbox-option').each(function(checkbox) {
@@ -134,7 +140,8 @@
134
  $$('#attributeGrid_massaction-form input[name=option]')[0].value = optionArray;
135
  $('mass-action-options-count').update(optionArray.length);
136
  };
137
- unselectVisibleMassActionOptions = function(){
 
138
  var optionArray = $$('#attributeGrid_massaction-form input[name=option]')[0].value.split(',');
139
 
140
  $$('.checkbox-option').each(function(checkbox) {
@@ -152,10 +159,125 @@
152
  $('mass-action-options-count').update(optionArray.length);
153
  }
154
  };
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
155
 
156
- document.observe("dom:loaded", function() {
157
- $$('#attributeGrid_table tr.filter th:nth(1)')[0].update($('massaction-attribute-label-wrapper'));
158
- $$('#attributeGrid_table tr.filter th:nth(3)')[0].update($('massaction-attribute-option-wrapper'));
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
159
  $$('.checkbox-option').each(function(element) {
160
  element.observe('click', function(e){
161
  var optionArray = $$('#attributeGrid_massaction-form input[name=option]')[0].value === '' ? [] : $$('#attributeGrid_massaction-form input[name=option]')[0].value.split(',');
@@ -179,8 +301,6 @@
179
  }
180
  });
181
  });
182
-
183
-
184
  var initOptionArray = $$('#attributeGrid_massaction-form input[name=option]')[0].value === '' ? [] : $$('#attributeGrid_massaction-form input[name=option]')[0].value.split(',');
185
  $$('.checkbox-option').each(function(checkbox) {
186
  if(initOptionArray.indexOf(checkbox.value) !== -1){
@@ -191,7 +311,6 @@
191
  }
192
  });
193
  $('mass-action-options-count').update(initOptionArray.length);
194
-
195
  $$('.massaction-checkbox').each(function(element) {
196
  element.observe('click', function(e){
197
  if( typeof(e.target.up('tr').down('.checkbox-option')) !== 'undefined' &&
@@ -204,7 +323,6 @@
204
  }
205
  });
206
  });
207
-
208
  $$('.checkbox-option').each(function(element) {
209
  element.observe('click', function(e){
210
  if(e.target.checked && !e.target.up('tr').down('.massaction-checkbox').checked){
@@ -212,65 +330,12 @@
212
  }
213
  });
214
  });
215
-
216
- });
217
-
218
- varienGrid.prototype.rowMouseClick = function(){
219
- if(event.element().matches('input[type=checkbox]') && this.rowClickCallback){
220
- try{
221
- this.rowClickCallback(this, event);
222
- }
223
- catch(e){}
224
- }
225
- varienGlobalEvents.fireEvent('gridRowClick', event);
226
- };
227
- varienGrid.prototype.setPage = function(pageNumber){
228
- this.addVarToUrl('internal_option', $$('#attributeGrid_massaction-form input[name=option]')[0].value)
229
- this.reload(this.addVarToUrl(this.pageVar, pageNumber));
230
  };
231
-
232
- varienGrid.prototype.addVarToUrl = function(varName, varValue){
233
- this.url = this._addVarToUrl(this.url, varName, varValue);
234
- return this.url;
235
- }
236
-
237
- varienGridMassaction.prototype.apply = function() {
238
- if(varienStringArray.count(this.checkedString) == 0 && varienStringArray.count($$('#attributeGrid_massaction-form input[name=option]')[0].value) == 0) {
239
- alert(this.errorText);
240
- return;
241
- }
242
-
243
- var item = this.getSelectedItem();
244
- if(!item) {
245
- this.validator.validate();
246
- return;
247
- }
248
- this.currentItem = item;
249
- var fieldName = (item.field ? item.field : this.formFieldName);
250
- var fieldsHtml = '';
251
-
252
- if(this.currentItem.confirm && !window.confirm(this.currentItem.confirm)) {
253
- return;
254
- }
255
-
256
- this.formHiddens.update('');
257
- new Insertion.Bottom(this.formHiddens, this.fieldTemplate.evaluate({name: fieldName, value: this.checkedString}));
258
- new Insertion.Bottom(this.formHiddens, this.fieldTemplate.evaluate({name: 'massaction_prepare_key', value: fieldName}));
259
-
260
- if(!this.validator.validate()) {
261
- return;
262
- }
263
-
264
- if(this.useAjax && item.url) {
265
- new Ajax.Request(item.url, {
266
- 'method': 'post',
267
- 'parameters': this.form.serialize(true),
268
- 'onComplete': this.onMassactionComplete.bind(this)
269
- });
270
- } else if(item.url) {
271
- this.form.action = item.url;
272
- this.form.submit();
273
- }
274
  }
 
 
 
275
  </script>
276
  </div>
26
  ?>
27
  <div id="<?php echo $this->getHtmlId() ?>">
28
  <table cellspacing="0" cellpadding="0" class="massaction">
29
+ <tr id="massactions-wrapper">
30
+ <td colspan="3">
31
  <div id="massaction-attribute-label-wrapper">
32
  <?php if ($this->getUseSelectAll()):?>
33
  <a href="#" onclick="return <?php echo $this->getJsObjectName() ?>.selectAll()"><?php echo $this->__('Select All') ?></a>
38
  <a href="#" onclick="return <?php echo $this->getJsObjectName() ?>.selectVisible()"><?php echo $this->__('Select Visible') ?></a>
39
  <span class="separator">|</span>
40
  <a href="#" onclick="return <?php echo $this->getJsObjectName() ?>.unselectVisible()"><?php echo $this->__('Unselect Visible') ?></a>
41
+ <span class="separator">|</span>
42
  <strong id="<?php echo $this->getHtmlId() ?>-count">0</strong> <?php echo $this->__('items selected') ?>
43
  </div>
44
+ </td>
45
+ <td colspan="3">
46
  <div id="massaction-attribute-option-wrapper">
47
  <?php if ($this->getUseSelectAll()):?>
48
+ <a href="#" onclick="return selectAllMassActionOptions(event)"><?php echo $this->__('Select All') ?></a>
49
  <span class="separator">|</span>
50
+ <a href="#" onclick="return unselectAllMassActionOptions(event)"><?php echo $this->__('Unselect All') ?></a>
51
  <span class="separator">|</span>
52
  <?php endif; ?>
53
+ <a href="#" onclick="return selectVisibleMassActionOptions(event)"><?php echo $this->__('Select Visible') ?></a>
54
+ <span class="separator">|</span>
55
+ <a href="#" onclick="return unselectVisibleMassActionOptions(event)"><?php echo $this->__('Unselect Visible') ?></a>
56
  <span class="separator">|</span>
 
 
57
  <strong id="mass-action-options-count">0</strong> <?php echo $this->__('items selected') ?>
58
  </div>
59
  </td>
60
+ </tr>
61
+ <tr>
62
  <td>
63
  <div class="right">
64
  <div class="entry-edit">
79
  </span>
80
  <span class="outer-span" id="<?php echo $this->getHtmlId() ?>-form-hiddens"></span>
81
  <span class="outer-span" id="<?php echo $this->getHtmlId() ?>-form-additional"></span>
82
+ <span class="field-row">
83
  <?php echo $this->getApplyButtonHtml() ?>
84
  </span>
85
  </fieldset>
105
  </script>
106
  <?php endif; ?>
107
  <script>
108
+ //JS to control attribute option checkboxes
109
  var allAttributesWithOptions = <?php echo json_encode( $this->getParentBlock()->getAttributesWithOption() ) ?>;
110
+ selectAllMassActionOptions = function(e){
111
+ e.preventDefault();
112
  $$('.checkbox-option').each(function(checkbox) {
113
  if(allAttributesWithOptions.indexOf(checkbox.value) !== -1){
114
  checkbox.checked = 1
117
  $$('#attributeGrid_massaction-form input[name=option]')[0].value = allAttributesWithOptions;
118
  $('mass-action-options-count').update(allAttributesWithOptions.length);
119
  };
120
+ unselectAllMassActionOptions = function(e){
121
+ e.preventDefault();
122
  $$('.checkbox-option').each(function(checkbox) {
123
  if(allAttributesWithOptions.indexOf(checkbox.value) !== -1){
124
  checkbox.checked = 0;
127
  $$('#attributeGrid_massaction-form input[name=option]')[0].value = '';
128
  $('mass-action-options-count').update(0);
129
  };
130
+ selectVisibleMassActionOptions = function(e){
131
+ e.preventDefault();
132
  var optionArray = $$('#attributeGrid_massaction-form input[name=option]')[0].value === '' ? [] : $$('#attributeGrid_massaction-form input[name=option]')[0].value.split(',');
133
 
134
  $$('.checkbox-option').each(function(checkbox) {
140
  $$('#attributeGrid_massaction-form input[name=option]')[0].value = optionArray;
141
  $('mass-action-options-count').update(optionArray.length);
142
  };
143
+ unselectVisibleMassActionOptions = function(e){
144
+ e.preventDefault();
145
  var optionArray = $$('#attributeGrid_massaction-form input[name=option]')[0].value.split(',');
146
 
147
  $$('.checkbox-option').each(function(checkbox) {
159
  $('mass-action-options-count').update(optionArray.length);
160
  }
161
  };
162
+ varienGrid.prototype.rowMouseClick = function(){
163
+ if(event.element().matches('input[type=checkbox]') && this.rowClickCallback){
164
+ try{
165
+ this.rowClickCallback(this, event);
166
+ }
167
+ catch(e){}
168
+ }
169
+ varienGlobalEvents.fireEvent('gridRowClick', event);
170
+ };
171
+ varienGrid.prototype.reload = function(url){
172
+ if (!this.reloadParams) {
173
+ this.reloadParams = {form_key: FORM_KEY};
174
+ }
175
+ else {
176
+ this.reloadParams.form_key = FORM_KEY;
177
+ }
178
+ url = url || this.url;
179
+ if(this.useAjax){
180
+ // this.reloadParams.internal_option = $$('#attributeGrid_massaction-form input[name=option]')[0].value;
181
+ new Ajax.Request(url + (url.match(new RegExp('\\?')) ? '&ajax=true' : '?ajax=true' ), {
182
+ loaderArea: this.containerId,
183
+ parameters: this.reloadParams || {},
184
+ evalScripts: true,
185
+ onFailure: this._processFailure.bind(this),
186
+ onComplete: this.initGridAjax.bind(this),
187
+ onSuccess: function(transport) {
188
+ try {
189
+ var responseText = transport.responseText.replace(/>\s+</g, '><');
190
 
191
+ if (transport.responseText.isJSON()) {
192
+ var response = transport.responseText.evalJSON()
193
+ if (response.error) {
194
+ alert(response.message);
195
+ }
196
+ if(response.ajaxExpired && response.ajaxRedirect) {
197
+ setLocation(response.ajaxRedirect);
198
+ }
199
+ } else {
200
+ /**
201
+ * For IE <= 7.
202
+ * If there are two elements, and first has name, that equals id of second.
203
+ * In this case, IE will choose one that is above
204
+ *
205
+ * @see https://prototype.lighthouseapp.com/projects/8886/tickets/994-id-selector-finds-elements-by-name-attribute-in-ie7
206
+ */
207
+ var divId = $(this.containerId);
208
+ if (divId.id == this.containerId) {
209
+ divId.update(responseText);
210
+ } else {
211
+ $$('div[id="'+this.containerId+'"]')[0].update(responseText);
212
+ }
213
+ }
214
+ } catch (e) {
215
+ var divId = $(this.containerId);
216
+ if (divId.id == this.containerId) {
217
+ divId.update(responseText);
218
+ } else {
219
+ $$('div[id="'+this.containerId+'"]')[0].update(responseText);
220
+ }
221
+ }
222
+ }.bind(this)
223
+ });
224
+ return;
225
+ }
226
+ else{
227
+ if(this.reloadParams){
228
+ $H(this.reloadParams).each(function(pair){
229
+ url = this.addVarToUrl(pair.key, pair.value);
230
+ }.bind(this));
231
+ }
232
+ location.href = url;
233
+ }
234
+ };
235
+ varienGrid.prototype.setPage = function(pageNumber){
236
+ this.reloadParams.internal_option = $$('#attributeGrid_massaction-form input[name=option]')[0].value;
237
+ this.reload(this.addVarToUrl(this.pageVar, pageNumber));
238
+ };
239
+ varienGridMassaction.prototype.apply = function() {
240
+ if(varienStringArray.count(this.checkedString) == 0 && varienStringArray.count($$('#attributeGrid_massaction-form input[name=option]')[0].value) == 0) {
241
+ alert(this.errorText);
242
+ return;
243
+ }
244
+ var item = this.getSelectedItem();
245
+
246
+ if(!item) {
247
+ this.validator.validate();
248
+ return;
249
+ }
250
+ this.currentItem = item;
251
+ var fieldName = (item.field ? item.field : this.formFieldName);
252
+ var fieldsHtml = '';
253
+
254
+ if(this.currentItem.confirm && !window.confirm(this.currentItem.confirm)) {
255
+ return;
256
+ }
257
+ this.formHiddens.update('');
258
+
259
+ new Insertion.Bottom(this.formHiddens, this.fieldTemplate.evaluate({name: fieldName, value: this.checkedString}));
260
+ new Insertion.Bottom(this.formHiddens, this.fieldTemplate.evaluate({name: 'massaction_prepare_key', value: fieldName}));
261
+
262
+ if(!this.validator.validate()) {
263
+ return;
264
+ }
265
+
266
+ if(this.useAjax && item.url) {
267
+ new Ajax.Request(item.url, {
268
+ 'method': 'post',
269
+ 'parameters': this.form.serialize(true),
270
+ 'onComplete': this.onMassactionComplete.bind(this)
271
+ });
272
+ } else if(item.url) {
273
+ this.form.action = item.url;
274
+ this.form.submit();
275
+ }
276
+ };
277
+ initGrid = function () {
278
+ // $$('#attributeGrid_table tr.filter th:nth(1)')[0].update($('massaction-attribute-label-wrapper'));
279
+ // $$('#attributeGrid_table tr.filter th:nth(3)')[0].update($('massaction-attribute-option-wrapper')
280
+ $$('#attributeGrid_table thead')[0].insert({top: $('massactions-wrapper')});
281
  $$('.checkbox-option').each(function(element) {
282
  element.observe('click', function(e){
283
  var optionArray = $$('#attributeGrid_massaction-form input[name=option]')[0].value === '' ? [] : $$('#attributeGrid_massaction-form input[name=option]')[0].value.split(',');
301
  }
302
  });
303
  });
 
 
304
  var initOptionArray = $$('#attributeGrid_massaction-form input[name=option]')[0].value === '' ? [] : $$('#attributeGrid_massaction-form input[name=option]')[0].value.split(',');
305
  $$('.checkbox-option').each(function(checkbox) {
306
  if(initOptionArray.indexOf(checkbox.value) !== -1){
311
  }
312
  });
313
  $('mass-action-options-count').update(initOptionArray.length);
 
314
  $$('.massaction-checkbox').each(function(element) {
315
  element.observe('click', function(e){
316
  if( typeof(e.target.up('tr').down('.checkbox-option')) !== 'undefined' &&
323
  }
324
  });
325
  });
 
326
  $$('.checkbox-option').each(function(element) {
327
  element.observe('click', function(e){
328
  if(e.target.checked && !e.target.up('tr').down('.massaction-checkbox').checked){
330
  }
331
  });
332
  });
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
333
  };
334
+ if( typeof $$('#attributeGrid_table tr.filter th:nth(1)')[0] !== 'undefined' ){
335
+ initGrid();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
336
  }
337
+ document.observe("dom:loaded", function() {
338
+ initGrid();
339
+ });
340
  </script>
341
  </div>
app/design/adminhtml/default/straker/template/straker/new/category/attributes.phtml CHANGED
@@ -3,7 +3,7 @@
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
6
- <li class="wizard-todo"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
9
  </ol>
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
6
+ <li class="wizard-current"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
9
  </ol>
app/design/adminhtml/default/straker/template/straker/new/category/confirm.phtml CHANGED
@@ -14,10 +14,11 @@
14
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
15
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
16
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
17
- <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
18
  </ol>
19
  <?php $params = Mage::app()->getRequest()->getParams(); ?>
20
- <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_category/new", array('store'=>$this->getStore(), 'attr'=>$this->getAttr(), 'internal_category'=> implode(',', $this->getCategory()))) ?>"><?php echo $this->__('Edit Categories') ?></a>
 
21
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_category/submitjob") ?>" method="post">
22
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
23
  <input type="hidden" name="category" value="<?php echo implode(',', $this->getCategory()) ?>" >
@@ -33,6 +34,6 @@
33
  <script>
34
  Event.observe(window, "load", function() {
35
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
36
- $('strakerProducts').insert({after: buttonHtml});
37
  });
38
  </script>
14
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
15
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
16
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
17
+ <li class="wizard-current"><?php echo $this->__('Confirm Content') ?></li>
18
  </ol>
19
  <?php $params = Mage::app()->getRequest()->getParams(); ?>
20
+ <!--<a href="--><?php //echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_category/new", array('store'=>$this->getStore(), 'attr'=>$this->getAttr(), 'internal_category'=> implode(',', $this->getCategory()))) ?><!--">--><?php //echo $this->__('Edit Categories') ?><!--</a>-->
21
+ <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_category/new", array('store'=>$this->getStore(), 'attr'=>$this->getAttr(), 'from' => 'confirm' )) ?>"><?php echo $this->__('Edit Categories') ?></a>
22
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_category/submitjob") ?>" method="post">
23
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
24
  <input type="hidden" name="category" value="<?php echo implode(',', $this->getCategory()) ?>" >
34
  <script>
35
  Event.observe(window, "load", function() {
36
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
37
+ $('strakerCategoriesConfirm').insert({after: buttonHtml});
38
  });
39
  </script>
app/design/adminhtml/default/straker/template/straker/new/category/tree.phtml CHANGED
@@ -7,7 +7,7 @@
7
  <ol class="wizard" data-wizard-steps="4">
8
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
9
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
10
- <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
11
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
12
  </ol>
13
  <div class="straker-main-container border">
7
  <ol class="wizard" data-wizard-steps="4">
8
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
9
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
10
+ <li class="wizard-current"><?php echo $this->__('Select Content') ?></li>
11
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
12
  </ol>
13
  <div class="straker-main-container border">
app/design/adminhtml/default/straker/template/straker/new/cms/block.phtml CHANGED
@@ -16,7 +16,7 @@
16
  <ol class="wizard" data-wizard-steps="4">
17
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
18
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
19
- <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
20
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
21
  </ol>
22
  <div>
@@ -24,8 +24,13 @@
24
  </div>
25
  <script>
26
  Event.observe(window, "load", function() {
27
- var buttonHtml = '<button title="Submit" type="button" class="right" onclick="strakerCmsPages_massactionJsObject.apply()" style=""><span><span><span>Submit</span></span></span></button>';
28
  $('strakerCmsBlocks').insert({after: buttonHtml});
29
  $$('.content-header-floating .content-header td.a-right')[0].insert(buttonHtml);
30
  });
 
 
 
 
 
31
  </script>
16
  <ol class="wizard" data-wizard-steps="4">
17
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
18
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
19
+ <li class="wizard-current"><?php echo $this->__('Select Content') ?></li>
20
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
21
  </ol>
22
  <div>
24
  </div>
25
  <script>
26
  Event.observe(window, "load", function() {
27
+ var buttonHtml = '<button title="Submit" type="button" class="right" onclick="strakerCmsBlocks_massactionJsObject.apply()" style=""><span><span><span>Submit</span></span></span></button>';
28
  $('strakerCmsBlocks').insert({after: buttonHtml});
29
  $$('.content-header-floating .content-header td.a-right')[0].insert(buttonHtml);
30
  });
31
+ <?php if($this->getRequest()->getParam('from') === 'confirm' ): ?>
32
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.checkedString = '<?php echo join(',', $this->getChild('grid')->getSelectedIds()); ?>';
33
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.checkCheckboxes();
34
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.updateCount();
35
+ <?php endif; ?>
36
  </script>
app/design/adminhtml/default/straker/template/straker/new/cms/block/attributes.phtml CHANGED
@@ -3,7 +3,7 @@
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
6
- <li class="wizard-todo"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
9
  </ol>
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
6
+ <li class="wizard-current"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
9
  </ol>
app/design/adminhtml/default/straker/template/straker/new/cms/block/confirm.phtml CHANGED
@@ -14,10 +14,11 @@
14
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
15
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
16
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
17
- <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
18
  </ol>
19
  <?php $params = $this->getRequest()->getParams(); ?>
20
- <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_block/new", array('store'=>$this->getStore(), 'internal_cms_block'=>implode(',', $this->getCmsBlock()), 'attr'=>$this->getAttr())) ?>"><?php echo $this->__('Edit CMS Blocks') ?></a>
 
21
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_block/submitjob") ?>" method="post">
22
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
23
  <input type="hidden" name="cms_block" value="<?php echo implode(',', $this->getCmsBlock()) ?>" >
@@ -33,6 +34,6 @@
33
  <script>
34
  Event.observe(window, "load", function() {
35
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
36
- $('strakerCmsBlocks').insert({after: buttonHtml});
37
  });
38
  </script>
14
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
15
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
16
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
17
+ <li class="wizard-current"><?php echo $this->__('Confirm Content') ?></li>
18
  </ol>
19
  <?php $params = $this->getRequest()->getParams(); ?>
20
+ <!--<a href="--><?php //echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_block/new", array('store'=>$this->getStore(), 'internal_cms_block'=>implode(',', $this->getCmsBlock()), 'attr'=>$this->getAttr())) ?><!--">--><?php //echo $this->__('Edit CMS Blocks') ?><!--</a>-->
21
+ <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_block/new", array('store'=>$this->getStore(), 'attr'=>$this->getAttr(), 'from' => 'confirm' )) ?>"><?php echo $this->__('Edit CMS Blocks') ?></a>
22
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_block/submitjob") ?>" method="post">
23
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
24
  <input type="hidden" name="cms_block" value="<?php echo implode(',', $this->getCmsBlock()) ?>" >
34
  <script>
35
  Event.observe(window, "load", function() {
36
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
37
+ $('strakerCmsBlocksConfirm').insert({after: buttonHtml});
38
  });
39
  </script>
app/design/adminhtml/default/straker/template/straker/new/cms/page.phtml CHANGED
@@ -16,7 +16,7 @@
16
  <ol class="wizard" data-wizard-steps="4">
17
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
18
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
19
- <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
20
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
21
  </ol>
22
  <div>
@@ -28,4 +28,9 @@
28
  $('strakerCmsPages').insert({after: buttonHtml});
29
  $$('.content-header-floating .content-header td.a-right')[0].insert(buttonHtml);
30
  });
 
 
 
 
 
31
  </script>
16
  <ol class="wizard" data-wizard-steps="4">
17
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
18
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
19
+ <li class="wizard-current"><?php echo $this->__('Select Content') ?></li>
20
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
21
  </ol>
22
  <div>
28
  $('strakerCmsPages').insert({after: buttonHtml});
29
  $$('.content-header-floating .content-header td.a-right')[0].insert(buttonHtml);
30
  });
31
+ <?php if($this->getRequest()->getParam('from') === 'confirm' ): ?>
32
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.checkedString = '<?php echo join(',', $this->getChild('grid')->getSelectedIds()); ?>';
33
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.checkCheckboxes();
34
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.updateCount();
35
+ <?php endif; ?>
36
  </script>
app/design/adminhtml/default/straker/template/straker/new/cms/page/attributes.phtml CHANGED
@@ -3,7 +3,7 @@
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
6
- <li class="wizard-todo"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
9
  </ol>
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
6
+ <li class="wizard-current"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
9
  </ol>
app/design/adminhtml/default/straker/template/straker/new/cms/page/confirm.phtml CHANGED
@@ -14,10 +14,11 @@
14
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
15
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
16
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
17
- <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
18
  </ol>
19
  <?php $params = $this->getRequest()->getParams(); ?>
20
- <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_page/new", array('store'=>$this->getStore(), 'internal_cms_page'=>implode(',', $this->getCmsPage()), 'attr'=>$this->getAttr())) ?>"><?php echo $this->__('Edit CMS Pages') ?></a>
 
21
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_page/submitjob") ?>" method="post">
22
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
23
  <input type="hidden" name="cms_page" value="<?php echo implode(',', $this->getCmsPage()) ?>" >
@@ -33,6 +34,6 @@
33
  <script>
34
  Event.observe(window, "load", function() {
35
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
36
- $('strakerCmsPages').insert({after: buttonHtml});
37
  });
38
  </script>
14
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
15
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
16
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
17
+ <li class="wizard-current"><?php echo $this->__('Confirm Content') ?></li>
18
  </ol>
19
  <?php $params = $this->getRequest()->getParams(); ?>
20
+ <!--<a href="--><?php //echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_page/new", array('store'=>$this->getStore(), 'internal_cms_page'=>implode(',', $this->getCmsPage()), 'attr'=>$this->getAttr())) ?><!--">--><?php //echo $this->__('Edit CMS Pages') ?><!--</a>-->
21
+ <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_page/new", array('store'=>$this->getStore(), 'attr'=>$this->getAttr(), 'from' => 'confirm' )) ?>"><?php echo $this->__('Edit CMS Pages') ?></a>
22
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_cms_page/submitjob") ?>" method="post">
23
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
24
  <input type="hidden" name="cms_page" value="<?php echo implode(',', $this->getCmsPage()) ?>" >
34
  <script>
35
  Event.observe(window, "load", function() {
36
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
37
+ $('strakerCmsPagesConfirm').insert({after: buttonHtml});
38
  });
39
  </script>
app/design/adminhtml/default/straker/template/straker/new/products.phtml CHANGED
@@ -19,7 +19,7 @@
19
  <ol class="wizard" data-wizard-steps="4">
20
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
21
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
22
- <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
23
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
24
  </ol>
25
  <div>
@@ -31,4 +31,9 @@
31
  $('strakerProducts').insert({after: buttonHtml});
32
  $$('.content-header-floating .content-header td.a-right')[0].insert(buttonHtml);
33
  });
 
 
 
 
 
34
  </script>
19
  <ol class="wizard" data-wizard-steps="4">
20
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
21
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
22
+ <li class="wizard-current"><?php echo $this->__('Select Content') ?></li>
23
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
24
  </ol>
25
  <div>
31
  $('strakerProducts').insert({after: buttonHtml});
32
  $$('.content-header-floating .content-header td.a-right')[0].insert(buttonHtml);
33
  });
34
+ <?php if($this->getRequest()->getParam('from') === 'confirm' ): ?>
35
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.checkedString = '<?php echo join(',', $this->getChild('grid')->getSelectedIds()); ?>';
36
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.checkCheckboxes();
37
+ <?php echo $this->getChild('grid')->getMassactionBlockJsObjName(); ?>.updateCount();
38
+ <?php endif; ?>
39
  </script>
app/design/adminhtml/default/straker/template/straker/new/products/attributes.phtml CHANGED
@@ -3,7 +3,7 @@
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
6
- <li class="wizard-todo"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
9
  </ol>
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
6
+ <li class="wizard-current"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
9
  </ol>
app/design/adminhtml/default/straker/template/straker/new/products/confirm.phtml CHANGED
@@ -14,10 +14,10 @@
14
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
15
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
16
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
17
- <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
18
  </ol>
19
  <?php $params = $this->getRequest()->getParams(); ?>
20
- <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_product/new", array('store'=>$this->getStore(), 'attr'=>$this->getAttr())) ?>"><?php echo $this->__('Edit Products') ?></a>
21
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_product/submitjob") ?>" method="post">
22
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
23
  <input type="hidden" name="product" value="<?php echo implode(',', $this->getProduct()) ?>" >
@@ -33,6 +33,6 @@
33
  <script>
34
  Event.observe(window, "load", function() {
35
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
36
- $('strakerProducts').insert({after: buttonHtml});
37
  });
38
  </script>
14
  <li class="wizard-done"><?php echo $this->__('Select Job Type') ?></li>
15
  <li class="wizard-done"><?php echo $this->__('Select Details') ?></li>
16
  <li class="wizard-done"><?php echo $this->__('Select Content') ?></li>
17
+ <li class="wizard-current"><?php echo $this->__('Confirm Content') ?></li>
18
  </ol>
19
  <?php $params = $this->getRequest()->getParams(); ?>
20
+ <a href="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_product/new", array('store'=>$this->getStore(), 'attr'=>$this->getAttr(), 'from' => 'confirm' )) ?>"><?php echo $this->__('Edit Products') ?></a>
21
  <form id="submit-new-job-form" action="<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/straker_product/submitjob") ?>" method="post">
22
  <input type="hidden" name="form_key" value="<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>" >
23
  <input type="hidden" name="product" value="<?php echo implode(',', $this->getProduct()) ?>" >
33
  <script>
34
  Event.observe(window, "load", function() {
35
  var buttonHtml = '<button title="Submit" type="button" class="right" onclick="$(\'submit-new-job-form\').submit();" style=""><span><span><span>Submit</span></span></span></button>';
36
+ $('strakerProductsConfirm').insert({after: buttonHtml});
37
  });
38
  </script>
app/design/adminhtml/default/straker/template/straker/new/type.phtml CHANGED
@@ -2,7 +2,7 @@
2
  <h3><?php echo $this->__('Job Type') ?></h3><h3 class="store-info-heading"><?php echo Mage::helper('strakertranslations_easytranslationplatform')->renderNewJobHeading($this->getRequest()->getParam('store')) ?></h3>
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
- <li class="wizard-todo"><?php echo $this->__('Select Job Type') ?></li>
6
  <li class="wizard-todo"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
2
  <h3><?php echo $this->__('Job Type') ?></h3><h3 class="store-info-heading"><?php echo Mage::helper('strakertranslations_easytranslationplatform')->renderNewJobHeading($this->getRequest()->getParam('store')) ?></h3>
3
  </div>
4
  <ol class="wizard" data-wizard-steps="4">
5
+ <li class="wizard-current"><?php echo $this->__('Select Job Type') ?></li>
6
  <li class="wizard-todo"><?php echo $this->__('Select Details') ?></li>
7
  <li class="wizard-todo"><?php echo $this->__('Select Content') ?></li>
8
  <li class="wizard-todo"><?php echo $this->__('Confirm Content') ?></li>
package.xml CHANGED
@@ -1,18 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>straker-translations-easy-translation-platform</name>
4
- <version>1.3.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Multilingual eCommerce extensions from the award-winning global translation company.</summary>
10
  <description>Total automation of the translation process, simple installation and setup, quality human translation at cost-effective rates, scalable to more than 80 languages and 1000s of projects and powerful dashboard reporting.</description>
11
- <notes>Bug fix when applying attributes translations</notes>
12
- <authors><author><name>Chris</name><user>Straker_support</user><email>extensions@strakertranslations.com</email></author></authors>
13
- <date>2017-02-27</date>
14
- <time>03:43:16</time>
15
- <contents><target name="magecommunity"><dir name="StrakerTranslations"><dir name="EasyTranslationPlatform"><dir name="Block"><dir name="Adminhtml"><dir name="Cms"><dir name="Block"><file name="Grid.php" hash="f3f619834386cc32c7b0d938d85b1b94"/></dir><dir name="Page"><file name="Grid.php" hash="b24310c42254a22bc94fa926f93735fd"/></dir></dir><dir name="Job"><dir name="Attribute"><file name="Grid.php" hash="4eae0bb7355b35a7e7b695f6add78fae"/></dir><file name="Attribute.php" hash="c355f64a030766afcf646b411035f85f"/><dir name="Category"><file name="Grid.php" hash="1052d1e5494533c80a89a5e74041f72d"/></dir><file name="Category.php" hash="f2c9c52e51b2112f32065beee4c3cafe"/><dir name="Cms"><dir name="Block"><file name="Grid.php" hash="64170c9e8cf55c3cfd5a8c9717fe665a"/></dir><file name="Block.php" hash="e5ab4001b92c2bccc442ae4cfb59f047"/><dir name="Page"><file name="Grid.php" hash="6a8406b8bf46d1e4a802b182cef19603"/></dir><file name="Page.php" hash="b7c14cf9b9892977d4c945d7d4b5e4bd"/></dir><file name="Grid.php" hash="c52dbc25e0c5c0f07f111e8dcc0f301b"/><dir name="Product"><file name="Grid.php" hash="5fd9795e42b12b97cb217fbad0e529f8"/></dir><file name="Product.php" hash="85f95b9ffd2a3f80fb62ad37b3cf11b5"/></dir><file name="Job.php" hash="bf5ad4cd596a3a93a54447ee112c0a23"/><dir name="New"><dir name="Attribute"><dir name="Confirm"><file name="Grid.php" hash="5ab113bb0a3e42ceef939b1b52c36876"/></dir><file name="Confirm.php" hash="d7ed18d35d0df6b899b402beb0800caa"/><file name="Grid.php" hash="7fd33f4b1c1b9854dd2592e2171db618"/></dir><file name="Attribute.php" hash="31f61557f7c69d8b90521e60bbb79898"/><dir name="Category"><file name="Attribute.php" hash="b6698a36ee449853edff1815fca6a56f"/><dir name="Confirm"><file name="Grid.php" hash="64fd873d16622c13581ae398eb07bbbb"/></dir><file name="Confirm.php" hash="b710371dceb26866857a62f9d19425e7"/><file name="Tree.php" hash="b405b4bf4969812e13d63d752cd89c23"/></dir><dir name="Cms"><dir name="Block"><file name="Attribute.php" hash="698021304ad1346b6f8476fd629c8eed"/><dir name="Confirm"><file name="Grid.php" hash="dcf6c9a7a3a844963076b5140370507c"/></dir><file name="Confirm.php" hash="d38a9be9238e8eff3c322529e066b2ae"/><file name="Grid.php" hash="25cd4beda99cf997a108db78d6af2b32"/></dir><file name="Block.php" hash="771df45fe8fa9d24b7a920f485cc67a4"/><dir name="Page"><file name="Attribute.php" hash="3643f4821171d2efb08f478db03b2eaa"/><dir name="Confirm"><file name="Grid.php" hash="5c77ef51a041fc61422efe3467e5be75"/></dir><file name="Confirm.php" hash="ca21f36fe293b10f5a7f0be7d4acd437"/><file name="Grid.php" hash="0916a315b664c02c94cebfa79af4a0a0"/></dir><file name="Page.php" hash="d4f32301e714f1e6692ace8ed40ec5c4"/></dir><dir name="Confirm"><file name="Grid.php" hash="49a048fe7340150dc387a30355951385"/></dir><file name="Confirm.php" hash="a903a2f53c3b44fb8c72dc70716ff0d3"/><dir name="Products"><file name="Attribute.php" hash="f9b11618404c31e7ac91622a0188479d"/><dir name="Confirm"><file name="Grid.php" hash="e35a967bf2e3d9882889a67d7de26e09"/></dir><file name="Confirm.php" hash="d4dddb499ff29d646fcd48246666126a"/><file name="Grid.php" hash="5c716c61d8b23d253b37f4755d4ea231"/></dir><file name="Products.php" hash="cd0c2de765d91c4c7a82cc74bb1797c9"/><file name="Register.php" hash="7f43aee445980708a6cb8510eec21e78"/><file name="Selectstore.php" hash="42553d67a4e14ca8f754ea096ddf9cf6"/><file name="Setupstore.php" hash="bc1ca941654f47f763d0e7605fc7b050"/><file name="Type.php" hash="6786a8663d019a616dfcd229f609b0cf"/></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Backupbutton.php" hash="8bfae419ddceed0553db1f5dc5322356"/><file name="Button.php" hash="eb5d2544ba93cbcd09e534dc5b81bbc1"/><file name="Restorebutton.php" hash="e98058e6769f5308fa9f48fa19a22704"/><file name="Store.php" hash="5b98d4711b04acbb60d1b7c17405a4a6"/></dir></dir></dir><dir name="Template"><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="47a1988c0136fa892856d7390af1d6bd"/><file name="AttributeOriginalLabel.php" hash="895fdf18d8993d3268d95541cca1a7a3"/><file name="AttributeOriginalOption.php" hash="3cbe41544c9a32a5742950392973a533"/><file name="AttributeTranslateLabel.php" hash="eef210480eea84f5fd69ded360697acf"/><file name="AttributeTranslateOption.php" hash="2393ee81a57d67de08d38c5e81ea9403"/><file name="Backend.php" hash="6ca085c9a5c50e635f8f4aa41d3314e1"/><file name="CmsOriginTitle.php" hash="e66578d499b77b65226ec3be9e727c56"/><file name="CmsVersion.php" hash="d396904cc2b8637e87c3332eff877436"/><file name="ConfirmTranslateLabel.php" hash="09fdb0146ab6f9fad36bff50042d2587"/><file name="ConfirmTranslateOptions.php" hash="90ba018bb7eef8d6ac3006b058d66197"/><file name="Dispute.php" hash="3bae4a4bbf43890a53a8c2698315430e"/><file name="Frontend.php" hash="f1a0c9a0b98e3e16ec28a46c11f3b71f"/><file name="Path.php" hash="5d9e268bde77a5e1d6d435a48d9f60b7"/><file name="Quote.php" hash="728f3e53af9619760a3921993a823ca6"/><file name="Refresh.php" hash="28db5556c4dad64f4d3aa808758673dd"/><file name="Selected.php" hash="88f58ed6edb419d1701a6f6a4955d881"/><file name="Status.php" hash="fd88108278d137995b6bbd2b9747a179"/><file name="StrakerTranslated.php" hash="8f6d3a963627f02fcd092c4103843c61"/><file name="TranslateOptions.php" hash="00f1c42c2205f76db4322fa0dbd686f6"/><file name="Translated.php" hash="cda1f5c402ed086974b76ee427c2a23a"/><file name="Update.php" hash="43a114983b2c00af3432e664512b1704"/><file name="Version.php" hash="908c1697bd48848a2ebf00cd38aa8dc1"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="a629e0f5ca179fa35dc1347b867e8e4d"/></dir><dir name="Model"><file name="Actionlog.php" hash="bd8a61e14712e32937e0622376b07ae7"/><file name="Api.php" hash="6b38c84f487d57023a243194e6ccfe18"/><dir name="Attribute"><file name="Translate.php" hash="03268891643539d670676a40e879e560"/></dir><dir name="Category"><file name="Attributes.php" hash="31639770ebe8f2aa4b320d686786f716"/><file name="Translate.php" hash="63888c2d229d1cc860b2d3555470f597"/></dir><dir name="Cms"><dir name="Block"><file name="Attributes.php" hash="1df167ceeea902db512b297d601336b8"/><file name="Translate.php" hash="239afe3bb57efe43687f7fd4abaabe11"/></dir><dir name="Page"><file name="Attributes.php" hash="f9aa8f988a06b442d44c5e1e3c044b0c"/><file name="Translate.php" hash="ada614e5395bea4a02694e38a9b4d761"/></dir></dir><dir name="Job"><file name="Attribute.php" hash="6bc9221934346093ec6054704625808e"/><file name="Category.php" hash="37079e7131a4d10a9577afb499c6d7b6"/><dir name="Cms"><file name="Block.php" hash="2263b8165de77cda0c368a6b127e5edb"/><file name="Page.php" hash="54cf2ffb4943b3bcffe28a5fc60a0d00"/></dir><file name="Product.php" hash="9f02ce34f909df6dd26c3414356ad565"/><file name="Status.php" hash="64c766deaf33bd0460c739f04544f8db"/><file name="Type.php" hash="c5010524e83e0c3c56595bcd72bba97d"/></dir><file name="Job.php" hash="7eee0cd64bca7140c60e6eff02bde2be"/><dir name="Product"><file name="Attributes.php" hash="f8539bb8a73a59017b811bea7d99835b"/><file name="Translate.php" hash="ebe6df5219d4ca3ee71290bf3e1de0da"/></dir><dir name="Resource"><dir name="Actionlog"><file name="Collection.php" hash="a60fb59aa09d55b5e5d4f41d58e20e6f"/></dir><file name="Actionlog.php" hash="5742408ecac5dce23b3492d118d6ca41"/><dir name="Attribute"><dir name="Translate"><file name="Collection.php" hash="dc15902d152cdc907123bbd847bc124a"/></dir><file name="Translate.php" hash="f619af9fb3bb71e346d89a314c1d0a2c"/></dir><dir name="Category"><dir name="Attributes"><file name="Collection.php" hash="d0d1bdb74c8b6d3ebcd00e986bbda5ac"/></dir><file name="Attributes.php" hash="438aefd7fd4768a18dea3835e592d020"/><dir name="Translate"><file name="Collection.php" hash="6f9b263579ba9c988dbf476a9a8d5254"/></dir><file name="Translate.php" hash="3493c3a5f4dff5278e61cf758b58f09e"/></dir><dir name="Cms"><dir name="Block"><dir name="Attributes"><file name="Collection.php" hash="877832a90560893e916e43b967e6dc34"/></dir><file name="Attributes.php" hash="09ff0c55a851e01cb84ea36d04f25991"/><dir name="Translate"><file name="Collection.php" hash="de7c22817b8216ba532469e22530fc9e"/></dir><file name="Translate.php" hash="a42c5543d64b231251c50623c06267e3"/></dir><dir name="Page"><dir name="Attributes"><file name="Collection.php" hash="e1316d1cd3595bbfb7733b2ac237796e"/></dir><file name="Attributes.php" hash="17aad05de17f6e1457ee41022acdce17"/><dir name="Translate"><file name="Collection.php" hash="6d3a9c65e8cab69179ac62d3cf4a86eb"/></dir><file name="Translate.php" hash="875bb57fe743508ff7fb46d7cb5031f9"/></dir></dir><dir name="Job"><dir name="Attribute"><file name="Collection.php" hash="e336ec26c414bdb050ae87d70487349a"/></dir><file name="Attribute.php" hash="6c096169a8867d54b37997312753a94e"/><dir name="Category"><file name="Collection.php" hash="6e29696c703503c821fb4fbeb04f7169"/></dir><file name="Category.php" hash="5cb332770a4600be8d82d5440a42a2a6"/><dir name="Cms"><dir name="Block"><file name="Collection.php" hash="6524c7d53db9e32d2802e571cc54a8ca"/></dir><file name="Block.php" hash="9de78cd2dad032b94b7a0fe32ca6b785"/><dir name="Page"><file name="Collection.php" hash="b36385630e4cd6fd25a233305bd8d359"/></dir><file name="Page.php" hash="0d449938e643605e500efc3f4c4f13ea"/></dir><file name="Collection.php" hash="26b821d388a969c048418254c702767d"/><dir name="Product"><file name="Collection.php" hash="0b333a2caf8977dbc9a8e71e58c54de6"/></dir><file name="Product.php" hash="8b0dfa9ce28bc4292021055f9253ea5d"/><dir name="Status"><file name="Collection.php" hash="84dd6c9d32fda84ea11102692b5359a9"/></dir><file name="Status.php" hash="5e29fbf619c9b1278273266fb2ce2afa"/><dir name="Type"><file name="Collection.php" hash="625b61447aee152376c19f36a347d5d8"/></dir><file name="Type.php" hash="36b8ec250e3bc2377c1fb755459fad95"/></dir><file name="Job.php" hash="22b19e144ede17aa8c57f817f3c84046"/><dir name="Product"><dir name="Attributes"><file name="Collection.php" hash="3f479577ce23ba9f264125439c1d1099"/></dir><file name="Attributes.php" hash="93c962dc76384771d9139574796c16b5"/><dir name="Translate"><file name="Collection.php" hash="4dc7e3a0a44edd6acea4b8cf45b40d05"/></dir><file name="Translate.php" hash="f88f7ea6f6e1dfdc55ef648ddea2ca38"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="SiteMode.php" hash="89a8260d88855f2caea230e3466c8f9a"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Straker"><file name="AttributeController.php" hash="699a547cfbddab454f057136df40c93a"/><file name="CategoryController.php" hash="0950833563bef549cc2426f63030f6db"/><dir name="Cms"><file name="BlockController.php" hash="2627bff77c3b5fafc0ad1102ce716445"/><file name="PageController.php" hash="e43d66294440afb15294217135334e80"/></dir><file name="JobController.php" hash="34c064012ad52f06ff65b4e61df2a7f2"/><file name="NewController.php" hash="c7288367fd7f7b2488d2e1746c5edfa5"/><file name="ProductController.php" hash="ae3b984d64ce4730b0f37084f8b1add6"/></dir></dir><file name="CallbackController.php" hash="c9abd6304f6f071940735a47ab658633"/></dir><dir name="data"><dir name="strakertranslations_easytranslationplatform_setup"><file name="data-install-1.2.0.php" hash="8f64e0b9eea4fe7b0d880cd354f59412"/><file name="data-upgrade-1.2.0-1.3.0.php" hash="5e01aabbd2c80e6c6d1c3e12126a4e6e"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="802ab54b889201efd9318ec11f220f18"/><file name="config.xml" hash="1eb53f4b3b451b24c87ccae37aa19511"/><file name="system.xml" hash="e047c334b01ea71b3108c02c1c5e7ae5"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="sql"><dir name="strakertranslations_easytranslationplatform_setup"><file name="install-1.2.0.php" hash="a93fd3369feb8cf12e1c69a8ae3bbe8b"/><file name="upgrade-1.2.0-1.3.0.php" hash="55e4e676d70e9ca6371b7b7ccd7a48e4"/><file name="upgrade-1.3.0-1.3.1.php" hash="37441781e0348f3761e677457e6b73b0"/><file name="upgrade-1.3.3-1.3.4.php" hash="5a7c214c97e3a8935feb0d7a1947c7eb"/></dir></dir><file name=".DS_Store" hash="68744ba828ac21d758275fd0631a6511"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="straker"><dir name="layout"><file name="straker.xml" hash="52ec2d65c1ac817a5f1603e916037d15"/></dir><dir name="template"><dir name="cms"><dir name="form"><file name="container.phtml" hash="9069e9f2e13f3f0c1f175920c295ee65"/></dir></dir><dir name="straker"><dir name="job"><dir name="attribute"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="attribute.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/><dir name="category"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="category.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/><dir name="cms"><dir name="block"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="block.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/><dir name="page"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="page.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/></dir><dir name="product"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="product.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/></dir><file name="job.phtml" hash="63c7a5b66b969635ee9996638878d63c"/><dir name="new"><dir name="attribute"><file name="confirm.phtml" hash="609ab700b5386b7d9549fb74f7e9025f"/><file name="massaction.phtml" hash="9dcf11014c7a598128a64c048e0108cf"/></dir><file name="attribute.phtml" hash="9f327fe0551b9d39e455b361d662ce08"/><file name="attributes.phtml" hash="a2b5136923f2afad369185077a3c4c53"/><dir name="category"><file name="attributes.phtml" hash="c92f98e8397ae9143c17c87e2e468758"/><dir name="confirm"><file name="grid.phtml" hash="8336aad4f7275992704b1b7ddaccac3e"/></dir><file name="confirm.phtml" hash="8e10afdfc326dc5e16f8d40125bfeaf8"/><file name="tree.phtml" hash="4599d5840d9bdf21cf5c057c6112dfcc"/></dir><dir name="cms"><dir name="block"><file name="attributes.phtml" hash="b2767598f08b2159c952c446f306e717"/><file name="confirm.phtml" hash="a7369555063de98c418c6cdf64485b6c"/><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="block.phtml" hash="6ad391571d617ca4f262d3bc15a41d7c"/><dir name="page"><file name="attributes.phtml" hash="288ef5992432d95493f919372af419bb"/><file name="confirm.phtml" hash="329c1f0943eda97164bda08e712a929c"/><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="page.phtml" hash="9e5e384888f81b5933ea2deb8dd9e0e8"/></dir><file name="confirm.phtml" hash="72552d8f56335eb644a4c0ffe314f12b"/><dir name="products"><file name="attributes.phtml" hash="fdfeb163ffb82ae983b4872fe59d2b77"/><file name="confirm.phtml" hash="f00acbdd4f83694b390c29346f6f0f79"/><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="products.phtml" hash="2930c175307b3178a7b8a6205981cdf2"/><file name="register.phtml" hash="13da4e89dafcdf0508343905121a6ed3"/><file name="selectstore.phtml" hash="59b46141938afec500ce3acf36da5427"/><file name="setupstore.phtml" hash="c3dab5a53f6007ac9608721bd75761bf"/><file name="type.phtml" hash="ab8bd7f6b5945af2e1dd0a9b19f0bfee"/></dir><dir name="system"><dir name="config"><file name="button.phtml" hash="9725dd1eea9e0a5c6ff9a34a31d5e433"/><file name="store.phtml" hash="accefd80ff19bf7c917c923b2aed961c"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="straker"><dir name="css"><file name="straker.css" hash="7de7c21b46326f421fcbb6363ab9e955"/><file name="straker.less" hash="5455064a2c31680a823d39bdc24997b0"/></dir><dir name="images"><dir name="default"><file name="bottom_left.gif" hash="fb99ffa815a8648f95f42698fe5dfaa1"/><file name="bottom_mid.gif" hash="49b9ca7025562ea7f070a9111282364b"/><file name="bottom_right.gif" hash="e46768f632765cd86c5fe5d0166dcf2c"/><file name="bottom_right_resize.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="center_left.gif" hash="bd567580b4ee16a7a2734057cfbbe219"/><file name="center_right.gif" hash="eef184d5d89d1710313581a2ccf408e8"/><file name="clear.gif" hash="7af1206eeb0e7834a75e69d70676060d"/><file name="close.gif" hash="8a08f243c37a8e25a88d4ac135b2f07d"/><file name="inspect.gif" hash="aa2a0961067aad5c54b8634919af863b"/><file name="maximize.gif" hash="e73cd71c4979ebeadeb9e27d40a9e8fb"/><file name="minimize.gif" hash="2d2f4b1bd0506f342425f80ab76c49a3"/><file name="overlay.png" hash="536d40e87cda0c7ae7b11f1721aa52d0"/><file name="resize.gif" hash="320f534b5d444b39701e0b679529e779"/><file name="sizer.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="top_left.gif" hash="9c5e5920bfc189a45cc618099af93aa8"/><file name="top_mid.gif" hash="a12ff2b944025ad2d127d033dae5e9e1"/><file name="top_right.gif" hash="0cf1ec5b93f8ac8fcce0e2f72cf7f45e"/></dir><file name="magento-banner.jpg" hash="b3105fd2dd00004ab903db4fbb81b61e"/><file name="refresh_32.png" hash="96e793bcbcc2dc48768b8e124beea378"/><file name="straker-translations-logo.png" hash="7cb5e29f562420142f918147d95ed232"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="StrakerTranslations_EasyTranslationPlatform.xml" hash="eb61fdaac7559a75e39bc01206165d0c"/></dir></target><target name="mage"><dir name="js"><dir name="straker"><file name="translations.js" hash="0168be67b66e071d1e8f833a959d95b7"/></dir></dir></target></contents>
 
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>7.1.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>straker-translations-easy-translation-platform</name>
4
+ <version>1.3.7</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Multilingual eCommerce extensions from the award-winning global translation company.</summary>
10
  <description>Total automation of the translation process, simple installation and setup, quality human translation at cost-effective rates, scalable to more than 80 languages and 1000s of projects and powerful dashboard reporting.</description>
11
+ <notes>1) add 'sku' and 'attribute set' to product grid&#xD;
12
+ 2) fix bugs in job management page</notes>
13
+ <authors><author><name>StrakerTranslations</name><user>Straker_support</user><email>extensions@strakertranslations.com</email></author></authors>
14
+ <date>2017-04-18</date>
15
+ <time>22:25:33</time>
16
+ <contents><target name="magecommunity"><dir name="StrakerTranslations"><dir name="EasyTranslationPlatform"><dir name="Block"><dir name="Adminhtml"><dir name="Cms"><dir name="Block"><file name="Grid.php" hash="f3f619834386cc32c7b0d938d85b1b94"/></dir><dir name="Page"><file name="Grid.php" hash="b24310c42254a22bc94fa926f93735fd"/></dir></dir><dir name="Job"><dir name="Attribute"><file name="Grid.php" hash="517552303a58fe6f3073c39384194639"/></dir><file name="Attribute.php" hash="c355f64a030766afcf646b411035f85f"/><dir name="Category"><file name="Grid.php" hash="c4e063414d9311a967a1805598a2997a"/></dir><file name="Category.php" hash="f2c9c52e51b2112f32065beee4c3cafe"/><dir name="Cms"><dir name="Block"><file name="Grid.php" hash="158162d13df45c9aa8b1b71cc6c0e81c"/></dir><file name="Block.php" hash="e5ab4001b92c2bccc442ae4cfb59f047"/><dir name="Page"><file name="Grid.php" hash="11a6895a8dd093f4adde187c62c88240"/></dir><file name="Page.php" hash="b7c14cf9b9892977d4c945d7d4b5e4bd"/></dir><file name="Grid.php" hash="254051a9faa41a1561c1618baf759057"/><dir name="Product"><file name="Grid.php" hash="48e2a791333e0bfd317863ed5ebeb989"/></dir><file name="Product.php" hash="85f95b9ffd2a3f80fb62ad37b3cf11b5"/></dir><file name="Job.php" hash="bf5ad4cd596a3a93a54447ee112c0a23"/><dir name="New"><dir name="Attribute"><dir name="Confirm"><file name="Grid.php" hash="875c81d547bf99a2f0e2c0075364cb2c"/></dir><file name="Confirm.php" hash="d7ed18d35d0df6b899b402beb0800caa"/><file name="Grid.php" hash="5a209fbbee26f223af8f4c8284e0c40b"/></dir><file name="Attribute.php" hash="31f61557f7c69d8b90521e60bbb79898"/><dir name="Category"><file name="Attribute.php" hash="b6698a36ee449853edff1815fca6a56f"/><dir name="Confirm"><file name="Grid.php" hash="1580b1fa19b1cb3d2ce25e4e0e175ffc"/></dir><file name="Confirm.php" hash="b710371dceb26866857a62f9d19425e7"/><file name="Tree.php" hash="f3300aaf82fffb0e38a5475beb0d8736"/></dir><dir name="Cms"><dir name="Block"><file name="Attribute.php" hash="698021304ad1346b6f8476fd629c8eed"/><dir name="Confirm"><file name="Grid.php" hash="bc6fa3b492e14861aa29ee48ef3d7364"/></dir><file name="Confirm.php" hash="d38a9be9238e8eff3c322529e066b2ae"/><file name="Grid.php" hash="34d3cfe1556b50846b52710fe84bdaaf"/></dir><file name="Block.php" hash="771df45fe8fa9d24b7a920f485cc67a4"/><dir name="Page"><file name="Attribute.php" hash="3643f4821171d2efb08f478db03b2eaa"/><dir name="Confirm"><file name="Grid.php" hash="06d503f92a63cd59c6f41c518763549b"/></dir><file name="Confirm.php" hash="ca21f36fe293b10f5a7f0be7d4acd437"/><file name="Grid.php" hash="5d276f9642a5c6a0d66073b0e0313fc2"/></dir><file name="Page.php" hash="d4f32301e714f1e6692ace8ed40ec5c4"/></dir><dir name="Confirm"><file name="Grid.php" hash="4c1abd9162879e6cf58fa6616152393d"/></dir><file name="Confirm.php" hash="a903a2f53c3b44fb8c72dc70716ff0d3"/><dir name="Products"><file name="Attribute.php" hash="f9b11618404c31e7ac91622a0188479d"/><dir name="Confirm"><file name="Grid.php" hash="a66dbc0234332558f86cb7e51c84f82f"/></dir><file name="Confirm.php" hash="d4dddb499ff29d646fcd48246666126a"/><file name="Grid.php" hash="adf2eb179349e5933f3780c080306911"/></dir><file name="Products.php" hash="cd0c2de765d91c4c7a82cc74bb1797c9"/><file name="Register.php" hash="7f43aee445980708a6cb8510eec21e78"/><file name="Selectstore.php" hash="42553d67a4e14ca8f754ea096ddf9cf6"/><file name="Setupstore.php" hash="bc1ca941654f47f763d0e7605fc7b050"/><file name="Type.php" hash="6786a8663d019a616dfcd229f609b0cf"/></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Backupbutton.php" hash="8bfae419ddceed0553db1f5dc5322356"/><file name="Button.php" hash="eb5d2544ba93cbcd09e534dc5b81bbc1"/><file name="Restorebutton.php" hash="e98058e6769f5308fa9f48fa19a22704"/><file name="Store.php" hash="5b98d4711b04acbb60d1b7c17405a4a6"/></dir></dir></dir><dir name="Template"><dir name="Grid"><dir name="Renderer"><file name="Action.php" hash="bd25cb1504b9e7334ce1fe604f6f68c3"/><file name="AttributeOriginalLabel.php" hash="895fdf18d8993d3268d95541cca1a7a3"/><file name="AttributeOriginalOption.php" hash="3cbe41544c9a32a5742950392973a533"/><file name="AttributeTranslateLabel.php" hash="eef210480eea84f5fd69ded360697acf"/><file name="AttributeTranslateOption.php" hash="2393ee81a57d67de08d38c5e81ea9403"/><file name="Backend.php" hash="6ca085c9a5c50e635f8f4aa41d3314e1"/><file name="CmsOriginTitle.php" hash="e66578d499b77b65226ec3be9e727c56"/><file name="CmsVersion.php" hash="aa045e2f5f490e4f82d56b1da14ad8e1"/><file name="ConfirmTranslateLabel.php" hash="09fdb0146ab6f9fad36bff50042d2587"/><file name="ConfirmTranslateOptions.php" hash="90ba018bb7eef8d6ac3006b058d66197"/><file name="Dispute.php" hash="3bae4a4bbf43890a53a8c2698315430e"/><file name="Frontend.php" hash="b74e5b2e3472128ab6e3edb7375dce4a"/><file name="Language.php" hash="ee2762259a51b54373f1fbaff4d0bade"/><file name="PageGridAction.php" hash="218b42e250005a7128a550385f2409eb"/><file name="Path.php" hash="5d9e268bde77a5e1d6d435a48d9f60b7"/><file name="Quote.php" hash="728f3e53af9619760a3921993a823ca6"/><file name="Refresh.php" hash="28db5556c4dad64f4d3aa808758673dd"/><file name="Selected.php" hash="88f58ed6edb419d1701a6f6a4955d881"/><file name="Status.php" hash="6d45439ff9d882ec3299e0911e7460fc"/><file name="StrakerTranslated.php" hash="8f6d3a963627f02fcd092c4103843c61"/><file name="TranslateOptions.php" hash="00f1c42c2205f76db4322fa0dbd686f6"/><file name="Translated.php" hash="cda1f5c402ed086974b76ee427c2a23a"/><file name="Update.php" hash="43a114983b2c00af3432e664512b1704"/><file name="Version.php" hash="908c1697bd48848a2ebf00cd38aa8dc1"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="38219988bd02da246fd32535a1bd9525"/></dir><dir name="Model"><file name="Actionlog.php" hash="bd8a61e14712e32937e0622376b07ae7"/><file name="Api.php" hash="e3345a3338cfa7f8b45aff2c26680711"/><dir name="Attribute"><file name="Translate.php" hash="f4b60a7a30ca4dbbce7fb46abdf415e7"/></dir><dir name="Category"><file name="Attributes.php" hash="31639770ebe8f2aa4b320d686786f716"/><file name="Translate.php" hash="63888c2d229d1cc860b2d3555470f597"/></dir><dir name="Cms"><dir name="Block"><file name="Attributes.php" hash="1df167ceeea902db512b297d601336b8"/><file name="Translate.php" hash="239afe3bb57efe43687f7fd4abaabe11"/></dir><dir name="Page"><file name="Attributes.php" hash="f9aa8f988a06b442d44c5e1e3c044b0c"/><file name="Translate.php" hash="bea3a9275187cab1460e106cefa2c10e"/></dir></dir><dir name="Job"><file name="Attribute.php" hash="6bc9221934346093ec6054704625808e"/><file name="Category.php" hash="37079e7131a4d10a9577afb499c6d7b6"/><dir name="Cms"><file name="Block.php" hash="2263b8165de77cda0c368a6b127e5edb"/><file name="Page.php" hash="54cf2ffb4943b3bcffe28a5fc60a0d00"/></dir><file name="Product.php" hash="9f02ce34f909df6dd26c3414356ad565"/><file name="Status.php" hash="e6546b9af4d665a15b1419d380692756"/><file name="Type.php" hash="ded64454eb196668ae1deb4ce5e92b72"/></dir><file name="Job.php" hash="f12316220e96409b7fede2998e6d4943"/><dir name="Product"><file name="Attributes.php" hash="f8539bb8a73a59017b811bea7d99835b"/><file name="Translate.php" hash="ebe6df5219d4ca3ee71290bf3e1de0da"/></dir><dir name="Resource"><dir name="Actionlog"><file name="Collection.php" hash="a60fb59aa09d55b5e5d4f41d58e20e6f"/></dir><file name="Actionlog.php" hash="5742408ecac5dce23b3492d118d6ca41"/><dir name="Attribute"><dir name="Translate"><file name="Collection.php" hash="dc15902d152cdc907123bbd847bc124a"/></dir><file name="Translate.php" hash="f619af9fb3bb71e346d89a314c1d0a2c"/></dir><dir name="Category"><dir name="Attributes"><file name="Collection.php" hash="d0d1bdb74c8b6d3ebcd00e986bbda5ac"/></dir><file name="Attributes.php" hash="438aefd7fd4768a18dea3835e592d020"/><dir name="Translate"><file name="Collection.php" hash="6f9b263579ba9c988dbf476a9a8d5254"/></dir><file name="Translate.php" hash="3493c3a5f4dff5278e61cf758b58f09e"/></dir><dir name="Cms"><dir name="Block"><dir name="Attributes"><file name="Collection.php" hash="877832a90560893e916e43b967e6dc34"/></dir><file name="Attributes.php" hash="09ff0c55a851e01cb84ea36d04f25991"/><dir name="Translate"><file name="Collection.php" hash="de7c22817b8216ba532469e22530fc9e"/></dir><file name="Translate.php" hash="a42c5543d64b231251c50623c06267e3"/></dir><dir name="Page"><dir name="Attributes"><file name="Collection.php" hash="e1316d1cd3595bbfb7733b2ac237796e"/></dir><file name="Attributes.php" hash="17aad05de17f6e1457ee41022acdce17"/><dir name="Translate"><file name="Collection.php" hash="6d3a9c65e8cab69179ac62d3cf4a86eb"/></dir><file name="Translate.php" hash="875bb57fe743508ff7fb46d7cb5031f9"/></dir></dir><dir name="Job"><dir name="Attribute"><file name="Collection.php" hash="e336ec26c414bdb050ae87d70487349a"/></dir><file name="Attribute.php" hash="6c096169a8867d54b37997312753a94e"/><dir name="Category"><file name="Collection.php" hash="6e29696c703503c821fb4fbeb04f7169"/></dir><file name="Category.php" hash="5cb332770a4600be8d82d5440a42a2a6"/><dir name="Cms"><dir name="Block"><file name="Collection.php" hash="6524c7d53db9e32d2802e571cc54a8ca"/></dir><file name="Block.php" hash="9de78cd2dad032b94b7a0fe32ca6b785"/><dir name="Page"><file name="Collection.php" hash="b36385630e4cd6fd25a233305bd8d359"/></dir><file name="Page.php" hash="0d449938e643605e500efc3f4c4f13ea"/></dir><file name="Collection.php" hash="26b821d388a969c048418254c702767d"/><dir name="Product"><file name="Collection.php" hash="0b333a2caf8977dbc9a8e71e58c54de6"/></dir><file name="Product.php" hash="8b0dfa9ce28bc4292021055f9253ea5d"/><dir name="Status"><file name="Collection.php" hash="84dd6c9d32fda84ea11102692b5359a9"/></dir><file name="Status.php" hash="5e29fbf619c9b1278273266fb2ce2afa"/><dir name="Type"><file name="Collection.php" hash="625b61447aee152376c19f36a347d5d8"/></dir><file name="Type.php" hash="36b8ec250e3bc2377c1fb755459fad95"/></dir><file name="Job.php" hash="22b19e144ede17aa8c57f817f3c84046"/><dir name="Product"><dir name="Attributes"><file name="Collection.php" hash="3f479577ce23ba9f264125439c1d1099"/></dir><file name="Attributes.php" hash="93c962dc76384771d9139574796c16b5"/><dir name="Translate"><file name="Collection.php" hash="4dc7e3a0a44edd6acea4b8cf45b40d05"/></dir><file name="Translate.php" hash="f88f7ea6f6e1dfdc55ef648ddea2ca38"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="SiteMode.php" hash="89a8260d88855f2caea230e3466c8f9a"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Straker"><file name="AttributeController.php" hash="fee5d8f280329f3161be823590506ad0"/><file name="CategoryController.php" hash="c59de73d9427cf2b6297cce5c15766b7"/><dir name="Cms"><file name="BlockController.php" hash="c2e4c05b5f3a3d71126cc98039cb95ec"/><file name="PageController.php" hash="444fbaf138b40520a4d548073e35abdd"/></dir><file name="JobController.php" hash="ba0d27641ef3f0de524abd89206149df"/><file name="NewController.php" hash="c7288367fd7f7b2488d2e1746c5edfa5"/><file name="ProductController.php" hash="0fd964fa3fd410e65891c2ffd2364c15"/></dir></dir><file name="CallbackController.php" hash="c9abd6304f6f071940735a47ab658633"/></dir><dir name="data"><dir name="strakertranslations_easytranslationplatform_setup"><file name="data-install-1.2.0.php" hash="8f64e0b9eea4fe7b0d880cd354f59412"/><file name="data-upgrade-1.2.0-1.3.0.php" hash="5e01aabbd2c80e6c6d1c3e12126a4e6e"/><file name="data-upgrade-1.3.6-1.3.7.php" hash="5643184a268212dfdd31dfd80bc4ed1f"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="802ab54b889201efd9318ec11f220f18"/><file name="config.xml" hash="41e08d3d17911bf6b1751f267d79c5f2"/><file name="system.xml" hash="577f61032f35ff143513513ae5bdac95"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="sql"><dir name="strakertranslations_easytranslationplatform_setup"><file name="install-1.2.0.php" hash="a93fd3369feb8cf12e1c69a8ae3bbe8b"/><file name="upgrade-1.2.0-1.3.0.php" hash="55e4e676d70e9ca6371b7b7ccd7a48e4"/><file name="upgrade-1.3.0-1.3.1.php" hash="8b426d63399accbf61889a0e2547cb40"/><file name="upgrade-1.3.3-1.3.4.php" hash="4fb79a636db845f176ce27e7eaf3e8e5"/><file name="upgrade-1.3.6-1.3.7.php" hash="5e8125590b0e9ed4e7b7183ee5b5726c"/></dir></dir><file name=".DS_Store" hash="e039ee669afa045519f0c84e7b15e181"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="straker"><dir name="layout"><file name="straker.xml" hash="52ec2d65c1ac817a5f1603e916037d15"/></dir><dir name="template"><dir name="cms"><dir name="form"><file name="container.phtml" hash="9069e9f2e13f3f0c1f175920c295ee65"/></dir></dir><dir name="straker"><dir name="job"><dir name="attribute"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="attribute.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/><dir name="category"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="category.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/><dir name="cms"><dir name="block"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="block.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/><dir name="page"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="page.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/></dir><dir name="product"><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="product.phtml" hash="e908bcbf0ad1435a35d6009f599c4f77"/></dir><file name="job.phtml" hash="63c7a5b66b969635ee9996638878d63c"/><dir name="new"><dir name="attribute"><file name="confirm.phtml" hash="4d670363c686f190f31239881479a5d3"/><file name="massaction.phtml" hash="67c280b642ca8ddd44f3af9dc036c277"/></dir><file name="attribute.phtml" hash="740fb10b16ff1128b23027c0dc53808b"/><file name="attributes.phtml" hash="a2b5136923f2afad369185077a3c4c53"/><dir name="category"><file name="attributes.phtml" hash="bdd965a35471405448809b2e6b7687cd"/><dir name="confirm"><file name="grid.phtml" hash="8336aad4f7275992704b1b7ddaccac3e"/></dir><file name="confirm.phtml" hash="a5151a4f8c0852e7441421f2dab78ecb"/><file name="tree.phtml" hash="70f1392f20f926176fc01f0bbf9ee554"/></dir><dir name="cms"><dir name="block"><file name="attributes.phtml" hash="c133b4d5ebbdea37016f985b6940f6ea"/><file name="confirm.phtml" hash="68a155e50459bf430487f3f2aca7c878"/><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="block.phtml" hash="55f72be16f231bf858453b4606bdcece"/><dir name="page"><file name="attributes.phtml" hash="0e1044e341d24894212e6743c71c089e"/><file name="confirm.phtml" hash="74e918432b4ff3d45f18c3a95718dadb"/><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="page.phtml" hash="a8163d1d5ebe203cad1c5514e9191077"/></dir><file name="confirm.phtml" hash="72552d8f56335eb644a4c0ffe314f12b"/><dir name="products"><file name="attributes.phtml" hash="4f385ebe47ebcb6dcccbaac9c76b98c6"/><file name="confirm.phtml" hash="e5abac8b93afc9ea35e9903f2e65081b"/><file name="massaction.phtml" hash="1c3b4ce443f6e4086bcc362d43f75354"/></dir><file name="products.phtml" hash="96faf03ba542534b343748376c5c9b05"/><file name="register.phtml" hash="13da4e89dafcdf0508343905121a6ed3"/><file name="selectstore.phtml" hash="59b46141938afec500ce3acf36da5427"/><file name="setupstore.phtml" hash="c3dab5a53f6007ac9608721bd75761bf"/><file name="type.phtml" hash="4a82a15d0ec58c5531ea7feaf4f19ab0"/></dir><dir name="system"><dir name="config"><file name="button.phtml" hash="9725dd1eea9e0a5c6ff9a34a31d5e433"/><file name="store.phtml" hash="accefd80ff19bf7c917c923b2aed961c"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="straker"><dir name="css"><file name="straker.css" hash="c7688b8e0ba910472b9a8dda58948003"/><file name="straker.less" hash="31c0eef6673e5e454f2d9c086f63526e"/></dir><dir name="images"><dir name="default"><file name="bottom_left.gif" hash="fb99ffa815a8648f95f42698fe5dfaa1"/><file name="bottom_mid.gif" hash="49b9ca7025562ea7f070a9111282364b"/><file name="bottom_right.gif" hash="e46768f632765cd86c5fe5d0166dcf2c"/><file name="bottom_right_resize.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="center_left.gif" hash="bd567580b4ee16a7a2734057cfbbe219"/><file name="center_right.gif" hash="eef184d5d89d1710313581a2ccf408e8"/><file name="clear.gif" hash="7af1206eeb0e7834a75e69d70676060d"/><file name="close.gif" hash="8a08f243c37a8e25a88d4ac135b2f07d"/><file name="inspect.gif" hash="aa2a0961067aad5c54b8634919af863b"/><file name="maximize.gif" hash="e73cd71c4979ebeadeb9e27d40a9e8fb"/><file name="minimize.gif" hash="2d2f4b1bd0506f342425f80ab76c49a3"/><file name="overlay.png" hash="536d40e87cda0c7ae7b11f1721aa52d0"/><file name="resize.gif" hash="320f534b5d444b39701e0b679529e779"/><file name="sizer.gif" hash="1b35a4ec3b734dfe37e31ba87bcc7d99"/><file name="top_left.gif" hash="9c5e5920bfc189a45cc618099af93aa8"/><file name="top_mid.gif" hash="a12ff2b944025ad2d127d033dae5e9e1"/><file name="top_right.gif" hash="0cf1ec5b93f8ac8fcce0e2f72cf7f45e"/></dir><file name="magento-banner.jpg" hash="b3105fd2dd00004ab903db4fbb81b61e"/><file name="refresh_32.png" hash="96e793bcbcc2dc48768b8e124beea378"/><file name="straker-translations-logo.png" hash="7cb5e29f562420142f918147d95ed232"/></dir><file name=".DS_Store" hash="4383767617d41fd13ca2618851200e2a"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="StrakerTranslations_EasyTranslationPlatform.xml" hash="eb61fdaac7559a75e39bc01206165d0c"/></dir></target><target name="mage"><dir name="js"><dir name="straker"><file name="translations.js" hash="0168be67b66e071d1e8f833a959d95b7"/></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>7.1.0</max></php></required></dependencies>
19
  </package>
skin/adminhtml/default/straker/.DS_Store ADDED
Binary file
skin/adminhtml/default/straker/css/straker.css CHANGED
@@ -304,6 +304,10 @@ ol.wizard li.wizard-todo {
304
  color: silver;
305
  border-bottom: 4px solid silver;
306
  }
 
 
 
 
307
  ol.wizard li:after {
308
  content: "\00a0\00a0";
309
  }
@@ -331,6 +335,13 @@ ol.wizard li.wizard-todo:before {
331
  font-size: 1.5em;
332
  bottom: -1.6em;
333
  }
 
 
 
 
 
 
 
334
  /*
335
  Temp UI Updates : Yogi
336
  */
@@ -483,3 +494,6 @@ ol.wizard {
483
  vertical-align: top;
484
  margin-left: 5px;
485
  }
 
 
 
304
  color: silver;
305
  border-bottom: 4px solid silver;
306
  }
307
+ ol.wizard li.wizard-current {
308
+ color: #eb5e00;
309
+ border-bottom: 4px solid #eb5e00;
310
+ }
311
  ol.wizard li:after {
312
  content: "\00a0\00a0";
313
  }
335
  font-size: 1.5em;
336
  bottom: -1.6em;
337
  }
338
+ ol.wizard li.wizard-current:before {
339
+ content: "\039F";
340
+ color: #eb5e00;
341
+ background-color: white;
342
+ font-size: 1.5em;
343
+ bottom: -1.6em;
344
+ }
345
  /*
346
  Temp UI Updates : Yogi
347
  */
494
  vertical-align: top;
495
  margin-left: 5px;
496
  }
497
+ #attributeGrid_table #massactions-wrapper {
498
+ background: url(../../default/images/massaction_bg.gif) repeat-x 0 100% #ebebeb;
499
+ }
skin/adminhtml/default/straker/css/straker.less CHANGED
@@ -332,6 +332,10 @@ ol.wizard {
332
  color: silver;
333
  border-bottom: 4px solid silver;
334
  }
 
 
 
 
335
 
336
  &:after {
337
  content: "\00a0\00a0";
@@ -360,6 +364,13 @@ ol.wizard {
360
  font-size: 1.5em;
361
  bottom: -1.6em;
362
  }
 
 
 
 
 
 
 
363
  }
364
  }
365
 
@@ -520,4 +531,9 @@ ol.wizard{
520
  margin-left: 5px;
521
  }
522
  }
 
 
 
 
 
523
  }
332
  color: silver;
333
  border-bottom: 4px solid silver;
334
  }
335
+ &.wizard-current {
336
+ color: #eb5e00;
337
+ border-bottom: 4px solid #eb5e00;
338
+ }
339
 
340
  &:after {
341
  content: "\00a0\00a0";
364
  font-size: 1.5em;
365
  bottom: -1.6em;
366
  }
367
+ &.wizard-current:before{
368
+ content: "\039F";
369
+ color: #eb5e00;
370
+ background-color: white;
371
+ font-size: 1.5em;
372
+ bottom: -1.6em;
373
+ }
374
  }
375
  }
376
 
531
  margin-left: 5px;
532
  }
533
  }
534
+ }
535
+ #attributeGrid_table{
536
+ #massactions-wrapper{
537
+ background:url(../../default/images/massaction_bg.gif) repeat-x 0 100% #ebebeb
538
+ }
539
  }