(For internal use)'), diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php index 7200b4bbd8..3a48bb52ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php @@ -52,4 +52,20 @@ public function getProductsJSON() } return $result ? Zend_Json_Encoder::encode($result) : '{}'; } + + /** + * Initialize grid block under the "Related Products", "Up-sells", "Cross-sells" sections + * + * @param string $blockName + * @param string $getProductFunction + * @param string $inputName + */ + public function initSerializerBlock($blockName, $getProductFunction, $inputName) + { + if ($block = $this->getLayout()->getBlock($blockName)) { + $this->setGridBlock($block) + ->setProducts(Mage::registry('current_product')->$getProductFunction()) + ->setInputElementName($inputName); + } + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php index bf7d8330ed..08e8578211 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php @@ -33,6 +33,10 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Crosssell extends Mage_Adminhtml_Block_Widget_Grid { + /** + * Set grid params + * + */ public function __construct() { parent::__construct(); @@ -54,6 +58,12 @@ protected function _getProduct() return Mage::registry('current_product'); } + /** + * Add filter + * + * @param object $column + * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Crosssell + */ protected function _addColumnFilterToCollection($column) { // Set custom filter for in product flag @@ -64,19 +74,22 @@ protected function _addColumnFilterToCollection($column) } if ($column->getFilter()->getValue()) { $this->getCollection()->addFieldToFilter('entity_id', array('in'=>$productIds)); - } - else { + } else { if($productIds) { $this->getCollection()->addFieldToFilter('entity_id', array('nin'=>$productIds)); } } - } - else { + } else { parent::_addColumnFilterToCollection($column); } return $this; } + /** + * Prepare collection + * + * @return Mage_Adminhtml_Block_Widget_Grid + */ protected function _prepareCollection() { $collection = Mage::getModel('catalog/product_link')->useCrossSellLinks() @@ -107,37 +120,42 @@ public function isReadonly() return $this->_getProduct()->getCrosssellReadonly(); } + /** + * Add columns to grid + * + * @return Mage_Adminhtml_Block_Widget_Grid + */ protected function _prepareColumns() { if (!$this->isReadonly()) { $this->addColumn('in_products', array( - 'header_css_class' => 'a-center', - 'type' => 'checkbox', - 'name' => 'in_products', - 'values' => $this->_getSelectedProducts(), - 'align' => 'center', - 'index' => 'entity_id' + 'header_css_class' => 'a-center', + 'type' => 'checkbox', + 'name' => 'in_products', + 'values' => $this->_getSelectedProducts(), + 'align' => 'center', + 'index' => 'entity_id' )); } $this->addColumn('entity_id', array( 'header' => Mage::helper('catalog')->__('ID'), 'sortable' => true, - 'width' => '60px', + 'width' => 60, 'index' => 'entity_id' )); + $this->addColumn('name', array( 'header' => Mage::helper('catalog')->__('Name'), 'index' => 'name' )); - $this->addColumn('type', - array( - 'header'=> Mage::helper('catalog')->__('Type'), - 'width' => '100px', - 'index' => 'type_id', - 'type' => 'options', - 'options' => Mage::getSingleton('catalog/product_type')->getOptionArray(), + $this->addColumn('type', array( + 'header' => Mage::helper('catalog')->__('Type'), + 'width' => 100, + 'index' => 'type_id', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_type')->getOptionArray(), )); $sets = Mage::getResourceModel('eav/entity_attribute_set_collection') @@ -145,73 +163,89 @@ protected function _prepareColumns() ->load() ->toOptionHash(); - $this->addColumn('set_name', - array( - 'header'=> Mage::helper('catalog')->__('Attrib. Set Name'), - 'width' => '130px', - 'index' => 'attribute_set_id', - 'type' => 'options', - 'options' => $sets, + $this->addColumn('set_name', array( + 'header' => Mage::helper('catalog')->__('Attrib. Set Name'), + 'width' => 130, + 'index' => 'attribute_set_id', + 'type' => 'options', + 'options' => $sets, )); - $this->addColumn('status', - array( - 'header'=> Mage::helper('catalog')->__('Status'), - 'width' => '90px', - 'index' => 'status', - 'type' => 'options', - 'options' => Mage::getSingleton('catalog/product_status')->getOptionArray(), + $this->addColumn('status', array( + 'header' => Mage::helper('catalog')->__('Status'), + 'width' => 90, + 'index' => 'status', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_status')->getOptionArray(), )); - $this->addColumn('visibility', - array( - 'header'=> Mage::helper('catalog')->__('Visibility'), - 'width' => '90px', - 'index' => 'visibility', - 'type' => 'options', - 'options' => Mage::getSingleton('catalog/product_visibility')->getOptionArray(), + $this->addColumn('visibility', array( + 'header' => Mage::helper('catalog')->__('Visibility'), + 'width' => 90, + 'index' => 'visibility', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_visibility')->getOptionArray(), )); $this->addColumn('sku', array( 'header' => Mage::helper('catalog')->__('SKU'), - 'width' => '80px', + 'width' => 80, 'index' => 'sku' )); + $this->addColumn('price', array( - 'header' => Mage::helper('catalog')->__('Price'), - 'type' => 'currency', + 'header' => Mage::helper('catalog')->__('Price'), + 'type' => 'currency', 'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE), - 'index' => 'price' + 'index' => 'price' )); $this->addColumn('position', array( - 'header' => Mage::helper('catalog')->__('Position'), - 'name' => 'position', - 'width' => '60px', - 'type' => 'number', - 'validate_class' => 'validate-number', - 'index' => 'position', - 'editable' => !$this->isReadonly(), - 'edit_only' => !$this->_getProduct()->getId() + 'header' => Mage::helper('catalog')->__('Position'), + 'name' => 'position', + 'width' => 60, + 'type' => 'number', + 'validate_class' => 'validate-number', + 'index' => 'position', + 'editable' => !$this->isReadonly(), + 'edit_only' => !$this->_getProduct()->getId() )); - - return parent::_prepareColumns(); } + /** + * Rerieve grid URL + * + * @return string + */ public function getGridUrl() { - return $this->_getData('grid_url') ? $this->_getData('grid_url') : $this->getUrl('*/*/crosssell', array('_current'=>true)); + return $this->_getData('grid_url') ? $this->_getData('grid_url') : $this->getUrl('*/*/crosssellGrid', array('_current'=>true)); } + /** + * Retrieve selected crosssell products + * + * @return array + */ protected function _getSelectedProducts() { - $products = $this->getRequest()->getPost('products', null); + $products = $this->getProductsCrossSell(); if (!is_array($products)) { - $products = $this->_getProduct()->getCrossSellProductIds(); + $products = $this->getSelectedCrossSellProducts(); } return $products; } + + /** + * Retrieve crosssell products + * + * @return array + */ + public function getSelectedCrossSellProducts() + { + return Mage::registry('current_product')->getCrossSellProductIds(); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php index bdf569c05f..63c23c3bc8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php @@ -38,9 +38,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option extends Mage_ protected $_productInstance; - protected $_name = 'product[options]'; - protected $_id = 'product_option'; - protected $_values; protected $_itemCount = 1; @@ -86,14 +83,24 @@ public function setProduct($product) return $this; } + /** + * Retrieve options field name prefix + * + * @return string + */ public function getFieldName() { - return $this->_name; + return 'product[options]'; } + /** + * Retrieve options field id prefix + * + * @return string + */ public function getFieldId() { - return $this->_id; + return 'product_option'; } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php index 3fb72af344..2d38dffe35 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php @@ -44,10 +44,12 @@ protected function _prepareLayout() 'id' => 'product_option_{{option_id}}_price_type', 'class' => 'select product-option-price-type' )) - ->setName('product[options][{{option_id}}][price_type]') - ->setOptions(Mage::getSingleton('adminhtml/system_config_source_product_options_price')->toOptionArray()) ); + $this->getChild('option_price_type')->setName('product[options][{{option_id}}][price_type]') + ->setOptions(Mage::getSingleton('adminhtml/system_config_source_product_options_price') + ->toOptionArray()); + return parent::_prepareLayout(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php index 10f9199c1d..654f4d8c54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php @@ -25,154 +25,273 @@ */ /** - * Adminhtml tier pricing item renderer + * Adminhtml tier price item renderer * * @category Mage * @package Mage_Adminhtml - * @author Magento Core Team
' . Mage::helper('cms')->__('(eg: domain.com/identifier)') . '
', + 'disabled' => $isElementDisabled )); /** @@ -77,6 +91,7 @@ protected function _prepareForm() 'title' => Mage::helper('cms')->__('Store View'), 'required' => true, 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(false, true), + 'disabled' => $isElementDisabled )); } else { @@ -87,30 +102,71 @@ protected function _prepareForm() $model->setStoreId(Mage::app()->getStore(true)->getId()); } - $fieldset->addField('is_active', 'select', array( + $fieldset->addField('is_active', 'select', array( 'label' => Mage::helper('cms')->__('Status'), 'title' => Mage::helper('cms')->__('Page Status'), 'name' => 'is_active', 'required' => true, - 'options' => array( - '1' => Mage::helper('cms')->__('Enabled'), - '0' => Mage::helper('cms')->__('Disabled'), - ), - )); - - $fieldset->addField('content', 'editor', array( - 'name' => 'content', - 'label' => Mage::helper('cms')->__('Content'), - 'title' => Mage::helper('cms')->__('Content'), - 'style' => 'height:36em;', - 'wysiwyg' => false, - 'required' => true, + 'options' => $model->getAvailableStatuses(), + 'disabled' => $isElementDisabled )); + Mage::dispatchEvent('adminhtml_cms_page_edit_tab_main_prepare_form', array('form' => $form)); $form->setValues($model->getData()); $this->setForm($form); return parent::_prepareForm(); } + + /** + * Prepare label for tab + * + * @return string + */ + public function getTabLabel() + { + return Mage::helper('cms')->__('Page Information'); + } + + /** + * Prepare title for tab + * + * @return string + */ + public function getTabTitle() + { + return Mage::helper('cms')->__('Page Information'); + } + + /** + * Returns status flag about this tab can be shown or not + * + * @return true + */ + public function canShowTab() + { + return true; + } + + /** + * Returns status flag about this tab hidden or not + * + * @return true + */ + public function isHidden() + { + return false; + } + + /** + * Check permission for passed action + * + * @param string $action + * @return bool + */ + protected function _isAllowedAction($action) + { + return Mage::getSingleton('admin/session')->isAllowed('cms/page/' . $action); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php index d4eab819a2..a0f2121633 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php @@ -31,7 +31,9 @@ * @package Mage_Adminhtml * @author Magento Core Team%s
', $i, $data['description']);
+ $i++;
+ }
+ return $html;
+ }
+
+ /**
+ * Return array of available widgets based on configuration
+ *
+ * @return array
+ */
+ protected function _getAvailableWidgets($withEmptyElement = false)
+ {
+ if (!$this->getData('available_widgets')) {
+ $config = Mage::getSingleton('cms/widget')->getXmlConfig();
+ $widgets = $config->getNode('widgets');
+ $result = array();
+ if ($withEmptyElement) {
+ $result[] = array(
+ 'type' => '',
+ 'name' => $this->helper('adminhtml')->__('-- Please Select --'),
+ 'description' => $this->getEmptyOptionDescription(),
+ );
+ }
+ $skipped = $this->_getSkippedWidgets();
+ foreach ($widgets->children() as $widget) {
+ if ($widget->is_context && $this->_skipContextWidgets()) {
+ continue;
+ }
+ if (is_array($skipped) && in_array($widget->getAttribute('type'), $skipped)) {
+ continue;
+ }
+ if ($widget->getAttribute('module')) {
+ $helper = Mage::helper($widget->getAttribute('module'));
+ } else {
+ $helper = Mage::helper('cms');
+ }
+ $result[$widget->getName()] = array(
+ 'name' => $helper->__((string)$widget->name),
+ 'code' => $widget->getName(),
+ 'type' => $widget->getAttribute('type'),
+ 'description' => $helper->__((string)$widget->description),
+ );
+ }
+ usort($result, array($this, "_sortWidgets"));
+ $this->setData('available_widgets', $result);
+ }
+ return $this->getData('available_widgets');
+ }
+
+ /**
+ * Disable insertion of context(is_context) widgets or not
+ *
+ * @return bool
+ */
+ protected function _skipContextWidgets()
+ {
+ return (bool)$this->getParentBlock()->getData('skip_context_widgets');
+ }
+
+ /**
+ * Return array of widgets disabled for selection
+ *
+ * @return array
+ */
+ protected function _getSkippedWidgets()
+ {
+ $skipped = $this->getParentBlock()->getData('skip_widgets');
+ if (is_array($skipped)) {
+ return $skipped;
+ }
+ $skipped = Mage::helper('core')->urlDecode($skipped);
+ $skipped = explode(',', $skipped);
+ return $skipped;
+ }
+
+ /**
+ * User-defined widgets sorting by Name
+ *
+ * @param array $a
+ * @param array $b
+ * @return boolean
+ */
+ protected function _sortWidgets($a, $b)
+ {
+ return strcmp($a["name"], $b["name"]);
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Widget/Options.php b/app/code/core/Mage/Adminhtml/Block/Cms/Widget/Options.php
new file mode 100644
index 0000000000..0ca8143899
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Widget/Options.php
@@ -0,0 +1,177 @@
+
+ */
+
+class Mage_Adminhtml_Block_Cms_Widget_Options extends Mage_Adminhtml_Block_Widget_Form
+{
+ protected $_defaultElementType = 'text';
+ protected $_translationHelper = null;
+
+ /**
+ * Prepare Widget Options Form and values according to specified type
+ *
+ * widget_type must be set in data before
+ * widget_values may be set before to render element values
+ */
+ protected function _prepareForm()
+ {
+ // prepare form instance
+ $form = new Varien_Data_Form();
+ $fieldset = $form->addFieldset('options_fieldset', array(
+ 'legend' => $this->helper('cms')->__('Widget Options')
+ ));
+ $form->setUseContainer(false);
+ $this->setForm($form);
+
+ // get configuration node and translation helper
+ if (!$this->getWidgetType()) {
+ Mage::throwException($this->__('Widget Type is not specified'));
+ }
+ $config = Mage::getSingleton('cms/widget')->getXmlElementByType($this->getWidgetType());
+ if (!($config instanceof Varien_Simplexml_Element)) {
+ return;
+ }
+ if (!$config->parameters) {
+ return;
+ }
+ $module = (string)$config->getAttribute('module');
+ $this->_translationHelper = Mage::helper($module ? $module : 'cms');
+
+ // sort widget parameters and add them to form
+ $sortOrder = 0;
+ foreach ($config->parameters->children() as $option) {
+ $option->sort_order = $option->sort_order ? (int)$option->sort_order : $sortOrder;
+ $options[$option->getName()] = $option;
+ $sortOrder++;
+ }
+ uasort($options, array($this, '_sortParameters'));
+ foreach ($options as $option) {
+ $this->_addField($option);
+ }
+ }
+
+ /**
+ * Widget parameters sort callback
+ *
+ * @param $a
+ * @param $b
+ * @return int
+ */
+ protected function _sortParameters($a, $b)
+ {
+ $aOrder = (int)$a->sort_order;
+ $bOrder = (int)$b->sort_order;
+ return $aOrder < $bOrder ? -1 : ($aOrder > $bOrder ? 1 : 0);
+ }
+
+ /**
+ * Add field to Options form based on option configuration
+ *
+ * @param Varien_Simplexml_Element $option
+ * @param Mage_Core_Helper_Abstract $helper
+ * @return Varien_Data_Form_Element_Abstract
+ */
+ protected function _addField($config)
+ {
+ $form = $this->getForm();
+ $fieldset = $form->getElement('options_fieldset');
+
+ // prepare element data with values (either from request of from default values)
+ $fieldName = (string)$config->getName();
+ $data = array(
+ 'name' => $form->addSuffixToName($fieldName, 'parameters'),
+ 'label' => $this->_translationHelper->__((string)$config->label),
+ 'required' => (bool)(int)(string)$config->required,
+ 'class' => 'widget-option',
+ 'note' => $this->_translationHelper->__((string)$config->description),
+ );
+ if ($values = $this->getWidgetValues()) {
+ $data['value'] = (isset($values[$fieldName]) ? $values[$fieldName] : '');
+ }
+ else {
+ $data['value'] = (string)$config->value;
+ }
+
+ // prepare element dropdown values, if any
+ if ($config->values) {
+ // dropdown options are specified in configuration
+ if ($config->values->hasChildren()) {
+ $data['values'] = array();
+ foreach ($config->values->children() as $option) {
+ $data['values'][] = array(
+ 'value' => (string)$option->value,
+ 'label' => $this->_translationHelper->__((string)$option->label)
+ );
+ }
+ }
+ // a source model is specified
+ elseif ($model = Mage::getModel((string)$config->values)) {
+ $data['values'] = $model->toOptionArray();
+ }
+ }
+
+ // prepare field type and renderers
+ $fieldRenderer = false;
+ $fieldChooserRenderer = false;
+ $fieldType = (string)$config->type;
+ // hidden element
+ if (!(int)(string)$config->visible) {
+ $fieldType = 'hidden';
+ }
+ // element of specified type with a chooser
+ elseif ($config->type->hasChildren()) {
+ $fieldType = $config->type->element_type ? (string)$config->type->element_type : $this->_defaultElementType;
+ if ($config->type->element_helper) {
+ $fieldChooserRenderer = $this->getLayout()->getBlockSingleton((string)$config->type->element_helper);
+ }
+ }
+ // just an element renderer
+ elseif (false !== strpos($config->type, '/')) {
+ $fieldType = $this->_defaultElementType;
+ $fieldRenderer = $this->getLayout()->createBlock((string)$config->type);
+ }
+
+ // instantiate field and prepare extra html
+ $field = $fieldset->addField('option_' . $fieldName, $fieldType, $data);
+ if ($fieldRenderer) {
+ $field->setRenderer($fieldRenderer);
+ } elseif ($fieldChooserRenderer) {
+ $fieldChooserRenderer->setFieldsetId($fieldset->getId())
+ ->setTranslationHelper($this->_translationHelper)
+ ->setConfig($config->type)
+ ->prepareElementHtml($field);
+ }
+
+ return $field;
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php
new file mode 100644
index 0000000000..22ddab6381
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php
@@ -0,0 +1,132 @@
+
+ */
+class Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content extends Mage_Adminhtml_Block_Widget_Container
+{
+ /**
+ * Block construction
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ $this->_headerText = $this->helper('cms')->__('Image Gallery');
+ $this->_removeButton('back')->_removeButton('edit');
+ $this->_addButton('newfolder', array(
+ 'class' => 'save',
+ 'label' => $this->helper('cms')->__('Create Folder'),
+ 'type' => 'button',
+ 'onclick' => 'Images.newFolder();'
+ ));
+ $this->_addButton('upload', array(
+ 'class' => 'add',
+ 'label' => $this->helper('cms')->__('Add Files'),
+ 'type' => 'button',
+ 'onclick' => 'Images.upload();'
+ ));
+
+ $this->_addButton('delete_folder', array(
+ 'class' => 'delete no-display',
+ 'label' => $this->helper('cms')->__('Delete Folder'),
+ 'type' => 'button',
+ 'onclick' => 'Images.deleteFolder();',
+ 'id' => 'button_delete_folder'
+ ));
+
+ $this->_addButton('delete_files', array(
+ 'class' => 'delete no-display',
+ 'label' => $this->helper('cms')->__('Delete File'),
+ 'type' => 'button',
+ 'onclick' => 'Images.deleteFiles();',
+ 'id' => 'button_delete_files'
+ ));
+
+ $this->_addButton('insert_files', array(
+ 'class' => 'save no-display',
+ 'label' => $this->helper('cms')->__('Insert File'),
+ 'type' => 'button',
+ 'onclick' => 'Images.insert();',
+ 'id' => 'button_insert_files'
+ ));
+ }
+
+ /**
+ * Files action source URL
+ *
+ * @return string
+ */
+ public function getContentsUrl()
+ {
+ return $this->getUrl('*/*/contents', array('type' => $this->getRequest()->getParam('type')));
+ }
+
+ /**
+ * New directory action target URL
+ *
+ * @return string
+ */
+ public function getNewfolderUrl()
+ {
+ return $this->getUrl('*/*/newFolder');
+ }
+
+ /**
+ * Delete directory action target URL
+ *
+ * @return string
+ */
+ protected function getDeletefolderUrl()
+ {
+ return $this->getUrl('*/*/deleteFolder');
+ }
+
+ /**
+ * Description goes here...
+ *
+ * @param none
+ * @return void
+ */
+ public function getDeleteFilesUrl()
+ {
+ return $this->getUrl('*/*/deleteFiles');
+ }
+
+ /**
+ * New directory action target URL
+ *
+ * @return string
+ */
+ public function getOnInsertUrl()
+ {
+ return $this->getUrl('*/*/onInsert');
+ }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php
new file mode 100644
index 0000000000..f0f0d860c9
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php
@@ -0,0 +1,89 @@
+
+ */
+class Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content_Files extends Mage_Adminhtml_Block_Template
+{
+ /**
+ * Prepare Files collection
+ *
+ * @return Varien_Data_Collection_Filesystem
+ */
+ public function getContentsCollection()
+ {
+ $helper = Mage::helper('cms/wysiwyg_images');
+ $type = $this->getRequest()->getParam('type');
+ $collection = $helper->getStorage()->getFilesCollection($helper->getCurrentPath(), $type);
+ foreach ($collection as $item) {
+ $item->setId(Mage::helper('core')->urlEncode($item->getBasename()));
+ $item->setName($this->getShortFilename($item->getBasename()));
+ $item->setUrl($helper->getCurrentUrl() . $item->getBasename());
+ $item->setEncodedPath(Mage::helper('core')->urlEncode($item->getFilename()));
+
+ if(is_file($helper->getCurrentPath() . DS . '.thumbs' . DS . $item->getBasename())) {
+ $item->setThumbUrl($helper->getCurrentUrl() . '.thumbs/' . $item->getBasename());
+ }
+
+ $size = @getimagesize($item->getFilename());
+ if (is_array($size)) {
+ $item->setWidth($size[0]);
+ $item->setHeight($size[1]);
+ }
+ }
+ return $collection;
+ }
+
+ public function getImagesWidth()
+ {
+ return Mage::getSingleton('cms/wysiwyg_images_storage')->getConfigData('browser_resize_width');
+ }
+
+ public function getImagesHeight()
+ {
+ return Mage::getSingleton('cms/wysiwyg_images_storage')->getConfigData('browser_resize_height');
+ }
+
+ /**
+ * Reduce filename by replacing some characters with dots
+ *
+ * @param string $filename
+ * @param int $maxLength Maximum filename
+ * @return string Truncated filename
+ */
+ public function getShortFilename($filename, $maxLength = 15)
+ {
+ if (strlen($filename) <= $maxLength) {
+ return $filename;
+ }
+ return preg_replace('/^(.{1,'.($maxLength - 3).'})(.*)(\.[a-z0-9]+)$/i', '$1..$3', $filename);
+ }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php
new file mode 100644
index 0000000000..592f7bb85f
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php
@@ -0,0 +1,37 @@
+
+ */
+class Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content_Newfolder extends Mage_Adminhtml_Block_Template
+{
+
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
new file mode 100644
index 0000000000..1fd305c604
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
@@ -0,0 +1,59 @@
+
+*/
+class Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content_Uploader extends Mage_Adminhtml_Block_Media_Uploader
+{
+ public function __construct()
+ {
+ parent::__construct();
+ $params = $this->getConfig()->getParams();
+ $type = $this->getRequest()->getParam('type');
+ $allowed = Mage::getSingleton('cms/wysiwyg_images_storage')->getAllowedExtensions($type);
+ $labels = array();
+ $files = array();
+ foreach ($allowed as $ext) {
+ $labels[] = '.' . $ext;
+ $files[] = '*.' . $ext;
+ }
+ $this->getConfig()
+ ->setUrl(Mage::getModel('adminhtml/url')->addSessionParam()->getUrl('*/*/upload', array('type' => $type)))
+ ->setParams($params)
+ ->setFileField('image')
+ ->setFilters(array(
+ 'images' => array(
+ 'label' => $this->helper('cms')->__('Images (%s)', implode(', ', $labels)),
+ 'files' => $files
+ )
+ ));
+ }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php
new file mode 100644
index 0000000000..a8484c7e82
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php
@@ -0,0 +1,98 @@
+
+ */
+class Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Tree extends Mage_Adminhtml_Block_Template
+{
+
+ /**
+ * Json tree builder
+ *
+ * @return string
+ */
+ public function getTreeJson()
+ {
+ $helper = Mage::helper('cms/wysiwyg_images');
+ $storageRoot = $helper->getStorageRoot();
+ $collection = Mage::registry('storage')->getDirsCollection($helper->getCurrentPath());
+ $jsonArray = array();
+ foreach ($collection as $item) {
+ $jsonArray[] = array(
+ 'text' => $item->getBasename(),
+ 'id' => $helper->convertPathToId($item->getFilename()),
+ 'cls' => 'folder'
+ );
+ }
+ return Zend_Json::encode($jsonArray);
+ }
+
+ /**
+ * Json source URL
+ *
+ * @return string
+ */
+ public function getTreeLoaderUrl()
+ {
+ return $this->getUrl('*/*/treeJson');
+ }
+
+ /**
+ * Root node name of tree
+ *
+ * @return string
+ */
+ public function getRootNodeName()
+ {
+ return $this->helper('cms')->__('Storage Root');
+ }
+
+ /**
+ * Return tree node full path based on current path
+ *
+ * @return string
+ */
+ public function getTreeCurrentPath()
+ {
+ $treePath = '/root';
+ if ($path = Mage::registry('storage')->getSession()->getCurrentPath()) {
+ $path = str_replace(Mage::helper('cms/wysiwyg_images')->getStorageRoot(), '', $path);
+ $relative = '';
+ foreach (explode(DS, $path) as $dirName) {
+ if ($dirName) {
+ $relative .= DS . $dirName;
+ $treePath .= '/' . Mage::helper('core')->urlEncode($relative);
+ }
+ }
+ }
+ return $treePath;
+ }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php
index 586c120073..ad540f93f3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php
@@ -31,7 +31,12 @@
*/
class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface
{
-
+ /**
+ * Output the region element and javasctipt that makes it dependent from country element
+ *
+ * @param Varien_Data_Form_Element_Abstract $element
+ * @return string
+ */
public function render(Varien_Data_Form_Element_Abstract $element)
{
if ($country = $element->getForm()->getElement('country_id')) {
@@ -42,7 +47,6 @@ public function render(Varien_Data_Form_Element_Abstract $element)
}
$regionId = $element->getForm()->getElement('region_id')->getValue();
- $postcode = $element->getForm()->getElement('postcode');
$html = '') { return $this->helper('adminhtml/sales')->displayPriceAttribute($this->getSource(), $code, $strong, $separator); } + /** + * Source order getter + * + * @return Mage_Sales_Model_Order + */ public function getSource() { return $this->getParentBlock()->getSource(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php index 0da3ca7258..2c2ee5924e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php @@ -78,6 +78,13 @@ public function __construct() )); } + $this->addButton('send_notification', array( + 'label' => Mage::helper('sales')->__('Send Order Email'), + 'onclick' => 'confirmSetLocation(\'' . Mage::helper('sales')->__( + 'Are you sure you want to send Order email to customer?' + ) . '\', \'' . $this->getEmailUrl() . '\')' + )); + if ($this->_isAllowedAction('creditmemo') && $this->getOrder()->canCreditmemo()) { $this->_addButton('order_creditmemo', array( 'label' => Mage::helper('sales')->__('Credit Memo'), @@ -169,6 +176,11 @@ public function getEditUrl() return $this->getUrl('*/sales_order_edit/start'); } + public function getEmailUrl() + { + return $this->getUrl('*/*/email'); + } + public function getCancelUrl() { return $this->getUrl('*/*/cancel'); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php index 882adf0211..f5269cf651 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php @@ -62,7 +62,7 @@ protected function _initTotals() /** * Add shipping */ - if ($this->getSource()->getShippingAmount() || $this->getSource()->getShippingDescription()) + if (!$this->getSource()->getIsVirtual() && ((float) $this->getSource()->getShippingAmount() || $this->getSource()->getShippingDescription())) { $this->_totals['shipping'] = new Varien_Object(array( 'code' => 'shipping', diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php new file mode 100644 index 0000000000..79a63b7f19 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php @@ -0,0 +1,271 @@ + + */ +class Mage_Adminhtml_Block_Tag_Assigned_Grid extends Mage_Adminhtml_Block_Widget_Grid +{ + /** + * Set grid params + * + */ + public function __construct() + { + parent::__construct(); + $this->setId('tag_assigned_product_grid'); + $this->setDefaultSort('entity_id'); + $this->setDefaultDir('DESC'); + $this->setUseAjax(true); + if ($this->_getTagId()) { + $this->setDefaultFilter(array('in_products'=>1)); + } + } + + /** + * Tag ID getter + * + * @return int + */ + protected function _getTagId() + { + return Mage::registry('current_tag')->getId(); + } + + /** + * Store getter + * + * @return Mage_Core_Model_Store + */ + protected function _getStore() + { + $storeId = (int) $this->getRequest()->getParam('store', 0); + return Mage::app()->getStore($storeId); + } + + /** + * Add filter to grid columns + * + * @param mixed $column + * @return Mage_Adminhtml_Block_Tag_Assigned_Grid + */ + protected function _addColumnFilterToCollection($column) + { + // Set custom filter for in product flag + if ($column->getId() == 'in_products') { + $productIds = $this->_getSelectedProducts(); + if (empty($productIds)) { + $productIds = 0; + } + if ($column->getFilter()->getValue()) { + $this->getCollection()->addFieldToFilter('entity_id', array('in'=>$productIds)); + } else { + if($productIds) { + $this->getCollection()->addFieldToFilter('entity_id', array('nin'=>$productIds)); + } + } + } else { + parent::_addColumnFilterToCollection($column); + } + return $this; + } + + /** + * Retrieve Products Collection + * + * @return Mage_Adminhtml_Block_Tag_Assigned_Grid + */ + protected function _prepareCollection() + { + $store = $this->_getStore(); + $collection = Mage::getModel('catalog/product')->getCollection() + ->addAttributeToSelect('sku') + ->addAttributeToSelect('name') + ->addAttributeToSelect('attribute_set_id') + ->addAttributeToSelect('type_id') + ->joinField('qty', + 'cataloginventory/stock_item', + 'qty', + 'product_id=entity_id', + '{{table}}.stock_id=1', + 'left'); + + if ($store->getId()) { + $collection->addStoreFilter($store); + $collection->joinAttribute('custom_name', 'catalog_product/name', 'entity_id', null, 'inner', $store->getId()); + $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner', $store->getId()); + $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner', $store->getId()); + $collection->joinAttribute('price', 'catalog_product/price', 'entity_id', null, 'left', $store->getId()); + } else { + $collection->addAttributeToSelect('price'); + $collection->addAttributeToSelect('status'); + $collection->addAttributeToSelect('visibility'); + } + + $this->setCollection($collection); + + parent::_prepareCollection(); + $this->getCollection()->addWebsiteNamesToResult(); + return $this; + } + + /** + * Prepeare columns for grid + * + * @return Mage_Adminhtml_Block_Widget_Grid + */ + protected function _prepareColumns() + { + $this->addColumn('in_products', array( + 'header_css_class' => 'a-center', + 'type' => 'checkbox', + 'field_name' => 'in_products', + 'values' => $this->_getSelectedProducts(), + 'align' => 'center', + 'index' => 'entity_id' + )); + + $this->addColumn('entity_id', + array( + 'header'=> Mage::helper('catalog')->__('ID'), + 'width' => 50, + 'sortable' => true, + 'type' => 'number', + 'index' => 'entity_id', + )); + $this->addColumn('name', + array( + 'header'=> Mage::helper('catalog')->__('Name'), + 'index' => 'name', + )); + + $store = $this->_getStore(); + if ($store->getId()) { + $this->addColumn('custom_name', + array( + 'header'=> Mage::helper('catalog')->__('Name In %s', $store->getName()), + 'index' => 'custom_name', + )); + } + + $this->addColumn('type', + array( + 'header' => Mage::helper('catalog')->__('Type'), + 'width' => 100, + 'index' => 'type_id', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_type')->getOptionArray(), + )); + + $sets = Mage::getResourceModel('eav/entity_attribute_set_collection') + ->setEntityTypeFilter(Mage::getModel('catalog/product')->getResource()->getTypeId()) + ->load() + ->toOptionHash(); + + $this->addColumn('set_name', + array( + 'header' => Mage::helper('catalog')->__('Attrib. Set Name'), + 'width' => 100, + 'index' => 'attribute_set_id', + 'type' => 'options', + 'options' => $sets, + )); + + $this->addColumn('sku', + array( + 'header'=> Mage::helper('catalog')->__('SKU'), + 'width' => 80, + 'index' => 'sku', + )); + + $store = $this->_getStore(); + $this->addColumn('price', + array( + 'header' => Mage::helper('catalog')->__('Price'), + 'type' => 'price', + 'currency_code' => $store->getBaseCurrency()->getCode(), + 'index' => 'price', + )); + + $this->addColumn('visibility', + array( + 'header' => Mage::helper('catalog')->__('Visibility'), + 'width' => 100, + 'index' => 'visibility', + 'type' => 'options', + 'options' => Mage::getModel('catalog/product_visibility')->getOptionArray(), + )); + + $this->addColumn('status', + array( + 'header' => Mage::helper('catalog')->__('Status'), + 'width' => 70, + 'index' => 'status', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_status')->getOptionArray(), + )); + + return parent::_prepareColumns(); + } + + /** + * Retrieve related products + * + * @return array + */ + protected function _getSelectedProducts() + { + $products = $this->getRequest()->getPost('assigned_products', null); + if (!is_array($products)) { + $products = $this->getRelatedProducts(); + } + return $products; + } + + /** + * Retrieve Grid Url + * + * @return string + */ + public function getGridUrl() + { + return $this->getUrl('*/*/assignedGridOnly', array('_current' => true)); + } + + /** + * Retrieve related products + * + * @return array + */ + public function getRelatedProducts() + { + return Mage::registry('current_tag')->getRelatedProductIds(); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php index 2ce80ddc36..43a022f1c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php @@ -37,18 +37,30 @@ class Mage_Adminhtml_Block_Tag_Customer_Grid extends Mage_Adminhtml_Block_Widget public function __construct() { parent::__construct(); - $this->setId('tag_grid' . Mage::registry('tagId')); + $this->setId('tag_customer_grid' . Mage::registry('current_tag')->getId()); $this->setDefaultSort('name'); $this->setDefaultDir('ASC'); + $this->setUseAjax(true); + } + /* + * Retrieves Grid Url + * + * @return string + */ + public function getGridUrl() + { + return $this->getUrl('*/*/customer', array('_current' => true)); } protected function _prepareCollection() { - $tagId = Mage::registry('tagId'); + $tagId = Mage::registry('current_tag')->getId(); + $storeId = Mage::registry('current_tag')->getStoreId(); $collection = Mage::getModel('tag/tag') ->getCustomerCollection() ->addTagFilter($tagId) ->setCountAttribute('tr.tag_relation_id') + ->addStoreFilter($storeId) ->addGroupByCustomerProduct(); $this->setCollection($collection); @@ -65,7 +77,7 @@ protected function _prepareColumns() { $this->addColumn('customer_id', array( 'header' => Mage::helper('tag')->__('ID'), - 'width' => '50px', + 'width' => 50, 'align' => 'right', 'index' => 'entity_id', )); @@ -80,15 +92,6 @@ protected function _prepareColumns() 'index' => 'lastname', )); - if (!Mage::app()->isSingleStoreMode()) { - $this->addColumn('store_id', array( - 'header' => Mage::helper('tag')->__('Tagged in'), - 'index' => 'store_id', - 'type' => 'store', - 'store_view' => true, - )); - } - $this->addColumn('product', array( 'header' => Mage::helper('tag')->__('Product Name'), 'filter' => false, @@ -100,19 +103,12 @@ protected function _prepareColumns() 'header' => Mage::helper('tag')->__('Product SKU'), 'filter' => false, 'sortable' => false, - 'width' => '50px', + 'width' => 50, 'align' => 'right', 'index' => 'product_sku', )); - $this->addColumn('product_sku', array( - 'header' => Mage::helper('tag')->__('Product SKU'), - 'filter' => false, - 'sortable' => false, - 'width' => '50px', - 'align' => 'right', - 'index' => 'product_sku', - )); + return parent::_prepareColumns(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php index 2eaef52363..1a8c691e2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php @@ -35,6 +35,10 @@ class Mage_Adminhtml_Block_Tag_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { + /** + * Add and update buttons + * + */ public function __construct() { $this->_objectId = 'tag_id'; @@ -44,16 +48,102 @@ public function __construct() $this->_updateButton('save', 'label', Mage::helper('tag')->__('Save Tag')); $this->_updateButton('delete', 'label', Mage::helper('tag')->__('Delete Tag')); + + $this->addButton('save_and_edit_button', array( + 'label' => Mage::helper('tag')->__('Save And Continue Edit'), + 'onclick' => 'saveAndContinueEdit(\''.$this->getSaveAndContinueUrl().'\')', + 'class' => 'save' + ), 1); } + /** + * Add child HTML to layout + * + * @return Mage_Adminhtml_Block_Tag_Edit + */ + protected function _prepareLayout() + { + parent::_prepareLayout(); + + $this->setChild('store_switcher', $this->getLayout()->createBlock('adminhtml/tag_store_switcher')); + + $this->setChild('tag_assign_accordion', $this->getLayout()->createBlock('adminhtml/tag_edit_assigned')); + + $this->setChild('accordion', $this->getLayout()->createBlock('adminhtml/tag_edit_accordion')); + + return $this; + } + + /** + * Retrieve Header text + * + * @return string + */ public function getHeaderText() { - if (Mage::registry('tag_tag')->getId()) { - return Mage::helper('tag')->__("Edit Tag '%s'", $this->htmlEscape(Mage::registry('tag_tag')->getName())); - } - else { - return Mage::helper('tag')->__('New Tag'); + if (Mage::registry('current_tag')->getId()) { + return Mage::helper('tag')->__("Edit Tag '%s'", $this->htmlEscape(Mage::registry('current_tag')->getName())); } + return Mage::helper('tag')->__('New Tag'); + } + + /** + * Retrieve Accordions HTML + * + * @return string + */ + public function getAcordionsHtml() + { + return $this->getChildHtml('accordion'); + } + + /** + * Retrieve Assigned Tags Accordion HTML + * + * @return string + */ + public function getTagAssignAccordionHtml() + { + return $this->getChildHtml('tag_assign_accordion'); } + /** + * Retrieve Store Switcher HTML + * + * @return string + */ + public function getStoreSwitcherHtml() + { + return $this->getChildHtml('store_switcher'); + } + + /** + * Check whether it is single store mode + * + * @return bool + */ + public function isSingleStoreMode() + { + return Mage::app()->isSingleStoreMode(); + } + + /** + * Retrieve Tag Save URL + * + * @return string + */ + public function getSaveUrl() + { + return $this->getUrl('*/*/save', array('_current'=>true)); + } + + /** + * Retrieve Tag SaveAndContinue URL + * + * @return string + */ + public function getSaveAndContinueUrl() + { + return $this->getUrl('*/*/save', array('_current' => true, 'ret' => 'edit')); + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php new file mode 100644 index 0000000000..97a5354b34 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php @@ -0,0 +1,64 @@ + + */ + +class Mage_Adminhtml_Block_Tag_Edit_Accordion extends Mage_Adminhtml_Block_Widget_Accordion +{ + /** + * Add products and customers accordion to layout + * + */ + protected function _prepareLayout() + { + if (is_null(Mage::registry('current_tag')->getId())) { + return $this; + } + + $tagModel = Mage::registry('current_tag'); + + $this->setId('tag_customer_and_product_accordion'); + + $this->addItem('tag_customer', array( + 'title' => Mage::helper('tag')->__('Customers Submitted this Tag'), + 'ajax' => true, + 'content_url' => $this->getUrl('*/*/customer', array('ret' => 'all', 'tag_id'=>$tagModel->getId(), 'store'=>$tagModel->getStoreId())), + )); + + $this->addItem('tag_product', array( + 'title' => Mage::helper('tag')->__('Products Tagged by Customers'), + 'ajax' => true, + 'content_url' => $this->getUrl('*/*/product', array('ret' => 'all', 'tag_id'=>$tagModel->getId(), 'store'=>$tagModel->getStoreId())), + )); + return parent::_prepareLayout(); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php new file mode 100644 index 0000000000..74af7ba2a9 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php @@ -0,0 +1,58 @@ + + */ + +class Mage_Adminhtml_Block_Tag_Edit_Assigned extends Mage_Adminhtml_Block_Widget_Accordion +{ + /** + * Add Assigned products accordion to layout + * + */ + protected function _prepareLayout() + { + if (is_null(Mage::registry('current_tag')->getId())) { + return $this; + } + + $tagModel = Mage::registry('current_tag'); + + $this->setId('tag_assigned_grid'); + + $this->addItem('tag_assign', array( + 'title' => Mage::helper('tag')->__('Products Tagged by Administrators'), + 'ajax' => true, + 'content_url' => $this->getUrl('*/*/assigned', array('ret' => 'all', 'tag_id'=>$tagModel->getId(), 'store'=>$tagModel->getStoreId())), + )); + return parent::_prepareLayout(); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php index f7ca2ff1fa..fe436354d9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php @@ -46,33 +46,54 @@ protected function _prepareForm() { $model = Mage::registry('tag_tag'); - $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post')); + $form = new Varien_Data_Form( + array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post') + ); $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('tag')->__('General Information'))); if ($model->getTagId()) { - $fieldset->addField('tag_id', 'hidden', array( + $fieldset->addField('tag_id', 'hidden', array( 'name' => 'tag_id', )); } - $fieldset->addField('name', 'text', array( - 'name' => 'name', + $fieldset->addField('form_key', 'hidden', array( + 'name' => 'form_key', + 'value' => Mage::getSingleton('core/session')->getFormKey(), + )); + + $fieldset->addField('store_id', 'hidden', array( + 'name' => 'store_id', + 'value' => (int)$this->getRequest()->getParam('store') + )); + + $fieldset->addField('name', 'text', array( + 'name' => 'tag_name', 'label' => Mage::helper('tag')->__('Tag Name'), 'title' => Mage::helper('tag')->__('Tag Name'), 'required' => true, + 'after_element_html' => ' [GLOBAL]', )); - $fieldset->addField('status', 'select', array( + $fieldset->addField('status', 'select', array( 'label' => Mage::helper('tag')->__('Status'), 'title' => Mage::helper('tag')->__('Status'), - 'name' => 'status', + 'name' => 'tag_status', 'required' => true, 'options' => array( Mage_Tag_Model_Tag::STATUS_DISABLED => Mage::helper('tag')->__('Disabled'), Mage_Tag_Model_Tag::STATUS_PENDING => Mage::helper('tag')->__('Pending'), Mage_Tag_Model_Tag::STATUS_APPROVED => Mage::helper('tag')->__('Approved'), ), + 'after_element_html' => ' [GLOBAL]', + )); + + $fieldset->addField('base_popularity', 'text', array( + 'name' => 'base_popularity', + 'label' => Mage::helper('tag')->__('Base Popularity'), + 'title' => Mage::helper('tag')->__('Base Popularity'), + 'after_element_html' => ' [STORE VIEW]', )); if (!$model->getId() && !Mage::getSingleton('adminhtml/session')->getTagData() ) { @@ -80,17 +101,13 @@ protected function _prepareForm() } if ( Mage::getSingleton('adminhtml/session')->getTagData() ) { - $form->setValues(Mage::getSingleton('adminhtml/session')->getTagData()); + $form->addValues(Mage::getSingleton('adminhtml/session')->getTagData()); Mage::getSingleton('adminhtml/session')->setTagData(null); } else { - $form->setValues($model->getData()); + $form->addValues($model->getData()); } - $form->setUseContainer(true); - $form->setAction( $form->getAction() . 'ret/' . $this->getRequest()->getParam('ret') ); $this->setForm($form); - return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php index 6b5339b016..03dffcf868 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php @@ -37,17 +37,31 @@ class Mage_Adminhtml_Block_Tag_Product_Grid extends Mage_Adminhtml_Block_Widget_ public function __construct() { parent::__construct(); - $this->setId('tag_grid' . Mage::registry('tagId')); + $this->setId('tag_product_grid' . Mage::registry('current_tag')->getId()); $this->setDefaultSort('name'); $this->setDefaultDir('ASC'); + $this->setUseAjax(true); + } + + /* + * Retrieves Grid Url + * + * @return string + */ + public function getGridUrl() + { + return $this->getUrl('*/*/product', array('_current' => true)); } protected function _prepareCollection() { - $tagId = Mage::registry('tagId'); + $tagId = Mage::registry('current_tag')->getId(); + $storeId = Mage::registry('current_tag')->getStoreId(); $collection = Mage::getModel('tag/tag') ->getEntityCollection() ->addTagFilter($tagId) + ->addCustomerFilter(array('null' => false)) + ->addStoreFilter($storeId) ->addPopularity($tagId); $this->setCollection($collection); @@ -81,6 +95,15 @@ protected function _prepareColumns() 'type' => 'number' )); + $this->addColumn('sku', array( + 'header' => Mage::helper('tag')->__('SKU'), + 'filter' => false, + 'sortable' => false, + 'width' => 50, + 'align' => 'right', + 'index' => 'sku', + )); + return parent::_prepareColumns(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php new file mode 100644 index 0000000000..5c72a50451 --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php @@ -0,0 +1,51 @@ + + */ +class Mage_Adminhtml_Block_Tag_Store_Switcher extends Mage_Adminhtml_Block_Store_Switcher +{ + /** + * @var bool + */ + protected $_hasDefaultOption = false; + + /** + * Set overriden params + */ + public function __construct() + { + parent::__construct(); + $this->setUseConfirm(false)->setSwitchUrl( + $this->getUrl('*/*/*/', array('store' => null, '_current' => true)) + ); + } +} \ No newline at end of file diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php index b9bb0b263e..5b27f715af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php @@ -38,7 +38,7 @@ class Mage_Adminhtml_Block_Tag_Tag extends Mage_Adminhtml_Block_Widget_Grid_Cont public function __construct() { $this->_controller = 'tag_tag'; - $this->_headerText = Mage::helper('tag')->__('All Tags'); + $this->_headerText = Mage::helper('tag')->__('Manage Tags'); $this->_addButtonLabel = Mage::helper('tag')->__('Add New Tag'); parent::__construct(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php index 477b7fd6d1..4a246e5645 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php @@ -27,6 +27,7 @@ /** * Admin tag edit block * + * @deprecated after 1.3.2.3 * @category Mage * @package Mage_Adminhtml * @author Magento Core Team
Signing up with Checkout by Amazon
To configure Checkout by Amazon™ you will need to enter your Checkout by Amazon™ Merchant ID, Access Key ID, and Secret Access Key.
-If you do not already have a Checkout by Amazon™ account, click here to create one now. Sign-Up
+If you do not already have a Checkout by Amazon™ account, click here to create one now. Sign-Up
To locate your Merchant ID, sign in to your Seller Central Checkout by Amazon™ account and click Settings > Checkout Pipeline Settings.
To locate your Access Key ID and Secret Access Key, sign in to your Seller Central Checkout by Amazon™ account and click Integration > AWS Key. Click the link to read the Amazon Web Services Customer Agreement, and then click the check box, if you are setting up a new Access Key ID.
To enable XML Order Reports click Settings > Checkout Pipeline Settings, and then clicking Edit under the Order Report Settings section. Select Order Report Type as XML to get XML Order Reports using SOAP APIs. Configure your downloads for hourly.
For additional information on setting up your Checkout by Amazon account, Click Here - FAQ.
- +sku
+ url_key
+ status
+ visibility
+ - ';
foreach ($this->getMessages($type) as $message) {
- $html.= '';
+ $html.= '';
}
$html .= '
'; if (isset($this->_connections[$name])) { return $this->_connections[$name]; } $connConfig = Mage::getConfig()->getResourceConnectionConfig($name); - - if (!$connConfig || !$connConfig->is('active', 1)) { + if (!$connConfig) { + $this->_connections[$name] = $this->_getDefaultConnection($name); + return $this->_connections[$name]; + } + if (!$connConfig->is('active', 1)) { return false; } $origName = $connConfig->getParent()->getName(); @@ -93,6 +100,14 @@ public function getConnection($name) return $conn; } + protected function _getDefaultConnection($requiredConnectionName) + { + if (strpos($requiredConnectionName, 'read') !== false) { + return $this->getConnection(self::DEFAULT_READ_RESOURCE); + } + return $this->getConnection(self::DEFAULT_WRITE_RESOURCE); + } + /** * Get connection type instance * diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php index 5498e9c9fe..b3b2e3902f 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup.php @@ -31,6 +31,7 @@ */ class Mage_Core_Model_Resource_Setup { + const DEFAULT_SETUP_CONNECTION = 'core_setup'; const VERSION_COMPARE_EQUAL = 0; const VERSION_COMPARE_LOWER = -1; const VERSION_COMPARE_GREATER = 1; @@ -56,7 +57,13 @@ public function __construct($resourceName) $config = Mage::getConfig(); $this->_resourceName = $resourceName; $this->_resourceConfig = $config->getResourceConfig($resourceName); - $this->_connectionConfig = $config->getResourceConnectionConfig($resourceName); + $connection = $config->getResourceConnectionConfig($resourceName); + if ($connection) { + $this->_connectionConfig = $connection; + } else { + $this->_connectionConfig = $config->getResourceConnectionConfig(self::DEFAULT_SETUP_CONNECTION); + } + $modName = (string)$this->_resourceConfig->setup->module; $this->_moduleConfig = $config->getModuleConfig($modName); $this->_conn = Mage::getSingleton('core/resource')->getConnection($this->_resourceName); diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php index cad2ee993e..36961c55e2 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -45,12 +45,6 @@ public function start($sessionName=null) return $this; } - Varien_Profiler::start(__METHOD__.'/setOptions'); - if (is_writable(Mage::getBaseDir('session'))) { - session_save_path($this->getSessionSavePath()); - } - Varien_Profiler::stop(__METHOD__.'/setOptions'); - switch($this->getSessionSaveMethod()) { case 'db': ini_set('session.save_handler', 'user'); @@ -62,27 +56,49 @@ public function start($sessionName=null) ini_set('session.save_handler', 'memcache'); session_save_path($this->getSessionSavePath()); break; + case 'eaccelerator': + ini_set('session.save_handler', 'eaccelerator'); + break; default: session_module_name('files'); + if (is_writable(Mage::getBaseDir('session'))) { + session_save_path($this->getSessionSavePath()); + } break; } if (Mage::app()->getStore()->isAdmin()) { $adminSessionLifetime = (int)Mage::getStoreConfig('admin/security/session_cookie_lifetime'); if ($adminSessionLifetime > 60) { - Mage::getSingleton('core/cookie')->setLifetime($adminSessionLifetime); + $this->getCookie()->setLifetime($adminSessionLifetime); } } - // set session cookie params - session_set_cookie_params( - $this->getCookie()->getLifetime(), - $this->getCookie()->getPath(), - $this->getCookie()->getDomain(), - $this->getCookie()->isSecure(), - $this->getCookie()->getHttponly() + // session cookie params + $cookieParams = array( + 'lifetime' => $this->getCookie()->getLifetime(), + 'path' => $this->getCookie()->getPath(), + 'domain' => $this->getCookie()->getConfigDomain(), + 'secure' => $this->getCookie()->isSecure(), + 'httponly' => $this->getCookie()->getHttponly() ); + if (!$cookieParams['httponly']) { + unset($cookieParams['httponly']); + if (!$cookieParams['secure']) { + unset($cookieParams['secure']); + if (!$cookieParams['domain']) { + unset($cookieParams['domain']); + } + } + } + + if (isset($cookieParams['domain'])) { + $cookieParams['domain'] = $this->getCookie()->getDomain(); + } + + call_user_func_array('session_set_cookie_params', $cookieParams); + if (!empty($sessionName)) { $this->setSessionName($sessionName); } diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 709bab5655..529969f4f4 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.php @@ -28,12 +28,14 @@ /** * Store model * - * @author Magento Core Team
-- +
+++- -
-
';
- //var_dump( (array)$res);
usort($res, array($this, '_sortMethods'));
- //var_dump((array)$res);
- // echo '';
return $res;
}
protected function _sortMethods($a, $b)
{
- // var_dump($a);
if (is_object($a)) {
- //var_dump($a->getData());
- //var_dump($a->sort_order);
- //die ();
-
return (int)$a->sort_order < (int)$b->sort_order ? -1 : ((int)$a->sort_order > (int)$b->sort_order ? 1 : 0);
}
return 0;
@@ -154,4 +127,4 @@ public function getInfoBlock(Mage_Payment_Model_Info $info)
$block->setInfo($info);
return $block;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php
index b7e180ec84..97220b40f6 100644
--- a/app/code/core/Mage/Payment/Model/Method/Abstract.php
+++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php
@@ -447,13 +447,21 @@ public function prepareSave()
}
/**
- * Return true if the method can be used at this time
+ * Check whether payment method can be used
*
+ * @param Mage_Sales_Model_Quote
* @return bool
*/
- public function isAvailable($quote=null)
+ public function isAvailable($quote = null)
{
- return true;
+ $checkResult = new StdClass;
+ $checkResult->isAvailable = (bool)(int)$this->getConfigData('active', ($quote ? $quote->getStoreId() : null));
+ Mage::dispatchEvent('payment_method_is_active', array(
+ 'result' => $checkResult,
+ 'method_instance' => $this,
+ 'quote' => $quote,
+ ));
+ return $checkResult->isAvailable;
}
/**
@@ -467,5 +475,4 @@ public function initialize($paymentAction, $stateObject)
{
return $this;
}
-
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php
index 0311ccbf2d..4262279f16 100644
--- a/app/code/core/Mage/Payment/Model/Method/Cc.php
+++ b/app/code/core/Mage/Payment/Model/Method/Cc.php
@@ -137,7 +137,7 @@ public function validate()
$errorMsg = $this->_getHelper()->__('Credit card type is not allowed for this payment method');
}
- //validate credit card verification number
+ //validate credit card verification number
if ($errorMsg === false && $this->hasVerification()) {
$verifcationRegEx = $this->getVerificationRegEx();
$regExp = isset($verifcationRegEx[$info->getCcType()]) ? $verifcationRegEx[$info->getCcType()] : '';
@@ -154,7 +154,7 @@ public function validate()
return $this;
}
- public function hasVerification()
+ public function hasVerification()
{
$configData = $this->getConfigData('useccv');
if(is_null($configData)){
@@ -163,7 +163,7 @@ public function hasVerification()
return (bool) $configData;
}
- public function getVerificationRegEx()
+ public function getVerificationRegEx()
{
$verificationExpList = array(
'VI' => '/^[0-9]{3}$/', // Visa
@@ -240,4 +240,14 @@ public function validateCcNumOther($ccNumber)
return preg_match('/^\\d+$/', $ccNumber);
}
-}
\ No newline at end of file
+ /**
+ * Check whether there are CC types set in configuration
+ *
+ * @return bool
+ */
+ public function isAvailable($quote = null)
+ {
+ return $this->getConfigData('cctypes', ($quote ? $quote->getStoreId() : null))
+ && parent::isAvailable($quote);
+ }
+}
diff --git a/app/code/core/Mage/Payment/Model/Method/Free.php b/app/code/core/Mage/Payment/Model/Method/Free.php
index 6a1dc2fee6..ba50e9b44f 100644
--- a/app/code/core/Mage/Payment/Model/Method/Free.php
+++ b/app/code/core/Mage/Payment/Model/Method/Free.php
@@ -42,20 +42,14 @@ class Mage_Payment_Model_Method_Free extends Mage_Payment_Model_Method_Abstract
protected $_code = 'free';
/**
- * Check method is available
+ * Check whether method is available
*
* @param Mage_Sales_Model_Quote $quote
* @return bool
*/
- public function isAvailable($quote=null)
+ public function isAvailable($quote = null)
{
- if (is_null($quote)) {
- return false;
- }
-
- if (Mage::app()->getStore()->roundPrice($quote->getGrandTotal()) == 0) {
- return true;
- }
- return false;
+ return parent::isAvailable($quote) && (!empty($quote))
+ && (Mage::app()->getStore()->roundPrice($quote->getGrandTotal()) == 0);
}
}
diff --git a/app/code/core/Mage/Payment/etc/adminhtml.xml b/app/code/core/Mage/Payment/etc/adminhtml.xml
new file mode 100644
index 0000000000..af8c74e4b7
--- /dev/null
+++ b/app/code/core/Mage/Payment/etc/adminhtml.xml
@@ -0,0 +1,48 @@
+
+
+";
-//print_r($data);
+
$rssObj->_addHeader($data);
$_collection = $category->getCollection();
@@ -81,18 +80,6 @@ protected function _toHtml()
$layer->prepareProductCollection($productCollection);
$productCollection->addCountToCategories($_collection);
- /*if ($_collection->count()) {
- foreach ($_collection as $_category){
- $data = array(
- 'title' => $_category->getName(),
- 'link' => $_category->getCategoryUrl(),
- 'description' => $this->helper('rss')->__('Total Products: %s', $_category->getProductCount()),
- );
-
- $rssObj->_addEntry($data);
- }
- }
- */
$category->getProductCollection()->setStoreId($storeId);
/*
only load latest 50 products
@@ -100,35 +87,61 @@ protected function _toHtml()
$_productCollection = $currentyCateogry
->getProductCollection()
->addAttributeToSort('updated_at','desc')
+ ->setVisibility(Mage::getSingleton('catalog/product_visibility')->getVisibleInCatalogIds())
->setCurPage(1)
->setPageSize(50)
;
-//echo "
".$_productCollection->getSelect();
+
if ($_productCollection->getSize()>0) {
+ $args = array('rssObj' => $rssObj);
foreach ($_productCollection as $_product) {
- $final_price = $_product->getFinalPrice();
- $description = '| '.$_product->getDescription().
- ' Price:'.Mage::helper('core')->currency($_product->getPrice()). - ($_product->getPrice() != $final_price ? ' Special Price:'. Mage::helper('core')->currency($final_price) : ''). - ' '. - ' | '.
- '
| ' . $product->getDescription();
+
+ if ($product->getAllowedPriceInRss()) {
+ $description .= ' Price:'.Mage::helper('core')->currency($product->getPrice()); + if ($product->getPrice() != $product->getFinalPrice()) { + $description .= ' Special Price:' . Mage::helper('core')->currency($product->getFinalPrice()); + } + $description .= ' '; + } + + $description .= ' |
| '.$product->getDescription().
- ' Price:'.Mage::helper('core')->currency($product->getPrice()). - ($product->getPrice() != $final_price ? ' Special Price:'. Mage::helper('core')->currency($final_price) : ''). - ' '. - ' | '.
+ ''.$product->getDescription();
+
+ if ($allowedPriceInRss) {
+ $description .= ' Price:' . Mage::helper('core')->currency($product->getPrice()); + if ($product->getPrice() != $product->getFinalPrice()){ + $description .= ' Special Price:' . Mage::helper('core')->currency($product->getFinalPrice()); + } + $description .= ' '; + } + + $description .= ' | '.
'
| '.$product->getDescription().
- ' Price:'.Mage::helper('core')->currency($product->getPrice()).
- ' Special Price:'. Mage::helper('core')->currency($special_price).
- ($result['use_special'] && $result['special_to_date'] ? ' | '.
- '
| '.$product->getDescription();
+
+ if ($product->getAllowedPriceInRss()) {
+ $specialPrice = ($result['use_special'] ? $result['special_price'] : $result['rule_price']);
+ $description .= ' Price:'.Mage::helper('core')->currency($product->getPrice()).
+ ' Special Price:'. Mage::helper('core')->currency($specialPrice).
+ ($result['use_special'] && $result['special_to_date'] ? ' |
";
-//print_r($args['row']);
$row = $args['row'];
- $special_price = $row['special_price'];
- $rule_price = $row['rule_price'];
- if (!$rule_price || ($rule_price && $special_price && $special_price<=$rule_price)) {
- $row['start_date'] = $row['special_from_date'];
- $row['use_special'] = true;
+
+ if ($product->getAllowedPriceInRss()) {
+ $specialPrice = $row['special_price'];
+ $rule_price = $row['rule_price'];
+ if (!$rulePrice || ($rulePrice && $specialPrice && $specialPrice<=$rulePrice)) {
+ $row['start_date'] = $row['special_from_date'];
+ $row['use_special'] = true;
+ } else {
+ $row['start_date'] = $row['rule_start_date'];
+ $row['use_special'] = false;
+ }
+ $row['allowed_price_in_rss'] = true;
} else {
- $row['start_date'] = $row['rule_start_date'];
- $row['use_special'] = false;
+ $row['allowed_price_in_rss'] = false;
}
$args['results'][] = $row;
}
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
index 1bf0b34726..be79fdcaad 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
@@ -64,6 +64,8 @@ protected function _toHtml()
->addTagFilter($tagModel->getId())
->addStoreFilter($storeId);
+ $_collection->setVisibility(Mage::getSingleton('catalog/product_visibility')->getVisibleInCatalogIds());
+
$product = Mage::getModel('catalog/product');
Mage::getSingleton('core/resource_iterator')
@@ -72,6 +74,11 @@ protected function _toHtml()
return $rssObj->createRssXml();
}
+ /**
+ * Preparing data and adding to rss object
+ *
+ * @param array $args
+ */
public function addTaggedItemXml($args)
{
$product = $args['product'];
@@ -84,20 +91,25 @@ public function addTaggedItemXml($args)
return;
}
+ $allowedPriceInRss = $product->getAllowedPriceInRss();
+
$product->unsetData()->load($args['row']['entity_id']);
$description = '| '.$product->getDescription().
- ' Price:'.Mage::helper('core')->currency($product->getFinalPrice()).' '. - ' | '.
- '
Price:'.Mage::helper('core')->currency($product->getFinalPrice()).'
'; + } + + $description .='.' "'.$this->__('Apply').'")
';
- }
+ if ($element->getExplicitApply()) {
+ $html.= ' ';
+ }
- $html.= ' ';
- }
- return $html;
- }
+ $html.= ' ';
+ }
+ return $html;
+ }
}
\ No newline at end of file
diff --git a/app/code/core/Mage/Rule/Block/Newchild.php b/app/code/core/Mage/Rule/Block/Newchild.php
index fbcbd8d3b7..180054a21d 100644
--- a/app/code/core/Mage/Rule/Block/Newchild.php
+++ b/app/code/core/Mage/Rule/Block/Newchild.php
@@ -28,14 +28,15 @@
class Mage_Rule_Block_Newchild extends Mage_Core_Block_Abstract
implements Varien_Data_Form_Element_Renderer_Interface
{
- public function render(Varien_Data_Form_Element_Abstract $element)
- {
- $html = ' getParamId() ? ' id="' . $element->getParamId() . '"' : '') . '>';
- $html.= '';
- $html.= $element->getValueName();
- $html.= '';
- $html.= $element->getElementHtml();
- $html.= ' ';
- return $html;
- }
+ public function render(Varien_Data_Form_Element_Abstract $element)
+ {
+ $element->addClass('element-value-changer');
+ $html = ' getParamId() ? ' id="' . $element->getParamId() . '"' : '') . '>';
+ $html.= '';
+ $html.= $element->getValueName();
+ $html.= '';
+ $html.= $element->getElementHtml();
+ $html.= ' ';
+ return $html;
+ }
}
\ No newline at end of file
diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
index 915d0bfbba..065f3133ad 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -33,10 +33,50 @@ abstract class Mage_Rule_Model_Condition_Abstract
extends Varien_Object
implements Mage_Rule_Model_Condition_Interface
{
+ /**
+ * Defines which operators will be available for this condition
+ *
+ * @var string
+ */
+ protected $_inputType = null;
+
+ /**
+ * Default values for possible operator options
+ * @var array
+ */
+ protected $_defaultOperatorOptions;
+
+ /**
+ * Default combinations of operator options, depending on input type
+ * @var array
+ */
+ protected $_defaultOperatorInputByType = array(
+ 'string' => array('==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'),
+ 'numeric' => array('==', '!=', '>=', '>', '<=', '<', '()', '!()'),
+ 'date' => array('==', '>=', '<='),
+ 'select' => array('==', '!='),
+ 'multiselect' => array('==', '!=', '{}', '!{}'),
+ 'grid' => array('()', '!()'),
+ );
+
public function __construct()
{
parent::__construct();
+ $this->_defaultOperatorOptions = array(
+ '==' => Mage::helper('rule')->__('is'),
+ '!=' => Mage::helper('rule')->__('is not'),
+ '>=' => Mage::helper('rule')->__('equals or greater than'),
+ '<=' => Mage::helper('rule')->__('equals or less than'),
+ '>' => Mage::helper('rule')->__('greater than'),
+ '<' => Mage::helper('rule')->__('less than'),
+ '{}' => Mage::helper('rule')->__('contains'),
+ '!{}' => Mage::helper('rule')->__('does not contain'),
+ '!{}' => Mage::helper('rule')->__('does not contain'),
+ '()' => Mage::helper('rule')->__('is one of'),
+ '!()' => Mage::helper('rule')->__('is not one of'),
+ );
+
$this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions();
if ($options = $this->getAttributeOptions()) {
@@ -123,39 +163,24 @@ public function getAttributeName()
public function loadOperatorOptions()
{
- $this->setOperatorOption(array(
- '==' => Mage::helper('rule')->__('is'),
- '!=' => Mage::helper('rule')->__('is not'),
- '>=' => Mage::helper('rule')->__('equals or greater than'),
- '<=' => Mage::helper('rule')->__('equals or less than'),
- '>' => Mage::helper('rule')->__('greater than'),
- '<' => Mage::helper('rule')->__('less than'),
- '{}' => Mage::helper('rule')->__('contains'),
- '!{}' => Mage::helper('rule')->__('does not contain'),
- '()' => Mage::helper('rule')->__('is one of'),
- '!()' => Mage::helper('rule')->__('is not one of'),
- ));
- $this->setOperatorByInputType(array(
- 'string' => array('==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'),
- 'numeric' => array('==', '!=', '>=', '>', '<=', '<', '()', '!()'),
- 'date' => array('==', '>=', '<='),
- 'select' => array('==', '!='),
- 'multiselect' => array('==', '!=', '{}', '!{}'),
- 'grid' => array('()', '!()'),
- ));
+ $this->setOperatorOption($this->_defaultOperatorOptions);
+ $this->setOperatorByInputType($this->_defaultOperatorInputByType);
return $this;
}
/**
* This value will define which operators will be available for this condition.
*
- * Possible values are: string, numeric, date, select, multiselect, grid
+ * Possible values are: string, numeric, date, select, multiselect, grid, boolean
*
* @return string
*/
public function getInputType()
{
- return 'string';
+ if (null === $this->_inputType) {
+ return 'string';
+ }
+ return $this->_inputType;
}
public function getOperatorSelectOptions()
diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php
index ead83c1721..4e1f7845c8 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Combine.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php
@@ -157,8 +157,10 @@ public function asXml($containerKey='conditions', $itemKey='condition')
public function loadArray($arr, $key='conditions')
{
- $this->setAggregator(isset($arr['aggregator']) ? $arr['aggregator'] : $arr['attribute'])
- ->setValue(isset($arr['value']) ? $arr['value'] : $arr['operator']);
+ $this->setAggregator(isset($arr['aggregator']) ? $arr['aggregator']
+ : (isset($arr['attribute']) ? $arr['attribute'] : null))
+ ->setValue(isset($arr['value']) ? $arr['value']
+ : (isset($arr['operator']) ? $arr['operator'] : null));
if (!empty($arr[$key]) && is_array($arr[$key])) {
foreach ($arr[$key] as $condArr) {
@@ -169,7 +171,7 @@ public function loadArray($arr, $key='conditions')
$cond->loadArray($condArr, $key);
}
} catch (Exception $e) {
-
+ Mage::logException($e);
}
}
}
diff --git a/app/code/core/Mage/Rule/Model/Rule.php b/app/code/core/Mage/Rule/Model/Rule.php
index 4ddb5a6014..0eda1c8516 100644
--- a/app/code/core/Mage/Rule/Model/Rule.php
+++ b/app/code/core/Mage/Rule/Model/Rule.php
@@ -44,7 +44,11 @@ class Mage_Rule_Model_Rule extends Mage_Core_Model_Abstract
*/
protected $_isReadonly = false;
-
+ /**
+ * Init resoirce
+ *
+ * @return unknown_type
+ */
protected function _construct()
{
$this->_init('rule/rule');
diff --git a/app/code/core/Mage/Sales/Block/Order/Totals.php b/app/code/core/Mage/Sales/Block/Order/Totals.php
index 3f55e98590..5196fbb429 100644
--- a/app/code/core/Mage/Sales/Block/Order/Totals.php
+++ b/app/code/core/Mage/Sales/Block/Order/Totals.php
@@ -104,7 +104,7 @@ protected function _initTotals()
/**
* Add shipping
*/
- if ($this->getSource()->getShippingAmount() || $this->getSource()->getShippingDescription())
+ if (!$this->getSource()->getIsVirtual() && ((float) $this->getSource()->getShippingAmount() || $this->getSource()->getShippingDescription()))
{
$this->_totals['shipping'] = new Varien_Object(array(
'code' => 'shipping',
@@ -211,7 +211,7 @@ public function addTotalBefore(Varien_Object $total, $before=null)
}
$this->_totals = $totals;
return $this;
- }
+ }
}
$totals = array();
$first = array_shift($this->_totals);
@@ -283,7 +283,7 @@ public function getTotals($area=null)
$totals[] = $total;
}
}
- }
+ }
return $totals;
}
diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
index 6d658debb7..89ef543317 100644
--- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
+++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php
@@ -53,6 +53,17 @@ public function __construct()
}
}
+ /**
+ * Retrieve form action url and set "secure" param to avoid confirm
+ * message when we submit form from secure page to unsecure
+ *
+ * @return string
+ */
+ public function getFormActionUrl()
+ {
+ return $this->getUrl('checkout/cart/addgroup', array('_secure' => true));
+ }
+
public function getLastOrder()
{
foreach ($this->getOrders() as $order) {
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
index 8165cb11b4..72753173a5 100644
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php
@@ -73,20 +73,15 @@ public function getSelectCountSql()
}
/**
- * Retrive all ids for collection
+ * Reset left join
*
- * @return array
+ * @return Mage_Eav_Model_Entity_Collection_Abstract
*/
- public function getAllIds($limit=null, $offset=null)
+ protected function _getAllIdsSelect($limit=null, $offset=null)
{
- $idsSelect = clone $this->getSelect();
- $idsSelect->reset(Zend_Db_Select::ORDER);
- $idsSelect->reset(Zend_Db_Select::LIMIT_COUNT);
- $idsSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
- $idsSelect->reset(Zend_Db_Select::COLUMNS);
- $idsSelect->from(null, 'e.'.$this->getEntity()->getIdFieldName());
- $idsSelect->limit($limit, $offset);
+ $idsSelect = parent::_getAllIdsSelect($limit, $offset);
$idsSelect->resetJoinLeft();
- return $this->getConnection()->fetchCol($idsSelect, $this->_bindParams);
+ return $idsSelect;
}
+
}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
index 0bb13eae8c..325c3d5eec 100644
--- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php
@@ -34,21 +34,40 @@
class Mage_Sales_Model_Mysql4_Order_Invoice_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
{
+ /**
+ * Initialize orders collection
+ *
+ */
protected function _construct()
{
$this->_init('sales/order_invoice');
}
+ /**
+ * Add order filter
+ *
+ * @return Mage_Sales_Model_Mysql4_Order_Invoice_Collection
+ */
public function setOrderFilter($order)
{
if ($order instanceof Mage_Sales_Model_Order) {
$this->addAttributeToFilter('order_id', $order->getId());
- }
- else {
+ } else {
$this->addAttributeToFilter('order_id', $order);
}
-
return $this;
}
+ /**
+ * Reset left join
+ *
+ * @return Mage_Eav_Model_Entity_Collection_Abstract
+ */
+ protected function _getAllIdsSelect($limit = null, $offset = null)
+ {
+ $idsSelect = parent::_getAllIdsSelect($limit, $offset);
+ $idsSelect->resetJoinLeft();
+ return $idsSelect;
+ }
+
}
diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php
index 25fa721aac..fd92965ae4 100644
--- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php
@@ -420,6 +420,8 @@ public function getDefaultEntities()
'base_shipping_canceled' => array('type'=>'static'),
'base_shipping_invoiced' => array('type'=>'static'),
+ 'protect_code' => array('type' => 'static'),
+
'customer_id' => array('type'=>'static', 'visible'=>false),
'customer_group_id' => array('type'=>'int', 'visible'=>false),
'customer_email' => array('type'=>'varchar', 'visible'=>false),
diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php
index 0b17f7a7a0..b61400258d 100644
--- a/app/code/core/Mage/Sales/Model/Order.php
+++ b/app/code/core/Mage/Sales/Model/Order.php
@@ -434,7 +434,6 @@ protected function _placePayment()
$this->getPayment()->place();
return $this;
}
-
/**
* Retrieve order payment model object
*
@@ -570,7 +569,23 @@ public function addStatusToHistory($status, $comment='', $isCustomerNotified = f
public function place()
{
Mage::dispatchEvent('sales_order_place_before', array('order'=>$this));
- $this->_placePayment();
+ $this->setState(self::STATE_NEW, true)->save();
+ try {
+ $this->_placePayment();
+ } catch (Mage_Core_Exception $e){
+ $message = $e->getMessage();
+ Mage::logException($e);
+ $this->addStatusToHistory(
+ $this->getStatus(),
+ Mage::helper('sales')->__('Payment failed: %s', $message)
+ )->save();
+ } catch (Exception $e){
+ Mage::logException($e);
+ $this->addStatusToHistory(
+ $this->getStatus(),
+ Mage::helper('sales')->__('Payment failed')
+ )->save();
+ }
Mage::dispatchEvent('sales_order_place_after', array('order'=>$this));
return $this;
}
@@ -1428,6 +1443,8 @@ protected function _beforeSave()
}
}
+ $this->setData('protect_code', substr(md5(uniqid(mt_rand(), true) . ':' . microtime(true)), 5, 6));
+
return $this;
}
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
index 53214bd9b6..4b3a2b2137 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
@@ -412,6 +412,10 @@ public function register()
);
}
+ $this->getOrder()->setBaseTotalInvoicedCost(
+ $this->getOrder()->getBaseTotalInvoicedCost()-$this->getBaseCost()
+ );
+
$state = $this->getState();
if (is_null($state)) {
$this->setState(self::STATE_OPEN);
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php
new file mode 100644
index 0000000000..8149f0d570
--- /dev/null
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php
@@ -0,0 +1,47 @@
+getAllItems() as $item) {
+ if (!$item->getHasChildren()){
+ $baseRefundTotalCost += $item->getBaseCost()*$item->getQty();
+ }
+ }
+ $creditmemo->setBaseCost($baseRefundTotalCost);
+ return $this;
+ }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php
index c307ce1579..8c9acdda33 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php
@@ -484,6 +484,9 @@ public function register()
$this->getOrder()->setBaseDiscountInvoiced(
$this->getOrder()->getBaseDiscountInvoiced()+$this->getBaseDiscountAmount()
);
+ $this->getOrder()->setBaseTotalInvoicedCost(
+ $this->getOrder()->getBaseTotalInvoicedCost()+$this->getBaseCost()
+ );
$state = $this->getState();
if (is_null($state)) {
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php
new file mode 100644
index 0000000000..e94a7bec84
--- /dev/null
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php
@@ -0,0 +1,47 @@
+getAllItems() as $item) {
+ if (!$item->getHasChildren()){
+ $baseInvoiceTotalCost += $item->getBaseCost()*$item->getQty();
+ }
+ }
+ $invoice->setBaseCost($baseInvoiceTotalCost);
+ return $this;
+ }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php
index 30efefb937..4cf2ac59dc 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php
@@ -92,6 +92,17 @@ public function setOrder(Mage_Sales_Model_Order $order)
return $this;
}
+
+ /**
+ * Retrieve hash code of current order
+ *
+ * @return string
+ */
+ public function getProtectCode()
+ {
+ return (string)$this->getOrder()->getProtectCode();
+ }
+
/**
* Retrieve the order the shipment for created for
*
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
index a040f8eb08..f00507e7cf 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php
@@ -71,6 +71,16 @@ public function isCustom()
return $this->getCarrierCode() == self::CUSTOM_CARRIER_CODE;
}
+ /**
+ * Retrieve hash code of current order
+ *
+ * @return string
+ */
+ public function getProtectCode()
+ {
+ return (string)$this->getShipment()->getProtectCode();
+ }
+
/**
* Retrieve detail for shipment track
*
diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php
index fd717ffee5..c1d28afc05 100644
--- a/app/code/core/Mage/Sales/Model/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Quote.php
@@ -894,6 +894,12 @@ public function removePayment()
*/
public function collectTotals()
{
+ /**
+ * Protect double totals collection
+ */
+ if ($this->getTotalsCollectedFlag()) {
+ return $this;
+ }
Mage::dispatchEvent(
$this->_eventPrefix . '_collect_totals_before',
array(
@@ -966,6 +972,7 @@ public function collectTotals()
)
);
+ $this->setTotalsCollectedFlag(true);
return $this;
}
@@ -984,14 +991,25 @@ public function getTotals()
if ($this->isVirtual()) {
return $this->getBillingAddress()->getTotals();
}
-
- $totals = $this->getShippingAddress()->getTotals();
- foreach ($this->getBillingAddress()->getTotals() as $code => $total) {
- if (isset($totals[$code])) {
- $totals[$code]->setValue($totals[$code]->getValue()+$total->getValue());
+
+ $totals = null;
+ // Going through all quote addresses and sum their totals
+ foreach ($this->getAddressesCollection() as $address) {
+ if ($address->isDeleted()) {
+ continue;
}
- else {
- $totals[$code] = $total;
+ if (!$totals) {
+ $totals = $address->getTotals();
+ } else {
+ foreach ($address->getTotals() as $code => $total) {
+ if (isset($totals[$code])) {
+ $totals[$code]->setValue($totals[$code]->getValue()+$total->getValue());
+ $totals[$code]->setValueExclTax($totals[$code]->getValueExclTax()+$total->getValueExclTax());
+ $totals[$code]->setValueInclTax($totals[$code]->getValueInclTax()+$total->getValueInclTax());
+ } else {
+ $totals[$code] = $total;
+ }
+ }
}
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php
index fc53b6d161..8bb04bbd9d 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address.php
@@ -265,8 +265,7 @@ public function getAllItems()
if ($this->getAddressType() == self::TYPE_BILLING) {
$items[] = $qItem;
}
- }
- else {
+ } else {
if ($this->getAddressType() == self::TYPE_SHIPPING) {
$items[] = $qItem;
}
@@ -568,9 +567,10 @@ public function collectShippingRates()
$this->removeAllShippingRates();
- $havingOptionalZip = Mage::helper('directory')->getCountriesWithOptionalZip();
- $postcodeValid = $this->getPostcode() || in_array($this->getCountryId(), $havingOptionalZip);
- if (!$this->getCountryId() && !$postcodeValid) {
+ $countryId = $this->getCountryId();
+ $postCode = $this->getPostcode();
+ if ((!$countryId && !$postCode)
+ || ($countryId && !$postCode && !Mage::helper('directory')->isZipCodeOptional($countryId))) {
return $this;
}
@@ -844,6 +844,34 @@ public function setBaseTotalAmount($code, $amount)
return $this;
}
+ /**
+ * Add amount total amount value
+ *
+ * @param string $code
+ * @param float $amount
+ * @return Mage_Sales_Model_Quote_Address
+ */
+ public function addTotalAmount($code, $amount)
+ {
+ $amount = $this->getTotalAmount($code)+$amount;
+ $this->setTotalAmount($code, $amount);
+ return $this;
+ }
+
+ /**
+ * Add amount total amount value in base store currency
+ *
+ * @param string $code
+ * @param float $amount
+ * @return Mage_Sales_Model_Quote_Address
+ */
+ public function addBaseTotalAmount($code, $amount)
+ {
+ $amount = $this->getBaseTotalAmount($code)+$amount;
+ $this->setBaseTotalAmount($code, $amount);
+ return $this;
+ }
+
/**
* Get total amount value by code
*
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php
index 7336a398a2..95fd306e06 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php
@@ -153,10 +153,7 @@ protected function _setBaseAmount($baseAmount)
*/
protected function _addAmount($amount)
{
- $this->_getAddress()->setTotalAmount(
- $this->getCode(),
- $this->_getAddress()->getTotalAmount($this->getCode())+$amount
- );
+ $this->_getAddress()->addTotalAmount($this->getCode(),$amount);
return $this;
}
@@ -168,10 +165,7 @@ protected function _addAmount($amount)
*/
protected function _addBaseAmount($baseAmount)
{
- $this->_getAddress()->setBaseTotalAmount(
- $this->getCode(),
- $this->_getAddress()->getBaseTotalAmount($this->getCode())+$baseAmount
- );
+ $this->_getAddress()->addBaseTotalAmount($this->getCode(), $baseAmount);
return $this;
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php
index 9f9f227496..6091f7c26b 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item.php
@@ -215,6 +215,23 @@ public function getQtyOptions()
return $return;
}
+ /**
+ * Checking item data
+ *
+ * @return Mage_Sales_Model_Quote_Item_Abstract
+ */
+ public function checkData()
+ {
+ $parent = parent::checkData();
+ if ($this->getProduct()->getHasError()) {
+ $this->setHasError(true);
+ $this->setMessage(Mage::helper('sales')->__('Item options declare error'));
+ $this->getQuote()->setHasError(true);
+ $this->getQuote()->addMessage($this->getProduct()->getMessage(), 'options');
+ }
+ return $parent;
+ }
+
/**
* Setup product for quote item
*
@@ -233,8 +250,10 @@ public function setProduct($product)
->setName($product->getName())
->setWeight($this->getProduct()->getWeight())
->setTaxClassId($product->getTaxClassId())
- ->setCost($product->getCost())
- ->setIsQtyDecimal($product->getIsQtyDecimal());
+ ->setBaseCost($product->getCost());
+ if ($product->getStockItem()) {
+ $this->setIsQtyDecimal($product->getStockItem()->getIsQtyDecimal());
+ }
Mage::dispatchEvent('sales_quote_item_set_product', array(
'product' => $product,
@@ -261,6 +280,7 @@ public function getProduct()
$product = Mage::getModel('catalog/product')
->setStoreId($this->getQuote()->getStoreId())
->load($this->getProductId());
+
$this->setProduct($product);
}
diff --git a/app/code/core/Mage/Sales/etc/adminhtml.xml b/app/code/core/Mage/Sales/etc/adminhtml.xml
new file mode 100644
index 0000000000..486995d457
--- /dev/null
+++ b/app/code/core/Mage/Sales/etc/adminhtml.xml
@@ -0,0 +1,127 @@
+
+
+++Shopping Cart Price Rules +
--Shopping Cart Price Rules -
-
+ getWebsitesReadonly()): ?>disabled="disabled" class="checkbox website-checkbox" id="add_product_website_getId() ?>" type="checkbox" />
@@ -70,7 +70,7 @@
getWebsiteCollection() as $_website): ?>
-
+ getWebsitesReadonly()): ?>disabled="disabled" class="checkbox website-checkbox" id="remove_product_website_getId() ?>" type="checkbox"/>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
index 9d9323aed2..56f36bc534 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
@@ -23,17 +23,23 @@
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
+/* @var $this Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier */
?>
getElement()->getHtmlId() ?>
getElement()->getClass() ?>
getElement()->getName() ?>
getElement()->getReadonly() ?>
-isMultiWebsites(); ?>
+isShowWebsiteColumn(); ?>
+isAllowChangeWebsite(); ?>
+
+
+isShowWebsiteColumn(); ?>
+isMultiWebsites(); ?>
getElement()->getLabel() ?>
-
+
-
-
+
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml
index ea96d0820c..7768569035 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml
@@ -1,3 +1,30 @@
+
+
+
| style="display:none">__('Website') ?> | +style="display:none">__('Website') ?> | __('Customer Group') ?> | __('Qty') ?> | getPriceColumnHeader(Mage::helper('catalog')->__('Price')) ?> | __('Action') ?> |
|---|---|---|---|---|---|
| style="display:none"> - - | -- - | -- __('and above')?> - | -- - | -- | |
| style="display:none"> | +style="display:none"> | getAddButtonHtml() ?> | |||
getChildHtml('wysiwyg_images.uploader') ?>
+
+getChildHtml('wysiwyg_images.newfolder') ?>
diff --git a/app/design/adminhtml/default/default/template/cms/wysiwyg/content/files.phtml b/app/design/adminhtml/default/default/template/cms/wysiwyg/content/files.phtml
new file mode 100644
index 0000000000..805db56915
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/cms/wysiwyg/content/files.phtml
@@ -0,0 +1,48 @@
+
+
+getImagesWidth();
+$_height = $this->getImagesHeight();
+?>
+getContentsCollection()->count() > 0): ?>
+ getContentsCollection() as $item): ?>
+
+  ? $item->getThumbUrl() : $item->getUrl()) ?>)
+ getWidth(); ?>xgetHeight(); ?> helper('cms')->__('px.') ?>
+ getName(); ?> +
+
+
+ helper('cms')->__('No files found') ?>
+
diff --git a/app/design/adminhtml/default/default/template/cms/wysiwyg/content/newfolder.phtml b/app/design/adminhtml/default/default/template/cms/wysiwyg/content/newfolder.phtml
new file mode 100644
index 0000000000..1ed23712b5
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/cms/wysiwyg/content/newfolder.phtml
@@ -0,0 +1,33 @@
+
+
diff --git a/app/design/adminhtml/default/default/template/cms/wysiwyg/content/uploader.phtml b/app/design/adminhtml/default/default/template/cms/wysiwyg/content/uploader.phtml
new file mode 100644
index 0000000000..2873e1b4c7
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/cms/wysiwyg/content/uploader.phtml
@@ -0,0 +1,71 @@
+
+
+helper('adminhtml/media_js')->includeScript('lib/flex.js') ?>
+helper('adminhtml/media_js')->includeScript('mage/adminhtml/flexuploader.js') ?>
+helper('adminhtml/media_js')->getTranslatorScript() ?>
+
+
++ getWidth(); ?>xgetHeight(); ?> helper('cms')->__('px.') ?>
+ getName(); ?> +
+
+
+
+
+
\ No newline at end of file
diff --git a/app/design/adminhtml/default/default/template/cms/wysiwyg/js.phtml b/app/design/adminhtml/default/default/template/cms/wysiwyg/js.phtml
new file mode 100644
index 0000000000..95e9faf255
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/cms/wysiwyg/js.phtml
@@ -0,0 +1,262 @@
+
+
+
diff --git a/app/design/adminhtml/default/default/template/cms/wysiwyg/tree.phtml b/app/design/adminhtml/default/default/template/cms/wysiwyg/tree.phtml
new file mode 100644
index 0000000000..5b2a356c63
--- /dev/null
+++ b/app/design/adminhtml/default/default/template/cms/wysiwyg/tree.phtml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
diff --git a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
index 875075a588..fa8ade5cb3 100644
--- a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
+++ b/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
@@ -145,7 +145,6 @@ addressesModel.prototype = {
this.loader = new varienLoader(true);
this.regionsUrl = 'getRegionsUrl() ?>';
- this.zipOptionalCountries = getCountriesWithOptionalZipJson() ?>;
this.reloadItemList(1);
@@ -188,7 +187,7 @@ addressesModel.prototype = {
// set Zip optional/required
var countryElement = $('id' + item.id.replace(/address_item_/, '') + 'country_id');
- this.setZipOptional(countryElement);
+ varienGlobalEvents.fireEvent("address_country_changed", countryElement);
}
},
@@ -430,7 +429,13 @@ addressesModel.prototype = {
bindCountryRegionRelation : function(parentId){
//alert('OK');
- var countryElements = $$('.countries');
+ if(parentId){
+ var countryElements = $(parentId).getElementsByClassName('countries');
+ }
+ else{
+ var countryElements = $$('.countries');
+ }
+
for(var i=0;i<=countryElements.length;i++){
if(countryElements[i]){
if(!countryElements[i].bindRegions || !countryElements[i].parentBindId || countryElements[i].parentBindId!=parentId){
@@ -454,18 +459,7 @@ addressesModel.prototype = {
this.loader.load(url, {}, this.refreshRegionField.bind(this));
}
// set Zip optional/required
- this.setZipOptional(countryElement);
- }
- },
-
- setZipOptional : function (countryElement){
- var zipElement = $(countryElement.id.replace(/country_id/, 'postcode'))
- if (zipElement && this.zipOptionalCountries.indexOf(countryElement.value) != -1) {
- zipElement.removeClassName('required-entry').removeClassName('required-entry');
- zipElement.up(1).down('label > span.required').hide();
- } else {
- zipElement.addClassName('required-entry');
- zipElement.up(1).down('label > span.required').show();
+ varienGlobalEvents.fireEvent("address_country_changed", countryElement);
}
},
diff --git a/app/design/adminhtml/default/default/template/cybersource/pdf/info.phtml b/app/design/adminhtml/default/default/template/cybersource/pdf/info.phtml
index 44edabee01..c063d3ae8b 100644
--- a/app/design/adminhtml/default/default/template/cybersource/pdf/info.phtml
+++ b/app/design/adminhtml/default/default/template/cybersource/pdf/info.phtml
@@ -33,8 +33,6 @@
{{pdf_row_separator}}
__('Credit Card Number: xxxx-%s', $this->getInfo()->getCcLast4()) ?>
{{pdf_row_separator}}
- __('Expiration Date: %s/%s', $this->getCcExpMonth(), $this->getInfo()->getCcExpYear()) ?>
- {{pdf_row_separator}}
getInfo()->getCcSsIssue()): ?>
__("Switch/Solo card issue number: %s", $this->getInfo()->getCcSsIssue()) ?>
{{pdf_row_separator}}
diff --git a/app/design/adminhtml/default/default/template/dashboard/index.phtml b/app/design/adminhtml/default/default/template/dashboard/index.phtml
index 554da142e6..3658a7d3dd 100644
--- a/app/design/adminhtml/default/default/template/dashboard/index.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/index.phtml
@@ -55,6 +55,29 @@ function changeDiagramsPeriod(periodObj) {
}
});
+ ajaxBlockUrl = 'getUrl('*/*/ajaxBlock', array('_current' => true, 'block' => 'totals', 'period' => '')) ?>' + periodParam;
+ new Ajax.Request(ajaxBlockUrl, {
+ parameters: {isAjax: 'true', form_key: FORM_KEY},
+ onSuccess: function(transport) {
+ tabContentElementId = 'dashboard_diagram_totals';
+ try {
+ if (transport.responseText.isJSON()) {
+ var response = transport.responseText.evalJSON()
+ if (response.error) {
+ alert(response.message);
+ }
+ if(response.ajaxExpired && response.ajaxRedirect) {
+ setLocation(response.ajaxRedirect);
+ }
+ } else {
+ $(tabContentElementId).replace(transport.responseText);
+ }
+ }
+ catch (e) {
+ $(tabContentElementId).replace(transport.responseText);
+ }
+ }
+ });
}
function toggleCal(id) {
diff --git a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
index 536cc6bddf..c9832a39f3 100644
--- a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
+++ b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
@@ -25,7 +25,7 @@
*/
?>
getTotals()) > 0 ): ?>
-
+
+
+ {{name}} ({{size}})
+
+
+
+
+
+ {{percent}}% {{uploaded}} / {{total}}
+
+
+
| __($_attribute->getFrontendLabel()) ?> | +getStoreLabel() ?> |
getAttributeCode()) {
diff --git a/app/design/frontend/default/default/template/catalogsearch/advanced/form.phtml b/app/design/frontend/default/default/template/catalogsearch/advanced/form.phtml
index 7b57f44f19..0349171d10 100644
--- a/app/design/frontend/default/default/template/catalogsearch/advanced/form.phtml
+++ b/app/design/frontend/default/default/template/catalogsearch/advanced/form.phtml
@@ -80,7 +80,6 @@
diff --git a/app/design/frontend/default/default/template/checkout/onepage/billing.phtml b/app/design/frontend/default/default/template/checkout/onepage/billing.phtml
index 9d321b237a..7a1aea971c 100644
--- a/app/design/frontend/default/default/template/checkout/onepage/billing.phtml
+++ b/app/design/frontend/default/default/template/checkout/onepage/billing.phtml
@@ -92,6 +92,14 @@
+getLayout()->createBlock('customer/widget_gender') ?>
+isEnabled()): ?>
+ @@ -135,6 +143,6 @@ //billingForm.setElementsRelation('billing:country_id', 'billing:region', 'getUrl('directory/json/childRegion') ?>', '__('Select State/Province...') ?>'); $('billing-address-select') && billing.newAddress(!$('billing-address-select').value); - var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions, undefined, helper('directory')->getCountriesWithOptionalZipJson() ?>); + var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', countryRegions, undefined, 'billing:postcode'); //]]> diff --git a/app/design/frontend/default/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/default/default/template/checkout/onepage/shipping.phtml index d4cd2a38d9..580c8c83f9 100644 --- a/app/design/frontend/default/default/template/checkout/onepage/shipping.phtml +++ b/app/design/frontend/default/default/template/checkout/onepage/shipping.phtml @@ -103,6 +103,6 @@ //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', 'getUrl('directory/json/childRegion') ?>', '__('Select State/Province...') ?>'); $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value); - var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', countryRegions, undefined, helper('directory')->getCountriesWithOptionalZipJson() ?>); + var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', countryRegions, undefined, 'shipping:postcode'); //]]> diff --git a/app/design/frontend/default/default/template/chronopay/info.phtml b/app/design/frontend/default/default/template/chronopay/info.phtml index 3b494c64df..849185b083 100644 --- a/app/design/frontend/default/default/template/chronopay/info.phtml +++ b/app/design/frontend/default/default/template/chronopay/info.phtml @@ -28,8 +28,7 @@ getMethod()->getTitle() ?> __('Name on the Card: %s', $this->htmlEscape($this->getInfo()->getCcOwner())) ?> __('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?> -__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> -__('Expiration Date: %s/%s', $this->htmlEscape($this->getCcExpMonth()), $this->htmlEscape($this->getInfo()->getCcExpYear())) ?> +__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> \ No newline at end of file diff --git a/app/design/frontend/default/default/template/customer/address/edit.phtml b/app/design/frontend/default/default/template/customer/address/edit.phtml index 236ee15b08..9e19e3addd 100644 --- a/app/design/frontend/default/default/template/customer/address/edit.phtml +++ b/app/design/frontend/default/default/template/customer/address/edit.phtml @@ -131,5 +131,5 @@ diff --git a/app/design/frontend/default/default/template/customer/form/address.phtml b/app/design/frontend/default/default/template/customer/form/address.phtml index e0159ee5e3..89f89aff6f 100644 --- a/app/design/frontend/default/default/template/customer/form/address.phtml +++ b/app/design/frontend/default/default/template/customer/form/address.phtml @@ -117,5 +117,5 @@ var dataForm = new VarienForm('form-validate', true); //dataForm.setElementsRelation('country', 'state', 'getUrl('directory/json/childRegion') ?>'); - new RegionUpdater('country', 'region', 'region_id', countryRegions, undefined, helper('directory')->getCountriesWithOptionalZipJson() ?>); - \ No newline at end of file + new RegionUpdater('country', 'region', 'region_id', countryRegions, undefined, 'zip'); + diff --git a/app/design/frontend/default/default/template/customer/form/edit.phtml b/app/design/frontend/default/default/template/customer/form/edit.phtml index cc5e32f48b..308784eeb3 100644 --- a/app/design/frontend/default/default/template/customer/form/edit.phtml +++ b/app/design/frontend/default/default/template/customer/form/edit.phtml @@ -48,6 +48,10 @@ getLayout()->createBlock('customer/widget_taxvat') ?> isEnabled()): ?> -
__('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?> -__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> -__('Expiration Date: %s/%s', $this->htmlEscape($this->getCcExpMonth()), $this->htmlEscape($this->getInfo()->getCcExpYear())) ?> +__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> \ No newline at end of file diff --git a/app/design/frontend/default/default/template/flo2cash/info.phtml b/app/design/frontend/default/default/template/flo2cash/info.phtml index b6c27bfca7..0a3b2be499 100644 --- a/app/design/frontend/default/default/template/flo2cash/info.phtml +++ b/app/design/frontend/default/default/template/flo2cash/info.phtml @@ -28,8 +28,7 @@ getMethod()->getTitle() ?> __('Name on the Card: %s', $this->htmlEscape($this->getInfo()->getCcOwner())) ?> __('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?> -__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> -__('Expiration Date: %s/%s', $this->htmlEscape($this->getCcExpMonth()), $this->htmlEscape($this->getInfo()->getCcExpYear())) ?> +__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> \ No newline at end of file diff --git a/app/design/frontend/default/default/template/giftmessage/inline.phtml b/app/design/frontend/default/default/template/giftmessage/inline.phtml index bc6fbcae90..aa7327a318 100644 --- a/app/design/frontend/default/default/template/giftmessage/inline.phtml +++ b/app/design/frontend/default/default/template/giftmessage/inline.phtml @@ -32,7 +32,7 @@ if(!window.toogleVisibilityOnObjects) { if($(source) && $(source).checked) { objects.each(function(item){ $(item).show(); - $(item).getElementsByClassName('input-text').each(function(item) { + $$('#' + item + ' .input-text').each(function(item) { item.removeClassName('validation-passed'); }); }); @@ -41,11 +41,11 @@ if(!window.toogleVisibilityOnObjects) { } else { objects.each(function(item){ $(item).hide(); - $(item).getElementsBySelector('.input-text').each(function(sitem) { + $$('#' + item + ' .input-text').each(function(sitem) { sitem.addClassName('validation-passed'); }); - $(item).getElementsBySelector('.giftmessage-area').each(function(sitem) { + $$('#' + item + ' .giftmessage-area').each(function(sitem) { sitem.value = ''; }); }); diff --git a/app/design/frontend/default/default/template/newsletter/subscribe.phtml b/app/design/frontend/default/default/template/newsletter/subscribe.phtml index 883bb4e26b..aaf36cab8e 100644 --- a/app/design/frontend/default/default/template/newsletter/subscribe.phtml +++ b/app/design/frontend/default/default/template/newsletter/subscribe.phtml @@ -28,7 +28,7 @@ - |