Skip to content
This repository has been archived by the owner on Jan 26, 2018. It is now read-only.

Commit

Permalink
Merge pull request #1 from Magmodules/development
Browse files Browse the repository at this point in the history
v1.5.0
Magmodules authored Apr 18, 2017
2 parents 1c1e46b + ddb5bd6 commit 2f1cf27
Showing 53 changed files with 1,307 additions and 1,040 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* Magmodules.eu - http://www.magmodules.eu
*
@@ -18,6 +17,7 @@
* @copyright Copyright (c) 2017 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Magmodules_Feedbackcompany_Block_Adminhtml_Feedbacklog extends Mage_Adminhtml_Block_Widget_Grid_Container
{

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* Magmodules.eu - http://www.magmodules.eu
*
@@ -18,6 +17,7 @@
* @copyright Copyright (c) 2017 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Magmodules_Feedbackcompany_Block_Adminhtml_Feedbacklog_Grid extends Mage_Adminhtml_Block_Widget_Grid
{

@@ -33,6 +33,11 @@ public function __construct()
$this->setSaveParametersInSession(true);
}

/**
* @param $row
*
* @return bool
*/
public function getRowUrl($row)
{
return false;
@@ -55,86 +60,86 @@ protected function _prepareColumns()
{
$showApiUrl = Mage::app()->getRequest()->getParam('showapiurl');

$this->addColumn(
'company', array(
'header' => Mage::helper('feedbackcompany')->__('Shop'),
'index' => 'company',
'width' => '120px',
)
);

$this->addColumn(
'type', array(
'header' => Mage::helper('feedbackcompany')->__('Type'),
'align' => 'left',
'index' => 'type',
'width' => '120',
'type' => 'options',
'header' => Mage::helper('feedbackcompany')->__('Type'),
'align' => 'left',
'index' => 'type',
'width' => '120',
'type' => 'options',
'options' => array(
'reviews' => Mage::helper('feedbackcompany')->__('Reviews'),
'reviews' => Mage::helper('feedbackcompany')->__('Reviews'),
'productreviews' => Mage::helper('feedbackcompany')->__('Productreviews'),
'invitation' => Mage::helper('feedbackcompany')->__('Invitation Call'),
'invitation' => Mage::helper('feedbackcompany')->__('Invitation Call'),
),
)
);

if ($showApiUrl) {
$this->addColumn(
'api_url', array(
'header' => Mage::helper('feedbackcompany')->__('Api URL'),
'align' => 'left',
'index' => 'api_url',
'filter' => false,
'header' => Mage::helper('feedbackcompany')->__('Api URL'),
'align' => 'left',
'index' => 'api_url',
'filter' => false,
'sortable' => false,
)
);
}

$this->addColumn(
'qty', array(
'header' => Mage::helper('feedbackcompany')->__('Description'),
'align' => 'left',
'index' => 'qty',
'header' => Mage::helper('feedbackcompany')->__('Description'),
'align' => 'left',
'index' => 'qty',
'renderer' => 'feedbackcompany/adminhtml_widget_grid_log',
'filter' => false,
'filter' => false,
'sortable' => false,
)
);

$this->addColumn(
'company', array(
'header' => Mage::helper('feedbackcompany')->__('Shop'),
'index' => 'company',
'width' => '120px',
)
);

$this->addColumn(
'cron', array(
'header' => Mage::helper('feedbackcompany')->__('Cron'),
'align' => 'left',
'index' => 'cron',
'width' => '120',
'type' => 'options',
'header' => Mage::helper('feedbackcompany')->__('Cron'),
'align' => 'left',
'index' => 'cron',
'width' => '120',
'type' => 'options',
'options' => array(
'' => Mage::helper('feedbackcompany')->__('Manually'),
'stats' => Mage::helper('feedbackcompany')->__('Stats Cron'),
'reviews' => Mage::helper('feedbackcompany')->__('Reviews Cron'),
'' => Mage::helper('feedbackcompany')->__('Manually'),
'stats' => Mage::helper('feedbackcompany')->__('Stats Cron'),
'reviews' => Mage::helper('feedbackcompany')->__('Reviews Cron'),
'productreviews' => Mage::helper('feedbackcompany')->__('Producteviews Cron'),
'orderupdate' => Mage::helper('feedbackcompany')->__('Invitation'),
'orderupdate' => Mage::helper('feedbackcompany')->__('Invitation'),
),
)
);

$this->addColumn(
'time', array(
'header' => Mage::helper('feedbackcompany')->__('Time'),
'align' => 'left',
'index' => 'time',
'width' => '60',
'header' => Mage::helper('feedbackcompany')->__('Time'),
'align' => 'left',
'index' => 'time',
'width' => '60',
'renderer' => 'feedbackcompany/adminhtml_widget_grid_seconds',
)
);

$this->addColumn(
'date', array(
'header' => Mage::helper('feedbackcompany')->__('Date'),
'align' => 'left',
'type' => 'datetime',
'index' => 'date',
'width' => '140',
'align' => 'left',
'type' => 'datetime',
'index' => 'date',
'width' => '140',
)
);

@@ -151,7 +156,7 @@ protected function _prepareMassaction()
$this->getMassactionBlock()->addItem(
'hide', array(
'label' => Mage::helper('feedbackcompany')->__('Delete'),
'url' => $this->getUrl('*/*/massDelete'),
'url' => $this->getUrl('*/*/massDelete'),
)
);

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* Magmodules.eu - http://www.magmodules.eu
*
@@ -18,6 +17,7 @@
* @copyright Copyright (c) 2017 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Magmodules_Feedbackcompany_Block_Adminhtml_Feedbackreviews extends Mage_Adminhtml_Block_Widget_Grid_Container
{

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* Magmodules.eu - http://www.magmodules.eu
*
@@ -18,6 +17,7 @@
* @copyright Copyright (c) 2017 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Magmodules_Feedbackcompany_Block_Adminhtml_Feedbackreviews_Grid
extends Mage_Adminhtml_Block_Widget_Grid
{
@@ -60,27 +60,35 @@ protected function _prepareCollection()
protected function _prepareColumns()
{

$this->addColumn(
'review_id', array(
'header' => Mage::helper('feedbackcompany')->__('ID'),
'index' => 'feedback_id',
'width' => '60px',
)
);

$this->addColumn(
'company', array(
'header' => Mage::helper('feedbackcompany')->__('Shop'),
'index' => 'company',
'width' => '120px',
)
);


$this->addColumn(
'customer_name', array(
'header' => Mage::helper('feedbackcompany')->__('User'),
'header' => Mage::helper('feedbackcompany')->__('Name'),
'align' => 'left',
'index' => 'customer_name',
)
);

$this->addColumn(
'purchased_products', array(
'header' => Mage::helper('feedbackcompany')->__('Product(s)'),
'customer_email', array(
'header' => Mage::helper('feedbackcompany')->__('Email'),
'align' => 'left',
'index' => 'purchased_products',
'index' => 'customer_email',
)
);

@@ -89,7 +97,7 @@ protected function _prepareColumns()
'header' => Mage::helper('feedbackcompany')->__('Review'),
'align' => 'left',
'index' => 'review_text',
'renderer' => 'feedbackcompany/adminhtml_feedbackreviews_renderer_experience',
'renderer' => 'feedbackcompany/adminhtml_widget_grid_experience',
)
);

@@ -105,42 +113,6 @@ protected function _prepareColumns()
)
);

$this->addColumn(
'customer_active', array(
'header' => Mage::helper('feedbackcompany')->__('Purchase'),
'align' => 'left',
'index' => 'customer_active',
'type' => 'options',
'options' => array(
'sometimes' => Mage::helper('feedbackcompany')->__('Sometimes'),
'regularly' => Mage::helper('feedbackcompany')->__('Regularly'),
'often' => Mage::helper('feedbackcompany')->__('Often'),
),
)
);

$this->addColumn(
'customer_sex', array(
'header' => Mage::helper('feedbackcompany')->__('Gender'),
'align' => 'left',
'index' => 'customer_sex',
'type' => 'options',
'options' => array(
'male' => Mage::helper('feedbackcompany')->__('Male'),
'female' => Mage::helper('feedbackcompany')->__('Female'),
),
)
);

$this->addColumn(
'customer_age', array(
'header' => Mage::helper('feedbackcompany')->__('Age'),
'align' => 'left',
'index' => 'customer_age',
'width' => '50',
)
);

$this->addColumn(
'date_created', array(
'header' => Mage::helper('feedbackcompany')->__('Date'),
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* Magmodules.eu - http://www.magmodules.eu
*
@@ -18,6 +17,7 @@
* @copyright Copyright (c) 2017 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Magmodules_Feedbackcompany_Block_Adminhtml_Widget_Buttons_Process
extends Mage_Adminhtml_Block_System_Config_Form_Field
{
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* Magmodules.eu - http://www.magmodules.eu
*
@@ -18,6 +17,7 @@
* @copyright Copyright (c) 2017 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Magmodules_Feedbackcompany_Block_Adminhtml_Widget_Buttons_Productreviews
extends Mage_Adminhtml_Block_System_Config_Form_Field
{

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* Magmodules.eu - http://www.magmodules.eu
*
@@ -18,6 +17,7 @@
* @copyright Copyright (c) 2017 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Magmodules_Feedbackcompany_Block_Adminhtml_Widget_Field_Version
extends Mage_Adminhtml_Block_System_Config_Form_Field
{
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

/**
* Magmodules.eu - http://www.magmodules.eu
*
@@ -18,6 +17,7 @@
* @copyright Copyright (c) 2017 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Magmodules_Feedbackcompany_Block_Adminhtml_Widget_Form_Heading extends Mage_Adminhtml_Block_Abstract
implements Varien_Data_Form_Element_Renderer_Interface
{
Loading

0 comments on commit 2f1cf27

Please sign in to comment.