forked from OpenMage/magento-mirror
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1efcc40
commit 613dace
Showing
298 changed files
with
8,923 additions
and
2,569 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,17 +31,19 @@ | |
| * @package Mage_Adminhtml | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Msrp_Enabled | ||
| extends Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Config | ||
| class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Msrp_Enabled extends Varien_Data_Form_Element_Select | ||
| { | ||
| /** | ||
| * Get config value data | ||
| * Retrieve Element HTML fragment | ||
| * | ||
| * @return bool | ||
| * @return string | ||
| */ | ||
| protected function _getValueFromConfig() | ||
| public function getElementHtml() | ||
| { | ||
| return Mage::helper('catalog')->isMsrpApplyToAll(); | ||
| if (is_null($this->getValue())) { | ||
| $this->setValue(Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type_Enabled::MSRP_ENABLE_USE_CONFIG); | ||
| } | ||
| return parent::getElementHtml(); | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,17 +31,19 @@ | |
| * @package Mage_Adminhtml | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Msrp_Price | ||
| extends Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Config | ||
| class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Msrp_Price extends Varien_Data_Form_Element_Select | ||
| { | ||
| /** | ||
| * Get config value data | ||
| * Retrieve Element HTML fragment | ||
| * | ||
| * @return null|string | ||
| * @return string | ||
| */ | ||
| protected function _getValueFromConfig() | ||
| public function getElementHtml() | ||
| { | ||
| return Mage::helper('catalog')->getMsrpDisplayActualPriceType(); | ||
| if (is_null($this->getValue())) { | ||
| $this->setValue(Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type_Price::TYPE_USE_CONFIG); | ||
| } | ||
| return parent::getElementHtml(); | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,11 +29,15 @@ | |
| * | ||
| * @category Mage | ||
| * @package Mage_Adminhtml | ||
| * @author Magento Core Team <[email protected]> | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Wishlist extends Mage_Adminhtml_Block_Widget_Grid | ||
| { | ||
|
|
||
| /** | ||
| * Initial settings | ||
| * | ||
| * @return void | ||
| */ | ||
| public function __construct() | ||
| { | ||
| parent::__construct(); | ||
|
|
@@ -44,6 +48,11 @@ public function __construct() | |
| $this->setEmptyText(Mage::helper('customer')->__("There are no items in customer's wishlist at the moment")); | ||
| } | ||
|
|
||
| /** | ||
| * Prepare collection | ||
| * | ||
| * @return Mage_Adminhtml_Block_Customer_Edit_Tab_View_Wishlist | ||
| */ | ||
| protected function _prepareCollection() | ||
| { | ||
| $wishlist = Mage::getModel('wishlist/wishlist'); | ||
|
|
@@ -59,6 +68,11 @@ protected function _prepareCollection() | |
| return parent::_prepareCollection(); | ||
| } | ||
|
|
||
| /** | ||
| * Prepare columns | ||
| * | ||
| * @return Mage_Adminhtml_Block_Customer_Edit_Tab_View_Wishlist | ||
| */ | ||
| protected function _prepareColumns() | ||
| { | ||
| $this->addColumn('product_id', array( | ||
|
|
@@ -70,7 +84,8 @@ protected function _prepareColumns() | |
|
|
||
| $this->addColumn('product_name', array( | ||
| 'header' => Mage::helper('customer')->__('Product Name'), | ||
| 'index' => 'product_name' | ||
| 'index' => 'product_name', | ||
| 'renderer' => 'adminhtml/customer_edit_tab_view_grid_renderer_item' | ||
| )); | ||
|
|
||
| if (!Mage::app()->isSingleStoreMode()) { | ||
|
|
@@ -99,15 +114,24 @@ protected function _prepareColumns() | |
| return parent::_prepareColumns(); | ||
| } | ||
|
|
||
| /** | ||
| * Get headers visibility | ||
| * | ||
| * @return bool | ||
| */ | ||
| public function getHeadersVisibility() | ||
| { | ||
| return ($this->getCollection()->getSize() > 0); | ||
| } | ||
|
|
||
| /** | ||
| * Get row url | ||
| * | ||
| * @param Mage_Wishlist_Model_Item $item | ||
| * @return string | ||
| */ | ||
| public function getRowUrl($row) | ||
| { | ||
| return $this->getUrl('*/catalog_product/edit', array('id' => $row->getProductId())); | ||
| } | ||
|
|
||
| } | ||
|
|
||
Oops, something went wrong.