-
- getMessagesBlock()->getGroupedHtml() ?>
- getChildHtml('content') ?>
- " . htmlspecialchars($templateProcessed) . ""; - } - - \Magento\Profiler::stop("newsletter_queue_proccessing"); - - return $templateProcessed; - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php b/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php deleted file mode 100644 index 5f7d41b594359..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Newsletter\Queue\Preview; - -class Form extends \Magento\Backend\Block\Widget\Form\Generic -{ - /** - * Preparing from for revision page - * - * @return \Magento\Adminhtml\Block\Widget\Form - */ - protected function _prepareForm() - { - /** @var \Magento\Data\Form $form */ - $form = $this->_formFactory->create(array( - 'attributes' => array( - 'id' => 'preview_form', - 'action' => $this->getUrl('adminhtml/*/drop', array('_current' => true)), - 'method' => 'post', - )) - ); - - if ($data = $this->getFormData()) { - - $mapper = array('preview_store_id' => 'store_id'); - - foreach ($data as $key => $value) { - if(array_key_exists($key, $mapper)) { - $name = $mapper[$key]; - } else { - $name = $key; - } - $form->addField($key, 'hidden', array('name' => $name)); - } - $form->setValues($data); - } - - $form->setUseContainer(true); - $this->setForm($form); - return parent::_prepareForm(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php deleted file mode 100644 index 77983dbce8d05..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php +++ /dev/null @@ -1,111 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Newsletter; - -class Subscriber extends \Magento\Adminhtml\Block\Template -{ - /** - * Queue collection - * - * @var \Magento\Newsletter\Model\Resource\Queue\Collection - */ - protected $_queueCollection = null; - - protected $_template = 'newsletter/subscriber/list.phtml'; - - /** - * @var \Magento\Newsletter\Model\Resource\Queue\CollectionFactory - */ - protected $_collectionFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Newsletter\Model\Resource\Queue\CollectionFactory $collectionFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Newsletter\Model\Resource\Queue\CollectionFactory $collectionFactory, - array $data = array() - ) { - $this->_collectionFactory = $collectionFactory; - parent::__construct($context, $coreData, $data); - } - - /** - * Prepares block to render - * - * @return \Magento\Adminhtml\Block\Newsletter\Subscriber - */ - protected function _beforeToHtml() - { - return parent::_beforeToHtml(); - } - - /** - * Return queue collection with loaded neversent queues - * - * @return \Magento\Newsletter\Model\Resource\Queue\Collection - */ - public function getQueueCollection() - { - if (is_null($this->_queueCollection)) { - /** @var $this->_queueCollection \Magento\Newsletter\Model\Resource\Queue\Collection */ - $this->_queueCollection = $this->_collectionFactory->create() - ->addTemplateInfo() - ->addOnlyUnsentFilter() - ->load(); - } - - return $this->_queueCollection; - } - - public function getShowQueueAdd() - { - return $this->getChildBlock('grid')->getShowQueueAdd(); - } - - /** - * Return list of neversent queues for select - * - * @return array - */ - public function getQueueAsOptions() - { - return $this->getQueueCollection()->toOptionArray(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php deleted file mode 100644 index 58d5307b946a5..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php +++ /dev/null @@ -1,77 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Newsletter\Subscriber; - -class Grid extends \Magento\Backend\Block\Widget\Grid -{ - /** - * @var \Magento\Newsletter\Model\QueueFactory - */ - protected $_queueFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Newsletter\Model\QueueFactory $queueFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Newsletter\Model\QueueFactory $queueFactory, - array $data = array() - ) { - $this->_queueFactory = $queueFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - /** - * Prepare collection for grid - * - * @return \Magento\Backend\Block\Widget\Grid - */ - protected function _prepareCollection() - { - - if ($this->getRequest()->getParam('queue', false)) { - $this->getCollection()->useQueue($this->_queueFactory->create() - ->load($this->getRequest()->getParam('queue')) - ); - } - - return parent::_prepareCollection(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php b/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php deleted file mode 100644 index 34144d5d71057..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php +++ /dev/null @@ -1,48 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter; - -class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\AbstractFilter -{ - public function getCondition() - { - return array(); - } - - public function getHtml() - { - return ''; - } -}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter\Checkbox END diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php b/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php deleted file mode 100644 index b611525e22472..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +++ /dev/null @@ -1,54 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Renderer; - -class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer -{ - /** - * Renders grid column - * - * @param \Magento\Object $row - * @return string - */ - public function render(\Magento\Object $row) - { - if($row->getSubscriberStatus()==\Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED) { - return ''; - } else { - return ''; - } - - } -}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Renderer\Checkbox END diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template.php deleted file mode 100644 index 87842f7a1bfe4..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Template.php +++ /dev/null @@ -1,59 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Newsletter; - -class Template extends \Magento\Adminhtml\Block\Template -{ - protected $_template = 'newsletter/template/list.phtml'; - - protected function _prepareLayout() - { - $this->setChild( - 'grid', - $this->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Template\Grid', 'newsletter.template.grid') - ); - return parent::_prepareLayout(); - } - - public function getCreateUrl() - { - return $this->getUrl('adminhtml/*/new'); - } - - public function getHeaderText() - { - return __('Newsletter Templates'); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php deleted file mode 100644 index e5e39f2044038..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php +++ /dev/null @@ -1,360 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Newsletter\Template; - -class Edit extends \Magento\Adminhtml\Block\Widget -{ - /** - * Edit Block model - * - * @var bool - */ - protected $_editMode = false; - - /** - * Core registry - * - * @var \Magento\Core\Model\Registry - */ - protected $_coreRegistry = null; - - /** - * @var \Magento\Cms\Model\Wysiwyg\Config - */ - protected $_wysiwygConfig; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig - * @param \Magento\Core\Model\Registry $registry - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig, - \Magento\Core\Model\Registry $registry, - array $data = array() - ) { - $this->_coreRegistry = $registry; - $this->_wysiwygConfig = $wysiwygConfig; - parent::__construct($context, $coreData, $data); - } - - /** - * Retrieve template object - * - * @return \Magento\Newsletter\Model\Template - */ - public function getModel() - { - return $this->_coreRegistry->registry('_current_template'); - } - - /** - * Preparing block layout - * - * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit - */ - protected function _prepareLayout() - { - // Load Wysiwyg on demand and Prepare layout - $block = $this->getLayout()->getBlock('head'); - if ($this->_wysiwygConfig->isEnabled() && $block) { - $block->setCanLoadTinyMce(true); - } - - $this->addChild('back_button', 'Magento\Adminhtml\Block\Widget\Button', array( - 'label' => __('Back'), - 'onclick' => "window.location.href = '" . $this->getUrl('adminhtml/*') . "'", - 'class' => 'action-back' - )); - - $this->addChild('reset_button', 'Magento\Adminhtml\Block\Widget\Button', array( - 'label' => __('Reset'), - 'onclick' => 'window.location.href = window.location.href', - 'class' => 'reset' - )); - - $this->addChild('to_plain_button', 'Magento\Adminhtml\Block\Widget\Button', array( - 'label' => __('Convert to Plain Text'), - 'onclick' => 'templateControl.stripTags();', - 'id' => 'convert_button', - 'class' => 'convert' - )); - - $this->addChild('to_html_button', 'Magento\Adminhtml\Block\Widget\Button', array( - 'label' => __('Return HTML Version'), - 'onclick' => 'templateControl.unStripTags();', - 'id' => 'convert_button_back', - 'style' => 'display:none', - 'class' => 'return' - )); - - $this->addChild('save_button', 'Magento\Adminhtml\Block\Widget\Button', array( - 'label' => __('Save Template'), - 'onclick' => 'templateControl.save();', - 'class' => 'save primary' - )); - - $this->addChild('save_as_button', 'Magento\Adminhtml\Block\Widget\Button', array( - 'label' => __('Save As'), - 'onclick' => 'templateControl.saveAs();', - 'class' => 'save-as' - )); - - $this->addChild('preview_button', 'Magento\Adminhtml\Block\Widget\Button', array( - 'label' => __('Preview Template'), - 'onclick' => 'templateControl.preview();', - 'class' => 'preview' - )); - - $this->addChild('delete_button', 'Magento\Adminhtml\Block\Widget\Button', array( - 'label' => __('Delete Template'), - 'onclick' => 'templateControl.deleteTemplate();', - 'class' => 'delete' - )); - - return parent::_prepareLayout(); - } - - /** - * Retrieve Back Button HTML - * - * @return string - */ - public function getBackButtonHtml() - { - return $this->getChildHtml('back_button'); - } - - /** - * Retrieve Reset Button HTML - * - * @return string - */ - public function getResetButtonHtml() - { - return $this->getChildHtml('reset_button'); - } - - /** - * Retrieve Convert To Plain Button HTML - * - * @return string - */ - public function getToPlainButtonHtml() - { - return $this->getChildHtml('to_plain_button'); - } - - /** - * Retrieve Convert to HTML Button HTML - * - * @return string - */ - public function getToHtmlButtonHtml() - { - return $this->getChildHtml('to_html_button'); - } - - /** - * Retrieve Save Button HTML - * - * @return string - */ - public function getSaveButtonHtml() - { - return $this->getChildHtml('save_button'); - } - - /** - * Retrieve Preview Button HTML - * - * @return string - */ - public function getPreviewButtonHtml() - { - return $this->getChildHtml('preview_button'); - } - - /** - * Retrieve Delete Button HTML - * - * @return string - */ - public function getDeleteButtonHtml() - { - return $this->getChildHtml('delete_button'); - } - - /** - * Retrieve Save as Button HTML - * - * @return string - */ - public function getSaveAsButtonHtml() - { - return $this->getChildHtml('save_as_button'); - } - - /** - * Set edit flag for block - * - * @param boolean $value - * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit - */ - public function setEditMode($value = true) - { - $this->_editMode = (bool)$value; - return $this; - } - - /** - * Return edit flag for block - * - * @return boolean - */ - public function getEditMode() - { - return $this->_editMode; - } - - /** - * Return header text for form - * - * @return string - */ - public function getHeaderText() - { - if ($this->getEditMode()) { - return __('Edit Newsletter Template'); - } - - return __('New Newsletter Template'); - } - - /** - * Return form block HTML - * - * @return string - */ - public function getForm() - { - return $this->getLayout() - ->createBlock('Magento\Adminhtml\Block\Newsletter\Template\Edit\Form') - ->toHtml(); - } - - /** - * Return return template name for JS - * - * @return string - */ - public function getJsTemplateName() - { - return addcslashes($this->getModel()->getTemplateCode(), "\"\r\n\\"); - } - - /** - * Return action url for form - * - * @return string - */ - public function getSaveUrl() - { - return $this->getUrl('adminhtml/*/save'); - } - - /** - * Return preview action url for form - * - * @return string - */ - public function getPreviewUrl() - { - return $this->getUrl('adminhtml/*/preview'); - } - - /** - * Check Template Type is Plain Text - * - * @return bool - */ - public function isTextType() - { - return $this->getModel()->isPlain(); - } - - /** - * Return delete url for customer group - * - * @return string - */ - public function getDeleteUrl() - { - return $this->getUrl('adminhtml/*/delete', array('id' => $this->getRequest()->getParam('id'))); - } - - /** - * Retrieve Save As Flag - * - * @return int - */ - public function getSaveAsFlag() - { - return $this->getRequest()->getParam('_save_as_flag') ? '1' : ''; - } - - /** - * Getter for single store mode check - * - * @return boolean - */ - protected function isSingleStoreMode() - { - return $this->_storeManager->isSingleStoreMode(); - } - - /** - * Getter for id of current store (the only one in single-store mode and current in multi-stores mode) - * - * @return boolean - */ - protected function getStoreId() - { - return $this->_storeManager->getStore(true)->getId(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php deleted file mode 100644 index aca73a4d27877..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php +++ /dev/null @@ -1,178 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Newsletter\Template\Edit; - -class Form extends \Magento\Backend\Block\Widget\Form\Generic -{ - /** - * @var \Magento\Cms\Model\Wysiwyg\Config - */ - protected $_wysiwygConfig; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Registry $registry - * @param \Magento\Data\FormFactory $formFactory - * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Registry $registry, - \Magento\Data\FormFactory $formFactory, - \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig, - array $data = array() - ) { - $this->_wysiwygConfig = $wysiwygConfig; - parent::__construct($context, $coreData, $registry, $formFactory, $data); - } - - /** - * Retrieve template object - * - * @return \Magento\Newsletter\Model\Template - */ - public function getModel() - { - return $this->_coreRegistry->registry('_current_template'); - } - - /** - * Prepare form before rendering HTML - * - * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit\Form - */ - protected function _prepareForm() - { - $model = $this->getModel(); - $identity = $this->_storeConfig->getConfig( - \Magento\Newsletter\Model\Subscriber::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY - ); - $identityName = $this->_storeConfig->getConfig('trans_email/ident_'.$identity.'/name'); - $identityEmail = $this->_storeConfig->getConfig('trans_email/ident_'.$identity.'/email'); - - /** @var \Magento\Data\Form $form */ - $form = $this->_formFactory->create(array( - 'attributes' => array( - 'id' => 'edit_form', - 'action' => $this->getData('action'), - 'method' => 'post', - )) - ); - - $fieldset = $form->addFieldset('base_fieldset', array( - 'legend' => __('Template Information'), - 'class' => 'fieldset-wide' - )); - - if ($model->getId()) { - $fieldset->addField('id', 'hidden', array( - 'name' => 'id', - 'value' => $model->getId(), - )); - } - - $fieldset->addField('code', 'text', array( - 'name' => 'code', - 'label' => __('Template Name'), - 'title' => __('Template Name'), - 'required' => true, - 'value' => $model->getTemplateCode(), - )); - - $fieldset->addField('subject', 'text', array( - 'name' => 'subject', - 'label' => __('Template Subject'), - 'title' => __('Template Subject'), - 'required' => true, - 'value' => $model->getTemplateSubject(), - )); - - $fieldset->addField('sender_name', 'text', array( - 'name' =>'sender_name', - 'label' => __('Sender Name'), - 'title' => __('Sender Name'), - 'required' => true, - 'value' => $model->getId() !== null - ? $model->getTemplateSenderName() - : $identityName, - )); - - $fieldset->addField('sender_email', 'text', array( - 'name' =>'sender_email', - 'label' => __('Sender Email'), - 'title' => __('Sender Email'), - 'class' => 'validate-email', - 'required' => true, - 'value' => $model->getId() !== null - ? $model->getTemplateSenderEmail() - : $identityEmail - )); - - - $widgetFilters = array('is_email_compatible' => 1); - $wysiwygConfig = $this->_wysiwygConfig->getConfig(array('widget_filters' => $widgetFilters)); - if ($model->isPlain()) { - $wysiwygConfig->setEnabled(false); - } - $fieldset->addField('text', 'editor', array( - 'name' => 'text', - 'label' => __('Template Content'), - 'title' => __('Template Content'), - 'required' => true, - 'state' => 'html', - 'style' => 'height:36em;', - 'value' => $model->getTemplateText(), - 'config' => $wysiwygConfig - )); - - if (!$model->isPlain()) { - $fieldset->addField('template_styles', 'textarea', array( - 'name' =>'styles', - 'label' => __('Template Styles'), - 'container_id' => 'field_template_styles', - 'value' => $model->getTemplateStyles() - )); - } - - $form->setAction($this->getUrl('adminhtml/*/save')); - $form->setUseContainer(true); - $this->setForm($form); - - return parent::_prepareForm(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php deleted file mode 100644 index e065b186a583f..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php +++ /dev/null @@ -1,156 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Newsletter\Template; - -class Grid extends \Magento\Backend\Block\Widget\Grid\Extended -{ - /** - * @var \Magento\Newsletter\Model\Resource\Template\Collection - */ - protected $_templateCollection; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Newsletter\Model\Resource\Template\Collection $templateCollection - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Newsletter\Model\Resource\Template\Collection $templateCollection, - array $data = array() - ) { - $this->_templateCollection = $templateCollection; - parent::__construct($context, $coreData, $urlModel, $data); - $this->setEmptyText(__('No Templates Found')); - } - - protected function _prepareCollection() - { - $this->setCollection($this->_templateCollection->useOnlyActual()); - - return parent::_prepareCollection(); - } - - protected function _prepareColumns() - { - $this->addColumn('template_code', - array( - 'header' => __('ID'), - 'index' => 'template_id', - 'header_css_class' => 'col-id', - 'column_css_class' => 'col-id' - )); - $this->addColumn('code', - array( - 'header' => __('Template'), - 'index' => 'template_code', - 'header_css_class' => 'col-template', - 'column_css_class' => 'col-template' - )); - - $this->addColumn('added_at', - array( - 'header' => __('Added'), - 'index' => 'added_at', - 'gmtoffset' => true, - 'type' => 'datetime', - 'header_css_class' => 'col-added', - 'column_css_class' => 'col-added' - )); - - $this->addColumn('modified_at', - array( - 'header' => __('Updated'), - 'index' => 'modified_at', - 'gmtoffset' => true, - 'type' => 'datetime', - 'header_css_class' => 'col-updated', - 'column_css_class' => 'col-updated' - )); - - $this->addColumn('subject', - array( - 'header' => __('Subject'), - 'index' => 'template_subject', - 'header_css_class' => 'col-subject', - 'column_css_class' => 'col-subject' - )); - - $this->addColumn('sender', - array( - 'header' => __('Sender'), - 'index' => 'template_sender_email', - 'renderer' => 'Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer\Sender', - 'header_css_class' => 'col-sender', - 'column_css_class' => 'col-sender' - )); - - $this->addColumn('type', - array( - 'header' => __('Template Type'), - 'index' => 'template_type', - 'type' => 'options', - 'options' => array( - \Magento\Newsletter\Model\Template::TYPE_HTML => 'html', - \Magento\Newsletter\Model\Template::TYPE_TEXT => 'text' - ), - 'header_css_class' => 'col-type', - 'column_css_class' => 'col-type' - )); - - $this->addColumn('action', - array( - 'header' => __('Action'), - 'index' => 'template_id', - 'sortable' => false, - 'filter' => false, - 'no_link' => true, - 'renderer' => 'Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer\Action', - 'header_css_class' => 'col-actions', - 'column_css_class' => 'col-actions' - )); - - return $this; - } - - public function getRowUrl($row) - { - return $this->getUrl('adminhtml/*/edit', array('id'=>$row->getId())); - } -} - diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php deleted file mode 100644 index e30fbd8a666f7..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +++ /dev/null @@ -1,64 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer; - -class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action -{ - /** - * Renderer for "Action" column in Newsletter templates grid - * - * @var \Magento\Newsletter\Model\Template $row - * @return string - */ - public function render(\Magento\Object $row) - { - if($row->isValidForSend()) { - $actions[] = array( - 'url' => $this->getUrl('adminhtml/newsletter_queue/edit', array('template_id' => $row->getId())), - 'caption' => __('Queue Newsletter...') - ); - } - - $actions[] = array( - 'url' => $this->getUrl('adminhtml/*/preview', array('id'=>$row->getId())), - 'popup' => true, - 'caption' => __('Preview') - ); - - $this->getColumn()->setActions($actions); - - return parent::render($row); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php deleted file mode 100644 index f60823e8bcd46..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php +++ /dev/null @@ -1,105 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Newsletter\Template; - -class Preview extends \Magento\Adminhtml\Block\Widget -{ - /** - * @var \Magento\Newsletter\Model\TemplateFactory - */ - protected $_templateFactory; - - /** - * @var \Magento\Newsletter\Model\SubscriberFactory - */ - protected $_subscriberFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Newsletter\Model\TemplateFactory $templateFactory - * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Newsletter\Model\TemplateFactory $templateFactory, - \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory, - array $data = array() - ) { - $this->_templateFactory = $templateFactory; - $this->_subscriberFactory = $subscriberFactory; - parent::__construct($context, $coreData, $data); - } - - protected function _toHtml() - { - /* @var $template \Magento\Newsletter\Model\Template */ - $template = $this->_templateFactory->create(); - - if ($id = (int)$this->getRequest()->getParam('id')) { - $template->load($id); - } else { - $template->setTemplateType($this->getRequest()->getParam('type')); - $template->setTemplateText($this->getRequest()->getParam('text')); - $template->setTemplateStyles($this->getRequest()->getParam('styles')); - } - - $storeId = (int)$this->getRequest()->getParam('store_id'); - if (!$storeId) { - $storeId = $this->_storeManager->getDefaultStoreView()->getId(); - } - - \Magento\Profiler::start("newsletter_template_proccessing"); - $vars = array(); - - $vars['subscriber'] = $this->_subscriberFactory->create(); - if ($this->getRequest()->getParam('subscriber')) { - $vars['subscriber']->load($this->getRequest()->getParam('subscriber')); - } - - $template->emulateDesign($storeId); - $templateProcessed = $template->getProcessedTemplate($vars, true); - $template->revertDesign(); - - if ($template->isPlain()) { - $templateProcessed = "
" . htmlspecialchars($templateProcessed) . ""; - } - - \Magento\Profiler::stop("newsletter_template_proccessing"); - - return $templateProcessed; - } -} diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php deleted file mode 100644 index 77b03cd1cca24..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Newsletter\Template\Preview; - -class Form extends \Magento\Backend\Block\Widget\Form\Generic -{ - /** - * Preparing from for revision page - * - * @return \Magento\Adminhtml\Block\Widget\Form - */ - protected function _prepareForm() - { - /** @var \Magento\Data\Form $form */ - $form = $this->_formFactory->create(array( - 'attributes' => array( - 'id' => 'preview_form', - 'action' => $this->getUrl('adminhtml/*/drop', array('_current' => true)), - 'method' => 'post', - )) - ); - - if ($data = $this->getFormData()) { - - $mapper = array('preview_store_id' => 'store_id'); - - foreach ($data as $key => $value) { - if (array_key_exists($key, $mapper)) { - $name = $mapper[$key]; - } else { - $name = $key; - } - $form->addField($key, 'hidden', array('name' => $name)); - } - $form->setValues($data); - } - - $form->setUseContainer(true); - $this->setForm($form); - return parent::_prepareForm(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php b/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php deleted file mode 100644 index cd74153c9abd3..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php +++ /dev/null @@ -1,244 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Filter; - -class Form extends \Magento\Backend\Block\Widget\Form\Generic -{ - /** - * Report type options - */ - protected $_reportTypeOptions = array(); - - /** - * Report field visibility - */ - protected $_fieldVisibility = array(); - - /** - * Report field opions - */ - protected $_fieldOptions = array(); - - /** - * Set field visibility - * - * @param string Field id - * @param bool Field visibility - */ - public function setFieldVisibility($fieldId, $visibility) - { - $this->_fieldVisibility[$fieldId] = (bool)$visibility; - } - - /** - * Get field visibility - * - * @param string Field id - * @param bool Default field visibility - * @return bool - */ - public function getFieldVisibility($fieldId, $defaultVisibility = true) - { - if (!array_key_exists($fieldId, $this->_fieldVisibility)) { - return $defaultVisibility; - } - return $this->_fieldVisibility[$fieldId]; - } - - /** - * Set field option(s) - * - * @param string $fieldId Field id - * @param mixed $option Field option name - * @param mixed $value Field option value - */ - public function setFieldOption($fieldId, $option, $value = null) - { - if (is_array($option)) { - $options = $option; - } else { - $options = array($option => $value); - } - if (!array_key_exists($fieldId, $this->_fieldOptions)) { - $this->_fieldOptions[$fieldId] = array(); - } - foreach ($options as $k => $v) { - $this->_fieldOptions[$fieldId][$k] = $v; - } - } - - /** - * Add report type option - * - * @param string $key - * @param string $value - * @return \Magento\Adminhtml\Block\Report\Filter\Form - */ - public function addReportTypeOption($key, $value) - { - $this->_reportTypeOptions[$key] = __($value); - return $this; - } - - /** - * Add fieldset with general report fields - * - * @return \Magento\Adminhtml\Block\Report\Filter\Form - */ - protected function _prepareForm() - { - $actionUrl = $this->getUrl('adminhtml/*/sales'); - - /** @var \Magento\Data\Form $form */ - $form = $this->_formFactory->create(array( - 'attributes' => array( - 'id' => 'filter_form', - 'action' => $actionUrl, - 'method' => 'get', - )) - ); - - $htmlIdPrefix = 'sales_report_'; - $form->setHtmlIdPrefix($htmlIdPrefix); - $fieldset = $form->addFieldset('base_fieldset', array('legend'=>__('Filter'))); - - $dateFormat = $this->_locale->getDateFormat(\Magento\Core\Model\LocaleInterface::FORMAT_TYPE_SHORT); - - $fieldset->addField('store_ids', 'hidden', array( - 'name' => 'store_ids' - )); - - $fieldset->addField('report_type', 'select', array( - 'name' => 'report_type', - 'options' => $this->_reportTypeOptions, - 'label' => __('Match Period To'), - )); - - $fieldset->addField('period_type', 'select', array( - 'name' => 'period_type', - 'options' => array( - 'day' => __('Day'), - 'month' => __('Month'), - 'year' => __('Year') - ), - 'label' => __('Period'), - 'title' => __('Period') - )); - - $fieldset->addField('from', 'date', array( - 'name' => 'from', - 'date_format' => $dateFormat, - 'image' => $this->getViewFileUrl('images/grid-cal.gif'), - 'label' => __('From'), - 'title' => __('From'), - 'required' => true - )); - - $fieldset->addField('to', 'date', array( - 'name' => 'to', - 'date_format' => $dateFormat, - 'image' => $this->getViewFileUrl('images/grid-cal.gif'), - 'label' => __('To'), - 'title' => __('To'), - 'required' => true - )); - - $fieldset->addField('show_empty_rows', 'select', array( - 'name' => 'show_empty_rows', - 'options' => array( - '1' => __('Yes'), - '0' => __('No') - ), - 'label' => __('Empty Rows'), - 'title' => __('Empty Rows') - )); - - $form->setUseContainer(true); - $this->setForm($form); - - return parent::_prepareForm(); - } - - /** - * Initialize form fileds values - * Method will be called after prepareForm and can be used for field values initialization - * - * @return \Magento\Adminhtml\Block\Widget\Form - */ - protected function _initFormValues() - { - $data = $this->getFilterData()->getData(); - foreach ($data as $key => $value) { - if (is_array($value) && isset($value[0])) { - $data[$key] = explode(',', $value[0]); - } - } - $this->getForm()->addValues($data); - return parent::_initFormValues(); - } - - /** - * This method is called before rendering HTML - * - * @return \Magento\Adminhtml\Block\Widget\Form - */ - protected function _beforeToHtml() - { - $result = parent::_beforeToHtml(); - - /** @var \Magento\Data\Form\Element\Fieldset $fieldset */ - $fieldset = $this->getForm()->getElement('base_fieldset'); - - if (is_object($fieldset) && $fieldset instanceof \Magento\Data\Form\Element\Fieldset) { - // apply field visibility - foreach ($fieldset->getElements() as $field) { - if (!$this->getFieldVisibility($field->getId())) { - $fieldset->removeField($field->getId()); - } - } - // apply field options - foreach ($this->_fieldOptions as $fieldId => $fieldOptions) { - $field = $fieldset->getElements()->searchById($fieldId); - /** @var \Magento\Object $field */ - if ($field) { - foreach ($fieldOptions as $k => $v) { - $field->setDataUsingMethod($k, $v); - } - } - } - } - - return $result; - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php deleted file mode 100644 index 89662e998c86c..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +++ /dev/null @@ -1,59 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer; - -class Customer - extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer -{ - /** - * Renders grid column - * - * @param \Magento\Object $row - * @return string - */ - public function render(\Magento\Object $row) - { - $id = $row->getCustomerId(); - - if (!$id) { - return __('Show Reviews'); - } - - return sprintf('%s', - $this->getUrl('adminhtml/catalog_product_review', array('customerId' => $id)), - __('Show Reviews') - ); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php deleted file mode 100644 index 7e2f7e3381bc0..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +++ /dev/null @@ -1,55 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer; - -class Product - extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer -{ - /** - * Renders grid column - * - * @param \Magento\Object $row - * @return string - */ - public function render(\Magento\Object $row) - { - $id = $row->getId(); - - return sprintf('%s', - $this->getUrl('catalog/product_review/', array('productId' => $id)), - __('Show Reviews') - ); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php b/app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php deleted file mode 100644 index 51b4fbd42d487..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php +++ /dev/null @@ -1,86 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Grid; - -class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended -{ - /** - * stores current currency code - */ - protected $_currentCurrencyCode = null; - - /** - * ids of current stores - */ - protected $_storeIds = array(); - - /** - * storeIds setter - * - * @param array $storeIds - * @return \Magento\Adminhtml\Block\Report\Grid\Shopcart - */ - public function setStoreIds($storeIds) - { - $this->_storeIds = $storeIds; - return $this; - } - - /** - * Retrieve currency code based on selected store - * - * @return string - */ - public function getCurrentCurrencyCode() - { - if (is_null($this->_currentCurrencyCode)) { - reset($this->_storeIds); - $this->_currentCurrencyCode = (count($this->_storeIds) > 0) - ? $this->_storeManager->getStore(current($this->_storeIds))->getBaseCurrencyCode() - : $this->_storeManager->getStore()->getBaseCurrencyCode(); - } - return $this->_currentCurrencyCode; - } - - /** - * Get currency rate (base to given currency) - * - * @param string|\Magento\Directory\Model\Currency $currencyCode - * @return double - */ - public function getRate($toCurrency) - { - return $this->_storeManager->getStore()->getBaseCurrency()->getRate($toCurrency); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Product.php b/app/code/Magento/Adminhtml/Block/Report/Product.php deleted file mode 100644 index de2056200a261..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Product.php +++ /dev/null @@ -1,47 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report; - -class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container -{ - - protected function _construct() - { - $this->_controller = 'report_product'; - $this->_headerText = __('Products Report'); - parent::_construct(); - $this->_removeButton('add'); - } - -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php deleted file mode 100644 index 92839062b4071..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php +++ /dev/null @@ -1,147 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Product\Downloads; - -class Grid extends \Magento\Adminhtml\Block\Widget\Grid -{ - /** - * @var \Magento\Reports\Model\Resource\Product\Downloads\CollectionFactory - */ - protected $_downloadsFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Product\Downloads\CollectionFactory $downloadsFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Product\Downloads\CollectionFactory $downloadsFactory, - array $data = array() - ) { - $this->_downloadsFactory = $downloadsFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - protected function _construct() - { - parent::_construct(); - $this->setId('downloadsGrid'); - $this->setUseAjax(false); - } - - protected function _prepareCollection() - { - if ($this->getRequest()->getParam('website')) { - $storeIds = $this->_storeManager->getWebsite($this->getRequest()->getParam('website'))->getStoreIds(); - $storeId = array_pop($storeIds); - } else if ($this->getRequest()->getParam('group')) { - $storeIds = $this->_storeManager->getGroup($this->getRequest()->getParam('group'))->getStoreIds(); - $storeId = array_pop($storeIds); - } else if ($this->getRequest()->getParam('store')) { - $storeId = (int)$this->getRequest()->getParam('store'); - } else { - $storeId = ''; - } - - $collection = $this->_downloadsFactory->create() - ->addAttributeToSelect('*') - ->setStoreId($storeId) - ->addAttributeToFilter('type_id', array(\Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE)) - ->addSummary(); - - if ($storeId) { - $collection->addStoreFilter($storeId); - } - - $this->setCollection($collection); - return parent::_prepareCollection(); - } - - protected function _prepareColumns() - { - $this->addColumn('name', array( - 'header' => __('Product'), - 'index' => 'name', - 'header_css_class' => 'col-product', - 'column_css_class' => 'col-product' - )); - - $this->addColumn('link_title', array( - 'header' => __('Link'), - 'index' => 'link_title', - 'header_css_class' => 'col-link', - 'column_css_class' => 'col-link' - )); - - $this->addColumn('sku', array( - 'header' =>__('SKU'), - 'index' =>'sku', - 'header_css_class' => 'col-sku', - 'column_css_class' => 'col-sku' - )); - - $this->addColumn('purchases', array( - 'header' => __('Purchases'), - 'width' => '215px', - 'align' => 'right', - 'filter' => false, - 'index' => 'purchases', - 'type' => 'number', - 'renderer' => 'Magento\Adminhtml\Block\Report\Product\Downloads\Renderer\Purchases', - 'header_css_class' => 'col-purchases', - 'column_css_class' => 'col-purchases' - )); - - $this->addColumn('downloads', array( - 'header' => __('Downloads'), - 'width' => '215px', - 'align' => 'right', - 'filter' => false, - 'index' => 'downloads', - 'type' => 'number', - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - $this->addExportType('*/*/exportDownloadsCsv', __('CSV')); - $this->addExportType('*/*/exportDownloadsExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Product/Grid.php deleted file mode 100644 index e5b71fae7b322..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Product/Grid.php +++ /dev/null @@ -1,149 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Product; - -class Grid extends \Magento\Backend\Block\Widget\Grid\Extended -{ - /** - * @var \Magento\Reports\Model\Resource\Product\CollectionFactory - */ - protected $_collectionFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Product\CollectionFactory $collectionFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Product\CollectionFactory $collectionFactory, - array $data = array() - ) { - $this->_collectionFactory = $collectionFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - protected function _construct() - { - parent::_construct(); - $this->setId('productsReportGrid'); - $this->setDefaultSort('entity_id'); - $this->setDefaultDir('desc'); - } - - protected function _prepareCollection() - { - - $collection = $this->_collectionFactory->create(); - $collection->getEntity()->setStore(0); - - $this->setCollection($collection); - - return parent::_prepareCollection(); - } - - protected function _afterLoadCollection() - { - $totalObj = new \Magento\Reports\Model\Totals(); - $this->setTotals($totalObj->countTotals($this)); - } - - protected function _prepareColumns() - { - $this->addColumn('entity_id', array( - 'header' =>__('ID'), - 'width' =>'50px', - 'index' =>'entity_id', - 'total' =>'Total' - )); - - $this->addColumn('name', array( - 'header' =>__('Name'), - 'index' =>'name' - )); - - $this->addColumn('viewed', array( - 'header' =>__('Viewed'), - 'width' =>'50px', - 'align' =>'right', - 'index' =>'viewed', - 'total' =>'sum' - )); - - $this->addColumn('added', array( - 'header' =>__('Added'), - 'width' =>'50px', - 'align' =>'right', - 'index' =>'added', - 'total' =>'sum' - )); - - $this->addColumn('purchased', array( - 'header' =>__('Purchased'), - 'width' =>'50px', - 'align' =>'right', - 'index' =>'purchased', - 'total' =>'sum' - )); - - $this->addColumn('fulfilled', array( - 'header' =>__('Fulfilled'), - 'width' =>'50px', - 'align' =>'right', - 'index' =>'fulfilled', - 'total' =>'sum' - )); - - $this->addColumn('revenue', array( - 'header' =>__('Revenue'), - 'width' =>'50px', - 'align' =>'right', - 'index' =>'revenue', - 'total' =>'sum' - )); - - $this->setCountTotals(true); - - $this->addExportType('*/*/exportProductsCsv', __('CSV')); - $this->addExportType('*/*/exportProductsExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } - -} - diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php deleted file mode 100644 index 5f415544878d0..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php +++ /dev/null @@ -1,99 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Product\Lowstock; - -class Grid extends \Magento\Backend\Block\Widget\Grid -{ - /** - * @var \Magento\Reports\Model\Resource\Product\Lowstock\CollectionFactory - */ - protected $_lowstocksFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Product\Lowstock\CollectionFactory $lowstocksFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Product\Lowstock\CollectionFactory $lowstocksFactory, - array $data = array() - ) { - $this->_lowstocksFactory = $lowstocksFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - /** - * @return \Magento\Backend\Block\Widget\Grid - */ - protected function _prepareCollection() - { - $website = $this->getRequest()->getParam('website'); - $group = $this->getRequest()->getParam('group'); - $store = $this->getRequest()->getParam('store'); - - if ($website) { - $storeIds = $this->_storeManager->getWebsite($website)->getStoreIds(); - $storeId = array_pop($storeIds); - } else if ($group) { - $storeIds = $this->_storeManager->getGroup($group)->getStoreIds(); - $storeId = array_pop($storeIds); - } else if ($store) { - $storeId = (int)$store; - } else { - $storeId = ''; - } - - /** @var $collection \Magento\Reports\Model\Resource\Product\Lowstock\Collection */ - $collection = $this->_lowstocksFactory->create() - ->addAttributeToSelect('*') - ->setStoreId($storeId) - ->filterByIsQtyProductTypes() - ->joinInventoryItem('qty') - ->useManageStockFilter($storeId) - ->useNotifyStockQtyFilter($storeId) - ->setOrder('qty', \Magento\Data\Collection::SORT_ORDER_ASC); - - if ($storeId) { - $collection->addStoreFilter($storeId); - } - - $this->setCollection($collection); - return parent::_prepareCollection(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php deleted file mode 100644 index d23166185dde2..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php +++ /dev/null @@ -1,134 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Product\Viewed; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid -{ - /** - * Column for grid to be grouped by - * - * @var string - */ - protected $_columnGroupBy = 'period'; - - /** - * Grid resource collection name - * - * @var string - */ - protected $_resourceCollectionName = 'Magento\Reports\Model\Resource\Report\Product\Viewed\Collection'; - - /** - * Init grid parameters - */ - protected function _construct() - { - parent::_construct(); - $this->setCountTotals(true); - } - - /** - * Custom columns preparation - * - * @return \Magento\Adminhtml\Block\Widget\Grid - */ - protected function _prepareColumns() - { - $this->addColumn('period', array( - 'header' => __('Interval'), - 'index' => 'period', - 'width' => 100, - 'sortable' => false, - 'period_type' => $this->getPeriodType(), - 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date', - 'totals_label' => __('Total'), - 'html_decorators' => array('nobr'), - 'header_css_class' => 'col-period', - 'column_css_class' => 'col-period' - )); - - $this->addColumn('product_name', array( - 'header' => __('Product'), - 'index' => 'product_name', - 'type' => 'string', - 'sortable' => false, - 'header_css_class' => 'col-name', - 'column_css_class' => 'col-name' - )); - - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } - $currencyCode = $this->getCurrentCurrencyCode(); - - $this->addColumn('product_price', array( - 'header' => __('Price'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'product_price', - 'sortable' => false, - 'rate' => $this->getRate($currencyCode), - 'header_css_class' => 'col-price', - 'column_css_class' => 'col-price' - )); - - $this->addColumn('views_num', array( - 'header' => __('Views'), - 'index' => 'views_num', - 'type' => 'number', - 'total' => 'sum', - 'sortable' => false, - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - - $this->addExportType('*/*/exportViewedCsv', __('CSV')); - $this->addExportType('*/*/exportViewedExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } - - /** - * Don't use orders in collection - * - * @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection - * @param \Magento\Object $filterData - * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid - */ - protected function _addOrderStatusFilter($collection, $filterData) - { - return $this; - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Customer.php b/app/code/Magento/Adminhtml/Block/Report/Review/Customer.php deleted file mode 100644 index c23a87c187360..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Review/Customer.php +++ /dev/null @@ -1,48 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Report\Review; - -class Customer extends \Magento\Adminhtml\Block\Widget\Grid\Container -{ - - protected function _construct() - { - $this->_controller = 'report_review_customer'; - $this->_headerText = __('Customers Reviews'); - parent::_construct(); - $this->_removeButton('add'); - } - -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php deleted file mode 100644 index c8032a5ff018b..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php +++ /dev/null @@ -1,115 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Review\Detail; - -class Grid extends \Magento\Adminhtml\Block\Widget\Grid -{ - /** - * @var \Magento\Reports\Model\Resource\Review\CollectionFactory - */ - protected $_reviewsFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Review\CollectionFactory $reviewsFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Review\CollectionFactory $reviewsFactory, - array $data = array() - ) { - $this->_reviewsFactory = $reviewsFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - protected function _construct() - { - parent::_construct(); - $this->setId('reviews_grid'); - } - - protected function _prepareCollection() - { - $collection = $this->_reviewsFactory->create() - ->addProductFilter((int)$this->getRequest()->getParam('id')); - - $this->setCollection($collection); - - parent::_prepareCollection(); - - return $this; - } - - protected function _prepareColumns() - { - - $this->addColumn('nickname', array( - 'header' =>__('Customer'), - 'width' =>'100px', - 'index' =>'nickname' - )); - - $this->addColumn('title', array( - 'header' =>__('Title'), - 'width' =>'150px', - 'index' =>'title' - )); - - $this->addColumn('detail', array( - 'header' =>__('Detail'), - 'index' =>'detail' - )); - - $this->addColumn('created_at', array( - 'header' =>__('Created'), - 'index' =>'created_at', - 'width' =>'200px', - 'type' =>'datetime' - )); - - $this->setFilterVisibility(false); - - $this->addExportType('*/*/exportProductDetailCsv', __('CSV')); - $this->addExportType('*/*/exportProductDetailExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } - -} - diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Product.php b/app/code/Magento/Adminhtml/Block/Report/Review/Product.php deleted file mode 100644 index 942cb137f5d77..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Review/Product.php +++ /dev/null @@ -1,47 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Review; - -class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container -{ - - protected function _construct() - { - $this->_controller = 'report_review_product'; - $this->_headerText = __('Products Reviews'); - parent::_construct(); - $this->_removeButton('add'); - } - -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php deleted file mode 100644 index a8e2d084aa72c..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php +++ /dev/null @@ -1,106 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Sales\Bestsellers; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid -{ - protected $_columnGroupBy = 'period'; - - protected function _construct() - { - parent::_construct(); - $this->setCountTotals(true); - } - - public function getResourceCollectionName() - { - return 'Magento\Sales\Model\Resource\Report\Bestsellers\Collection'; - } - - protected function _prepareColumns() - { - $this->addColumn('period', array( - 'header' => __('Interval'), - 'index' => 'period', - 'sortable' => false, - 'period_type' => $this->getPeriodType(), - 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date', - 'totals_label' => __('Total'), - 'html_decorators' => array('nobr'), - 'header_css_class' => 'col-period', - 'column_css_class' => 'col-period' - )); - - $this->addColumn('product_name', array( - 'header' => __('Product'), - 'index' => 'product_name', - 'type' => 'string', - 'sortable' => false, - 'header_css_class' => 'col-product', - 'column_css_class' => 'col-product' - )); - - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } - $currencyCode = $this->getCurrentCurrencyCode(); - - $this->addColumn('product_price', array( - 'header' => __('Price'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'product_price', - 'sortable' => false, - 'rate' => $this->getRate($currencyCode), - 'header_css_class' => 'col-price', - 'column_css_class' => 'col-price' - )); - - $this->addColumn('qty_ordered', array( - 'header' => __('Order Quantity'), - 'index' => 'qty_ordered', - 'type' => 'number', - 'total' => 'sum', - 'sortable' => false, - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - - $this->addExportType('*/*/exportBestsellersCsv', __('CSV')); - $this->addExportType('*/*/exportBestsellersExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php deleted file mode 100644 index d3b003c3b7a87..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php +++ /dev/null @@ -1,200 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Sales\Coupons; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid -{ - protected $_columnGroupBy = 'period'; - - protected function _construct() - { - parent::_construct(); - $this->setCountTotals(true); - $this->setCountSubTotals(true); - } - - public function getResourceCollectionName() - { - if (($this->getFilterData()->getData('report_type') == 'updated_at_order')) { - return 'Magento\SalesRule\Model\Resource\Report\Updatedat\Collection'; - } else { - return 'Magento\SalesRule\Model\Resource\Report\Collection'; - } - } - - protected function _prepareColumns() - { - $this->addColumn('period', array( - 'header' => __('Interval'), - 'index' => 'period', - 'sortable' => false, - 'period_type' => $this->getPeriodType(), - 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date', - 'totals_label' => __('Total'), - 'subtotals_label' => __('Subtotal'), - 'html_decorators' => array('nobr'), - 'header_css_class' => 'col-period', - 'column_css_class' => 'col-period' - )); - - $this->addColumn('coupon_code', array( - 'header' => __('Coupon Code'), - 'sortable' => false, - 'index' => 'coupon_code', - 'header_css_class' => 'col-code', - 'column_css_class' => 'col-code' - )); - - $this->addColumn('rule_name', array( - 'header' => __('Price Rule'), - 'sortable' => false, - 'index' => 'rule_name', - 'header_css_class' => 'col-rule', - 'column_css_class' => 'col-rule' - )); - - $this->addColumn('coupon_uses', array( - 'header' => __('Uses'), - 'sortable' => false, - 'index' => 'coupon_uses', - 'total' => 'sum', - 'type' => 'number', - 'header_css_class' => 'col-users', - 'column_css_class' => 'col-users' - )); - - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } - $currencyCode = $this->getCurrentCurrencyCode(); - $rate = $this->getRate($currencyCode); - - $this->addColumn('subtotal_amount', array( - 'header' => __('Sales Subtotal'), - 'sortable' => false, - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'total' => 'sum', - 'index' => 'subtotal_amount', - 'rate' => $rate, - 'header_css_class' => 'col-sales', - 'column_css_class' => 'col-sales' - )); - - $this->addColumn('discount_amount', array( - 'header' => __('Sales Discount'), - 'sortable' => false, - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'total' => 'sum', - 'index' => 'discount_amount', - 'rate' => $rate, - 'header_css_class' => 'col-sales-discount', - 'column_css_class' => 'col-sales-discount' - )); - - $this->addColumn('total_amount', array( - 'header' => __('Sales Total'), - 'sortable' => false, - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'total' => 'sum', - 'index' => 'total_amount', - 'rate' => $rate, - 'header_css_class' => 'col-total-amount', - 'column_css_class' => 'col-total-amount' - )); - - $this->addColumn('subtotal_amount_actual', array( - 'header' => __('Subtotal'), - 'sortable' => false, - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'total' => 'sum', - 'index' => 'subtotal_amount_actual', - 'rate' => $rate, - 'header_css_class' => 'col-subtotal', - 'column_css_class' => 'col-subtotal' - )); - - $this->addColumn('discount_amount_actual', array( - 'header' => __('Discount'), - 'sortable' => false, - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'total' => 'sum', - 'index' => 'discount_amount_actual', - 'rate' => $rate, - 'header_css_class' => 'col-discount', - 'column_css_class' => 'col-discount' - )); - - $this->addColumn('total_amount_actual', array( - 'header' => __('Total'), - 'sortable' => false, - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'total' => 'sum', - 'index' => 'total_amount_actual', - 'rate' => $rate, - 'header_css_class' => 'col-total', - 'column_css_class' => 'col-total' - )); - - $this->addExportType('*/*/exportCouponsCsv', __('CSV')); - $this->addExportType('*/*/exportCouponsExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } - - /** - * Add price rule filter - * - * @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection - * @param \Magento\Object $filterData - * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid - */ - protected function _addCustomFilter($collection, $filterData) - { - if ($filterData->getPriceRuleType()) { - $rulesList = $filterData->getData('rules_list'); - if (isset($rulesList[0])) { - $rulesIds = explode(',', $rulesList[0]); - $collection->addRuleFilter($rulesIds); - } - } - - return parent::_addCustomFilter($filterData, $collection); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php deleted file mode 100644 index a2099f27cd5db..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php +++ /dev/null @@ -1,109 +0,0 @@ -getColumn()->getFormat(); - if (!$format) { - if (is_null(self::$_format)) { - try { - $localeCode = $this->_locale->getLocaleCode(); - $localeData = new \Zend_Locale_Data; - switch ($this->getColumn()->getPeriodType()) { - case 'month' : - self::$_format = $localeData->getContent($localeCode, 'dateitem', 'yM'); - break; - - case 'year' : - self::$_format = $localeData->getContent($localeCode, 'dateitem', 'y'); - break; - - default: - self::$_format = $this->_locale->getDateFormat( - \Magento\Core\Model\LocaleInterface::FORMAT_TYPE_MEDIUM - ); - break; - } - } - catch (\Exception $e) { - - } - } - $format = self::$_format; - } - return $format; - } - - /** - * Renders grid column - * - * @param \Magento\Object $row - * @return string - */ - public function render(\Magento\Object $row) - { - if ($data = $row->getData($this->getColumn()->getIndex())) { - switch ($this->getColumn()->getPeriodType()) { - case 'month' : - $dateFormat = 'yyyy-MM'; - break; - case 'year' : - $dateFormat = 'yyyy'; - break; - default: - $dateFormat = \Magento\Stdlib\DateTime::DATE_INTERNAL_FORMAT; - break; - } - - $format = $this->_getFormat(); - try { - $data = ($this->getColumn()->getGmtoffset()) - ? $this->_locale->date($data, $dateFormat)->toString($format) - : $this->_locale->date($data, \Zend_Date::ISO_8601, null, false)->toString($format); - } - catch (\Exception $e) { - $data = ($this->getColumn()->getTimezone()) - ? $this->_locale->date($data, $dateFormat)->toString($format) - : $this->_locale->date($data, $dateFormat, null, false)->toString($format); - } - return $data; - } - return $this->getColumn()->getDefault(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php deleted file mode 100644 index e57fd51c9940a..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +++ /dev/null @@ -1,134 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Sales\Invoiced; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid -{ - protected $_columnGroupBy = 'period'; - - protected function _construct() - { - parent::_construct(); - $this->setCountTotals(true); - } - - public function getResourceCollectionName() - { - return ($this->getFilterData()->getData('report_type') == 'created_at_invoice') - ? 'Magento\Sales\Model\Resource\Report\Invoiced\Collection\Invoiced' - : 'Magento\Sales\Model\Resource\Report\Invoiced\Collection\Order'; - } - - protected function _prepareColumns() - { - $this->addColumn('period', array( - 'header' => __('Interval'), - 'index' => 'period', - 'sortable' => false, - 'period_type' => $this->getPeriodType(), - 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date', - 'totals_label' => __('Total'), - 'html_decorators' => array('nobr'), - 'header_css_class' => 'col-period', - 'column_css_class' => 'col-period' - )); - - $this->addColumn('orders_count', array( - 'header' => __('Orders'), - 'index' => 'orders_count', - 'type' => 'number', - 'total' => 'sum', - 'sortable' => false, - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - $this->addColumn('orders_invoiced', array( - 'header' => __('Invoiced Orders'), - 'index' => 'orders_invoiced', - 'type' => 'number', - 'total' => 'sum', - 'sortable' => false, - 'header_css_class' => 'col-invoiced', - 'column_css_class' => 'col-invoiced' - )); - - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } - $currencyCode = $this->getCurrentCurrencyCode(); - $rate = $this->getRate($currencyCode); - - $this->addColumn('invoiced', array( - 'header' => __('Total Invoiced'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'invoiced', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-total-invoiced', - 'column_css_class' => 'col-total-invoiced' - )); - - $this->addColumn('invoiced_captured', array( - 'header' => __('Paid Invoices'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'invoiced_captured', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-total-invoiced-paid', - 'column_css_class' => 'col-total-invoiced-paid' - )); - - $this->addColumn('invoiced_not_captured', array( - 'header' => __('Unpaid Invoices'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'invoiced_not_captured', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-total-invoiced-not-paid', - 'column_css_class' => 'col-total-invoiced-not-paid' - )); - - $this->addExportType('*/*/exportInvoicedCsv', __('CSV')); - $this->addExportType('*/*/exportInvoicedExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php deleted file mode 100644 index 8e7d1d36bdcbf..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php +++ /dev/null @@ -1,124 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Sales\Refunded; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid -{ - protected $_columnGroupBy = 'period'; - - protected function _construct() - { - parent::_construct(); - $this->setCountTotals(true); - } - - public function getResourceCollectionName() - { - return ($this->getFilterData()->getData('report_type') == 'created_at_refunded') - ? 'Magento\Sales\Model\Resource\Report\Refunded\Collection\Refunded' - : 'Magento\Sales\Model\Resource\Report\Refunded\Collection\Order'; - } - - protected function _prepareColumns() - { - $this->addColumn('period', array( - 'header' => __('Interval'), - 'index' => 'period', - 'sortable' => false, - 'period_type' => $this->getPeriodType(), - 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date', - 'totals_label' => __('Total'), - 'html_decorators' => array('nobr'), - 'header_css_class' => 'col-period', - 'column_css_class' => 'col-period' - )); - - $this->addColumn('orders_count', array( - 'header' => __('Refunded Orders'), - 'index' => 'orders_count', - 'type' => 'number', - 'total' => 'sum', - 'sortable' => false, - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } - $currencyCode = $this->getCurrentCurrencyCode(); - $rate = $this->getRate($currencyCode); - - $this->addColumn('refunded', array( - 'header' => __('Total Refunded'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'refunded', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-ref-total', - 'column_css_class' => 'col-ref-total' - )); - - $this->addColumn('online_refunded', array( - 'header' => __('Online Refunds'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'online_refunded', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-ref-online', - 'column_css_class' => 'col-ref-online' - )); - - $this->addColumn('offline_refunded', array( - 'header' => __('Offline Refunds'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'offline_refunded', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-ref-offline', - 'column_css_class' => 'col-ref-offline' - )); - - $this->addExportType('*/*/exportRefundedCsv', __('CSV')); - $this->addExportType('*/*/exportRefundedExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php deleted file mode 100644 index 28b260bc3c13c..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php +++ /dev/null @@ -1,60 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Report\Sales; - -class Sales extends \Magento\Adminhtml\Block\Widget\Grid\Container -{ - protected $_template = 'report/grid/container.phtml'; - - protected function _construct() - { - $this->_controller = 'report_sales_sales'; - $this->_headerText = __('Total Ordered Report'); - parent::_construct(); - - $this->_removeButton('add'); - $this->addButton('filter_form_submit', array( - 'label' => __('Show Report'), - 'onclick' => 'filterFormSubmit()', - 'class' => 'primary' - )); - } - - public function getFilterUrl() - { - $this->getRequest()->setParam('filter', null); - return $this->getUrl('adminhtml/*/sales', array('_current' => true)); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php deleted file mode 100644 index 2c4828a09a456..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php +++ /dev/null @@ -1,272 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Sales\Sales; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid -{ - protected $_columnGroupBy = 'period'; - - protected function _construct() - { - parent::_construct(); - $this->setCountTotals(true); - } - - public function getResourceCollectionName() - { - return ($this->getFilterData()->getData('report_type') == 'updated_at_order') - ? 'Magento\Sales\Model\Resource\Report\Order\Updatedat\Collection' - : 'Magento\Sales\Model\Resource\Report\Order\Collection'; - } - - protected function _prepareColumns() - { - $this->addColumn('period', array( - 'header' => __('Interval'), - 'index' => 'period', - 'sortable' => false, - 'period_type' => $this->getPeriodType(), - 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date', - 'totals_label' => __('Total'), - 'html_decorators' => array('nobr'), - 'header_css_class' => 'col-period', - 'column_css_class' => 'col-period' - )); - - $this->addColumn('orders_count', array( - 'header' => __('Orders'), - 'index' => 'orders_count', - 'type' => 'number', - 'total' => 'sum', - 'sortable' => false, - 'header_css_class' => 'col-orders', - 'column_css_class' => 'col-orders' - )); - - $this->addColumn('total_qty_ordered', array( - 'header' => __('Sales Items'), - 'index' => 'total_qty_ordered', - 'type' => 'number', - 'total' => 'sum', - 'sortable' => false, - 'header_css_class' => 'col-sales-items', - 'column_css_class' => 'col-sales-items' - )); - - $this->addColumn('total_qty_invoiced', array( - 'header' => __('Items'), - 'index' => 'total_qty_invoiced', - 'type' => 'number', - 'total' => 'sum', - 'sortable' => false, - 'visibility_filter' => array('show_actual_columns'), - 'header_css_class' => 'col-items', - 'column_css_class' => 'col-items' - )); - - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } - $currencyCode = $this->getCurrentCurrencyCode(); - $rate = $this->getRate($currencyCode); - - $this->addColumn('total_income_amount', array( - 'header' => __('Sales Total'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_income_amount', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-sales-total', - 'column_css_class' => 'col-sales-total' - )); - - $this->addColumn('total_revenue_amount', array( - 'header' => __('Revenue'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_revenue_amount', - 'total' => 'sum', - 'sortable' => false, - 'visibility_filter' => array('show_actual_columns'), - 'rate' => $rate, - 'header_css_class' => 'col-revenue', - 'column_css_class' => 'col-revenue' - )); - - $this->addColumn('total_profit_amount', array( - 'header' => __('Profit'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_profit_amount', - 'total' => 'sum', - 'sortable' => false, - 'visibility_filter' => array('show_actual_columns'), - 'rate' => $rate, - 'header_css_class' => 'col-profit', - 'column_css_class' => 'col-profit' - )); - - $this->addColumn('total_invoiced_amount', array( - 'header' => __('Invoiced'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_invoiced_amount', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-invoiced', - 'column_css_class' => 'col-invoiced' - )); - - $this->addColumn('total_paid_amount', array( - 'header' => __('Paid'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_paid_amount', - 'total' => 'sum', - 'sortable' => false, - 'visibility_filter' => array('show_actual_columns'), - 'rate' => $rate, - 'header_css_class' => 'col-paid', - 'column_css_class' => 'col-paid' - )); - - $this->addColumn('total_refunded_amount', array( - 'header' => __('Refunded'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_refunded_amount', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-refunded', - 'column_css_class' => 'col-refunded' - )); - - $this->addColumn('total_tax_amount', array( - 'header' => __('Sales Tax'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_tax_amount', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-sales-tax', - 'column_css_class' => 'col-sales-tax' - )); - - $this->addColumn('total_tax_amount_actual', array( - 'header' => __('Tax'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_tax_amount_actual', - 'total' => 'sum', - 'sortable' => false, - 'visibility_filter' => array('show_actual_columns'), - 'rate' => $rate, - 'header_css_class' => 'col-tax', - 'column_css_class' => 'col-tax' - )); - - $this->addColumn('total_shipping_amount', array( - 'header' => __('Sales Shipping'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_shipping_amount', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-sales-shipping', - 'column_css_class' => 'col-sales-shipping' - )); - - $this->addColumn('total_shipping_amount_actual', array( - 'header' => __('Shipping'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_shipping_amount_actual', - 'total' => 'sum', - 'sortable' => false, - 'visibility_filter' => array('show_actual_columns'), - 'rate' => $rate, - 'header_css_class' => 'col-shipping', - 'column_css_class' => 'col-shipping' - )); - - $this->addColumn('total_discount_amount', array( - 'header' => __('Sales Discount'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_discount_amount', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-sales-discount', - 'column_css_class' => 'col-sales-discount' - )); - - $this->addColumn('total_discount_amount_actual', array( - 'header' => __('Discount'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_discount_amount_actual', - 'total' => 'sum', - 'sortable' => false, - 'visibility_filter' => array('show_actual_columns'), - 'rate' => $rate, - 'header_css_class' => 'col-discount', - 'column_css_class' => 'col-discount' - )); - - $this->addColumn('total_canceled_amount', array( - 'header' => __('Canceled'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_canceled_amount', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-canceled', - 'column_css_class' => 'col-canceled' - )); - - - $this->addExportType('*/*/exportSalesCsv', __('CSV')); - $this->addExportType('*/*/exportSalesExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php deleted file mode 100644 index 973449259f075..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php +++ /dev/null @@ -1,126 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Sales\Shipping; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid -{ - protected $_columnGroupBy = 'period'; - - protected function _construct() - { - parent::_construct(); - $this->setCountTotals(true); - $this->setCountSubTotals(true); - } - - public function getResourceCollectionName() - { - return ($this->getFilterData()->getData('report_type') == 'created_at_shipment') - ? 'Magento\Sales\Model\Resource\Report\Shipping\Collection\Shipment' - : 'Magento\Sales\Model\Resource\Report\Shipping\Collection\Order'; - } - - protected function _prepareColumns() - { - $this->addColumn('period', array( - 'header' => __('Interval'), - 'index' => 'period', - 'sortable' => false, - 'period_type' => $this->getPeriodType(), - 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date', - 'totals_label' => __('Total'), - 'subtotals_label' => __('Subtotal'), - 'html_decorators' => array('nobr'), - 'header_css_class' => 'col-period', - 'column_css_class' => 'col-period' - )); - - $this->addColumn('shipping_description', array( - 'header' => __('Carrier/Method'), - 'index' => 'shipping_description', - 'sortable' => false, - 'header_css_class' => 'col-method', - 'column_css_class' => 'col-method' - )); - - $this->addColumn('orders_count', array( - 'header' => __('Orders'), - 'index' => 'orders_count', - 'total' => 'sum', - 'type' => 'number', - 'sortable' => false, - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } - - $currencyCode = $this->getCurrentCurrencyCode(); - $rate = $this->getRate($currencyCode); - - $this->addColumn('total_shipping', array( - 'header' => __('Total Sales Shipping'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_shipping', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-total-sales-shipping', - 'column_css_class' => 'col-total-sales-shipping' - )); - - $this->addColumn('total_shipping_actual', array( - 'header' => __('Total Shipping'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'total_shipping_actual', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $rate, - 'header_css_class' => 'col-total-shipping', - 'column_css_class' => 'col-total-shipping' - )); - - $this->addExportType('*/*/exportShippingCsv', __('CSV')); - $this->addExportType('*/*/exportShippingExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } -} - - - diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php deleted file mode 100644 index cb23cc1d3b2b9..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php +++ /dev/null @@ -1,171 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Sales\Tax; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid -{ - protected $_columnGroupBy = 'period'; - - /** - * @var \Magento\Sales\Model\Order\ConfigFactory - */ - protected $_configFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory - * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory - * @param \Magento\Reports\Helper\Data $reportsData - * @param \Magento\Sales\Model\Order\ConfigFactory $configFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory, - \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory, - \Magento\Reports\Helper\Data $reportsData, - \Magento\Sales\Model\Order\ConfigFactory $configFactory, - array $data = array() - ) { - $this->_configFactory = $configFactory; - parent::__construct($context, $coreData, $urlModel, $resourceFactory, $collectionFactory, $reportsData, $data); - } - - protected function _construct() - { - parent::_construct(); - $this->setCountTotals(true); - $this->setCountSubTotals(true); - } - - public function getResourceCollectionName() - { - return ($this->getFilterData()->getData('report_type') == 'updated_at_order') - ? 'Magento\Tax\Model\Resource\Report\Updatedat\Collection' - : 'Magento\Tax\Model\Resource\Report\Collection'; - } - - protected function _prepareColumns() - { - $this->addColumn('period', array( - 'header' => __('Interval'), - 'index' => 'period', - 'sortable' => false, - 'period_type' => $this->getPeriodType(), - 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date', - 'totals_label' => __('Total'), - 'subtotals_label' => __('Subtotal'), - 'html_decorators' => array('nobr'), - 'header_css_class' => 'col-period', - 'column_css_class' => 'col-period' - )); - - $this->addColumn('code', array( - 'header' => __('Tax'), - 'index' => 'code', - 'type' => 'string', - 'sortable' => false, - 'header_css_class' => 'col-tax-name', - 'column_css_class' => 'col-tax-name' - )); - - $this->addColumn('percent', array( - 'header' => __('Rate'), - 'index' => 'percent', - 'type' => 'number', - 'sortable' => false, - 'header_css_class' => 'col-rate', - 'column_css_class' => 'col-rate' - )); - - $this->addColumn('orders_count', array( - 'header' => __('Orders'), - 'index' => 'orders_count', - 'total' => 'sum', - 'type' => 'number', - 'sortable' => false, - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - if ($this->getFilterData()->getStoreIds()) { - $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds())); - } - $currencyCode = $this->getCurrentCurrencyCode(); - - $this->addColumn('tax_base_amount_sum', array( - 'header' => __('Tax Amount'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'tax_base_amount_sum', - 'total' => 'sum', - 'sortable' => false, - 'rate' => $this->getRate($currencyCode), - 'header_css_class' => 'col-tax-amount', - 'column_css_class' => 'col-tax-amount' - )); - - $this->addExportType('*/*/exportTaxCsv', __('CSV')); - $this->addExportType('*/*/exportTaxExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } - - /** - * Preparing collection - * Filter canceled statuses for orders in taxes - * - * @return \Magento\Adminhtml\Block\Report\Sales\Tax\Grid - */ - protected function _prepareCollection() - { - $filterData = $this->getFilterData(); - if (!$filterData->hasData('order_statuses')) { - $orderConfig = $this->_configFactory->create(); - $statusValues = array(); - $canceledStatuses = $orderConfig->getStateStatuses(\Magento\Sales\Model\Order::STATE_CANCELED); - foreach ($orderConfig->getStatuses() as $code => $label) { - if (!isset($canceledStatuses[$code])) { - $statusValues[] = $code; - } - } - $filterData->setOrderStatuses($statusValues); - } - return parent::_prepareCollection(); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php deleted file mode 100644 index cc77533f1d48e..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +++ /dev/null @@ -1,207 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Shopcart\Abandoned; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart -{ - /** - * @var \Magento\Reports\Model\Resource\Quote\CollectionFactory - */ - protected $_quotesFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory, - array $data = array() - ) { - $this->_quotesFactory = $quotesFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - protected function _construct() - { - parent::_construct(); - $this->setId('gridAbandoned'); - } - - protected function _prepareCollection() - { - /** @var $collection \Magento\Reports\Model\Resource\Quote\Collection */ - $collection = $this->_quotesFactory->create(); - - $filter = $this->getParam($this->getVarNameFilter(), array()); - if ($filter) { - $filter = base64_decode($filter); - parse_str(urldecode($filter), $data); - } - - if (!empty($data)) { - $collection->prepareForAbandonedReport($this->_storeIds, $data); - } else { - $collection->prepareForAbandonedReport($this->_storeIds); - } - - $this->setCollection($collection); - return parent::_prepareCollection(); - } - - protected function _addColumnFilterToCollection($column) - { - $field = ( $column->getFilterIndex() ) ? $column->getFilterIndex() : $column->getIndex(); - $skip = array('subtotal', 'customer_name', 'email'/*, 'created_at', 'updated_at'*/); - - if (in_array($field, $skip)) { - return $this; - } - - parent::_addColumnFilterToCollection($column); - return $this; - } - - protected function _prepareColumns() - { - $this->addColumn('customer_name', array( - 'header' => __('Customer'), - 'index' => 'customer_name', - 'sortable' => false, - 'header_css_class' => 'col-name', - 'column_css_class' => 'col-name' - )); - - $this->addColumn('email', array( - 'header' => __('Email'), - 'index' => 'email', - 'sortable' => false, - 'header_css_class' => 'col-email', - 'column_css_class' => 'col-email' - )); - - $this->addColumn('items_count', array( - 'header' => __('Products'), - 'index' => 'items_count', - 'sortable' => false, - 'type' => 'number', - 'header_css_class' => 'col-number', - 'column_css_class' => 'col-number' - )); - - $this->addColumn('items_qty', array( - 'header' => __('Quantity'), - 'index' => 'items_qty', - 'sortable' => false, - 'type' => 'number', - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - if ($this->getRequest()->getParam('website')) { - $storeIds = $this->_storeManager->getWebsite($this->getRequest()->getParam('website'))->getStoreIds(); - } else if ($this->getRequest()->getParam('group')) { - $storeIds = $this->_storeManager->getGroup($this->getRequest()->getParam('group'))->getStoreIds(); - } else if ($this->getRequest()->getParam('store')) { - $storeIds = array((int)$this->getRequest()->getParam('store')); - } else { - $storeIds = array(); - } - $this->setStoreIds($storeIds); - $currencyCode = $this->getCurrentCurrencyCode(); - - $this->addColumn('subtotal', array( - 'header' => __('Subtotal'), - 'type' => 'currency', - 'currency_code' => $currencyCode, - 'index' => 'subtotal', - 'sortable' => false, - 'renderer' => 'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency', - 'rate' => $this->getRate($currencyCode), - 'header_css_class' => 'col-subtotal', - 'column_css_class' => 'col-subtotal' - )); - - $this->addColumn('coupon_code', array( - 'header' => __('Applied Coupon'), - 'index' => 'coupon_code', - 'sortable' => false, - 'header_css_class' => 'col-coupon', - 'column_css_class' => 'col-coupon' - )); - - $this->addColumn('created_at', array( - 'header' => __('Created'), - 'type' => 'datetime', - 'index' => 'created_at', - 'filter_index'=> 'main_table.created_at', - 'sortable' => false, - 'header_css_class' => 'col-created', - 'column_css_class' => 'col-created' - )); - - $this->addColumn('updated_at', array( - 'header' => __('Updated'), - 'type' => 'datetime', - 'index' => 'updated_at', - 'filter_index'=> 'main_table.updated_at', - 'sortable' => false, - 'header_css_class' => 'col-updated', - 'column_css_class' => 'col-updated' - )); - - $this->addColumn('remote_ip', array( - 'header' => __('IP Address'), - 'index' => 'remote_ip', - 'sortable' => false, - 'header_css_class' => 'col-ip', - 'column_css_class' => 'col-ip' - )); - - $this->addExportType('*/*/exportAbandonedCsv', __('CSV')); - $this->addExportType('*/*/exportAbandonedExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } - - public function getRowUrl($row) - { - return $this->getUrl('customer/index/edit', array('id'=>$row->getCustomerId(), 'active_tab'=>'cart')); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php deleted file mode 100644 index 6693c7db4b2d9..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php +++ /dev/null @@ -1,46 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Report\Shopcart; - -class Customer extends \Magento\Adminhtml\Block\Widget\Grid\Container -{ - protected function _construct() - { - $this->_controller = 'report_shopcart_customer'; - $this->_headerText = __('Customers'); - parent::_construct(); - $this->_removeButton('add'); - } -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php deleted file mode 100644 index d167a0e66d989..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +++ /dev/null @@ -1,132 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Shopcart\Customer; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart -{ - /** - * @var \Magento\Reports\Model\Resource\Customer\CollectionFactory - */ - protected $_customersFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Customer\CollectionFactory $customersFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Customer\CollectionFactory $customersFactory, - array $data = array() - ) { - $this->_customersFactory = $customersFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - protected function _construct() - { - parent::_construct(); - $this->setId('grid'); - } - - protected function _prepareCollection() - { - //TODO: add full name logic - $collection = $this->_customersFactory->create() - ->addAttributeToSelect('firstname') - ->addAttributeToSelect('lastname'); - - $this->setCollection($collection); - return parent::_prepareCollection(); - } - - protected function _afterLoadCollection() - { - $this->getCollection()->addCartInfo(); - } - - protected function _prepareColumns() - { - $this->addColumn('entity_id', array( - 'header' =>__('ID'), - 'width' =>'50px', - 'align' =>'right', - 'index' =>'entity_id' - )); - - $this->addColumn('firstname', array( - 'header' =>__('First Name'), - 'index' =>'firstname' - )); - - $this->addColumn('lastname', array( - 'header' =>__('Last Name'), - 'index' =>'lastname' - )); - - $this->addColumn('items', array( - 'header' =>__('Items in Cart'), - 'width' =>'70px', - 'sortable' =>false, - 'align' =>'right', - 'index' =>'items' - )); - - $currencyCode = $this->getCurrentCurrencyCode(); - - $this->addColumn('total', array( - 'header' =>__('Total'), - 'width' =>'70px', - 'sortable' =>false, - 'type' =>'currency', - 'align' =>'right', - 'currency_code' => $currencyCode, - 'index' =>'total', - 'renderer' =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency', - 'rate' => $this->getRate($currencyCode), - )); - - $this->setFilterVisibility(false); - - $this->addExportType('*/*/exportCustomerCsv', __('CSV')); - $this->addExportType('*/*/exportCustomerExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } - -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php deleted file mode 100644 index a753f5f8d5f09..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php +++ /dev/null @@ -1,47 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Shopcart; - -class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container -{ - - protected function _construct() - { - $this->_controller = 'report_shopcart_product'; - $this->_headerText = __('Products in carts'); - parent::_construct(); - $this->_removeButton('add'); - } - -} diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php deleted file mode 100644 index fb98870a7e1ba..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php +++ /dev/null @@ -1,136 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Shopcart\Product; - -class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart -{ - /** - * @var \Magento\Reports\Model\Resource\Quote\CollectionFactory - */ - protected $_quotesFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory, - array $data = array() - ) { - $this->_quotesFactory = $quotesFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - protected function _construct() - { - parent::_construct(); - $this->setId('gridProducts'); - } - - protected function _prepareCollection() - { - /** @var $collection \Magento\Reports\Model\Resource\Quote\Collection */ - $collection = $this->_quotesFactory->create(); - $collection->prepareForProductsInCarts() - ->setSelectCountSqlType(\Magento\Reports\Model\Resource\Quote\Collection::SELECT_COUNT_SQL_TYPE_CART); - $this->setCollection($collection); - return parent::_prepareCollection(); - } - - protected function _prepareColumns() - { - $this->addColumn('entity_id', array( - 'header' =>__('ID'), - 'align' =>'right', - 'index' =>'entity_id', - 'header_css_class' => 'col-id', - 'column_css_class' => 'col-id' - )); - - $this->addColumn('name', array( - 'header' =>__('Product'), - 'index' =>'name', - 'header_css_class' => 'col-product', - 'column_css_class' => 'col-product' - )); - - $currencyCode = $this->getCurrentCurrencyCode(); - - $this->addColumn('price', array( - 'header' =>__('Price'), - 'type' =>'currency', - 'currency_code' => $currencyCode, - 'index' =>'price', - 'renderer' =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency', - 'rate' => $this->getRate($currencyCode), - 'header_css_class' => 'col-price', - 'column_css_class' => 'col-price' - )); - - $this->addColumn('carts', array( - 'header' =>__('Carts'), - 'align' =>'right', - 'index' =>'carts', - 'header_css_class' => 'col-carts', - 'column_css_class' => 'col-carts' - )); - - $this->addColumn('orders', array( - 'header' =>__('Orders'), - 'align' =>'right', - 'index' =>'orders', - 'header_css_class' => 'col-qty', - 'column_css_class' => 'col-qty' - )); - - $this->setFilterVisibility(false); - - $this->addExportType('*/*/exportProductCsv', __('CSV')); - $this->addExportType('*/*/exportProductExcel', __('Excel XML')); - - return parent::_prepareColumns(); - } - - public function getRowUrl($row) - { - return $this->getUrl('catalog/product/edit', array('id'=>$row->getEntityId())); - } -} - diff --git a/app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php deleted file mode 100644 index d0a7e08aaa5f2..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php +++ /dev/null @@ -1,137 +0,0 @@ - - */ -namespace Magento\Adminhtml\Block\Report\Wishlist; - -class Grid extends \Magento\Adminhtml\Block\Widget\Grid -{ - /** - * @var \Magento\Reports\Model\Resource\Wishlist\Product\CollectionFactory - */ - protected $_productsFactory; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Url $urlModel - * @param \Magento\Reports\Model\Resource\Wishlist\Product\CollectionFactory $productsFactory - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Url $urlModel, - \Magento\Reports\Model\Resource\Wishlist\Product\CollectionFactory $productsFactory, - array $data = array() - ) { - $this->_productsFactory = $productsFactory; - parent::__construct($context, $coreData, $urlModel, $data); - } - - protected function _construct() - { - parent::_construct(); - $this->setId('wishlistReportGrid'); - $this->setDefaultSort('entity_id'); - $this->setDefaultDir('desc'); - } - - protected function _prepareCollection() - { - - $collection = $this->_productsFactory->create() - ->addAttributeToSelect('entity_id') - ->addAttributeToSelect('name') - ->addWishlistCount(); - - $this->setCollection($collection); - - parent::_prepareCollection(); - - return $this; - } - - protected function _prepareColumns() - { - $this->addColumn('entity_id', array( - 'header' =>__('ID'), - 'width' =>'50px', - 'index' =>'entity_id' - )); - - $this->addColumn('name', array( - 'header' =>__('Name'), - 'index' =>'name' - )); - - $this->addColumn('wishlists', array( - 'header' =>__('Wish Lists'), - 'width' =>'50px', - 'align' =>'right', - 'index' =>'wishlists' - )); - - $this->addColumn('bought_from_wishlists', array( - 'header' =>__('Wishlist Purchase'), - 'width' =>'50px', - 'align' =>'right', - 'sortable' =>false, - 'index' =>'bought_from_wishlists' - )); - - $this->addColumn('w_vs_order', array( - 'header' =>__('Wish List vs. Regular Order'), - 'width' =>'50px', - 'align' =>'right', - 'sortable' =>false, - 'index' =>'w_vs_order' - )); - - $this->addColumn('num_deleted', array( - 'header' =>__('Times Deleted'), - 'width' =>'50px', - 'align' =>'right', - 'sortable' =>false, - 'index' =>'num_deleted' - )); - - $this->addExportType('*/*/exportWishlistCsv', __('CSV')); - $this->addExportType('*/*/exportWishlistExcel', __('Excel XML')); - - $this->setFilterVisibility(false); - - return parent::_prepareColumns(); - } - -} - diff --git a/app/code/Magento/Adminhtml/Block/Review/Add/Form.php b/app/code/Magento/Adminhtml/Block/Review/Add/Form.php deleted file mode 100644 index 57ab6ced96f39..0000000000000 --- a/app/code/Magento/Adminhtml/Block/Review/Add/Form.php +++ /dev/null @@ -1,156 +0,0 @@ - - */ - -namespace Magento\Adminhtml\Block\Review\Add; - -class Form extends \Magento\Backend\Block\Widget\Form\Generic -{ - /** - * Review data - * - * @var \Magento\Review\Helper\Data - */ - protected $_reviewData = null; - - /** - * @var \Magento\Core\Model\System\Store - */ - protected $_systemStore; - - /** - * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Helper\Data $coreData - * @param \Magento\Core\Model\Registry $registry - * @param \Magento\Data\FormFactory $formFactory - * @param \Magento\Core\Model\System\Store $systemStore - * @param \Magento\Review\Helper\Data $reviewData - * @param array $data - */ - public function __construct( - \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Helper\Data $coreData, - \Magento\Core\Model\Registry $registry, - \Magento\Data\FormFactory $formFactory, - \Magento\Core\Model\System\Store $systemStore, - \Magento\Review\Helper\Data $reviewData, - array $data = array() - ) { - $this->_reviewData = $reviewData; - $this->_systemStore = $systemStore; - parent::__construct($context, $coreData, $registry, $formFactory, $data); - } - - protected function _prepareForm() - { - /** @var \Magento\Data\Form $form */ - $form = $this->_formFactory->create(); - - $fieldset = $form->addFieldset('add_review_form', array('legend' => __('Review Details'))); - - $fieldset->addField('product_name', 'note', array( - 'label' => __('Product'), - 'text' => 'product_name', - )); - - $fieldset->addField('detailed_rating', 'note', array( - 'label' => __('Product Rating'), - 'required' => true, - 'text' => '