__('Options Details'); ?>
diff --git a/app/code/core/Mage/Wishlist/view/frontend/render/item/price.phtml b/app/code/Mage/Wishlist/view/frontend/render/item/price.phtml
similarity index 100%
rename from app/code/core/Mage/Wishlist/view/frontend/render/item/price.phtml
rename to app/code/Mage/Wishlist/view/frontend/render/item/price.phtml
diff --git a/app/code/core/Mage/Wishlist/view/frontend/render/item/price_msrp_item.phtml b/app/code/Mage/Wishlist/view/frontend/render/item/price_msrp_item.phtml
similarity index 100%
rename from app/code/core/Mage/Wishlist/view/frontend/render/item/price_msrp_item.phtml
rename to app/code/Mage/Wishlist/view/frontend/render/item/price_msrp_item.phtml
diff --git a/app/code/core/Mage/Wishlist/view/frontend/render/item/price_msrp_rss.phtml b/app/code/Mage/Wishlist/view/frontend/render/item/price_msrp_rss.phtml
similarity index 100%
rename from app/code/core/Mage/Wishlist/view/frontend/render/item/price_msrp_rss.phtml
rename to app/code/Mage/Wishlist/view/frontend/render/item/price_msrp_rss.phtml
diff --git a/app/code/core/Mage/Wishlist/view/frontend/shared.phtml b/app/code/Mage/Wishlist/view/frontend/shared.phtml
similarity index 100%
rename from app/code/core/Mage/Wishlist/view/frontend/shared.phtml
rename to app/code/Mage/Wishlist/view/frontend/shared.phtml
diff --git a/app/code/core/Mage/Wishlist/view/frontend/sharing.phtml b/app/code/Mage/Wishlist/view/frontend/sharing.phtml
similarity index 100%
rename from app/code/core/Mage/Wishlist/view/frontend/sharing.phtml
rename to app/code/Mage/Wishlist/view/frontend/sharing.phtml
diff --git a/app/code/core/Mage/Wishlist/view/frontend/sidebar.phtml b/app/code/Mage/Wishlist/view/frontend/sidebar.phtml
similarity index 100%
rename from app/code/core/Mage/Wishlist/view/frontend/sidebar.phtml
rename to app/code/Mage/Wishlist/view/frontend/sidebar.phtml
diff --git a/app/code/core/Mage/Wishlist/view/frontend/view.phtml b/app/code/Mage/Wishlist/view/frontend/view.phtml
similarity index 100%
rename from app/code/core/Mage/Wishlist/view/frontend/view.phtml
rename to app/code/Mage/Wishlist/view/frontend/view.phtml
diff --git a/app/code/core/Mage/Wishlist/view/frontend/wishlist.js b/app/code/Mage/Wishlist/view/frontend/wishlist.js
similarity index 100%
rename from app/code/core/Mage/Wishlist/view/frontend/wishlist.js
rename to app/code/Mage/Wishlist/view/frontend/wishlist.js
diff --git a/app/code/community/Phoenix/Moneybookers/Block/Form.php b/app/code/Phoenix/Moneybookers/Block/Form.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Block/Form.php
rename to app/code/Phoenix/Moneybookers/Block/Form.php
diff --git a/app/code/community/Phoenix/Moneybookers/Block/Info.php b/app/code/Phoenix/Moneybookers/Block/Info.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Block/Info.php
rename to app/code/Phoenix/Moneybookers/Block/Info.php
diff --git a/app/code/community/Phoenix/Moneybookers/Block/Jsinit.php b/app/code/Phoenix/Moneybookers/Block/Jsinit.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Block/Jsinit.php
rename to app/code/Phoenix/Moneybookers/Block/Jsinit.php
diff --git a/app/code/community/Phoenix/Moneybookers/Block/Payment.php b/app/code/Phoenix/Moneybookers/Block/Payment.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Block/Payment.php
rename to app/code/Phoenix/Moneybookers/Block/Payment.php
diff --git a/app/code/community/Phoenix/Moneybookers/Block/Placeform.php b/app/code/Phoenix/Moneybookers/Block/Placeform.php
similarity index 97%
rename from app/code/community/Phoenix/Moneybookers/Block/Placeform.php
rename to app/code/Phoenix/Moneybookers/Block/Placeform.php
index 574ee6c791bec..4aa3fcef63ed9 100644
--- a/app/code/community/Phoenix/Moneybookers/Block/Placeform.php
+++ b/app/code/Phoenix/Moneybookers/Block/Placeform.php
@@ -52,7 +52,7 @@ protected function _getOrder()
}
/**
- * Get Form data by using ogone payment api
+ * Retrieve form data
*
* @return array
*/
diff --git a/app/code/community/Phoenix/Moneybookers/Block/Redirect.php b/app/code/Phoenix/Moneybookers/Block/Redirect.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Block/Redirect.php
rename to app/code/Phoenix/Moneybookers/Block/Redirect.php
diff --git a/app/code/community/Phoenix/Moneybookers/Helper/Data.php b/app/code/Phoenix/Moneybookers/Helper/Data.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Helper/Data.php
rename to app/code/Phoenix/Moneybookers/Helper/Data.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Abstract.php b/app/code/Phoenix/Moneybookers/Model/Abstract.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Abstract.php
rename to app/code/Phoenix/Moneybookers/Model/Abstract.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Acc.php b/app/code/Phoenix/Moneybookers/Model/Acc.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Acc.php
rename to app/code/Phoenix/Moneybookers/Model/Acc.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Csi.php b/app/code/Phoenix/Moneybookers/Model/Csi.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Csi.php
rename to app/code/Phoenix/Moneybookers/Model/Csi.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Did.php b/app/code/Phoenix/Moneybookers/Model/Did.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Did.php
rename to app/code/Phoenix/Moneybookers/Model/Did.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Dnk.php b/app/code/Phoenix/Moneybookers/Model/Dnk.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Dnk.php
rename to app/code/Phoenix/Moneybookers/Model/Dnk.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Ebt.php b/app/code/Phoenix/Moneybookers/Model/Ebt.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Ebt.php
rename to app/code/Phoenix/Moneybookers/Model/Ebt.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Ent.php b/app/code/Phoenix/Moneybookers/Model/Ent.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Ent.php
rename to app/code/Phoenix/Moneybookers/Model/Ent.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Event.php b/app/code/Phoenix/Moneybookers/Model/Event.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Event.php
rename to app/code/Phoenix/Moneybookers/Model/Event.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Gcb.php b/app/code/Phoenix/Moneybookers/Model/Gcb.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Gcb.php
rename to app/code/Phoenix/Moneybookers/Model/Gcb.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Gir.php b/app/code/Phoenix/Moneybookers/Model/Gir.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Gir.php
rename to app/code/Phoenix/Moneybookers/Model/Gir.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Idl.php b/app/code/Phoenix/Moneybookers/Model/Idl.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Idl.php
rename to app/code/Phoenix/Moneybookers/Model/Idl.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Lsr.php b/app/code/Phoenix/Moneybookers/Model/Lsr.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Lsr.php
rename to app/code/Phoenix/Moneybookers/Model/Lsr.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Mae.php b/app/code/Phoenix/Moneybookers/Model/Mae.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Mae.php
rename to app/code/Phoenix/Moneybookers/Model/Mae.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Npy.php b/app/code/Phoenix/Moneybookers/Model/Npy.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Npy.php
rename to app/code/Phoenix/Moneybookers/Model/Npy.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Obt.php b/app/code/Phoenix/Moneybookers/Model/Obt.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Obt.php
rename to app/code/Phoenix/Moneybookers/Model/Obt.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Pli.php b/app/code/Phoenix/Moneybookers/Model/Pli.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Pli.php
rename to app/code/Phoenix/Moneybookers/Model/Pli.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Psp.php b/app/code/Phoenix/Moneybookers/Model/Psp.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Psp.php
rename to app/code/Phoenix/Moneybookers/Model/Psp.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Pwy.php b/app/code/Phoenix/Moneybookers/Model/Pwy.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Pwy.php
rename to app/code/Phoenix/Moneybookers/Model/Pwy.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Sft.php b/app/code/Phoenix/Moneybookers/Model/Sft.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Sft.php
rename to app/code/Phoenix/Moneybookers/Model/Sft.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/So2.php b/app/code/Phoenix/Moneybookers/Model/So2.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/So2.php
rename to app/code/Phoenix/Moneybookers/Model/So2.php
diff --git a/app/code/community/Phoenix/Moneybookers/Model/Wlt.php b/app/code/Phoenix/Moneybookers/Model/Wlt.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/Model/Wlt.php
rename to app/code/Phoenix/Moneybookers/Model/Wlt.php
diff --git a/app/code/community/Phoenix/Moneybookers/controllers/MoneybookersController.php b/app/code/Phoenix/Moneybookers/controllers/MoneybookersController.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/controllers/MoneybookersController.php
rename to app/code/Phoenix/Moneybookers/controllers/MoneybookersController.php
diff --git a/app/code/community/Phoenix/Moneybookers/controllers/ProcessingController.php b/app/code/Phoenix/Moneybookers/controllers/ProcessingController.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/controllers/ProcessingController.php
rename to app/code/Phoenix/Moneybookers/controllers/ProcessingController.php
diff --git a/app/code/Phoenix/Moneybookers/etc/adminhtml/acl.xml b/app/code/Phoenix/Moneybookers/etc/adminhtml/acl.xml
new file mode 100644
index 0000000000000..6e26bb3bf7c45
--- /dev/null
+++ b/app/code/Phoenix/Moneybookers/etc/adminhtml/acl.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/community/Phoenix/Moneybookers/etc/adminhtml/system.xml b/app/code/Phoenix/Moneybookers/etc/adminhtml/system.xml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/etc/adminhtml/system.xml
rename to app/code/Phoenix/Moneybookers/etc/adminhtml/system.xml
diff --git a/app/code/Phoenix/Moneybookers/etc/config.xml b/app/code/Phoenix/Moneybookers/etc/config.xml
new file mode 100644
index 0000000000000..cfb70cb6cff05
--- /dev/null
+++ b/app/code/Phoenix/Moneybookers/etc/config.xml
@@ -0,0 +1,281 @@
+
+
+
+
+
+ 1.6.0.0
+ true
+
+
+
+
+
+
+ Phoenix_Moneybookers
+
+
+
+
+
+
+ Activation of Payment Configuration
+ email/activation.html
+ html
+
+
+
+
+
+ Moneybookers
+
+
+
+
+
+ /moneybookers/processing
+
+
+
+ standard
+
+ Phoenix_Moneybookers
+ moneybookers
+
+
+
+
+
+
+
+ Phoenix_Moneybookers.csv
+
+
+
+
+
+
+
+ layout.xml
+
+
+
+
+
+
+
+
+
+ Phoenix_Moneybookers
+
+
+
+
+
+
+
+
+
+
+ Phoenix_Moneybookers.csv
+
+
+
+
+
+
+
+ layout.xml
+
+
+
+
+
+
+ http://www.phoenix-medien.de/index.php?id=105
+
+
+
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Acc
+ Credit Card / Visa, Mastercard, AMEX, JCB, Diners
+ 0
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Csi
+ CartaSi
+ 1
+ IT
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Did
+ Lastschrift (ELV)
+ 1
+ DE
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Dnk
+ Dankort
+ 1
+ DK
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Ebt
+ Nordea Solo
+ 1
+ SE
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Ent
+ eNETS
+ 1
+ SG
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Gcb
+ Carte Bleue
+ 1
+ FR
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Gir
+ Giropay
+ 1
+ DE
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Idl
+ iDeal
+ 1
+ NL
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Lsr
+ Laser
+ 1
+ IE
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Mae
+ Maestro
+ 1
+ GB,AT,ES
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Npy
+ EPS Online-Überweisung
+ 1
+ AT
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Pli
+ POLi
+ 1
+ AU
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Psp
+ Postepay
+ 1
+ IT
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Pwy
+ All Polish Banks
+ 1
+ PL
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Sft
+ Sofortüberweisung
+ 1
+ DE
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_So2
+ Nordea Solo
+ 1
+ FI
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Wlt
+ Moneybookers eWallet
+ 0
+
+
+ mbookers
+ 0
+ Phoenix_Moneybookers_Model_Obt
+ Onlineüberweisung (empfohlen)
+ 1
+ GB,DE
+
+
+
+
+ 0
+
+
+
+
diff --git a/app/code/community/Phoenix/Moneybookers/locale/de_DE/Phoenix_Moneybookers.csv b/app/code/Phoenix/Moneybookers/locale/de_DE/Phoenix_Moneybookers.csv
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/locale/de_DE/Phoenix_Moneybookers.csv
rename to app/code/Phoenix/Moneybookers/locale/de_DE/Phoenix_Moneybookers.csv
diff --git a/app/code/community/Phoenix/Moneybookers/locale/en_US/Phoenix_Moneybookers.csv b/app/code/Phoenix/Moneybookers/locale/en_US/Phoenix_Moneybookers.csv
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/locale/en_US/Phoenix_Moneybookers.csv
rename to app/code/Phoenix/Moneybookers/locale/en_US/Phoenix_Moneybookers.csv
diff --git a/app/code/community/Phoenix/Moneybookers/locale/es_ES/Phoenix_Moneybookers.csv b/app/code/Phoenix/Moneybookers/locale/es_ES/Phoenix_Moneybookers.csv
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/locale/es_ES/Phoenix_Moneybookers.csv
rename to app/code/Phoenix/Moneybookers/locale/es_ES/Phoenix_Moneybookers.csv
diff --git a/app/code/community/Phoenix/Moneybookers/locale/fr_FR/Phoenix_Moneybookers.csv b/app/code/Phoenix/Moneybookers/locale/fr_FR/Phoenix_Moneybookers.csv
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/locale/fr_FR/Phoenix_Moneybookers.csv
rename to app/code/Phoenix/Moneybookers/locale/fr_FR/Phoenix_Moneybookers.csv
diff --git a/app/code/community/Phoenix/Moneybookers/locale/nl_NL/Phoenix_Moneybookers.csv b/app/code/Phoenix/Moneybookers/locale/nl_NL/Phoenix_Moneybookers.csv
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/locale/nl_NL/Phoenix_Moneybookers.csv
rename to app/code/Phoenix/Moneybookers/locale/nl_NL/Phoenix_Moneybookers.csv
diff --git a/app/code/community/Phoenix/Moneybookers/locale/pt_BR/Phoenix_Moneybookers.csv b/app/code/Phoenix/Moneybookers/locale/pt_BR/Phoenix_Moneybookers.csv
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/locale/pt_BR/Phoenix_Moneybookers.csv
rename to app/code/Phoenix/Moneybookers/locale/pt_BR/Phoenix_Moneybookers.csv
diff --git a/app/code/community/Phoenix/Moneybookers/locale/zh_CN/Phoenix_Moneybookers.csv b/app/code/Phoenix/Moneybookers/locale/zh_CN/Phoenix_Moneybookers.csv
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/locale/zh_CN/Phoenix_Moneybookers.csv
rename to app/code/Phoenix/Moneybookers/locale/zh_CN/Phoenix_Moneybookers.csv
diff --git a/app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php b/app/code/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php
rename to app/code/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php
diff --git a/app/code/community/Phoenix/Moneybookers/view/adminhtml/activation.js b/app/code/Phoenix/Moneybookers/view/adminhtml/activation.js
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/adminhtml/activation.js
rename to app/code/Phoenix/Moneybookers/view/adminhtml/activation.js
diff --git a/app/code/community/Phoenix/Moneybookers/view/adminhtml/banner.jpg b/app/code/Phoenix/Moneybookers/view/adminhtml/banner.jpg
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/adminhtml/banner.jpg
rename to app/code/Phoenix/Moneybookers/view/adminhtml/banner.jpg
diff --git a/app/code/community/Phoenix/Moneybookers/view/adminhtml/info.phtml b/app/code/Phoenix/Moneybookers/view/adminhtml/info.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/adminhtml/info.phtml
rename to app/code/Phoenix/Moneybookers/view/adminhtml/info.phtml
diff --git a/app/code/community/Phoenix/Moneybookers/view/adminhtml/jsinit.phtml b/app/code/Phoenix/Moneybookers/view/adminhtml/jsinit.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/adminhtml/jsinit.phtml
rename to app/code/Phoenix/Moneybookers/view/adminhtml/jsinit.phtml
diff --git a/app/code/community/Phoenix/Moneybookers/view/adminhtml/layout.xml b/app/code/Phoenix/Moneybookers/view/adminhtml/layout.xml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/adminhtml/layout.xml
rename to app/code/Phoenix/Moneybookers/view/adminhtml/layout.xml
diff --git a/app/code/community/Phoenix/Moneybookers/view/adminhtml/pdf/info.phtml b/app/code/Phoenix/Moneybookers/view/adminhtml/pdf/info.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/adminhtml/pdf/info.phtml
rename to app/code/Phoenix/Moneybookers/view/adminhtml/pdf/info.phtml
diff --git a/app/code/community/Phoenix/Moneybookers/view/email/activation.html b/app/code/Phoenix/Moneybookers/view/email/activation.html
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/email/activation.html
rename to app/code/Phoenix/Moneybookers/view/email/activation.html
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/blank.phtml b/app/code/Phoenix/Moneybookers/view/frontend/blank.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/blank.phtml
rename to app/code/Phoenix/Moneybookers/view/frontend/blank.phtml
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/form.phtml b/app/code/Phoenix/Moneybookers/view/frontend/form.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/form.phtml
rename to app/code/Phoenix/Moneybookers/view/frontend/form.phtml
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_de.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_de.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_de.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_de.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_de.png b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_de.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_de.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_de.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_dk.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_dk.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_dk.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_dk.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_fr.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_fr.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_fr.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_fr.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_fr.png b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_fr.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_fr.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_fr.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_int.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_int.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_int.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_int.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_int.png b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_int.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_int.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_int.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_pl.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_pl.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_pl.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_pl.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_pl.png b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_pl.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_pl.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_pl.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_sp.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_sp.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_sp.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_sp.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_sp.png b/app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_sp.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/banner_120_sp.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/banner_120_sp.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_acc.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_acc.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_acc.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_acc.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_csi.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_csi.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_csi.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_csi.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_did.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_did.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_did.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_did.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_dnk.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_dnk.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_dnk.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_dnk.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_ebt.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_ebt.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_ebt.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_ebt.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_ent.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_ent.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_ent.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_ent.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_gcb.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_gcb.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_gcb.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_gcb.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_gir.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_gir.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_gir.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_gir.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_idl.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_idl.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_idl.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_idl.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_lsr.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_lsr.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_lsr.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_lsr.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_mae.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_mae.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_mae.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_mae.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_npy.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_npy.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_npy.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_npy.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_de.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_de.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_de.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_de.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_dk.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_dk.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_dk.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_dk.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_ee.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_ee.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_ee.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_ee.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_en.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_en.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_en.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_en.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_fl.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_fl.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_fl.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_fl.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_lt.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_lt.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_lt.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_lt.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_lv.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_lv.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_lv.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_lv.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_pl.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_pl.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_pl.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_pl.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_se.png b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_se.png
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_se.png
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_obt_se.png
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_pli.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_pli.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_pli.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_pli.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_psp.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_psp.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_psp.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_psp.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_pwy.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_pwy.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_pwy.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_pwy.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_sft.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_sft.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_sft.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_sft.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_so2.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_so2.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_so2.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_so2.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_wlt.gif b/app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_wlt.gif
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/images/moneybookers_wlt.gif
rename to app/code/Phoenix/Moneybookers/view/frontend/images/moneybookers_wlt.gif
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/info.phtml b/app/code/Phoenix/Moneybookers/view/frontend/info.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/info.phtml
rename to app/code/Phoenix/Moneybookers/view/frontend/info.phtml
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/layout.xml b/app/code/Phoenix/Moneybookers/view/frontend/layout.xml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/layout.xml
rename to app/code/Phoenix/Moneybookers/view/frontend/layout.xml
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/payment.phtml b/app/code/Phoenix/Moneybookers/view/frontend/payment.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/payment.phtml
rename to app/code/Phoenix/Moneybookers/view/frontend/payment.phtml
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/placeform.phtml b/app/code/Phoenix/Moneybookers/view/frontend/placeform.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/placeform.phtml
rename to app/code/Phoenix/Moneybookers/view/frontend/placeform.phtml
diff --git a/app/code/community/Phoenix/Moneybookers/view/frontend/redirect.phtml b/app/code/Phoenix/Moneybookers/view/frontend/redirect.phtml
similarity index 100%
rename from app/code/community/Phoenix/Moneybookers/view/frontend/redirect.phtml
rename to app/code/Phoenix/Moneybookers/view/frontend/redirect.phtml
diff --git a/app/code/core/Zend/Date.php b/app/code/Zend/Date.php
similarity index 100%
rename from app/code/core/Zend/Date.php
rename to app/code/Zend/Date.php
diff --git a/app/code/core/Zend/Mime.php b/app/code/Zend/Mime.php
similarity index 100%
rename from app/code/core/Zend/Mime.php
rename to app/code/Zend/Mime.php
diff --git a/app/code/core/Zend/Soap/Wsdl.php b/app/code/Zend/Soap/Wsdl.php
similarity index 100%
rename from app/code/core/Zend/Soap/Wsdl.php
rename to app/code/Zend/Soap/Wsdl.php
diff --git a/app/code/core/Zend/XmlRpc/Request.php b/app/code/Zend/XmlRpc/Request.php
similarity index 100%
rename from app/code/core/Zend/XmlRpc/Request.php
rename to app/code/Zend/XmlRpc/Request.php
diff --git a/app/code/core/Zend/XmlRpc/Response.php b/app/code/Zend/XmlRpc/Response.php
similarity index 100%
rename from app/code/core/Zend/XmlRpc/Response.php
rename to app/code/Zend/XmlRpc/Response.php
diff --git a/app/code/community/Phoenix/Moneybookers/etc/adminhtml/acl.xml b/app/code/community/Phoenix/Moneybookers/etc/adminhtml/acl.xml
deleted file mode 100644
index 7b7505757116c..0000000000000
--- a/app/code/community/Phoenix/Moneybookers/etc/adminhtml/acl.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/community/Phoenix/Moneybookers/etc/config.xml b/app/code/community/Phoenix/Moneybookers/etc/config.xml
deleted file mode 100644
index ad3f69ca7a007..0000000000000
--- a/app/code/community/Phoenix/Moneybookers/etc/config.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-
-
-
- 1.6.0.0
- true
- community
-
-
-
-
-
-
- Phoenix_Moneybookers
-
-
-
-
-
-
- Activation of Payment Configuration
- email/activation.html
- html
-
-
-
-
-
- Moneybookers
-
-
-
-
-
- /moneybookers/processing
-
-
-
- standard
-
- Phoenix_Moneybookers
- moneybookers
-
-
-
-
-
-
-
- Phoenix_Moneybookers.csv
-
-
-
-
-
-
-
- layout.xml
-
-
-
-
-
-
-
-
-
- Phoenix_Moneybookers
-
-
-
-
-
-
-
-
-
-
- Phoenix_Moneybookers.csv
-
-
-
-
-
-
-
- layout.xml
-
-
-
-
-
-
- http://www.phoenix-medien.de/index.php?id=105
-
-
-
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Acc
- Credit Card / Visa, Mastercard, AMEX, JCB, Diners
- 0
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Csi
- CartaSi
- 1
- IT
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Did
- Lastschrift (ELV)
- 1
- DE
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Dnk
- Dankort
- 1
- DK
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Ebt
- Nordea Solo
- 1
- SE
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Ent
- eNETS
- 1
- SG
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Gcb
- Carte Bleue
- 1
- FR
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Gir
- Giropay
- 1
- DE
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Idl
- iDeal
- 1
- NL
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Lsr
- Laser
- 1
- IE
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Mae
- Maestro
- 1
- GB,AT,ES
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Npy
- EPS Online-Überweisung
- 1
- AT
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Pli
- POLi
- 1
- AU
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Psp
- Postepay
- 1
- IT
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Pwy
- All Polish Banks
- 1
- PL
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Sft
- Sofortüberweisung
- 1
- DE
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_So2
- Nordea Solo
- 1
- FI
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Wlt
- Moneybookers eWallet
- 0
-
-
- mbookers
- 0
- Phoenix_Moneybookers_Model_Obt
- Onlineüberweisung (empfohlen)
- 1
- GB,DE
-
-
-
-
- 0
-
-
-
-
diff --git a/app/code/core/Mage/AdminNotification/etc/adminhtml/acl.xml b/app/code/core/Mage/AdminNotification/etc/adminhtml/acl.xml
deleted file mode 100644
index f7682c3a8fba8..0000000000000
--- a/app/code/core/Mage/AdminNotification/etc/adminhtml/acl.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/core/Mage/AdminNotification/etc/adminhtml/menu.xml b/app/code/core/Mage/AdminNotification/etc/adminhtml/menu.xml
deleted file mode 100644
index afe0a24a889de..0000000000000
--- a/app/code/core/Mage/AdminNotification/etc/adminhtml/menu.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml
deleted file mode 100644
index 63b422ea72cb5..0000000000000
--- a/app/code/core/Mage/AdminNotification/etc/config.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
- 1.6.0.0
- true
- core
-
-
-
-
-
-
-
-
- Mage_AdminNotification
-
-
-
-
-
-
-
-
-
- Mage_AdminNotification.csv
-
-
-
-
-
-
-
-
- Mage_AdminNotification_Model_Observer
- preDispatch
-
-
-
-
-
-
-
-
- notifications.magentocommerce.com/community/notifications.rss
- widgets.magentocommerce.com/notificationPopup
- widgets.magentocommerce.com/%s/%s.gif
- 0
- 1
- 0
-
-
-
-
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
deleted file mode 100644
index ede51e4a2bc63..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Helper_Form_Wysiwyg extends Varien_Data_Form_Element_Textarea
-{
- /**
- * Retrieve additional html and put it at the end of element html
- *
- * @return string
- */
- public function getAfterElementHtml()
- {
- $html = parent::getAfterElementHtml();
- if ($this->getIsWysiwygEnabled()) {
- $disabled = ($this->getDisabled() || $this->getReadonly());
- $html .= Mage::app()->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Widget_Button', '', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('WYSIWYG Editor'),
- 'type' => 'button',
- 'disabled' => $disabled,
- 'class' => ($disabled) ? 'disabled btn-wysiwyg' : 'btn-wysiwyg',
- 'onclick' => 'catalogWysiwygEditor.open(\''
- . Mage::helper('Mage_Adminhtml_Helper_Data')->getUrl('*/*/wysiwyg')
- . '\', \'' . $this->getHtmlId().'\')'
- ))->toHtml();
- }
- return $html;
- }
-
- /**
- * Check whether wysiwyg enabled or not
- *
- * @return boolean
- */
- public function getIsWysiwygEnabled()
- {
- if (Mage::helper('Mage_Catalog_Helper_Data')->isModuleEnabled('Mage_Cms')) {
- return (bool)(Mage::getSingleton('Mage_Cms_Model_Wysiwyg_Config')->isEnabled()
- && $this->getEntityAttribute()->getIsWysiwygEnabled());
- }
-
- return false;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
deleted file mode 100644
index 392930b231906..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
-{
-
- protected function _construct()
- {
- $this->_objectId = 'attribute_id';
- $this->_controller = 'catalog_product_attribute';
-
- parent::_construct();
-
- if($this->getRequest()->getParam('popup')) {
- $this->_removeButton('back');
- $this->_addButton(
- 'close',
- array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Close Window'),
- 'class' => 'cancel',
- 'onclick' => 'window.close()',
- 'level' => -1
- )
- );
- $this->_addButton(
- 'save_in_new_set',
- array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Save in New Attribute Set'),
- 'class' => 'save',
- 'onclick' => 'saveAttributeInNewSet(\''
- . Mage::helper('Mage_Catalog_Helper_Data')->__('Enter Name for New Attribute Set')
- . '\')',
- )
- );
- } else {
- $this->_addButton(
- 'save_and_edit_button',
- array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Save and Continue Edit'),
- 'class' => 'save',
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => 'saveAndContinueEdit', 'target' => '#edit_form'),
- ),
- ),
- ),
- 100
- );
- }
-
- $this->_updateButton('save', 'label', Mage::helper('Mage_Catalog_Helper_Data')->__('Save Attribute'));
- $this->_updateButton('save', 'data_attribute', array(
- 'mage-init' => array(
- 'button' => array('event' => 'save', 'target' => '#edit_form'),
- ),
- ));
-
- if (!Mage::registry('entity_attribute') || !Mage::registry('entity_attribute')->getIsUserDefined()) {
- $this->_removeButton('delete');
- } else {
- $this->_updateButton('delete', 'label', Mage::helper('Mage_Catalog_Helper_Data')->__('Delete Attribute'));
- }
- }
-
- /**
- * Retrieve header text
- *
- * @return string
- */
- public function getHeaderText()
- {
- if (Mage::registry('entity_attribute')->getId()) {
- $frontendLabel = Mage::registry('entity_attribute')->getFrontendLabel();
- if (is_array($frontendLabel)) {
- $frontendLabel = $frontendLabel[0];
- }
- return Mage::helper('Mage_Catalog_Helper_Data')->__('Edit Product Attribute "%s"', $this->escapeHtml($frontendLabel));
- }
- return Mage::helper('Mage_Catalog_Helper_Data')->__('New Product Attribute');
- }
-
- /**
- * Retrieve URL for validation
- *
- * @return string
- */
- public function getValidationUrl()
- {
- return $this->getUrl('*/*/validate', array('_current'=>true));
- }
-
- /**
- * Retrieve URL for save
- *
- * @return string
- */
- public function getSaveUrl()
- {
- return $this->getUrl('*/'.$this->_controller.'/save', array('_current'=>true, 'back'=>null));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
deleted file mode 100644
index d0e79eeb1c199..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add extends Mage_Adminhtml_Block_Template
-{
-
- protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
-
- protected function _prepareLayout()
- {
- $this->addChild('save_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Save Attribute Set'),
- 'class' => 'save',
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => 'save', 'target' => '#set-prop-form'),
- ),
- ),
- ));
- $this->addChild('back_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Back'),
- 'onclick' => 'setLocation(\''.$this->getUrl('*/*/').'\')',
- 'class' => 'back'
- ));
-
- $this->addChild('setForm', 'Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formset');
- return parent::_prepareLayout();
- }
-
- protected function _getHeader()
- {
- return Mage::helper('Mage_Catalog_Helper_Data')->__('Add New Attribute Set');
- }
-
- protected function getSaveButtonHtml()
- {
- return $this->getChildHtml('save_button');
- }
-
- protected function getBackButtonHtml()
- {
- return $this->getChildHtml('back_button');
- }
-
- protected function getFormHtml()
- {
- return $this->getChildHtml('setForm');
- }
-
- /**
- * Return id of form, used by this block
- *
- * @return string
- */
- protected function getFormId()
- {
- return $this->getChildBlock('setForm')->getForm()->getId();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
deleted file mode 100644
index 215de4d75f73a..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
+++ /dev/null
@@ -1,360 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Widget
-{
- protected $_template = 'catalog/product/edit.phtml';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('product_edit');
- }
-
- /**
- * Retrieve currently edited product object
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- return Mage::registry('current_product');
- }
-
- /**
- * Add elements in layout
- *
- * @return Mage_Adminhtml_Block_Catalog_Product_Edit
- */
- protected function _prepareLayout()
- {
- if (!$this->getRequest()->getParam('popup')) {
- $this->addChild('back_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Back'),
- 'title' => Mage::helper('Mage_Catalog_Helper_Data')->__('Back'),
- 'onclick' => 'setLocation(\''
- . $this->getUrl('*/*/', array('store' => $this->getRequest()->getParam('store', 0))) . '\')',
- 'class' => 'action-back'
- ));
- } else {
- $this->addChild('back_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Close Window'),
- 'onclick' => 'window.close()',
- 'class' => 'cancel'
- ));
- }
-
- if (!$this->getProduct()->isReadonly()) {
- $this->addChild('reset_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Reset'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/*', array('_current' => true)) . '\')'
- ));
- }
-
- if (!$this->getRequest()->getParam('popup')) {
- if ($this->getProduct()->isDeleteable()) {
- $this->addChild('delete_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Delete'),
- 'onclick' => 'confirmSetLocation(\''
- . Mage::helper('Mage_Catalog_Helper_Data')->__('Are you sure?') . '\', \'' . $this->getDeleteUrl() . '\')',
- 'class' => 'delete'
- ));
- }
- }
- if (!$this->getProduct()->isReadonly()) {
- $this->addChild('save-split-button', 'Mage_Backend_Block_Widget_Button_Split', array(
- 'id' => 'save-split-button',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Save'),
- 'class_name' => 'Mage_Backend_Block_Widget_Button_Split',
- 'button_class' => 'widget-button-save',
- 'options' => $this->_getSaveSplitButtonOptions()
- ));
- }
-
- return parent::_prepareLayout();
- }
-
- public function getBackButtonHtml()
- {
- return $this->getChildHtml('back_button');
- }
-
- public function getCancelButtonHtml()
- {
- return $this->getChildHtml('reset_button');
- }
-
- public function getSaveButtonHtml()
- {
- return $this->getChildHtml('save_button');
- }
-
- public function getSaveAndEditButtonHtml()
- {
- return $this->getChildHtml('save_and_edit_button');
- }
-
- public function getDeleteButtonHtml()
- {
- return $this->getChildHtml('delete_button');
- }
-
- public function getDuplicateButtonHtml()
- {
- return $this->getChildHtml('duplicate_button');
- }
-
- /**
- * Get Save Split Button html
- *
- * @return string
- */
- public function getSaveSplitButtonHtml()
- {
- return $this->getChildHtml('save-split-button');
- }
-
- public function getValidationUrl()
- {
- return $this->getUrl('*/*/validate', array('_current'=>true));
- }
-
- public function getSaveUrl()
- {
- return $this->getUrl('*/*/save', array('_current'=>true, 'back'=>null));
- }
-
- public function getSaveAndContinueUrl()
- {
- return $this->getUrl('*/*/save', array(
- '_current' => true,
- 'back' => 'edit',
- 'tab' => '{{tab_id}}',
- 'active_tab' => null
- ));
- }
-
- public function getProductId()
- {
- return $this->getProduct()->getId();
- }
-
- public function getProductSetId()
- {
- $setId = false;
- if (!($setId = $this->getProduct()->getAttributeSetId()) && $this->getRequest()) {
- $setId = $this->getRequest()->getParam('set', null);
- }
- return $setId;
- }
-
- public function getIsGrouped()
- {
- return $this->getProduct()->isGrouped();
- }
-
- public function getDeleteUrl()
- {
- return $this->getUrl('*/*/delete', array('_current'=>true));
- }
-
- public function getDuplicateUrl()
- {
- return $this->getUrl('*/*/duplicate', array('_current'=>true));
- }
-
- public function getHeader()
- {
- if ($this->getProduct()->getId()) {
- $header = $this->escapeHtml($this->getProduct()->getName());
- } else {
- $header = Mage::helper('Mage_Catalog_Helper_Data')->__('New Product');
- }
- return $header;
- }
-
- public function getAttributeSetName()
- {
- if ($setId = $this->getProduct()->getAttributeSetId()) {
- $set = Mage::getModel('Mage_Eav_Model_Entity_Attribute_Set')
- ->load($setId);
- return $set->getAttributeSetName();
- }
- return '';
- }
-
- public function getIsConfigured()
- {
- $result = true;
-
- $product = $this->getProduct();
- if ($product->isConfigurable()) {
- $superAttributes = $product->getTypeInstance()->getUsedProductAttributeIds($product);
- $result = !empty($superAttributes);
- }
-
- return $result;
- }
-
- public function getSelectedTabId()
- {
- return addslashes(htmlspecialchars($this->getRequest()->getParam('tab')));
- }
-
- /**
- * Get fields masks from config
- *
- * @return array
- */
- public function getFieldsAutogenerationMasks()
- {
- return $this->helper('Mage_Catalog_Helper_Product')->getFieldsAutogenerationMasks();
- }
-
- /**
- * Retrieve available placeholders
- *
- * @return array
- */
- public function getAttributesAllowedForAutogeneration()
- {
- return $this->helper('Mage_Catalog_Helper_Product')->getAttributesAllowedForAutogeneration();
- }
-
- /**
- * Get data for JS (product type transition)
- *
- * @return string
- */
- public function getTypeSwitcherData()
- {
- return Mage::helper('Mage_Core_Helper_Data')->jsonEncode(array(
- 'tab_id' => 'product_info_tabs_downloadable_items',
- 'is_virtual_id' => Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Weight_Renderer::VIRTUAL_FIELD_HTML_ID,
- 'weight_id' => 'weight',
- 'current_type' => $this->getProduct()->getTypeId(),
- 'attributes' => $this->_getAttributes(),
- ));
- }
-
- /**
- * Get formed array with attribute codes and Apply To property
- *
- * @return array
- */
- protected function _getAttributes()
- {
- /** @var $product Mage_Catalog_Model_Product */
- $product = $this->getProduct();
- $attributes = array();
-
- foreach ($product->getAttributes() as $key => $attribute) {
- $attributes[$key] = $attribute->getApplyTo();
- }
- return $attributes;
- }
-
- /**
- * Get dropdown options for save split button
- *
- * @return array
- */
- protected function _getSaveSplitButtonOptions()
- {
- $options = array();
- if (!$this->getRequest()->getParam('popup')) {
- $options[] = array(
- 'id' => 'edit-button',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Save & Edit'),
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => 'saveAndContinueEdit', 'target' => '#product-edit-form'),
- ),
- ),
- 'default' => true,
- );
- }
-
- /** @var $limitation Mage_Catalog_Model_Product_Limitation */
- $limitation = Mage::getObjectManager()->get('Mage_Catalog_Model_Product_Limitation');
- if ($this->_isProductNew()) {
- $showAddNewButtons = !$limitation->isCreateRestricted(2);
- } else {
- $showAddNewButtons = !$limitation->isCreateRestricted();
- }
- if ($showAddNewButtons) {
- $options[] = array(
- 'id' => 'new-button',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Save & New'),
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => 'saveAndNew', 'target' => '#product-edit-form'),
- ),
- ),
- );
- if (!$this->getRequest()->getParam('popup') && $this->getProduct()->isDuplicable()) {
- $options[] = array(
- 'id' => 'duplicate-button',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Save & Duplicate'),
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => '', 'target' => '#product-edit-form'),
- ),
- ),
- 'onclick' => $this->_isProductNew() ? '' : 'setLocation(\'' . $this->getDuplicateUrl() . '\')',
- );
- }
- }
- $options[] = array(
- 'id' => 'close-button',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Save & Close'),
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => 'save', 'target' => '#product-edit-form'),
- ),
- ),
- );
- return $options;
- }
-
- /**
- * Check whether new product is being created
- *
- * @return bool
- */
- protected function _isProductNew()
- {
- $product = $this->getProduct();
- return !$product || !$product->getId();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php
deleted file mode 100644
index 236ebaf9d3fcd..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php
+++ /dev/null
@@ -1,172 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes extends Mage_Adminhtml_Block_Catalog_Form
-{
- /**
- * Load Wysiwyg on demand and prepare layout
- */
- protected function _prepareLayout()
- {
- parent::_prepareLayout();
- if (Mage::helper('Mage_Catalog_Helper_Data')->isModuleEnabled('Mage_Cms')
- && Mage::getSingleton('Mage_Cms_Model_Wysiwyg_Config')->isEnabled()
- ) {
- $this->getLayout()->getBlock('head')->setCanLoadTinyMce(true);
- }
- }
-
- /**
- * Prepare attributes form
- *
- * @return null
- */
- protected function _prepareForm()
- {
- $group = $this->getGroup();
- if ($group) {
- $form = new Varien_Data_Form();
- $product = Mage::registry('product');
- // Initialize product object as form property to use it during elements generation
- $form->setDataObject($product);
-
- $fieldset = $form->addFieldset('group_fields' . $group->getId(), array(
- 'legend' => Mage::helper('Mage_Catalog_Helper_Data')->__($group->getAttributeGroupName()),
- 'collapsable' => true
- ));
-
- $attributes = $this->getGroupAttributes();
-
- $this->_setFieldset($attributes, $fieldset, array('gallery'));
-
- $urlKey = $form->getElement('url_key');
- if ($urlKey) {
- $urlKey->setRenderer(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Form_Renderer_Attribute_Urlkey')
- );
- }
-
- $tierPrice = $form->getElement('tier_price');
- if ($tierPrice) {
- $tierPrice->setRenderer(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier')
- );
- }
-
- $groupPrice = $form->getElement('group_price');
- if ($groupPrice) {
- $groupPrice->setRenderer(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group')
- );
- }
-
- $recurringProfile = $form->getElement('recurring_profile');
- if ($recurringProfile) {
- $recurringProfile->setRenderer(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Recurring')
- );
- }
-
- // Add new attribute button if it is not an image tab
- if (!$form->getElement('media_gallery')
- && Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Catalog::attributes_attributes')
- ) {
- $headerBar = $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes_Create');
-
- $headerBar->getConfig()
- ->setTabId('group_' . $group->getId())
- ->setGroupId($group->getId())
- ->setStoreId($form->getDataObject()->getStoreId())
- ->setAttributeSetId($form->getDataObject()->getAttributeSetId())
- ->setTypeId($form->getDataObject()->getTypeId())
- ->setProductId($form->getDataObject()->getId());
-
- $fieldset->setHeaderBar($headerBar->toHtml());
- }
-
- $values = $product->getData();
-
- // Set default attribute values for new product or on attribute set change
- if (!$product->getId() || $product->dataHasChangedFor('attribute_set_id')) {
- foreach ($attributes as $attribute) {
- if (!isset($values[$attribute->getAttributeCode()])) {
- $values[$attribute->getAttributeCode()] = $attribute->getDefaultValue();
- }
- }
- }
-
- if ($product->hasLockedAttributes()) {
- foreach ($product->getLockedAttributes() as $attribute) {
- $element = $form->getElement($attribute);
- if ($element) {
- $element->setReadonly(true, true);
- }
- }
- }
- $form->addValues($values);
- $form->setFieldNameSuffix('product');
-
- Mage::dispatchEvent('adminhtml_catalog_product_edit_prepare_form', array('form' => $form));
-
- $this->setForm($form);
- }
- }
-
- /**
- * Retrieve additional element types
- *
- * @return array
- */
- protected function _getAdditionalElementTypes()
- {
- $result = array(
- 'price' => 'Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Price',
- 'weight' => 'Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Weight',
- 'gallery' => 'Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Gallery',
- 'image' => 'Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Image',
- 'boolean' => 'Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Boolean',
- 'textarea' => 'Mage_Adminhtml_Block_Catalog_Helper_Form_Wysiwyg',
- );
-
- $response = new Varien_Object();
- $response->setTypes(array());
- Mage::dispatchEvent('adminhtml_catalog_product_edit_element_types', array('response' => $response));
-
- foreach ($response->getTypes() as $typeName => $typeClass) {
- $result[$typeName] = $typeClass;
- }
-
- return $result;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php
deleted file mode 100644
index 82f66b6658b0e..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php
+++ /dev/null
@@ -1,104 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes_Create extends Mage_Adminhtml_Block_Widget_Button
-{
- /**
- * Config of create new attribute
- *
- * @var Varien_Object
- */
- protected $_config = null;
-
- /**
- * Retrive config of new attribute creation
- *
- * @return Varien_Object
- */
- public function getConfig()
- {
- if (is_null($this->_config)) {
- $this->_config = new Varien_Object();
- }
-
- return $this->_config;
- }
-
- protected function _beforeToHtml()
- {
- $this->setId('create_attribute_' . $this->getConfig()->getGroupId())
- ->setOnClick($this->getJsObjectName() . '.create();')
- ->setType('button')
- ->setClass('action-add')
- ->setLabel(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Add Attribute'));
-
- $this->getConfig()
- ->setUrl($this->getUrl(
- '*/catalog_product_attribute/new',
- array(
- 'group' => $this->getConfig()->getGroupId(),
- 'product_tab' => $this->getConfig()->getTabId(),
- 'store' => $this->getConfig()->getStoreId(),
- 'product' => $this->getConfig()->getProductId(),
- 'set' => $this->getConfig()->getAttributeSetId(),
- 'type' => $this->getConfig()->getTypeId(),
- 'popup' => 1
- )
- ));
-
- return parent::_beforeToHtml();
- }
-
- protected function _toHtml()
- {
- $this->setCanShow(true);
- Mage::dispatchEvent('adminhtml_catalog_product_edit_tab_attributes_create_html_before', array('block' => $this));
- if (!$this->getCanShow()) {
- return '';
- }
-
- $html = parent::_toHtml();
- $html .= Mage::helper('Mage_Adminhtml_Helper_Js')->getScript(
- "var {$this->getJsObjectName()} = new Product.Attributes('{$this->getId()}');\n"
- . "{$this->getJsObjectName()}.setConfig("
- . Mage::helper('Mage_Core_Helper_Data')->jsonEncode($this->getConfig()->getData()) . ");\n"
- );
-
- return $html;
- }
-
- public function getJsObjectName()
- {
- return $this->getId() . 'JsObject';
- }
-} // Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes_Create End
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
deleted file mode 100644
index 9205c5c36038f..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options extends Mage_Adminhtml_Block_Widget
-{
- protected $_template = 'catalog/product/edit/options.phtml';
-
- protected function _prepareLayout()
- {
- $this->addChild('add_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Add New Option'),
- 'class' => 'add',
- 'id' => 'add_new_defined_option'
- ));
-
- $this->addChild('options_box', 'Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option');
-
- $this->addChild('import_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Import Options'),
- 'class' => 'add',
- 'id' => 'import_new_defined_option'
- ));
-
- return parent::_prepareLayout();
- }
-
- public function getAddButtonHtml()
- {
- return $this->getChildHtml('add_button');
- }
-
- public function getOptionsBoxHtml()
- {
- return $this->getChildHtml('options_box');
- }
-
-}
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
deleted file mode 100644
index 586e53d870c71..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
+++ /dev/null
@@ -1,362 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option extends Mage_Adminhtml_Block_Widget
-{
- protected $_product;
-
- protected $_productInstance;
-
- protected $_values;
-
- protected $_itemCount = 1;
-
- protected $_template = 'catalog/product/edit/options/option.phtml';
-
- /**
- * Class constructor
- */
- protected function _construct()
- {
- parent::_construct();
-
- $this->setCanReadPrice(true);
- $this->setCanEditPrice(true);
- }
-
- public function getItemCount()
- {
- return $this->_itemCount;
- }
-
- public function setItemCount($itemCount)
- {
- $this->_itemCount = max($this->_itemCount, $itemCount);
- return $this;
- }
-
- /**
- * Get Product
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- if (!$this->_productInstance) {
- if ($product = Mage::registry('product')) {
- $this->_productInstance = $product;
- } else {
- $this->_productInstance = Mage::getSingleton('Mage_Catalog_Model_Product');
- }
- }
-
- return $this->_productInstance;
- }
-
- public function setProduct($product)
- {
- $this->_productInstance = $product;
- return $this;
- }
-
- /**
- * Retrieve options field name prefix
- *
- * @return string
- */
- public function getFieldName()
- {
- return 'product[options]';
- }
-
- /**
- * Retrieve options field id prefix
- *
- * @return string
- */
- public function getFieldId()
- {
- return 'product_option';
- }
-
- /**
- * Check block is readonly
- *
- * @return boolean
- */
- public function isReadonly()
- {
- return $this->getProduct()->getOptionsReadonly();
- }
-
- protected function _prepareLayout()
- {
- $this->addChild('delete_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Delete Option'),
- 'class' => 'delete delete-product-option '
- ));
-
- $path = 'global/catalog/product/options/custom/groups';
-
- foreach (Mage::getConfig()->getNode($path)->children() as $group) {
- $this->addChild(
- $group->getName() . '_option_type',
- (string) Mage::getConfig()->getNode($path . '/' . $group->getName() . '/render')
- );
- }
-
- return parent::_prepareLayout();
- }
-
- public function getAddButtonId()
- {
- $buttonId = $this->getLayout()
- ->getBlock('admin.product.options')
- ->getChildBlock('add_button')->getId();
- return $buttonId;
- }
-
- public function getDeleteButtonHtml()
- {
- return $this->getChildHtml('delete_button');
- }
-
- public function getTypeSelectHtml()
- {
- $select = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Html_Select')
- ->setData(array(
- 'id' => $this->getFieldId().'_{{id}}_type',
- 'class' => 'select select-product-option-type required-option-select'
- ))
- ->setName($this->getFieldName().'[{{id}}][type]')
- ->setOptions(Mage::getSingleton('Mage_Catalog_Model_Config_Source_Product_Options_Type')->toOptionArray());
-
- return $select->getHtml();
- }
-
- public function getRequireSelectHtml()
- {
- $select = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Html_Select')
- ->setData(array(
- 'id' => $this->getFieldId().'_{{id}}_is_require',
- 'class' => 'select'
- ))
- ->setName($this->getFieldName().'[{{id}}][is_require]')
- ->setOptions(Mage::getSingleton('Mage_Backend_Model_Config_Source_Yesno')->toOptionArray());
-
- return $select->getHtml();
- }
-
- /**
- * Retrieve html templates for different types of product custom options
- *
- * @return string
- */
- public function getTemplatesHtml()
- {
- $canEditPrice = $this->getCanEditPrice();
- $canReadPrice = $this->getCanReadPrice();
- $this->getChildBlock('select_option_type')
- ->setCanReadPrice($canReadPrice)
- ->setCanEditPrice($canEditPrice);
-
- $this->getChildBlock('file_option_type')
- ->setCanReadPrice($canReadPrice)
- ->setCanEditPrice($canEditPrice);
-
- $this->getChildBlock('date_option_type')
- ->setCanReadPrice($canReadPrice)
- ->setCanEditPrice($canEditPrice);
-
- $this->getChildBlock('text_option_type')
- ->setCanReadPrice($canReadPrice)
- ->setCanEditPrice($canEditPrice);
-
- $templates = $this->getChildHtml('text_option_type') . "\n" .
- $this->getChildHtml('file_option_type') . "\n" .
- $this->getChildHtml('select_option_type') . "\n" .
- $this->getChildHtml('date_option_type');
-
- return $templates;
- }
-
- public function getOptionValues()
- {
- $optionsArr = array_reverse($this->getProduct()->getOptions(), true);
-
- if (!$this->_values || $this->getIgnoreCaching()) {
- $showPrice = $this->getCanReadPrice();
- $values = array();
- $scope = (int) Mage::app()->getStore()->getConfig(Mage_Core_Model_Store::XML_PATH_PRICE_SCOPE);
- foreach ($optionsArr as $option) {
- /* @var $option Mage_Catalog_Model_Product_Option */
-
- $this->setItemCount($option->getOptionId());
-
- $value = array();
-
- $value['id'] = $option->getOptionId();
- $value['item_count'] = $this->getItemCount();
- $value['option_id'] = $option->getOptionId();
- $value['title'] = $this->escapeHtml($option->getTitle());
- $value['type'] = $option->getType();
- $value['is_require'] = $option->getIsRequire();
- $value['sort_order'] = $option->getSortOrder();
- $value['can_edit_price'] = $this->getCanEditPrice();
-
- if ($this->getProduct()->getStoreId() != '0') {
- $value['checkboxScopeTitle'] = $this->getCheckboxScopeHtml($option->getOptionId(), 'title',
- is_null($option->getStoreTitle()));
- $value['scopeTitleDisabled'] = is_null($option->getStoreTitle())?'disabled':null;
- }
-
- if ($option->getGroupByType() == Mage_Catalog_Model_Product_Option::OPTION_GROUP_SELECT) {
-
-// $valuesArr = array_reverse($option->getValues(), true);
-
- $i = 0;
- $itemCount = 0;
- foreach ($option->getValues() as $_value) {
- /* @var $_value Mage_Catalog_Model_Product_Option_Value */
- $value['optionValues'][$i] = array(
- 'item_count' => max($itemCount, $_value->getOptionTypeId()),
- 'option_id' => $_value->getOptionId(),
- 'option_type_id' => $_value->getOptionTypeId(),
- 'title' => $this->escapeHtml($_value->getTitle()),
- 'price' => ($showPrice)
- ? $this->getPriceValue($_value->getPrice(), $_value->getPriceType()) : '',
- 'price_type' => ($showPrice) ? $_value->getPriceType() : 0,
- 'sku' => $this->escapeHtml($_value->getSku()),
- 'sort_order' => $_value->getSortOrder(),
- );
-
- if ($this->getProduct()->getStoreId() != '0') {
- $value['optionValues'][$i]['checkboxScopeTitle'] = $this->getCheckboxScopeHtml(
- $_value->getOptionId(), 'title', is_null($_value->getStoreTitle()),
- $_value->getOptionTypeId());
- $value['optionValues'][$i]['scopeTitleDisabled'] = is_null($_value->getStoreTitle())
- ? 'disabled' : null;
- if ($scope == Mage_Core_Model_Store::PRICE_SCOPE_WEBSITE) {
- $value['optionValues'][$i]['checkboxScopePrice'] = $this->getCheckboxScopeHtml(
- $_value->getOptionId(), 'price', is_null($_value->getstorePrice()),
- $_value->getOptionTypeId());
- $value['optionValues'][$i]['scopePriceDisabled'] = is_null($_value->getStorePrice())
- ? 'disabled' : null;
- }
- }
- $i++;
- }
- } else {
- $value['price'] = ($showPrice)
- ? $this->getPriceValue($option->getPrice(), $option->getPriceType()) : '';
- $value['price_type'] = $option->getPriceType();
- $value['sku'] = $this->escapeHtml($option->getSku());
- $value['max_characters'] = $option->getMaxCharacters();
- $value['file_extension'] = $option->getFileExtension();
- $value['image_size_x'] = $option->getImageSizeX();
- $value['image_size_y'] = $option->getImageSizeY();
- if ($this->getProduct()->getStoreId() != '0' &&
- $scope == Mage_Core_Model_Store::PRICE_SCOPE_WEBSITE) {
- $value['checkboxScopePrice'] = $this->getCheckboxScopeHtml($option->getOptionId(),
- 'price', is_null($option->getStorePrice()));
- $value['scopePriceDisabled'] = is_null($option->getStorePrice())?'disabled':null;
- }
- }
- $values[] = new Varien_Object($value);
- }
- $this->_values = $values;
- }
-
- return $this->_values;
- }
-
- /**
- * Retrieve html of scope checkbox
- *
- * @param string $id
- * @param string $name
- * @param boolean $checked
- * @param string $select_id
- * @return string
- */
- public function getCheckboxScopeHtml($id, $name, $checked=true, $select_id='-1')
- {
- $checkedHtml = '';
- if ($checked) {
- $checkedHtml = ' checked="checked"';
- }
- $selectNameHtml = '';
- $selectIdHtml = '';
- if ($select_id != '-1') {
- $selectNameHtml = '[values][' . $select_id . ']';
- $selectIdHtml = 'select_' . $select_id . '_';
- }
- $checkbox = '
';
- $checkbox .= '
' . $this->__('Use Default Value') . ' ';
- return $checkbox;
- }
-
- public function getPriceValue($value, $type)
- {
- if ($type == 'percent') {
- return number_format($value, 2, null, '');
- } elseif ($type == 'fixed') {
- return number_format($value, 2, null, '');
- }
- }
-
- /**
- * Return product grid url for custom options import popup
- *
- * @return string
- */
- public function getProductGridUrl()
- {
- return $this->getUrl('*/*/optionsImportGrid');
- }
-
- /**
- * Return custom options getter URL for ajax queries
- *
- * @return string
- */
- public function getCustomOptionsUrl()
- {
- return $this->getUrl('*/*/customOptions');
- }
-}
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
deleted file mode 100644
index f23fc2bc472f7..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Abstract extends Mage_Adminhtml_Block_Widget
-{
- protected $_name = 'abstract';
-
- protected function _prepareLayout()
- {
- $this->setChild('option_price_type',
- $this->getLayout()->addBlock('Mage_Adminhtml_Block_Html_Select', '', $this->getNameInLayout())
- ->setData(array(
- 'id' => 'product_option_{{option_id}}_price_type',
- 'class' => 'select product-option-price-type'
- ))
- );
-
- $this->getChildBlock('option_price_type')->setName('product[options][{{option_id}}][price_type]')
- ->setOptions(Mage::getSingleton('Mage_Catalog_Model_Config_Source_Product_Options_Price')
- ->toOptionArray());
-
- return parent::_prepareLayout();
- }
-
- /**
- * Get html of Price Type select element
- *
- * @return string
- */
- public function getPriceTypeSelectHtml()
- {
- if ($this->getCanEditPrice() === false) {
- $this->getChildBlock('option_price_type')->setExtraParams('disabled="disabled"');
- }
- return $this->getChildHtml('option_price_type');
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
deleted file mode 100644
index 456fb2d35c92e..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
+++ /dev/null
@@ -1,86 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Select extends
- Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Abstract
-{
-
- protected $_template = 'catalog/product/edit/options/type/select.phtml';
- /**
- * Class constructor
- */
- protected function _construct()
- {
- parent::_construct();
-
- $this->setCanEditPrice(true);
- $this->setCanReadPrice(true);
- }
-
- protected function _prepareLayout()
- {
- $this->addChild('add_select_row_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Add New Row'),
- 'class' => 'add add-select-row',
- 'id' => 'add_select_row_button_{{option_id}}'
- ));
-
- $this->addChild('delete_select_row_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Delete Row'),
- 'class' => 'delete delete-select-row icon-btn',
- 'id' => 'delete_select_row_button'
- ));
-
- return parent::_prepareLayout();
- }
-
- public function getAddButtonHtml()
- {
- return $this->getChildHtml('add_select_row_button');
- }
-
- public function getDeleteButtonHtml()
- {
- return $this->getChildHtml('delete_select_row_button');
- }
-
- public function getPriceTypeSelectHtml()
- {
- $this->getChildBlock('option_price_type')
- ->setData('id', 'product_option_{{id}}_select_{{select_id}}_price_type')
- ->setName('product[options][{{id}}][values][{{select_id}}][price_type]');
-
- return parent::getPriceTypeSelectHtml();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
deleted file mode 100644
index 78a39205fbc38..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
+++ /dev/null
@@ -1,383 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config extends Mage_Adminhtml_Block_Widget
- implements Mage_Adminhtml_Block_Widget_Tab_Interface
-{
-
- protected $_template = 'catalog/product/edit/super/config.phtml';
-
- /**
- * Initialize block
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setProductId($this->getRequest()->getParam('id'));
-
- $this->setId('config_super_product');
- $this->setCanEditPrice(true);
- $this->setCanReadPrice(true);
- }
-
- /**
- * Retrieve Tab class (for loading)
- *
- * @return string
- */
- public function getTabClass()
- {
- return 'ajax';
- }
-
- /**
- * Check block is readonly
- *
- * @return boolean
- */
- public function isReadonly()
- {
- return (bool) $this->_getProduct()->getCompositeReadonly();
- }
-
- /**
- * Check whether attributes of configurable products can be editable
- *
- * @return boolean
- */
- public function isAttributesConfigurationReadonly()
- {
- return (bool) $this->_getProduct()->getAttributesConfigurationReadonly();
- }
-
- /**
- * Get configurable product type
- *
- * @return Mage_Catalog_Model_Product_Type_Configurable
- */
- protected function _getProductType()
- {
- return Mage::getModel('Mage_Catalog_Model_Product_Type_Configurable');
- }
-
- /**
- * Check whether prices of configurable products can be editable
- *
- * @return boolean
- */
- public function isAttributesPricesReadonly()
- {
- return $this->_getProduct()->getAttributesConfigurationReadonly() ||
- (Mage::helper('Mage_Catalog_Helper_Data')->isPriceGlobal() && $this->isReadonly());
- }
-
- /**
- * Prepare Layout data
- *
- * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config
- */
- protected function _prepareLayout()
- {
- $this->addChild('create_empty', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Create Empty'),
- 'class' => 'add',
- 'onclick' => 'superProduct.createEmptyProduct()'
- ));
- $this->addChild('super_settings', 'Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings');
-
- if ($this->_getProduct()->getId()) {
- $this->setChild('simple',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple',
- 'catalog.product.edit.tab.super.config.simple')
- );
-
- $this->addChild('create_from_configurable', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Copy From Configurable'),
- 'class' => 'add',
- 'onclick' => 'superProduct.createNewProduct()'
- ));
- }
-
- $this->addChild(
- 'generate',
- 'Mage_Backend_Block_Widget_Button',
- array(
- 'id' => 'generate-variations-button',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Generate Variations'),
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array(
- 'event' => 'generate',
- 'target' => '#product-variations-matrix',
- 'eventData' => array(
- 'url' => $this->getUrl('*/*/variationsMatrix', array('_current' => true)),
- ),
- ),
- ),
- ),
- )
- );
-
- return parent::_prepareLayout();
- }
-
- /**
- * Retrieve currently edited product object
- *
- * @return Mage_Catalog_Model_Product
- */
- protected function _getProduct()
- {
- return Mage::registry('current_product');
- }
-
- /**
- * Retrieve attributes data
- *
- * @return array
- */
- public function getAttributes()
- {
- if (!$this->hasData('attributes')) {
- $attributes = (array)$this->_getProductType()->getConfigurableAttributesAsArray($this->_getProduct());
- $productData = (array)$this->getRequest()->getParam('product');
- if (isset($productData['configurable_attributes_data'])) {
- $configurableData = $productData['configurable_attributes_data'];
- foreach ($attributes as $key => &$attribute) {
- if (isset($configurableData[$key])) {
- $attribute['values'] = array_merge(
- isset($attribute['values']) ? $attribute['values'] : array(),
- isset($configurableData[$key]['values'])
- ? array_filter($configurableData[$key]['values'])
- : array()
- );
- }
- }
- }
-
- foreach ($attributes as &$attribute) {
- if (isset($attribute['values']) && is_array($attribute['values'])) {
- foreach ($attribute['values'] as &$attributeValue) {
- if (!$this->getCanReadPrice()) {
- $attributeValue['pricing_value'] = '';
- $attributeValue['is_percent'] = 0;
- }
- $attributeValue['can_edit_price'] = $this->getCanEditPrice();
- $attributeValue['can_read_price'] = $this->getCanReadPrice();
- }
- }
- }
- $this->setData('attributes', $attributes);
- }
- return $this->getData('attributes');
- }
-
- /**
- * Retrieve Links in JSON format
- *
- * @return string
- */
- public function getLinksJson()
- {
- $products = $this->_getProductType()
- ->getUsedProducts($this->_getProduct());
- if(!$products) {
- return '{}';
- }
- $data = array();
- foreach ($products as $product) {
- $data[$product->getId()] = $this->getConfigurableSettings($product);
- }
- return Mage::helper('Mage_Core_Helper_Data')->jsonEncode($data);
- }
-
- /**
- * Retrieve configurable settings
- *
- * @param Mage_Catalog_Model_Product $product
- * @return array
- */
- public function getConfigurableSettings($product) {
- $data = array();
- $attributes = $this->_getProductType()
- ->getUsedProductAttributes($this->_getProduct());
- foreach ($attributes as $attribute) {
- $data[] = array(
- 'attribute_id' => $attribute->getId(),
- 'label' => $product->getAttributeText($attribute->getAttributeCode()),
- 'value_index' => $product->getData($attribute->getAttributeCode())
- );
- }
-
- return $data;
- }
-
- /**
- * Retrieve Grid child HTML
- *
- * @return string
- */
- public function getGridHtml()
- {
- return $this->getChildHtml('grid');
- }
-
- /**
- * Retrieve Grid JavaScript object name
- *
- * @return string
- */
- public function getGridJsObject()
- {
- return $this->getChildBlock('grid')->getJsObjectName();
- }
-
- /**
- * Retrieve Create New Empty Product URL
- *
- * @return string
- */
- public function getNewEmptyProductUrl()
- {
- return $this->getUrl(
- '*/*/new',
- array(
- 'set' => $this->_getProduct()->getAttributeSetId(),
- 'type' => Mage_Catalog_Model_Product_Type::TYPE_SIMPLE,
- 'required' => $this->_getRequiredAttributesIds(),
- 'popup' => 1
- )
- );
- }
-
- /**
- * Retrieve Create New Product URL
- *
- * @return string
- */
- public function getNewProductUrl()
- {
- return $this->getUrl(
- '*/*/new',
- array(
- 'set' => $this->_getProduct()->getAttributeSetId(),
- 'type' => Mage_Catalog_Model_Product_Type::TYPE_SIMPLE,
- 'required' => $this->_getRequiredAttributesIds(),
- 'popup' => 1,
- 'product' => $this->_getProduct()->getId()
- )
- );
- }
-
- /**
- * Retrieve Required attributes Ids (comma separated)
- *
- * @return string
- */
- protected function _getRequiredAttributesIds()
- {
- $attributesIds = array();
- $configurableAttributes = $this->_getProduct()
- ->getTypeInstance()->getConfigurableAttributes($this->_getProduct());
- foreach ($configurableAttributes as $attribute) {
- $attributesIds[] = $attribute->getProductAttribute()->getId();
- }
-
- return implode(',', $attributesIds);
- }
-
- /**
- * Retrieve Tab label
- *
- * @return string
- */
- public function getTabLabel()
- {
- return Mage::helper('Mage_Catalog_Helper_Data')->__('Associated Products');
- }
-
- /**
- * Retrieve Tab title
- *
- * @return string
- */
- public function getTabTitle()
- {
- return Mage::helper('Mage_Catalog_Helper_Data')->__('Associated Products');
- }
-
- /**
- * Can show tab flag
- *
- * @return bool
- */
- public function canShowTab()
- {
- return true;
- }
-
- /**
- * Check is a hidden tab
- *
- * @return bool
- */
- public function isHidden()
- {
- return false;
- }
-
- /**
- * Show "Use default price" checkbox
- *
- * @return bool
- */
- public function getShowUseDefaultPrice()
- {
- return !Mage::helper('Mage_Catalog_Helper_Data')->isPriceGlobal()
- && $this->_getProduct()->getStoreId();
- }
-
- /**
- * Get list of used attributes
- *
- * @return array
- */
- public function getSelectedAttributes()
- {
- return $this->_getProduct()->isConfigurable()
- ? array_filter($this->_getProductType()->getUsedProductAttributes($this->_getProduct()))
- : array();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php
deleted file mode 100644
index f1faa8f9a02a3..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php
+++ /dev/null
@@ -1,257 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Upsell extends Mage_Adminhtml_Block_Widget_Grid
-{
-
- /**
- * Set grid params
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setId('up_sell_product_grid');
- $this->setDefaultSort('entity_id');
- $this->setUseAjax(true);
- if ($this->_getProduct() && $this->_getProduct()->getId()) {
- $this->setDefaultFilter(array('in_products'=>1));
- }
- if ($this->isReadonly()) {
- $this->setFilterVisibility(false);
- }
- }
-
- /**
- * Retirve currently edited product model
- *
- * @return Mage_Catalog_Model_Product
- */
- protected function _getProduct()
- {
- return Mage::registry('current_product');
- }
-
- /**
- * Add filter
- *
- * @param object $column
- * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Upsell
- */
- 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;
- }
-
- /**
- * Checks when this block is readonly
- *
- * @return boolean
- */
- public function isReadonly()
- {
- return $this->_getProduct() && $this->_getProduct()->getUpsellReadonly();
- }
-
- /**
- * Prepare collection
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- $collection = Mage::getModel('Mage_Catalog_Model_Product_Link')->useUpSellLinks()
- ->getProductCollection()
- ->setProduct($this->_getProduct())
- ->addAttributeToSelect('*');
-
- if ($this->isReadonly()) {
- $productIds = $this->_getSelectedProducts();
- if (empty($productIds)) {
- $productIds = array(0);
- }
- $collection->addFieldToFilter('entity_id', array('in'=>$productIds));
- }
-
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- /**
- * Add columns to grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareColumns()
- {
- if (!$this->_getProduct()->getUpsellReadonly()) {
- $this->addColumn('in_products', array(
- '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('Mage_Catalog_Helper_Data')->__('ID'),
- 'sortable' => true,
- 'width' => 60,
- 'index' => 'entity_id'
- ));
- $this->addColumn('name', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Name'),
- 'index' => 'name'
- ));
-
- $this->addColumn('type', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Type'),
- 'width' => 100,
- 'index' => 'type_id',
- 'type' => 'options',
- 'options' => Mage::getSingleton('Mage_Catalog_Model_Product_Type')->getOptionArray(),
- ));
-
- $sets = Mage::getResourceModel('Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection')
- ->setEntityTypeFilter(Mage::getModel('Mage_Catalog_Model_Product')->getResource()->getTypeId())
- ->load()
- ->toOptionHash();
-
- $this->addColumn('set_name', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Attrib. Set Name'),
- 'width' => 130,
- 'index' => 'attribute_set_id',
- 'type' => 'options',
- 'options' => $sets,
- ));
-
- $this->addColumn('status', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Status'),
- 'width' => 90,
- 'index' => 'status',
- 'type' => 'options',
- 'options' => Mage::getSingleton('Mage_Catalog_Model_Product_Status')->getOptionArray(),
- ));
-
- $this->addColumn('visibility', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Visibility'),
- 'width' => 90,
- 'index' => 'visibility',
- 'type' => 'options',
- 'options' => Mage::getSingleton('Mage_Catalog_Model_Product_Visibility')->getOptionArray(),
- ));
-
- $this->addColumn('sku', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('SKU'),
- 'width' => 80,
- 'index' => 'sku'
- ));
-
- $this->addColumn('price', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Price'),
- 'type' => 'currency',
- 'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE),
- 'index' => 'price'
- ));
-
- $this->addColumn('position', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Position'),
- 'name' => 'position',
- 'type' => 'number',
- 'width' => 60,
- 'validate_class' => 'validate-number',
- 'index' => 'position',
- 'editable' => !$this->_getProduct()->getUpsellReadonly(),
- '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('*/*/upsellGrid', array('_current'=>true));
- }
-
- /**
- * Retrieve selected upsell products
- *
- * @return array
- */
- protected function _getSelectedProducts()
- {
- $products = $this->getProductsUpsell();
- if (!is_array($products)) {
- $products = array_keys($this->getSelectedUpsellProducts());
- }
- return $products;
- }
-
- /**
- * Retrieve upsell products
- *
- * @return array
- */
- public function getSelectedUpsellProducts()
- {
- $products = array();
- foreach (Mage::registry('current_product')->getUpSellProducts() as $product) {
- $products[$product->getId()] = array('position' => $product->getPosition());
- }
- return $products;
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php
deleted file mode 100644
index 2cdb49d5c1a24..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php
+++ /dev/null
@@ -1,208 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
-{
- protected $_attributeTabBlock = 'Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('product_info_tabs');
- $this->setDestElementId('product-edit-form-tabs');
- $this->setTitle(Mage::helper('Mage_Catalog_Helper_Data')->__('Product Information'));
- }
-
- protected function _prepareLayout()
- {
- $product = $this->getProduct();
-
- if (!($setId = $product->getAttributeSetId())) {
- $setId = $this->getRequest()->getParam('set', null);
- }
-
- if ($setId) {
- $groupCollection = Mage::getResourceModel('Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection')
- ->setAttributeSetFilter($setId)
- ->setSortOrder()
- ->load();
-
- $tabAttributesBlock = $this->getLayout()->createBlock(
- $this->getAttributeTabBlock(), $this->getNameInLayout() . '_attributes_tab'
- );
- foreach ($groupCollection as $group) {
- $attributes = $product->getAttributes($group->getId(), true);
- // do not add groups without attributes
-
- foreach ($attributes as $key => $attribute) {
- if( !$attribute->getIsVisible() ) {
- unset($attributes[$key]);
- }
- }
-
- if (count($attributes)==0) {
- continue;
- }
-
- $this->addTab('group_' . $group->getId(), array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__($group->getAttributeGroupName()),
- 'content' => $this->_translateHtml($tabAttributesBlock->setGroup($group)
- ->setGroupAttributes($attributes)
- ->toHtml()
- ),
- ));
- }
-
- if (Mage::helper('Mage_Core_Helper_Data')->isModuleEnabled('Mage_CatalogInventory')) {
- $this->addTab('inventory', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Inventory'),
- 'content' => $this->_translateHtml($this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Inventory')->toHtml()),
- ));
- }
-
- /**
- * Don't display website tab for single mode
- */
- if (!Mage::app()->isSingleStoreMode()) {
- $this->addTab('websites', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Websites'),
- 'content' => $this->_translateHtml($this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Websites')->toHtml()),
- ));
- }
-
- $this->addTab('related', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Related Products'),
- 'url' => $this->getUrl('*/*/related', array('_current' => true)),
- 'class' => 'ajax',
- ));
-
- $this->addTab('upsell', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Up-sells'),
- 'url' => $this->getUrl('*/*/upsell', array('_current' => true)),
- 'class' => 'ajax',
- ));
-
- $this->addTab('crosssell', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Cross-sells'),
- 'url' => $this->getUrl('*/*/crosssell', array('_current' => true)),
- 'class' => 'ajax',
- ));
-
- $alertPriceAllow = Mage::getStoreConfig('catalog/productalert/allow_price');
- $alertStockAllow = Mage::getStoreConfig('catalog/productalert/allow_stock');
-
- if (($alertPriceAllow || $alertStockAllow) && !$product->isGrouped()) {
- $this->addTab('productalert', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Product Alerts'),
- 'content' => $this->_translateHtml($this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Alerts', 'admin.alerts.products')
- ->toHtml()
- )
- ));
- }
-
- if( $this->getRequest()->getParam('id', false) ) {
- if (Mage::helper('Mage_Catalog_Helper_Data')->isModuleEnabled('Mage_Review')) {
- if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Review::reviews_ratings')){
- $this->addTab('reviews', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Product Reviews'),
- 'url' => $this->getUrl('*/*/reviews', array('_current' => true)),
- 'class' => 'ajax',
- ));
- }
- }
- }
-
- /**
- * Do not change this tab id
- * @see Mage_Adminhtml_Block_Catalog_Product_Edit_Tabs_Configurable
- * @see Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tabs
- */
- if (!$product->isGrouped()) {
- $this->addTab('customer_options', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Custom Options'),
- 'url' => $this->getUrl('*/*/options', array('_current' => true)),
- 'class' => 'ajax',
- ));
- }
-
- }
- return parent::_prepareLayout();
- }
-
- /**
- * Retrive product object from object if not from registry
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- if (!($this->getData('product') instanceof Mage_Catalog_Model_Product)) {
- $this->setData('product', Mage::registry('product'));
- }
- return $this->getData('product');
- }
-
- /**
- * Getting attribute block name for tabs
- *
- * @return string
- */
- public function getAttributeTabBlock()
- {
- if (is_null(Mage::helper('Mage_Adminhtml_Helper_Catalog')->getAttributeTabBlock())) {
- return $this->_attributeTabBlock;
- }
- return Mage::helper('Mage_Adminhtml_Helper_Catalog')->getAttributeTabBlock();
- }
-
- public function setAttributeTabBlock($attributeTabBlock)
- {
- $this->_attributeTabBlock = $attributeTabBlock;
- return $this;
- }
-
- /**
- * Translate html content
- *
- * @param string $html
- * @return string
- */
- protected function _translateHtml($html)
- {
- Mage::getSingleton('Mage_Core_Model_Translate_Inline')->processResponseBody($html);
- return $html;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php
deleted file mode 100644
index a9041152ac791..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php
+++ /dev/null
@@ -1,327 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('productGrid');
- $this->setDefaultSort('entity_id');
- $this->setDefaultDir('DESC');
- $this->setSaveParametersInSession(true);
- $this->setUseAjax(true);
- $this->setVarNameFilter('product_filter');
-
- }
-
- protected function _getStore()
- {
- $storeId = (int) $this->getRequest()->getParam('store', 0);
- return Mage::app()->getStore($storeId);
- }
-
- protected function _prepareCollection()
- {
- $store = $this->_getStore();
- $collection = Mage::getModel('Mage_Catalog_Model_Product')->getCollection()
- ->addAttributeToSelect('sku')
- ->addAttributeToSelect('name')
- ->addAttributeToSelect('attribute_set_id')
- ->addAttributeToSelect('type_id');
-
- if (Mage::helper('Mage_Catalog_Helper_Data')->isModuleEnabled('Mage_CatalogInventory')) {
- $collection->joinField('qty',
- 'cataloginventory_stock_item',
- 'qty',
- 'product_id=entity_id',
- '{{table}}.stock_id=1',
- 'left');
- }
- if ($store->getId()) {
- //$collection->setStoreId($store->getId());
- $adminStore = Mage_Core_Model_AppInterface::ADMIN_STORE_ID;
- $collection->addStoreFilter($store);
- $collection->joinAttribute(
- 'name',
- 'catalog_product/name',
- 'entity_id',
- null,
- 'inner',
- $adminStore
- );
- $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->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
- $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
- }
-
- $this->setCollection($collection);
-
- parent::_prepareCollection();
- $this->getCollection()->addWebsiteNamesToResult();
- return $this;
- }
-
- protected function _addColumnFilterToCollection($column)
- {
- if ($this->getCollection()) {
- if ($column->getId() == 'websites') {
- $this->getCollection()->joinField('websites',
- 'catalog_product_website',
- 'website_id',
- 'product_id=entity_id',
- null,
- 'left');
- }
- }
- return parent::_addColumnFilterToCollection($column);
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('entity_id',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('ID'),
- 'width' => '50px',
- 'type' => 'number',
- 'index' => 'entity_id',
- ));
- $this->addColumn('name',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Name'),
- 'index' => 'name',
- ));
-
- $store = $this->_getStore();
- if ($store->getId()) {
- $this->addColumn('custom_name',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Name in %s', $store->getName()),
- 'index' => 'custom_name',
- ));
- }
-
- $this->addColumn('type',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Type'),
- 'width' => '60px',
- 'index' => 'type_id',
- 'type' => 'options',
- 'options' => Mage::getSingleton('Mage_Catalog_Model_Product_Type')->getOptionArray(),
- ));
-
- $sets = Mage::getResourceModel('Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection')
- ->setEntityTypeFilter(Mage::getModel('Mage_Catalog_Model_Product')->getResource()->getTypeId())
- ->load()
- ->toOptionHash();
-
- $this->addColumn('set_name',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Attrib. Set Name'),
- 'width' => '100px',
- 'index' => 'attribute_set_id',
- 'type' => 'options',
- 'options' => $sets,
- ));
-
- $this->addColumn('sku',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('SKU'),
- 'width' => '80px',
- 'index' => 'sku',
- ));
-
- $store = $this->_getStore();
- $this->addColumn('price',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Price'),
- 'type' => 'price',
- 'currency_code' => $store->getBaseCurrency()->getCode(),
- 'index' => 'price',
- ));
-
- if (Mage::helper('Mage_Catalog_Helper_Data')->isModuleEnabled('Mage_CatalogInventory')) {
- $this->addColumn('qty',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Qty'),
- 'width' => '100px',
- 'type' => 'number',
- 'index' => 'qty',
- ));
- }
-
- $this->addColumn('visibility',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Visibility'),
- 'width' => '70px',
- 'index' => 'visibility',
- 'type' => 'options',
- 'options' => Mage::getModel('Mage_Catalog_Model_Product_Visibility')->getOptionArray(),
- ));
-
- $this->addColumn('status',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Status'),
- 'width' => '70px',
- 'index' => 'status',
- 'type' => 'options',
- 'options' => Mage::getSingleton('Mage_Catalog_Model_Product_Status')->getOptionArray(),
- ));
-
- if (!Mage::app()->isSingleStoreMode()) {
- $this->addColumn('websites',
- array(
- 'header'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Websites'),
- 'width' => '100px',
- 'sortable' => false,
- 'index' => 'websites',
- 'type' => 'options',
- 'options' => Mage::getModel('Mage_Core_Model_Website')->getCollection()->toOptionHash(),
- ));
- }
-
- $this->addColumn('action',
- array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Action'),
- 'width' => '50px',
- 'type' => 'action',
- 'getter' => 'getId',
- 'actions' => array(
- array(
- 'caption' => Mage::helper('Mage_Catalog_Helper_Data')->__('Edit'),
- 'url' => array(
- 'base'=>'*/*/edit',
- 'params'=>array('store'=>$this->getRequest()->getParam('store'))
- ),
- 'field' => 'id'
- )
- ),
- 'filter' => false,
- 'sortable' => false,
- 'index' => 'stores',
- ));
-
- if (Mage::helper('Mage_Catalog_Helper_Data')->isModuleEnabled('Mage_Rss')) {
- $this->addRssList('rss/catalog/notifystock', Mage::helper('Mage_Catalog_Helper_Data')->__('Notify Low Stock RSS'));
- }
-
- return parent::_prepareColumns();
- }
-
- protected function _prepareMassaction()
- {
- $this->setMassactionIdField('entity_id');
- $this->getMassactionBlock()->setFormFieldName('product');
-
- $this->getMassactionBlock()->addItem('delete', array(
- 'label'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Delete'),
- 'url' => $this->getUrl('*/*/massDelete'),
- 'confirm' => Mage::helper('Mage_Catalog_Helper_Data')->__('Are you sure?')
- ));
-
- $statuses = Mage::getSingleton('Mage_Catalog_Model_Product_Status')->getOptionArray();
-
- array_unshift($statuses, array('label'=>'', 'value'=>''));
- $this->getMassactionBlock()->addItem('status', array(
- 'label'=> Mage::helper('Mage_Catalog_Helper_Data')->__('Change status'),
- 'url' => $this->getUrl('*/*/massStatus', array('_current'=>true)),
- 'additional' => array(
- 'visibility' => array(
- 'name' => 'status',
- 'type' => 'select',
- 'class' => 'required-entry',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Status'),
- 'values' => $statuses
- )
- )
- ));
-
- if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Catalog::update_attributes')){
- $this->getMassactionBlock()->addItem('attributes', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Update Attributes'),
- 'url' => $this->getUrl('*/catalog_product_action_attribute/edit', array('_current'=>true))
- ));
- }
-
- Mage::dispatchEvent('adminhtml_catalog_product_grid_prepare_massaction', array('block' => $this));
- return $this;
- }
-
- public function getGridUrl()
- {
- return $this->getUrl('*/*/grid', array('_current'=>true));
- }
-
- public function getRowUrl($row)
- {
- return $this->getUrl('*/*/edit', array(
- 'store'=>$this->getRequest()->getParam('store'),
- 'id'=>$row->getId())
- );
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
deleted file mode 100644
index 38968a24a1d36..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
+++ /dev/null
@@ -1,152 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Category extends Varien_Data_Form_Element_Multiselect
-{
- /**
- * Get values for select
- * @return array
- */
- public function getValues()
- {
- $collection = $this->_getCategoriesCollection();
- $values = $this->getValue();
- if (!is_array($values)) {
- $values = explode(',', $values);
- }
- $collection->addAttributeToSelect('name');
- $collection->addIdFilter($values);
-
- $options = array();
-
- foreach ($collection as $category) {
- $options[] = array(
- 'label' => $category->getName(),
- 'value' => $category->getId()
- );
- }
- return $options;
- }
-
- /**
- * Get categories collection
- * @return Mage_Catalog_Model_Resource_Category_Collection
- */
- protected function _getCategoriesCollection()
- {
- return Mage::getResourceModel('Mage_Catalog_Model_Resource_Category_Collection');
- }
-
- /**
- * Attach category suggest widget initialization
- *
- * @return string
- */
- public function getAfterElementHtml()
- {
- /** @var $coreHelper Mage_Core_Helper_Data */
- $coreHelper = Mage::helper('Mage_Core_Helper_Data');
- $treeOptions = $coreHelper->escapeHtml($coreHelper->jsonEncode(array(
- 'jstree' => array(
- 'plugins' => array('themes', 'html_data', 'ui', 'hotkeys'),
- 'themes' => array(
- 'theme' => 'default',
- 'dots' => false,
- 'icons' => false,
- ),
- )
- )));
-
- $htmlId = $this->getHtmlId();
- $suggestPlaceholder = Mage::helper('Mage_Catalog_Helper_Data')->__('start typing to search category');
- $selectorOptions = $coreHelper->jsonEncode($this->_getSelectorOptions());
- $newCategoryCaption = Mage::helper('Mage_Catalog_Helper_Data')->__('New Category');
-
- return <<
-
-
-
- {$newCategoryCaption}
-HTML;
- }
-
- /**
- * Get selector options
- *
- * @return array
- */
- protected function _getSelectorOptions()
- {
- return array(
- 'source' => Mage::helper('Mage_Backend_Helper_Data')->getUrl('*/catalog_category/suggestCategories'),
- 'valueField' => '#' . $this->getHtmlId(),
- 'template' => '#' . $this->getHtmlId() . '-template',
- 'control' => 'jstree',
- 'className' => 'category-select',
- 'multiselect' => true,
- );
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
deleted file mode 100644
index de1d711625640..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
+++ /dev/null
@@ -1,174 +0,0 @@
-
- *
- * @method Varien_Data_Form_Element_Abstract getElement()
- */
-class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Gallery_Content extends Mage_Adminhtml_Block_Widget
-{
- protected $_template = 'catalog/product/helper/gallery.phtml';
-
- protected function _prepareLayout()
- {
- $this->addChild('uploader', 'Mage_Adminhtml_Block_Media_Uploader');
-
- $this->getUploader()->getConfig()
- ->setUrl(
- Mage::getModel('Mage_Backend_Model_Url')
- ->addSessionParam()
- ->getUrl('*/catalog_product_gallery/upload')
- )
- ->setFileField('image')
- ->setFilters(array(
- 'images' => array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Images (.gif, .jpg, .png)'),
- 'files' => array('*.gif', '*.jpg','*.jpeg', '*.png')
- )
- ));
-
- Mage::dispatchEvent('catalog_product_gallery_prepare_layout', array('block' => $this));
-
- return parent::_prepareLayout();
- }
-
-
- /**
- * Retrive uploader block
- *
- * @return Mage_Adminhtml_Block_Media_Uploader
- */
- public function getUploader()
- {
- return $this->getChildBlock('uploader');
- }
-
- /**
- * Retrive uploader block html
- *
- * @return string
- */
- public function getUploaderHtml()
- {
- return $this->getChildHtml('uploader');
- }
-
- public function getJsObjectName()
- {
- return $this->getHtmlId() . 'JsObject';
- }
-
- public function getAddImagesButton()
- {
- return $this->getButtonHtml(
- Mage::helper('Mage_Catalog_Helper_Data')->__('Add New Images'),
- $this->getJsObjectName() . '.showUploader()',
- 'add',
- $this->getHtmlId() . '_add_images_button'
- );
- }
-
- public function getImagesJson()
- {
- if (is_array($this->getElement()->getValue())) {
- $value = $this->getElement()->getValue();
- if (is_array($value['images']) && count($value['images']) > 0) {
- foreach ($value['images'] as &$image) {
- $image['url'] = Mage::getSingleton('Mage_Catalog_Model_Product_Media_Config')
- ->getMediaUrl($image['file']);
- }
- return Mage::helper('Mage_Core_Helper_Data')->jsonEncode($value['images']);
- }
- }
- return '[]';
- }
-
- public function getImagesValuesJson()
- {
- $values = array();
- foreach ($this->getMediaAttributes() as $attribute) {
- /* @var $attribute Mage_Eav_Model_Entity_Attribute */
- $values[$attribute->getAttributeCode()] = $this->getElement()->getDataObject()->getData(
- $attribute->getAttributeCode()
- );
- }
- return Mage::helper('Mage_Core_Helper_Data')->jsonEncode($values);
- }
-
- /**
- * Get image types data
- *
- * @return array
- */
- public function getImageTypes()
- {
- $imageTypes = array();
- foreach ($this->getMediaAttributes() as $attribute) {
- /* @var $attribute Mage_Eav_Model_Entity_Attribute */
- $imageTypes[$attribute->getAttributeCode()] = array(
- 'code' => $attribute->getAttributeCode(),
- 'value' => $this->getElement()->getDataObject()->getData($attribute->getAttributeCode()),
- 'label' => $attribute->getFrontend()->getLabel(),
- 'scope' => Mage::helper('Mage_Catalog_Helper_Data')->__($this->getElement()->getScopeLabel($attribute)),
- 'name' => $this->getElement()->getAttributeFieldName($attribute)
- );
- }
- return $imageTypes;
- }
-
- public function hasUseDefault()
- {
- foreach ($this->getMediaAttributes() as $attribute) {
- if($this->getElement()->canDisplayUseDefault($attribute)) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Enter description here...
- *
- * @return array
- */
- public function getMediaAttributes()
- {
- return $this->getElement()->getDataObject()->getMediaAttributes();
- }
-
- public function getImageTypesJson()
- {
- return Mage::helper('Mage_Core_Helper_Data')->jsonEncode($this->getImageTypes());
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php
deleted file mode 100644
index 837df013a1a28..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Weight extends Varien_Data_Form_Element_Text
-{
- /**
- * Validation classes for weight field which corresponds to DECIMAL(12,4) SQL type
- */
- protected function _construct()
- {
- parent::_construct();
- $this->addClass('validate-number validate-zero-or-greater validate-number-range number-range-0-99999999.9999');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight/Renderer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight/Renderer.php
deleted file mode 100644
index 6bc2ca2ab74d4..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight/Renderer.php
+++ /dev/null
@@ -1,91 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Weight_Renderer extends Varien_Data_Form_Element_Text
-{
- const VIRTUAL_FIELD_HTML_ID = 'weight_and_type_switcher';
-
- /**
- * Is virtual checkbox element
- *
- * @var Varien_Data_Form_Element_Checkbox
- */
- protected $_virtual;
-
- /**
- * Catalog helper
- *
- * @var Mage_Catalog_Helper_Product
- */
- protected $_helper;
-
- public function __construct(array $data = array())
- {
- $this->_helper = isset($data['helper']) ? $data['helper'] : Mage::helper('Mage_Catalog_Helper_Product');
- $this->_virtual = isset($data['element'])
- ? $data['element']
- : Mage::getModel('Varien_Data_Form_Element_Checkbox');
- $this->_virtual->setId(self::VIRTUAL_FIELD_HTML_ID)->setName('is_virtual')
- ->setLabel($this->_helper->getTypeSwitcherControlLabel());
- parent::__construct($data);
- }
-
- /**
- * Add Is Virtual checkbox html to weight field
- *
- * @return string
- */
- public function getElementHtml()
- {
- if (!$this->getForm()->getDataObject()->getTypeInstance()->hasWeight()) {
- $this->_virtual->setChecked('checked');
- }
- return '
'
- . parent::getElementHtml() . '
'
- . $this->_virtual->getElementHtml() . $this->_virtual->getLabelHtml()
- . '
';
- }
-
- /**
- * Set form for both fields
- *
- * @param Varien_Data_Form $form
- * @return Varien_Data_Form
- */
- public function setForm($form)
- {
- $this->_virtual->setForm($form);
- return parent::setForm($form);
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php
deleted file mode 100644
index 8f05ed2103000..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php
+++ /dev/null
@@ -1,292 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Catalog_Product_Widget_Chooser extends Mage_Adminhtml_Block_Widget_Grid
-{
- protected $_selectedProducts = array();
-
- /**
- * Block construction, prepare grid params
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setDefaultSort('name');
- $this->setUseAjax(true);
- }
-
- /**
- * Prepare chooser element HTML
- *
- * @param Varien_Data_Form_Element_Abstract $element Form Element
- * @return Varien_Data_Form_Element_Abstract
- */
- public function prepareElementHtml(Varien_Data_Form_Element_Abstract $element)
- {
- $uniqId = Mage::helper('Mage_Core_Helper_Data')->uniqHash($element->getId());
- $sourceUrl = $this->getUrl('*/catalog_product_widget/chooser', array(
- 'uniq_id' => $uniqId,
- 'use_massaction' => false,
- ));
-
- $chooser = $this->getLayout()->createBlock('Mage_Widget_Block_Adminhtml_Widget_Chooser')
- ->setElement($element)
- ->setTranslationHelper($this->getTranslationHelper())
- ->setConfig($this->getConfig())
- ->setFieldsetId($this->getFieldsetId())
- ->setSourceUrl($sourceUrl)
- ->setUniqId($uniqId);
-
- if ($element->getValue()) {
- $value = explode('/', $element->getValue());
- $productId = false;
- if (isset($value[0]) && isset($value[1]) && $value[0] == 'product') {
- $productId = $value[1];
- }
- $categoryId = isset($value[2]) ? $value[2] : false;
- $label = '';
- if ($categoryId) {
- $label = Mage::getResourceSingleton('Mage_Catalog_Model_Resource_Category')
- ->getAttributeRawValue($categoryId, 'name', Mage::app()->getStore()) . '/';
- }
- if ($productId) {
- $label .= Mage::getResourceSingleton('Mage_Catalog_Model_Resource_Product')
- ->getAttributeRawValue($productId, 'name', Mage::app()->getStore());
- }
- $chooser->setLabel($label);
- }
-
- $element->setData('after_element_html', $chooser->toHtml());
- return $element;
- }
-
- /**
- * Checkbox Check JS Callback
- *
- * @return string
- */
- public function getCheckboxCheckCallback()
- {
- if ($this->getUseMassaction()) {
- return "function (grid, element) {
- $(grid.containerId).fire('product:changed', {element: element});
- }";
- }
- }
-
- /**
- * Grid Row JS Callback
- *
- * @return string
- */
- public function getRowClickCallback()
- {
- if (!$this->getUseMassaction()) {
- $chooserJsObject = $this->getId();
- return '
- function (grid, event) {
- var trElement = Event.findElement(event, "tr");
- var productId = trElement.down("td").innerHTML;
- var productName = trElement.down("td").next().next().innerHTML;
- var optionLabel = productName;
- var optionValue = "product/" + productId.replace(/^\s+|\s+$/g,"");
- if (grid.categoryId) {
- optionValue += "/" + grid.categoryId;
- }
- if (grid.categoryName) {
- optionLabel = grid.categoryName + " / " + optionLabel;
- }
- '.$chooserJsObject.'.setElementValue(optionValue);
- '.$chooserJsObject.'.setElementLabel(optionLabel);
- '.$chooserJsObject.'.close();
- }
- ';
- }
- }
-
- /**
- * Category Tree node onClick listener js function
- *
- * @return string
- */
- public function getCategoryClickListenerJs()
- {
- $js = '
- function (node, e) {
- {jsObject}.addVarToUrl("category_id", node.attributes.id);
- {jsObject}.reload({jsObject}.url);
- {jsObject}.categoryId = node.attributes.id != "none" ? node.attributes.id : false;
- {jsObject}.categoryName = node.attributes.id != "none" ? node.text : false;
- }
- ';
- $js = str_replace('{jsObject}', $this->getJsObjectName(), $js);
- return $js;
- }
-
- /**
- * Filter checked/unchecked rows in grid
- *
- * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
- * @return Mage_Adminhtml_Block_Catalog_Product_Widget_Chooser
- */
- protected function _addColumnFilterToCollection($column)
- {
- if ($column->getId() == 'in_products') {
- $selected = $this->getSelectedProducts();
- if ($column->getFilter()->getValue()) {
- $this->getCollection()->addFieldToFilter('entity_id', array('in'=>$selected));
- } else {
- $this->getCollection()->addFieldToFilter('entity_id', array('nin'=>$selected));
- }
- } else {
- parent::_addColumnFilterToCollection($column);
- }
- return $this;
- }
-
- /**
- * Prepare products collection, defined collection filters (category, product type)
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- /* @var $collection Mage_Catalog_Model_Resource_Product_Collection */
- $collection = Mage::getResourceModel('Mage_Catalog_Model_Resource_Product_Collection')
- ->setStoreId(0)
- ->addAttributeToSelect('name');
-
- if ($categoryId = $this->getCategoryId()) {
- $category = Mage::getModel('Mage_Catalog_Model_Category')->load($categoryId);
- if ($category->getId()) {
- // $collection->addCategoryFilter($category);
- $productIds = $category->getProductsPosition();
- $productIds = array_keys($productIds);
- if (empty($productIds)) {
- $productIds = 0;
- }
- $collection->addFieldToFilter('entity_id', array('in' => $productIds));
- }
- }
-
- if ($productTypeId = $this->getProductTypeId()) {
- $collection->addAttributeToFilter('type_id', $productTypeId);
- }
-
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- /**
- * Prepare columns for products grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareColumns()
- {
- if ($this->getUseMassaction()) {
- $this->addColumn('in_products', array(
- 'header_css_class' => 'a-center',
- 'type' => 'checkbox',
- 'name' => 'in_products',
- 'inline_css' => 'checkbox entities',
- 'field_name' => 'in_products',
- 'values' => $this->getSelectedProducts(),
- 'align' => 'center',
- 'index' => 'entity_id',
- 'use_index' => true,
- ));
- }
-
- $this->addColumn('entity_id', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('ID'),
- 'sortable' => true,
- 'width' => '60px',
- 'index' => 'entity_id'
- ));
- $this->addColumn('chooser_sku', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('SKU'),
- 'name' => 'chooser_sku',
- 'width' => '80px',
- 'index' => 'sku'
- ));
- $this->addColumn('chooser_name', array(
- 'header' => Mage::helper('Mage_Catalog_Helper_Data')->__('Product Name'),
- 'name' => 'chooser_name',
- 'index' => 'name'
- ));
-
- return parent::_prepareColumns();
- }
-
- /**
- * Adds additional parameter to URL for loading only products grid
- *
- * @return string
- */
- public function getGridUrl()
- {
- return $this->getUrl('*/catalog_product_widget/chooser', array(
- 'products_grid' => true,
- '_current' => true,
- 'uniq_id' => $this->getId(),
- 'use_massaction' => $this->getUseMassaction(),
- 'product_type_id' => $this->getProductTypeId()
- ));
- }
-
- /**
- * Setter
- *
- * @param array $selectedProducts
- * @return Mage_Adminhtml_Block_Catalog_Product_Widget_Chooser
- */
- public function setSelectedProducts($selectedProducts)
- {
- $this->_selectedProducts = $selectedProducts;
- return $this;
- }
-
- /**
- * Getter
- *
- * @return array
- */
- public function getSelectedProducts()
- {
- if ($selectedProducts = $this->getRequest()->getParam('selected_products', null)) {
- $this->setSelectedProducts($selectedProducts);
- }
- return $this->_selectedProducts;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php
deleted file mode 100644
index 2725a5db86a79..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php
+++ /dev/null
@@ -1,110 +0,0 @@
-setDefaultSort('agreement_id');
- $this->setId('agreementGrid');
- $this->setDefaultDir('asc');
- $this->setSaveParametersInSession(true);
- }
-
- protected function _prepareCollection()
- {
- $collection = Mage::getModel('Mage_Checkout_Model_Agreement')
- ->getCollection();
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('agreement_id',
- array(
- 'header'=>Mage::helper('Mage_Checkout_Helper_Data')->__('ID'),
- 'align' =>'right',
- 'width' => '50px',
- 'index' => 'agreement_id'
- )
- );
-
- $this->addColumn('name',
- array(
- 'header'=>Mage::helper('Mage_Checkout_Helper_Data')->__('Condition Name'),
- 'index' => 'name'
- )
- );
-
- if (!Mage::app()->isSingleStoreMode()) {
- $this->addColumn('store_id', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Store View'),
- 'index' => 'store_id',
- 'type' => 'store',
- 'store_all' => true,
- 'store_view' => true,
- 'sortable' => false,
- 'filter_condition_callback'
- => array($this, '_filterStoreCondition'),
- ));
- }
-
- $this->addColumn('is_active', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Status'),
- 'index' => 'is_active',
- 'type' => 'options',
- 'options' => array(
- 0 => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Disabled'),
- 1 => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Enabled')
- ),
- ));
-
- return parent::_prepareColumns();
- }
-
- protected function _afterLoadCollection()
- {
- $this->getCollection()->walk('afterLoad');
- parent::_afterLoadCollection();
- }
-
- protected function _filterStoreCondition($collection, $column)
- {
- if (!$value = $column->getFilter()->getValue()) {
- return;
- }
-
- $this->getCollection()->addStoreFilter($value);
- }
-
- public function getRowUrl($row)
- {
- return $this->getUrl('*/*/edit', array('id' => $row->getId()));
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
deleted file mode 100644
index 841634d8fe6d1..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
+++ /dev/null
@@ -1,143 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Cms_Page_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
-{
- /**
- * Initialize cms page edit block
- *
- * @return void
- */
- protected function _construct()
- {
- $this->_objectId = 'page_id';
- $this->_controller = 'cms_page';
-
- parent::_construct();
-
- if ($this->_isAllowedAction('Mage_Cms::save')) {
- $this->_updateButton('save', 'label', Mage::helper('Mage_Cms_Helper_Data')->__('Save Page'));
- $this->_addButton('saveandcontinue', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Save and Continue Edit'),
- 'class' => 'save',
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => 'saveAndContinueEdit', 'target' => '#edit_form'),
- ),
- ),
- ), -100);
- } else {
- $this->_removeButton('save');
- }
-
- if ($this->_isAllowedAction('Mage_Cms::page_delete')) {
- $this->_updateButton('delete', 'label', Mage::helper('Mage_Cms_Helper_Data')->__('Delete Page'));
- } else {
- $this->_removeButton('delete');
- }
- }
-
- /**
- * Retrieve text for header element depending on loaded page
- *
- * @return string
- */
- public function getHeaderText()
- {
- if (Mage::registry('cms_page')->getId()) {
- return Mage::helper('Mage_Cms_Helper_Data')->__("Edit Page '%s'", $this->escapeHtml(Mage::registry('cms_page')->getTitle()));
- }
- else {
- return Mage::helper('Mage_Cms_Helper_Data')->__('New Page');
- }
- }
-
- /**
- * Check permission for passed action
- *
- * @param string $resourceId
- * @return bool
- */
- protected function _isAllowedAction($resourceId)
- {
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed($resourceId);
- }
-
- /**
- * Getter of url for "Save and Continue" button
- * tab_id will be replaced by desired by JS later
- *
- * @return string
- */
- protected function _getSaveAndContinueUrl()
- {
- return $this->getUrl('*/*/save', array(
- '_current' => true,
- 'back' => 'edit',
- 'active_tab' => '{{tab_id}}'
- ));
- }
-
- /**
- * Prepare layout
- *
- * @return Mage_Core_Block_Abstract
- */
- protected function _prepareLayout()
- {
- $tabsBlock = $this->getLayout()->getBlock('cms_page_edit_tabs');
- if ($tabsBlock) {
- $tabsBlockJsObject = $tabsBlock->getJsObjectName();
- $tabsBlockPrefix = $tabsBlock->getId() . '_';
- } else {
- $tabsBlockJsObject = 'page_tabsJsTabs';
- $tabsBlockPrefix = 'page_tabs_';
- }
-
- $this->_formScripts[] = "
- function toggleEditor() {
- if (tinyMCE.getInstanceById('page_content') == null) {
- tinyMCE.execCommand('mceAddControl', false, 'page_content');
- } else {
- tinyMCE.execCommand('mceRemoveControl', false, 'page_content');
- }
- }
- jQuery(function() {
- jQuery(\"#" . $tabsBlock->getId() ."\")
- .tabs('option', 'tabsBlockPrefix', '" . $tabsBlockPrefix . "')
- .tabs('option', 'tabIdArgument', 'active_tab');
- });
- ";
- return parent::_prepareLayout();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php
deleted file mode 100644
index 1db0389f6f65b..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php
+++ /dev/null
@@ -1,165 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Cms_Page_Widget_Chooser extends Mage_Adminhtml_Block_Widget_Grid
-{
- /**
- * Block construction, prepare grid params
- *
- * @param array $arguments Object data
- */
- protected function _construct()
- {
- parent::_construct();
- //$this->setDefaultSort('name');
- $this->setUseAjax(true);
- $this->setDefaultFilter(array('chooser_is_active' => '1'));
- }
-
- /**
- * Prepare chooser element HTML
- *
- * @param Varien_Data_Form_Element_Abstract $element Form Element
- * @return Varien_Data_Form_Element_Abstract
- */
- public function prepareElementHtml(Varien_Data_Form_Element_Abstract $element)
- {
- $uniqId = Mage::helper('Mage_Core_Helper_Data')->uniqHash($element->getId());
- $sourceUrl = $this->getUrl('*/cms_page_widget/chooser', array('uniq_id' => $uniqId));
-
- $chooser = $this->getLayout()->createBlock('Mage_Widget_Block_Adminhtml_Widget_Chooser')
- ->setElement($element)
- ->setTranslationHelper($this->getTranslationHelper())
- ->setConfig($this->getConfig())
- ->setFieldsetId($this->getFieldsetId())
- ->setSourceUrl($sourceUrl)
- ->setUniqId($uniqId);
-
-
- if ($element->getValue()) {
- $page = Mage::getModel('Mage_Cms_Model_Page')->load((int)$element->getValue());
- if ($page->getId()) {
- $chooser->setLabel($page->getTitle());
- }
- }
-
- $element->setData('after_element_html', $chooser->toHtml());
- return $element;
- }
-
- /**
- * Grid Row JS Callback
- *
- * @return string
- */
- public function getRowClickCallback()
- {
- $chooserJsObject = $this->getId();
- $js = '
- function (grid, event) {
- var trElement = Event.findElement(event, "tr");
- var pageTitle = trElement.down("td").next().innerHTML;
- var pageId = trElement.down("td").innerHTML.replace(/^\s+|\s+$/g,"");
- '.$chooserJsObject.'.setElementValue(pageId);
- '.$chooserJsObject.'.setElementLabel(pageTitle);
- '.$chooserJsObject.'.close();
- }
- ';
- return $js;
- }
-
- /**
- * Prepare pages collection
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- $collection = Mage::getModel('Mage_Cms_Model_Page')->getCollection();
- /* @var $collection Mage_Cms_Model_Resource_Page_Collection */
- $collection->setFirstStoreFlag(true);
- $this->setCollection($collection);
-
- return parent::_prepareCollection();
- }
-
- /**
- * Prepare columns for pages grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareColumns()
- {
- $this->addColumn('chooser_id', array(
- 'header' => Mage::helper('Mage_Cms_Helper_Data')->__('ID'),
- 'align' => 'right',
- 'index' => 'page_id',
- 'width' => 50
- ));
-
- $this->addColumn('chooser_title', array(
- 'header' => Mage::helper('Mage_Cms_Helper_Data')->__('Title'),
- 'align' => 'left',
- 'index' => 'title',
- ));
-
- $this->addColumn('chooser_identifier', array(
- 'header' => Mage::helper('Mage_Cms_Helper_Data')->__('URL Key'),
- 'align' => 'left',
- 'index' => 'identifier'
- ));
-
- $this->addColumn('chooser_root_template', array(
- 'header' => Mage::helper('Mage_Cms_Helper_Data')->__('Layout'),
- 'index' => 'root_template',
- 'type' => 'options',
- 'options' => Mage::getSingleton('Mage_Page_Model_Source_Layout')->getOptions(),
- 'width' => '100',
- ));
-
- $this->addColumn('chooser_is_active', array(
- 'header' => Mage::helper('Mage_Cms_Helper_Data')->__('Status'),
- 'index' => 'is_active',
- 'type' => 'options',
- 'options' => Mage::getModel('Mage_Cms_Model_Page')->getAvailableStatuses(),
- 'width' => '100',
- ));
-
- return parent::_prepareColumns();
- }
-
- public function getGridUrl()
- {
- return $this->getUrl('*/cms_page_widget/chooser', array('_current' => true));
- }
-}
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
deleted file mode 100644
index 7cbbe85227f77..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php
+++ /dev/null
@@ -1,161 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content extends Mage_Adminhtml_Block_Widget_Container
-{
- /**
- * Block construction
- */
- protected function _construct()
- {
- parent::_construct();
- $this->_headerText = $this->helper('Mage_Cms_Helper_Data')->__('Media Storage');
- $this->_removeButton('back')->_removeButton('edit');
- $this->_addButton('newfolder', array(
- 'class' => 'save',
- 'label' => $this->helper('Mage_Cms_Helper_Data')->__('Create Folder...'),
- 'type' => 'button',
- 'onclick' => 'MediabrowserInstance.newFolder();'
- ));
-
- $this->_addButton('delete_folder', array(
- 'class' => 'delete no-display',
- 'label' => $this->helper('Mage_Cms_Helper_Data')->__('Delete Folder'),
- 'type' => 'button',
- 'onclick' => 'MediabrowserInstance.deleteFolder();',
- 'id' => 'button_delete_folder'
- ));
-
- $this->_addButton('delete_files', array(
- 'class' => 'delete no-display',
- 'label' => $this->helper('Mage_Cms_Helper_Data')->__('Delete File'),
- 'type' => 'button',
- 'onclick' => 'MediabrowserInstance.deleteFiles();',
- 'id' => 'button_delete_files'
- ));
-
- $this->_addButton('insert_files', array(
- 'class' => 'save no-display',
- 'label' => $this->helper('Mage_Cms_Helper_Data')->__('Insert File'),
- 'type' => 'button',
- 'onclick' => 'MediabrowserInstance.insert();',
- 'id' => 'button_insert_files'
- ));
- }
-
- /**
- * Files action source URL
- *
- * @return string
- */
- public function getContentsUrl()
- {
- return $this->getUrl('*/*/contents', array('type' => $this->getRequest()->getParam('type')));
- }
-
- /**
- * Javascript setup object for filebrowser instance
- *
- * @return string
- */
- public function getFilebrowserSetupObject()
- {
- $setupObject = new Varien_Object();
-
- $setupObject->setData(array(
- 'newFolderPrompt' => $this->helper('Mage_Cms_Helper_Data')->__('New Folder Name:'),
- 'deleteFolderConfirmationMessage' => $this->helper('Mage_Cms_Helper_Data')->__('Are you sure you want to delete current folder?'),
- 'deleteFileConfirmationMessage' => $this->helper('Mage_Cms_Helper_Data')->__('Are you sure you want to delete the selected file?'),
- 'targetElementId' => $this->getTargetElementId(),
- 'contentsUrl' => $this->getContentsUrl(),
- 'onInsertUrl' => $this->getOnInsertUrl(),
- 'newFolderUrl' => $this->getNewfolderUrl(),
- 'deleteFolderUrl' => $this->getDeletefolderUrl(),
- 'deleteFilesUrl' => $this->getDeleteFilesUrl(),
- 'headerText' => $this->getHeaderText()
- ));
-
- return Mage::helper('Mage_Core_Helper_Data')->jsonEncode($setupObject);
- }
-
- /**
- * 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');
- }
-
- /**
- * Target element ID getter
- *
- * @return string
- */
- public function getTargetElementId()
- {
- return $this->getRequest()->getParam('target_element_id');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
deleted file mode 100644
index 681ce3887e31e..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
+++ /dev/null
@@ -1,129 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Customer_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
-{
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('customer_info_tabs');
- $this->setDestElementId('edit_form');
- $this->setTitle(Mage::helper('Mage_Customer_Helper_Data')->__('Customer Information'));
- }
-
- protected function _beforeToHtml()
- {
- Magento_Profiler::start('customer/tabs');
-
- /*
- if (Mage::registry('current_customer')->getId()) {
- $this->addTab('view', array(
- 'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Customer View'),
- 'content' => $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Customer_Edit_Tab_View')->toHtml(),
- 'active' => true
- ));
- }
- */
- $this->addTab('account', array(
- 'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Account Information'),
- 'content' => $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Customer_Edit_Tab_Account')->initForm()->toHtml(),
- 'active' => Mage::registry('current_customer')->getId() ? false : true
- ));
-
- $this->addTab('addresses', array(
- 'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Addresses'),
- 'content' => $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses')->initForm()->toHtml(),
- ));
-
-
- // load: Orders, Shopping Cart, Wishlist, Product Reviews, Product Tags - with ajax
-
- if (Mage::registry('current_customer')->getId()) {
-
- if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Sales::actions_view')) {
- $this->addTab('orders', array(
- 'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Orders'),
- 'class' => 'ajax',
- 'url' => $this->getUrl('*/*/orders', array('_current' => true)),
- ));
- }
-
- $this->addTab('cart', array(
- 'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Shopping Cart'),
- 'class' => 'ajax',
- 'url' => $this->getUrl('*/*/carts', array('_current' => true)),
- ));
-
- $this->addTab('wishlist', array(
- 'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Wishlist'),
- 'class' => 'ajax',
- 'url' => $this->getUrl('*/*/wishlist', array('_current' => true)),
- ));
-
- if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Newsletter::subscriber')) {
- $this->addTab('newsletter', array(
- 'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Newsletter'),
- 'content' => $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter')->initForm()->toHtml()
- ));
- }
-
- if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Review::reviews_ratings')) {
- $this->addTab('reviews', array(
- 'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Product Reviews'),
- 'class' => 'ajax',
- 'url' => $this->getUrl('*/*/productReviews', array('_current' => true)),
- ));
- }
- }
-
- $this->_updateActiveTab();
- Magento_Profiler::stop('customer/tabs');
- return parent::_beforeToHtml();
- }
-
- protected function _updateActiveTab()
- {
- $tabId = $this->getRequest()->getParam('tab');
- if ($tabId) {
- $tabId = preg_replace("#{$this->getId()}_#", '', $tabId);
- if ($tabId) {
- $this->setActiveTab($tabId);
- }
- }
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php
deleted file mode 100644
index f6bb4dbc94390..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Customer_System_Config_Validatevat extends Mage_Backend_Block_System_Config_Form_Field
-{
- /**
- * Set template to itself
- *
- * @return Mage_Adminhtml_Block_Customer_System_Config_Validatevat
- */
- protected function _prepareLayout()
- {
- parent::_prepareLayout();
- if (!$this->getTemplate()) {
- $this->setTemplate('customer/system/config/validatevat.phtml');
- }
- return $this;
- }
-
- /**
- * Unset some non-related element parameters
- *
- * @param Varien_Data_Form_Element_Abstract $element
- * @return string
- */
- public function render(Varien_Data_Form_Element_Abstract $element)
- {
- $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
- return parent::render($element);
- }
-
- /**
- * Get the button and scripts contents
- *
- * @param Varien_Data_Form_Element_Abstract $element
- * @return string
- */
- protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
- {
- $originalData = $element->getOriginalData();
- $this->addData(array(
- 'button_label' => Mage::helper('Mage_Customer_Helper_Data')->__($originalData['button_label']),
- 'html_id' => $element->getHtmlId(),
- 'ajax_url' => Mage::getSingleton('Mage_Backend_Model_Url')
- ->getUrl('*/customer_system_config_validatevat/validate')
- ));
-
- return $this->_toHtml();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Date.php b/app/code/core/Mage/Adminhtml/Block/Html/Date.php
deleted file mode 100644
index 283746501823d..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Html/Date.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Html_Date extends Mage_Core_Block_Html_Date
-{
- /**
- * @param Mage_Core_Controller_Request_Http $request
- * @param Mage_Core_Model_Layout $layout
- * @param Mage_Core_Model_Event_Manager $eventManager
- * @param Mage_Backend_Model_Url $urlBuilder
- * @param Mage_Core_Model_Translate $translator
- * @param Mage_Core_Model_Cache $cache
- * @param Mage_Core_Model_Design_Package $designPackage
- * @param Mage_Core_Model_Session $session
- * @param Mage_Core_Model_Store_Config $storeConfig
- * @param Mage_Core_Controller_Varien_Front $frontController
- * @param Mage_Core_Model_Factory_Helper $helperFactory
- * @param Mage_Core_Model_Dir $dirs
- * @param Mage_Core_Model_Logger $logger
- * @param Magento_Filesystem $filesystem
- * @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- */
- public function __construct(
- Mage_Core_Controller_Request_Http $request,
- Mage_Core_Model_Layout $layout,
- Mage_Core_Model_Event_Manager $eventManager,
- Mage_Backend_Model_Url $urlBuilder,
- Mage_Core_Model_Translate $translator,
- Mage_Core_Model_Cache $cache,
- Mage_Core_Model_Design_Package $designPackage,
- Mage_Core_Model_Session $session,
- Mage_Core_Model_Store_Config $storeConfig,
- Mage_Core_Controller_Varien_Front $frontController,
- Mage_Core_Model_Factory_Helper $helperFactory,
- Mage_Core_Model_Dir $dirs,
- Mage_Core_Model_Logger $logger,
- Magento_Filesystem $filesystem,
- array $data = array()
- ) {
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache, $designPackage,
- $session, $storeConfig, $frontController, $helperFactory, $dirs, $logger, $filesystem, $data
- );
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Select.php b/app/code/core/Mage/Adminhtml/Block/Html/Select.php
deleted file mode 100644
index 3326a5c1a737d..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Html/Select.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Html_Select extends Mage_Core_Block_Html_Select
-{
- /**
- * @param Mage_Core_Controller_Request_Http $request
- * @param Mage_Core_Model_Layout $layout
- * @param Mage_Core_Model_Event_Manager $eventManager
- * @param Mage_Backend_Model_Url $urlBuilder
- * @param Mage_Core_Model_Translate $translator
- * @param Mage_Core_Model_Cache $cache
- * @param Mage_Core_Model_Design_Package $designPackage
- * @param Mage_Core_Model_Session $session
- * @param Mage_Core_Model_Store_Config $storeConfig
- * @param Mage_Core_Controller_Varien_Front $frontController
- * @param Mage_Core_Model_Factory_Helper $helperFactory
- * @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- */
- public function __construct(
- Mage_Core_Controller_Request_Http $request,
- Mage_Core_Model_Layout $layout,
- Mage_Core_Model_Event_Manager $eventManager,
- Mage_Backend_Model_Url $urlBuilder,
- Mage_Core_Model_Translate $translator,
- Mage_Core_Model_Cache $cache,
- Mage_Core_Model_Design_Package $designPackage,
- Mage_Core_Model_Session $session,
- Mage_Core_Model_Store_Config $storeConfig,
- Mage_Core_Controller_Varien_Front $frontController,
- Mage_Core_Model_Factory_Helper $helperFactory,
- array $data = array()
- ) {
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache, $designPackage,
- $session, $storeConfig, $frontController, $helperFactory, $data
- );
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Messages.php b/app/code/core/Mage/Adminhtml/Block/Messages.php
deleted file mode 100644
index 2b815058e0013..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Messages.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Messages extends Mage_Core_Block_Messages
-{
- /**
- * @param Mage_Core_Controller_Request_Http $request
- * @param Mage_Core_Model_Layout $layout
- * @param Mage_Core_Model_Event_Manager $eventManager
- * @param Mage_Backend_Model_Url $urlBuilder
- * @param Mage_Core_Model_Translate $translator
- * @param Mage_Core_Model_Cache $cache
- * @param Mage_Core_Model_Design_Package $designPackage
- * @param Mage_Core_Model_Session $session
- * @param Mage_Core_Model_Store_Config $storeConfig
- * @param Mage_Core_Controller_Varien_Front $frontController
- * @param Mage_Core_Model_Factory_Helper $helperFactory
- * @param Mage_Core_Model_Dir $dirs
- * @param Mage_Core_Model_Logger $logger
- * @param Magento_Filesystem $filesystem
- * @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- */
- public function __construct(
- Mage_Core_Controller_Request_Http $request,
- Mage_Core_Model_Layout $layout,
- Mage_Core_Model_Event_Manager $eventManager,
- Mage_Backend_Model_Url $urlBuilder,
- Mage_Core_Model_Translate $translator,
- Mage_Core_Model_Cache $cache,
- Mage_Core_Model_Design_Package $designPackage,
- Mage_Core_Model_Session $session,
- Mage_Core_Model_Store_Config $storeConfig,
- Mage_Core_Controller_Varien_Front $frontController,
- Mage_Core_Model_Factory_Helper $helperFactory,
- Mage_Core_Model_Dir $dirs,
- Mage_Core_Model_Logger $logger,
- Magento_Filesystem $filesystem,
- array $data = array()
- ) {
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache, $designPackage,
- $session, $storeConfig, $frontController, $helperFactory, $dirs, $logger, $filesystem, $data
- );
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
deleted file mode 100644
index b22f8c4138200..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ /dev/null
@@ -1,259 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Newsletter_Queue_Edit extends Mage_Adminhtml_Block_Template
-{
- protected $_template = 'newsletter/queue/edit.phtml';
-
- protected function _construct()
- {
- parent::_construct();
- $templateId = $this->getRequest()->getParam('template_id');
- if ($templateId) {
- $this->setTemplateId($templateId);
- }
- }
-
- /**
- * Retrieve current Newsletter Queue Object
- *
- * @return Mage_Newsletter_Model_Queue
- */
- public function getQueue()
- {
- return Mage::registry('current_queue');
- }
-
- protected function _beforeToHtml() {
-
-
-
- $this->setChild('form',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Newsletter_Queue_Edit_Form','form')
- );
-
- return parent::_beforeToHtml();
- }
-
- public function getSaveUrl()
- {
- if ($this->getTemplateId()) {
- $params = array('template_id' => $this->getTemplateId());
- } else {
- $params = array('id' => $this->getRequest()->getParam('id'));
- }
- return $this->getUrl('*/*/save', $params);
- }
-
- protected function _prepareLayout()
- {
- // Load Wysiwyg on demand and Prepare layout
- if (Mage::getSingleton('Mage_Cms_Model_Wysiwyg_Config')->isEnabled()) {
- $this->getLayout()->getBlock('head')->setCanLoadTinyMce(true);
- }
-
- $this->addChild('preview_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Preview Template'),
- 'onclick' => 'queueControl.preview();',
- 'class' => 'task'
- ));
-
- $this->addChild('save_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Save Newsletter'),
- 'class' => 'save',
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => 'save', 'target' => '#queue_edit_form'),
- ),
- ),
- ));
-
- $this->addChild('save_and_resume', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Save and Resume'),
- 'class' => 'save',
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array(
- 'event' => 'save',
- 'target' => '#queue_edit_form',
- 'eventData' => array(
- 'action' => array(
- 'args' => array('_resume' => 1),
- ),
- ),
- ),
- ),
- ),
- ));
-
- $this->addChild('reset_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Reset'),
- 'onclick' => 'window.location = window.location'
- ));
-
- $this->addChild('back_button','Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Back'),
- 'onclick' => "window.location.href = '" . $this->getUrl((
- $this->getTemplateId() ? '*/newsletter_template/' : '*/*')) . "'",
- 'class' => 'back'
- ));
-
- return parent::_prepareLayout();
- }
-
- /**
- * Return preview action url for form
- *
- * @return string
- */
- public function getPreviewUrl()
- {
- return $this->getUrl('*/*/preview');
- }
-
- /**
- * Retrieve Preview Button HTML
- *
- * @return string
- */
- public function getPreviewButtonHtml()
- {
- return $this->getChildHtml('preview_button');
- }
-
- /**
- * Retrieve Save Button HTML
- *
- * @return string
- */
- public function getSaveButtonHtml()
- {
- return $this->getChildHtml('save_button');
- }
-
- /**
- * Retrieve Reset Button HTML
- *
- * @return string
- */
- public function getResetButtonHtml()
- {
- return $this->getChildHtml('reset_button');
- }
-
- /**
- * Retrieve Back Button HTML
- *
- * @return string
- */
- public function getBackButtonHtml()
- {
- return $this->getChildHtml('back_button');
- }
-
- /**
- * Retrieve Resume Button HTML
- *
- * @return string
- */
- public function getResumeButtonHtml()
- {
- return $this->getChildHtml('save_and_resume');
- }
-
- /**
- * Getter for availability preview mode
- *
- * @return boolean
- */
- public function getIsPreview()
- {
- return !in_array($this->getQueue()->getQueueStatus(), array(
- Mage_Newsletter_Model_Queue::STATUS_NEVER,
- Mage_Newsletter_Model_Queue::STATUS_PAUSE
- ));
- }
-
- /**
- * Getter for single store mode check
- *
- * @return boolean
- */
- protected function isSingleStoreMode()
- {
- return Mage::app()->isSingleStoreMode();
- }
-
- /**
- * Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
- *
- * @return boolean
- */
- protected function getStoreId()
- {
- return Mage::app()->getStore(true)->getId();
- }
-
- /**
- * Getter for check is this newsletter the plain text.
- *
- * @return boolean
- */
- public function getIsTextType()
- {
- return $this->getQueue()->isPlain();
- }
-
- /**
- * Getter for availability resume action
- *
- * @return boolean
- */
- public function getCanResume()
- {
- return in_array($this->getQueue()->getQueueStatus(), array(
- Mage_Newsletter_Model_Queue::STATUS_PAUSE
- ));
- }
-
- /**
- * Getter for header text
- *
- * @return boolean
- */
- public function getHeaderText()
- {
- return ( $this->getIsPreview() ? Mage::helper('Mage_Newsletter_Helper_Data')->__('View Newsletter') : Mage::helper('Mage_Newsletter_Helper_Data')->__('Edit Newsletter'));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php
deleted file mode 100644
index dc7c8cebedd94..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php
+++ /dev/null
@@ -1,219 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
- /**
- * Application instance
- *
- * @var Mage_Core_Model_App
- */
- protected $_app;
-
- /**
- * Constructor
- *
- * Set main configuration of grid
- */
- protected function _construct()
- {
- $this->_app = Mage::app();
-
- parent::_construct();
- $this->setId('subscriberGrid');
- $this->setUseAjax(true);
- $this->setDefaultSort('subscriber_id', 'desc');
- }
-
- /**
- * Prepare collection for grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceSingleton('Mage_Newsletter_Model_Resource_Subscriber_Collection');
- /* @var $collection Mage_Newsletter_Model_Resource_Subscriber_Collection */
- $collection
- ->showCustomerInfo(true)
- ->addSubscriberTypeField()
- ->showStoreInfo();
-
- if($this->getRequest()->getParam('queue', false)) {
- $collection->useQueue(Mage::getModel('Mage_Newsletter_Model_Queue')
- ->load($this->getRequest()->getParam('queue')));
- }
-
- $this->setCollection($collection);
-
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
-
- $this->addColumn('subscriber_id', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('ID'),
- 'index' => 'subscriber_id'
- ));
-
- $this->addColumn('email', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Email'),
- 'index' => 'subscriber_email'
- ));
-
- $this->addColumn('type', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Type'),
- 'index' => 'type',
- 'type' => 'options',
- 'options' => array(
- 1 => Mage::helper('Mage_Newsletter_Helper_Data')->__('Guest'),
- 2 => Mage::helper('Mage_Newsletter_Helper_Data')->__('Customer')
- )
- ));
-
- $this->addColumn('firstname', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Customer First Name'),
- 'index' => 'customer_firstname',
- 'default' => '----'
- ));
-
- $this->addColumn('lastname', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Customer Last Name'),
- 'index' => 'customer_lastname',
- 'default' => '----'
- ));
-
- $this->addColumn('status', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Status'),
- 'index' => 'subscriber_status',
- 'type' => 'options',
- 'options' => array(
- Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE => Mage::helper('Mage_Newsletter_Helper_Data')->__('Not Activated'),
- Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED => Mage::helper('Mage_Newsletter_Helper_Data')->__('Subscribed'),
- Mage_Newsletter_Model_Subscriber::STATUS_UNSUBSCRIBED => Mage::helper('Mage_Newsletter_Helper_Data')->__('Unsubscribed'),
- Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED => Mage::helper('Mage_Newsletter_Helper_Data')->__('Unconfirmed'),
- )
- ));
-
- if (!$this->_app->isSingleStoreMode()) {
- $this->addColumn('website', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Website'),
- 'index' => 'website_id',
- 'type' => 'options',
- 'options' => $this->_getWebsiteOptions()
- ));
-
- $this->addColumn('group', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Store'),
- 'index' => 'group_id',
- 'type' => 'options',
- 'options' => $this->_getStoreGroupOptions()
- ));
-
- $this->addColumn('store', array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Store View'),
- 'index' => 'store_id',
- 'type' => 'options',
- 'options' => $this->_getStoreOptions()
- ));
- }
-
- $this->addExportType('*/*/exportCsv', Mage::helper('Mage_Customer_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportXml', Mage::helper('Mage_Customer_Helper_Data')->__('Excel XML'));
- return parent::_prepareColumns();
- }
-
- /**
- * Convert OptionsValue array to Options array
- *
- * @param array $optionsArray
- * @return array
- */
- protected function _getOptions($optionsArray)
- {
- $options = array();
- foreach ($optionsArray as $option) {
- $options[$option['value']] = $option['label'];
- }
- return $options;
- }
-
- /**
- * Retrieve Website Options array
- *
- * @return array
- */
- protected function _getWebsiteOptions()
- {
- return Mage::getModel('Mage_Core_Model_System_Store')->getWebsiteOptionHash();
- }
-
- /**
- * Retrieve Store Group Options array
- *
- * @return array
- */
- protected function _getStoreGroupOptions()
- {
- return Mage::getModel('Mage_Core_Model_System_Store')->getStoreGroupOptionHash();
- }
-
- /**
- * Retrieve Store Options array
- *
- * @return array
- */
- protected function _getStoreOptions()
- {
- return Mage::getModel('Mage_Core_Model_System_Store')->getStoreOptionHash();
- }
-
- protected function _prepareMassaction()
- {
- $this->setMassactionIdField('subscriber_id');
- $this->getMassactionBlock()->setFormFieldName('subscriber');
-
- $this->getMassactionBlock()->addItem('unsubscribe', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Unsubscribe'),
- 'url' => $this->getUrl('*/*/massUnsubscribe')
- ));
-
- $this->getMassactionBlock()->addItem('delete', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Delete'),
- 'url' => $this->getUrl('*/*/massDelete')
- ));
-
- return $this;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
deleted file mode 100644
index 71e0ad271debb..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
+++ /dev/null
@@ -1,326 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Newsletter_Template_Edit extends Mage_Adminhtml_Block_Widget
-{
- /**
- * Edit Block model
- *
- * @var bool
- */
- protected $_editMode = false;
-
- /**
- * Retrieve template object
- *
- * @return Mage_Newsletter_Model_Template
- */
- public function getModel()
- {
- return Mage::registry('_current_template');
- }
-
- /**
- * Preparing block layout
- *
- * @return Mage_Adminhtml_Block_Newsletter_Template_Edit
- */
- protected function _prepareLayout()
- {
- // Load Wysiwyg on demand and Prepare layout
- if (Mage::getSingleton('Mage_Cms_Model_Wysiwyg_Config')->isEnabled() && ($block = $this->getLayout()->getBlock('head'))) {
- $block->setCanLoadTinyMce(true);
- }
-
- $this->addChild('back_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Back'),
- 'onclick' => "window.location.href = '" . $this->getUrl('*/*') . "'",
- 'class' => 'back'
- ));
-
- $this->addChild('reset_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Reset'),
- 'onclick' => 'window.location.href = window.location.href'
- ));
-
- $this->addChild('to_plain_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Convert to Plain Text'),
- 'onclick' => 'templateControl.stripTags();',
- 'id' => 'convert_button',
- 'class' => 'task'
- ));
-
- $this->addChild('to_html_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Return HTML Version'),
- 'onclick' => 'templateControl.unStripTags();',
- 'id' => 'convert_button_back',
- 'style' => 'display:none',
- 'class' => 'task'
- ));
-
- $this->addChild('save_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Save Template'),
- 'onclick' => 'templateControl.save();',
- 'class' => 'save'
- ));
-
- $this->addChild('save_as_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Save As'),
- 'onclick' => 'templateControl.saveAs();',
- 'class' => 'save'
- ));
-
- $this->addChild('preview_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Preview Template'),
- 'onclick' => 'templateControl.preview();',
- 'class' => 'task'
- ));
-
- $this->addChild('delete_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Delete Template'),
- 'onclick' => 'templateControl.deleteTemplate();',
- 'class' => 'delete'
- ));
-
- return parent::_prepareLayout();
- }
-
- /**
- * Retrieve Back Button HTML
- *
- * @return string
- */
- public function getBackButtonHtml()
- {
- return $this->getChildHtml('back_button');
- }
-
- /**
- * Retrieve Reset Button HTML
- *
- * @return string
- */
- public function getResetButtonHtml()
- {
- return $this->getChildHtml('reset_button');
- }
-
- /**
- * Retrieve Convert To Plain Button HTML
- *
- * @return string
- */
- public function getToPlainButtonHtml()
- {
- return $this->getChildHtml('to_plain_button');
- }
-
- /**
- * Retrieve Convert to HTML Button HTML
- *
- * @return string
- */
- public function getToHtmlButtonHtml()
- {
- return $this->getChildHtml('to_html_button');
- }
-
- /**
- * Retrieve Save Button HTML
- *
- * @return string
- */
- public function getSaveButtonHtml()
- {
- return $this->getChildHtml('save_button');
- }
-
- /**
- * Retrieve Preview Button HTML
- *
- * @return string
- */
- public function getPreviewButtonHtml()
- {
- return $this->getChildHtml('preview_button');
- }
-
- /**
- * Retrieve Delete Button HTML
- *
- * @return string
- */
- public function getDeleteButtonHtml()
- {
- return $this->getChildHtml('delete_button');
- }
-
- /**
- * Retrieve Save as Button HTML
- *
- * @return string
- */
- public function getSaveAsButtonHtml()
- {
- return $this->getChildHtml('save_as_button');
- }
-
- /**
- * Set edit flag for block
- *
- * @param boolean $value
- * @return Mage_Adminhtml_Block_Newsletter_Template_Edit
- */
- public function setEditMode($value = true)
- {
- $this->_editMode = (bool)$value;
- return $this;
- }
-
- /**
- * Return edit flag for block
- *
- * @return boolean
- */
- public function getEditMode()
- {
- return $this->_editMode;
- }
-
- /**
- * Return header text for form
- *
- * @return string
- */
- public function getHeaderText()
- {
- if ($this->getEditMode()) {
- return Mage::helper('Mage_Newsletter_Helper_Data')->__('Edit Newsletter Template');
- }
-
- return Mage::helper('Mage_Newsletter_Helper_Data')->__('New Newsletter Template');
- }
-
- /**
- * Return form block HTML
- *
- * @return string
- */
- public function getForm()
- {
- return $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Newsletter_Template_Edit_Form')
- ->toHtml();
- }
-
- /**
- * Return return template name for JS
- *
- * @return string
- */
- public function getJsTemplateName()
- {
- return addcslashes($this->getModel()->getTemplateCode(), "\"\r\n\\");
- }
-
- /**
- * Return action url for form
- *
- * @return string
- */
- public function getSaveUrl()
- {
- return $this->getUrl('*/*/save');
- }
-
- /**
- * Return preview action url for form
- *
- * @return string
- */
- public function getPreviewUrl()
- {
- return $this->getUrl('*/*/preview');
- }
-
- /**
- * Check Template Type is Plain Text
- *
- * @return bool
- */
- public function isTextType()
- {
- return $this->getModel()->isPlain();
- }
-
- /**
- * Return delete url for customer group
- *
- * @return string
- */
- public function getDeleteUrl()
- {
- return $this->getUrl('*/*/delete', array('id' => $this->getRequest()->getParam('id')));
- }
-
- /**
- * Retrieve Save As Flag
- *
- * @return int
- */
- public function getSaveAsFlag()
- {
- return $this->getRequest()->getParam('_save_as_flag') ? '1' : '';
- }
-
- /**
- * Getter for single store mode check
- *
- * @return boolean
- */
- protected function isSingleStoreMode()
- {
- return Mage::app()->isSingleStoreMode();
- }
-
- /**
- * Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
- *
- * @return boolean
- */
- protected function getStoreId()
- {
- return Mage::app()->getStore(true)->getId();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php
deleted file mode 100644
index c9c4fabc9c070..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Newsletter_Template_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
- protected function _construct()
- {
- $this->setEmptyText(Mage::helper('Mage_Newsletter_Helper_Data')->__('No Templates Found'));
- }
-
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceSingleton('Mage_Newsletter_Model_Resource_Template_Collection')
- ->useOnlyActual();
-
- $this->setCollection($collection);
-
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('template_code',
- array('header'=>Mage::helper('Mage_Newsletter_Helper_Data')->__('ID'), 'align'=>'center', 'index'=>'template_id'));
- $this->addColumn('code',
- array(
- 'header'=>Mage::helper('Mage_Newsletter_Helper_Data')->__('Template Name'),
- 'index'=>'template_code'
- ));
-
- $this->addColumn('added_at',
- array(
- 'header'=>Mage::helper('Mage_Newsletter_Helper_Data')->__('Date Added'),
- 'index'=>'added_at',
- 'gmtoffset' => true,
- 'type'=>'datetime'
- ));
-
- $this->addColumn('modified_at',
- array(
- 'header'=>Mage::helper('Mage_Newsletter_Helper_Data')->__('Date Updated'),
- 'index'=>'modified_at',
- 'gmtoffset' => true,
- 'type'=>'datetime'
- ));
-
- $this->addColumn('subject',
- array(
- 'header'=>Mage::helper('Mage_Newsletter_Helper_Data')->__('Subject'),
- 'index'=>'template_subject'
- ));
-
- $this->addColumn('sender',
- array(
- 'header'=>Mage::helper('Mage_Newsletter_Helper_Data')->__('Sender'),
- 'index'=>'template_sender_email',
- 'renderer' => 'Mage_Adminhtml_Block_Newsletter_Template_Grid_Renderer_Sender'
- ));
-
- $this->addColumn('type',
- array(
- 'header'=>Mage::helper('Mage_Newsletter_Helper_Data')->__('Template Type'),
- 'index'=>'template_type',
- 'type' => 'options',
- 'options' => array(
- Mage_Newsletter_Model_Template::TYPE_HTML => 'html',
- Mage_Newsletter_Model_Template::TYPE_TEXT => 'text'
- ),
- ));
-
- $this->addColumn('action',
- array(
- 'header' => Mage::helper('Mage_Newsletter_Helper_Data')->__('Action'),
- 'index' =>'template_id',
- 'sortable' =>false,
- 'filter' => false,
- 'no_link' => true,
- 'width' => '170px',
- 'renderer' => 'Mage_Adminhtml_Block_Newsletter_Template_Grid_Renderer_Action'
- ));
-
- return $this;
- }
-
- public function getRowUrl($row)
- {
- return $this->getUrl('*/*/edit', array('id'=>$row->getId()));
- }
-
-}
-
diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Head.php b/app/code/core/Mage/Adminhtml/Block/Page/Head.php
deleted file mode 100644
index 547514f11c12d..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Page/Head.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Page_Head extends Mage_Page_Block_Html_Head
-{
- protected $_template = 'page/head.phtml';
-
- /**
- * @param Mage_Core_Controller_Request_Http $request
- * @param Mage_Core_Model_Layout $layout
- * @param Mage_Core_Model_Event_Manager $eventManager
- * @param Mage_Backend_Model_Url $urlBuilder
- * @param Mage_Core_Model_Translate $translator
- * @param Mage_Core_Model_Cache $cache
- * @param Mage_Core_Model_Design_Package $designPackage
- * @param Mage_Core_Model_Session $session
- * @param Mage_Core_Model_Store_Config $storeConfig
- * @param Mage_Core_Controller_Varien_Front $frontController
- * @param Mage_Core_Model_Factory_Helper $helperFactory
- * @param Mage_Core_Model_Dir $dirs
- * @param Mage_Core_Model_Logger $logger
- * @param Magento_Filesystem $filesystem
- * @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- */
- public function __construct(
- Mage_Core_Controller_Request_Http $request,
- Mage_Core_Model_Layout $layout,
- Mage_Core_Model_Event_Manager $eventManager,
- Mage_Backend_Model_Url $urlBuilder,
- Mage_Core_Model_Translate $translator,
- Mage_Core_Model_Cache $cache,
- Mage_Core_Model_Design_Package $designPackage,
- Mage_Core_Model_Session $session,
- Mage_Core_Model_Store_Config $storeConfig,
- Mage_Core_Controller_Varien_Front $frontController,
- Mage_Core_Model_Factory_Helper $helperFactory,
- Mage_Core_Model_Dir $dirs,
- Mage_Core_Model_Logger $logger,
- Magento_Filesystem $filesystem,
- array $data = array()
- ) {
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache, $designPackage,
- $session, $storeConfig, $frontController, $helperFactory, $dirs, $logger, $filesystem, $data
- );
- }
-
- /**
- * Retrieve Session Form Key
- *
- * @return string
- */
- public function getFormKey()
- {
- return Mage::getSingleton('Mage_Core_Model_Session')->getFormKey();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php
deleted file mode 100644
index 2b3c08e6335dd..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php
+++ /dev/null
@@ -1,200 +0,0 @@
-_app = $app;
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache, $designPackage,
- $session, $storeConfig, $frontController, $helperFactory, $dirs, $logger, $filesystem, $data
- );
- }
-
-
- /**
- * Prepare content for tab
- *
- * @return string
- */
- public function getTabLabel()
- {
- return Mage::helper('Mage_SalesRule_Helper_Data')->__('Labels');
- }
-
- /**
- * Prepare title for tab
- *
- * @return string
- */
- public function getTabTitle()
- {
- return Mage::helper('Mage_SalesRule_Helper_Data')->__('Labels');
- }
-
- /**
- * Returns status flag about this tab can be showen 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;
- }
-
- protected function _prepareForm()
- {
- $rule = Mage::registry('current_promo_quote_rule');
- $form = new Varien_Data_Form();
- $form->setHtmlIdPrefix('rule_');
-
- $fieldset = $form->addFieldset('default_label_fieldset', array(
- 'legend' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Default Label')
- ));
- $labels = $rule->getStoreLabels();
-
- $fieldset->addField('store_default_label', 'text', array(
- 'name' => 'store_labels[0]',
- 'required' => false,
- 'label' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Default Rule Label for All Store Views'),
- 'value' => isset($labels[0]) ? $labels[0] : '',
- ));
-
- if (!$this->_app->isSingleStoreMode()) {
- $fieldset = $this->_createStoreSpecificFieldset($form, $labels);
- }
-
- if ($rule->isReadonly()) {
- foreach ($fieldset->getElements() as $element) {
- $element->setReadonly(true, true);
- }
- }
-
- $this->setForm($form);
- return parent::_prepareForm();
- }
-
- /**
- * Create store specific fieldset
- *
- * @param Varien_Data_Form $form
- * @param array $labels
- * @return Varien_Data_Form_Element_Fieldset mixed
- */
- protected function _createStoreSpecificFieldset($form, $labels)
- {
- $fieldset = $form->addFieldset('store_labels_fieldset', array(
- 'legend' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Store View Specific Labels'),
- 'table_class' => 'form-list stores-tree',
- ));
- $renderer = $this->getLayout()->createBlock('Mage_Backend_Block_Store_Switcher_Form_Renderer_Fieldset');
- $fieldset->setRenderer($renderer);
-
- foreach (Mage::app()->getWebsites() as $website) {
- $fieldset->addField("w_{$website->getId()}_label", 'note', array(
- 'label' => $website->getName(),
- 'fieldset_html_class' => 'website',
- ));
- foreach ($website->getGroups() as $group) {
- $stores = $group->getStores();
- if (count($stores) == 0) {
- continue;
- }
- $fieldset->addField("sg_{$group->getId()}_label", 'note', array(
- 'label' => $group->getName(),
- 'fieldset_html_class' => 'store-group',
- ));
- foreach ($stores as $store) {
- $fieldset->addField("s_{$store->getId()}", 'text', array(
- 'name' => 'store_labels[' . $store->getId() . ']',
- 'required' => false,
- 'label' => $store->getName(),
- 'value' => isset($labels[$store->getId()]) ? $labels[$store->getId()] : '',
- 'fieldset_html_class' => 'store',
- ));
- }
- }
- }
- return $fieldset;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php
deleted file mode 100644
index fc4d93df92dfe..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php
+++ /dev/null
@@ -1,222 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Rating_Edit_Tab_Form extends Mage_Backend_Block_Widget_Form
-{
- /**
- * Application instance
- *
- * @var Mage_Core_Model_App
- */
- protected $_app;
-
- /**
- * Constructor
- *
- * @param Mage_Core_Controller_Request_Http $request
- * @param Mage_Core_Model_Layout $layout
- * @param Mage_Core_Model_Event_Manager $eventManager
- * @param Mage_Backend_Model_Url $urlBuilder
- * @param Mage_Core_Model_Translate $translator
- * @param Mage_Core_Model_Cache $cache
- * @param Mage_Core_Model_Design_Package $designPackage
- * @param Mage_Core_Model_Session $session
- * @param Mage_Core_Model_Store_Config $storeConfig
- * @param Mage_Core_Controller_Varien_Front $frontController
- * @param Mage_Core_Model_Factory_Helper $helperFactory
- * @param Mage_Core_Model_Dir $dirs
- * @param Mage_Core_Model_Logger $logger
- * @param Magento_Filesystem $filesystem
- * @param Mage_Core_Model_App $app
- * @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- */
- public function __construct(
- Mage_Core_Controller_Request_Http $request,
- Mage_Core_Model_Layout $layout,
- Mage_Core_Model_Event_Manager $eventManager,
- Mage_Backend_Model_Url $urlBuilder,
- Mage_Core_Model_Translate $translator,
- Mage_Core_Model_Cache $cache,
- Mage_Core_Model_Design_Package $designPackage,
- Mage_Core_Model_Session $session,
- Mage_Core_Model_Store_Config $storeConfig,
- Mage_Core_Controller_Varien_Front $frontController,
- Mage_Core_Model_Factory_Helper $helperFactory,
- Mage_Core_Model_Dir $dirs,
- Mage_Core_Model_Logger $logger,
- Magento_Filesystem $filesystem,
- Mage_Core_Model_App $app,
- array $data = array()
- ) {
- $this->_app = $app;
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache, $designPackage,
- $session, $storeConfig, $frontController, $helperFactory, $dirs, $logger, $filesystem, $data
- );
- }
-
-
- /**
- * Prepare rating edit form
- *
- * @return Mage_Adminhtml_Block_Rating_Edit_Tab_Form
- */
- protected function _prepareForm()
- {
- $form = new Varien_Data_Form();
- $this->setForm($form);
-
- $fieldset = $form->addFieldset('rating_form', array(
- 'legend'=>Mage::helper('Mage_Rating_Helper_Data')->__('Rating Title')
- ));
-
- $fieldset->addField('rating_code', 'text', array(
- 'name' => 'rating_code',
- 'label' => Mage::helper('Mage_Rating_Helper_Data')->__('Default Value'),
- 'class' => 'required-entry',
- 'required' => true,
- ));
-
- foreach (Mage::getSingleton('Mage_Core_Model_System_Store')->getStoreCollection() as $store) {
- $fieldset->addField('rating_code_' . $store->getId(), 'text', array(
- 'label' => $store->getName(),
- 'name' => 'rating_codes[' . $store->getId() . ']',
- ));
- }
-
- if (Mage::getSingleton('Mage_Adminhtml_Model_Session')->getRatingData()) {
- $form->setValues(Mage::getSingleton('Mage_Adminhtml_Model_Session')->getRatingData());
- $data = Mage::getSingleton('Mage_Adminhtml_Model_Session')->getRatingData();
- if (isset($data['rating_codes'])) {
- $this->_setRatingCodes($data['rating_codes']);
- }
- Mage::getSingleton('Mage_Adminhtml_Model_Session')->setRatingData(null);
- } elseif (Mage::registry('rating_data')) {
- $form->setValues(Mage::registry('rating_data')->getData());
- if (Mage::registry('rating_data')->getRatingCodes()) {
- $this->_setRatingCodes(Mage::registry('rating_data')->getRatingCodes());
- }
- }
-
- if (Mage::registry('rating_data')) {
- $collection = Mage::getModel('Mage_Rating_Model_Rating_Option')
- ->getResourceCollection()
- ->addRatingFilter(Mage::registry('rating_data')->getId())
- ->load();
-
- $i = 1;
- foreach ($collection->getItems() as $item) {
- $fieldset->addField('option_code_' . $item->getId() , 'hidden', array(
- 'required' => true,
- 'name' => 'option_title[' . $item->getId() . ']',
- 'value' => ($item->getCode()) ? $item->getCode() : $i,
- ));
-
- $i ++;
- }
- } else {
- for ($i = 1; $i <= 5; $i++) {
- $fieldset->addField('option_code_' . $i, 'hidden', array(
- 'required' => true,
- 'name' => 'option_title[add_' . $i . ']',
- 'value' => $i,
- ));
- }
- }
-
- $fieldset = $form->addFieldset('visibility_form', array(
- 'legend' => Mage::helper('Mage_Rating_Helper_Data')->__('Rating Visibility')
- ));
- if (!$this->_app->isSingleStoreMode()) {
- $field = $fieldset->addField('stores', 'multiselect', array(
- 'label' => Mage::helper('Mage_Rating_Helper_Data')->__('Visible In'),
- 'name' => 'stores[]',
- 'values' => Mage::getSingleton('Mage_Core_Model_System_Store')->getStoreValuesForForm(),
- ));
- $renderer = $this->getLayout()->createBlock('Mage_Backend_Block_Store_Switcher_Form_Renderer_Fieldset_Element');
- $field->setRenderer($renderer);
-
- if (Mage::registry('rating_data')) {
- $form->getElement('stores')->setValue(Mage::registry('rating_data')->getStores());
- }
- }
-
- $fieldset->addField('is_active', 'checkbox', array(
- 'label' => Mage::helper('Mage_Rating_Helper_Data')->__('Is Active'),
- 'name' => 'is_active',
- 'value' => 1,
- ));
-
- $fieldset->addField('position', 'text', array(
- 'label' => Mage::helper('Mage_Rating_Helper_Data')->__('Sort Order'),
- 'name' => 'position',
- ));
-
- if (Mage::registry('rating_data')) {
- $form->getElement('position')->setValue(Mage::registry('rating_data')->getPosition());
- $form->getElement('is_active')->setIsChecked(Mage::registry('rating_data')->getIsActive());
- }
-
- return parent::_prepareForm();
- }
-
- protected function _setRatingCodes($ratingCodes) {
- foreach($ratingCodes as $store=>$value) {
- if($element = $this->getForm()->getElement('rating_code_' . $store)) {
- $element->setValue($value);
- }
- }
- }
-
- protected function _toHtml()
- {
- return $this->_getWarningHtml() . parent::_toHtml();
- }
-
- protected function _getWarningHtml()
- {
- return '
-
-
-
- '.Mage::helper('Mage_Rating_Helper_Data')->__('If you do not specify a rating title for a store, the default value will be used.').'
-
-
-
-
';
- }
-
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php
deleted file mode 100644
index 7e4dfae9023ad..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php
+++ /dev/null
@@ -1,112 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Product_Downloads_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
- protected function _construct()
- {
- parent::_construct();
- $this->setId('downloadsGrid');
- $this->setUseAjax(false);
- }
-
- protected function _prepareCollection()
- {
- if ($this->getRequest()->getParam('website')) {
- $storeIds = Mage::app()->getWebsite($this->getRequest()->getParam('website'))->getStoreIds();
- $storeId = array_pop($storeIds);
- } else if ($this->getRequest()->getParam('group')) {
- $storeIds = Mage::app()->getGroup($this->getRequest()->getParam('group'))->getStoreIds();
- $storeId = array_pop($storeIds);
- } else if ($this->getRequest()->getParam('store')) {
- $storeId = (int)$this->getRequest()->getParam('store');
- } else {
- $storeId = '';
- }
-
- $collection = Mage::getResourceModel('Mage_Reports_Model_Resource_Product_Downloads_Collection')
- ->addAttributeToSelect('*')
- ->setStoreId($storeId)
- ->addAttributeToFilter('type_id', array(Mage_Downloadable_Model_Product_Type::TYPE_DOWNLOADABLE))
- ->addSummary();
-
- if( $storeId ) {
- $collection->addStoreFilter($storeId);
- }
-
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('name', array(
- 'header' => Mage::helper('Mage_Reports_Helper_Data')->__('Product Name'),
- 'index' => 'name'
- ));
-
- $this->addColumn('link_title', array(
- 'header' => Mage::helper('Mage_Reports_Helper_Data')->__('Link'),
- 'index' => 'link_title'
- ));
-
- $this->addColumn('sku', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Product SKU'),
- 'index' =>'sku'
- ));
-
- $this->addColumn('purchases', array(
- 'header' => Mage::helper('Mage_Reports_Helper_Data')->__('Purchases'),
- 'width' => '215px',
- 'align' => 'right',
- 'filter' => false,
- 'index' => 'purchases',
- 'type' => 'number',
- 'renderer' => 'Mage_Adminhtml_Block_Report_Product_Downloads_Renderer_Purchases',
- ));
-
- $this->addColumn('downloads', array(
- 'header' => Mage::helper('Mage_Reports_Helper_Data')->__('Downloads'),
- 'width' => '215px',
- 'align' => 'right',
- 'filter' => false,
- 'index' => 'downloads',
- 'type' => 'number'
- ));
-
- $this->addExportType('*/*/exportDownloadsCsv', Mage::helper('Mage_Reports_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportDownloadsExcel', Mage::helper('Mage_Reports_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php
deleted file mode 100644
index 769a602cc2fa0..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Product_Lowstock_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
-// protected $_saveParametersInSession = true;
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('gridLowstock');
- $this->setUseAjax(false);
- }
-
- protected function _prepareCollection()
- {
- if ($this->getRequest()->getParam('website')) {
- $storeIds = Mage::app()->getWebsite($this->getRequest()->getParam('website'))->getStoreIds();
- $storeId = array_pop($storeIds);
- } else if ($this->getRequest()->getParam('group')) {
- $storeIds = Mage::app()->getGroup($this->getRequest()->getParam('group'))->getStoreIds();
- $storeId = array_pop($storeIds);
- } else if ($this->getRequest()->getParam('store')) {
- $storeId = (int)$this->getRequest()->getParam('store');
- } else {
- $storeId = '';
- }
-
- /** @var $collection Mage_Reports_Model_Resource_Product_Lowstock_Collection */
- $collection = Mage::getResourceModel('Mage_Reports_Model_Resource_Product_Lowstock_Collection')
- ->addAttributeToSelect('*')
- ->setStoreId($storeId)
- ->filterByIsQtyProductTypes()
- ->joinInventoryItem('qty')
- ->useManageStockFilter($storeId)
- ->useNotifyStockQtyFilter($storeId)
- ->setOrder('qty', Varien_Data_Collection::SORT_ORDER_ASC);
-
- if( $storeId ) {
- $collection->addStoreFilter($storeId);
- }
-
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('name', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Product Name'),
- 'sortable' =>false,
- 'index' =>'name'
- ));
-
- $this->addColumn('sku', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Product SKU'),
- 'sortable' =>false,
- 'index' =>'sku'
- ));
-
- $this->addColumn('qty', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Stock Qty'),
- 'width' =>'215px',
- 'align' =>'right',
- 'sortable' =>false,
- 'filter' =>'Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Range',
- 'index' =>'qty',
- 'type' =>'number'
- ));
-
- $this->addExportType('*/*/exportLowstockCsv', Mage::helper('Mage_Reports_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportLowstockExcel', Mage::helper('Mage_Reports_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php
deleted file mode 100644
index 696306f1b96fc..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Product_Viewed_Grid extends Mage_Adminhtml_Block_Report_Grid_Abstract
-{
- /**
- * Column for grid to be grouped by
- *
- * @var string
- */
- protected $_columnGroupBy = 'period';
-
- /**
- * Grid resource collection name
- *
- * @var string
- */
- protected $_resourceCollectionName = 'Mage_Reports_Model_Resource_Report_Product_Viewed_Collection';
-
- /**
- * Init grid parameters
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setCountTotals(true);
- }
-
- /**
- * Custom columns preparation
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareColumns()
- {
- $this->addColumn('period', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Period'),
- 'index' => 'period',
- 'width' => 100,
- 'sortable' => false,
- 'period_type' => $this->getPeriodType(),
- 'renderer' => 'Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date',
- 'totals_label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total'),
- 'html_decorators' => array('nobr'),
- ));
-
- $this->addColumn('product_name', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Product Name'),
- 'index' => 'product_name',
- 'type' => 'string',
- 'sortable' => false
- ));
-
- if ($this->getFilterData()->getStoreIds()) {
- $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
- }
- $currencyCode = $this->getCurrentCurrencyCode();
-
- $this->addColumn('product_price', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Price'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'product_price',
- 'sortable' => false,
- 'rate' => $this->getRate($currencyCode),
- ));
-
- $this->addColumn('views_num', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Number of Views'),
- 'index' => 'views_num',
- 'type' => 'number',
- 'total' => 'sum',
- 'sortable' => false
- ));
-
-
- $this->addExportType('*/*/exportViewedCsv', Mage::helper('Mage_Adminhtml_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportViewedExcel', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-
- /**
- * Don't use orders in collection
- *
- * @param Mage_Reports_Model_Resource_Report_Collection_Abstract $collection
- * @param Varien_Object $filterData
- * @return Mage_Adminhtml_Block_Report_Grid_Abstract
- */
- protected function _addOrderStatusFilter($collection, $filterData)
- {
- return $this;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php
deleted file mode 100644
index ce85b633e5777..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php
+++ /dev/null
@@ -1,97 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Sales_Bestsellers_Grid extends Mage_Adminhtml_Block_Report_Grid_Abstract
-{
- protected $_columnGroupBy = 'period';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setCountTotals(true);
- }
-
- public function getResourceCollectionName()
- {
- return 'Mage_Sales_Model_Resource_Report_Bestsellers_Collection';
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('period', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Period'),
- 'index' => 'period',
- 'width' => 100,
- 'sortable' => false,
- 'period_type' => $this->getPeriodType(),
- 'renderer' => 'Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date',
- 'totals_label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total'),
- 'html_decorators' => array('nobr'),
- ));
-
- $this->addColumn('product_name', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Product Name'),
- 'index' => 'product_name',
- 'type' => 'string',
- 'sortable' => false
- ));
-
- if ($this->getFilterData()->getStoreIds()) {
- $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
- }
- $currencyCode = $this->getCurrentCurrencyCode();
-
- $this->addColumn('product_price', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Price'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'product_price',
- 'sortable' => false,
- 'rate' => $this->getRate($currencyCode),
- ));
-
- $this->addColumn('qty_ordered', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Quantity Ordered'),
- 'index' => 'qty_ordered',
- 'type' => 'number',
- 'total' => 'sum',
- 'sortable' => false
- ));
-
-
- $this->addExportType('*/*/exportBestsellersCsv', Mage::helper('Mage_Adminhtml_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportBestsellersExcel', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php
deleted file mode 100644
index 4e92b26e887af..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php
+++ /dev/null
@@ -1,179 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Sales_Coupons_Grid extends Mage_Adminhtml_Block_Report_Grid_Abstract
-{
- protected $_columnGroupBy = 'period';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setCountTotals(true);
- $this->setCountSubTotals(true);
- }
-
- public function getResourceCollectionName()
- {
- if (($this->getFilterData()->getData('report_type') == 'updated_at_order')) {
- return 'Mage_SalesRule_Model_Resource_Report_Updatedat_Collection';
- } else {
- return 'Mage_SalesRule_Model_Resource_Report_Collection';
- }
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('period', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Period'),
- 'index' => 'period',
- 'width' => 100,
- 'sortable' => false,
- 'period_type' => $this->getPeriodType(),
- 'renderer' => 'Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date',
- 'totals_label' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Total'),
- 'subtotals_label' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Subtotal'),
- 'html_decorators' => array('nobr'),
- ));
-
- $this->addColumn('coupon_code', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Coupon Code'),
- 'sortable' => false,
- 'index' => 'coupon_code'
- ));
-
- $this->addColumn('rule_name', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Shopping Cart Price Rule'),
- 'sortable' => false,
- 'index' => 'rule_name'
- ));
-
- $this->addColumn('coupon_uses', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Number of Uses'),
- 'sortable' => false,
- 'index' => 'coupon_uses',
- 'total' => 'sum',
- 'type' => 'number'
- ));
-
- if ($this->getFilterData()->getStoreIds()) {
- $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
- }
- $currencyCode = $this->getCurrentCurrencyCode();
- $rate = $this->getRate($currencyCode);
-
- $this->addColumn('subtotal_amount', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Sales Subtotal Amount'),
- 'sortable' => false,
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'total' => 'sum',
- 'index' => 'subtotal_amount',
- 'rate' => $rate,
- ));
-
- $this->addColumn('discount_amount', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Sales Discount Amount'),
- 'sortable' => false,
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'total' => 'sum',
- 'index' => 'discount_amount',
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_amount', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Sales Total Amount'),
- 'sortable' => false,
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'total' => 'sum',
- 'index' => 'total_amount',
- 'rate' => $rate,
- ));
-
- $this->addColumn('subtotal_amount_actual', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Subtotal Amount'),
- 'sortable' => false,
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'total' => 'sum',
- 'index' => 'subtotal_amount_actual',
- 'rate' => $rate,
- ));
-
- $this->addColumn('discount_amount_actual', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Discount Amount'),
- 'sortable' => false,
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'total' => 'sum',
- 'index' => 'discount_amount_actual',
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_amount_actual', array(
- 'header' => Mage::helper('Mage_SalesRule_Helper_Data')->__('Total Amount'),
- 'sortable' => false,
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'total' => 'sum',
- 'index' => 'total_amount_actual',
- 'rate' => $rate,
- ));
-
- $this->addExportType('*/*/exportCouponsCsv', Mage::helper('Mage_Adminhtml_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportCouponsExcel', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-
- /**
- * Add price rule filter
- *
- * @param Mage_Reports_Model_Resource_Report_Collection_Abstract $collection
- * @param Varien_Object $filterData
- * @return Mage_Adminhtml_Block_Report_Grid_Abstract
- */
- protected function _addCustomFilter($collection, $filterData)
- {
- if ($filterData->getPriceRuleType()) {
- $rulesList = $filterData->getData('rules_list');
- if (isset($rulesList[0])) {
- $rulesIds = explode(',', $rulesList[0]);
- $collection->addRuleFilter($rulesIds);
- }
- }
-
- return parent::_addCustomFilter($filterData, $collection);
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php
deleted file mode 100644
index 5dd4d3b46b004..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Sales_Invoiced_Grid extends Mage_Adminhtml_Block_Report_Grid_Abstract
-{
- protected $_columnGroupBy = 'period';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setCountTotals(true);
- }
-
- public function getResourceCollectionName()
- {
- return ($this->getFilterData()->getData('report_type') == 'created_at_invoice')
- ? 'Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced'
- : 'Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order';
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('period', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Period'),
- 'index' => 'period',
- 'width' => 100,
- 'sortable' => false,
- 'period_type' => $this->getPeriodType(),
- 'renderer' => 'Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date',
- 'totals_label' => Mage::helper('Mage_Sales_Helper_Data')->__('Total'),
- 'html_decorators' => array('nobr'),
- ));
-
- $this->addColumn('orders_count', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Number of Orders'),
- 'index' => 'orders_count',
- 'type' => 'number',
- 'total' => 'sum',
- 'sortable' => false
- ));
-
- $this->addColumn('orders_invoiced', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Number of Invoiced Orders'),
- 'index' => 'orders_invoiced',
- 'type' => 'number',
- 'total' => 'sum',
- 'sortable' => false
- ));
-
- if ($this->getFilterData()->getStoreIds()) {
- $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
- }
- $currencyCode = $this->getCurrentCurrencyCode();
- $rate = $this->getRate($currencyCode);
-
- $this->addColumn('invoiced', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Total Invoiced'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'invoiced',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('invoiced_captured', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Total Invoiced Paid'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'invoiced_captured',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('invoiced_not_captured', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Total Invoiced not Paid'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'invoiced_not_captured',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addExportType('*/*/exportInvoicedCsv', Mage::helper('Mage_Adminhtml_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportInvoicedExcel', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php
deleted file mode 100644
index 452b0be0c60bd..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Sales_Refunded_Grid extends Mage_Adminhtml_Block_Report_Grid_Abstract
-{
- protected $_columnGroupBy = 'period';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setCountTotals(true);
- }
-
- public function getResourceCollectionName()
- {
- return ($this->getFilterData()->getData('report_type') == 'created_at_refunded')
- ? 'Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded'
- : 'Mage_Sales_Model_Resource_Report_Refunded_Collection_Order';
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('period', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Period'),
- 'index' => 'period',
- 'width' => 100,
- 'sortable' => false,
- 'period_type' => $this->getPeriodType(),
- 'renderer' => 'Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date',
- 'totals_label' => Mage::helper('Mage_Sales_Helper_Data')->__('Total'),
- 'html_decorators' => array('nobr'),
- ));
-
- $this->addColumn('orders_count', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Number of Refunded Orders'),
- 'index' => 'orders_count',
- 'type' => 'number',
- 'total' => 'sum',
- 'sortable' => false
- ));
-
- if ($this->getFilterData()->getStoreIds()) {
- $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
- }
- $currencyCode = $this->getCurrentCurrencyCode();
- $rate = $this->getRate($currencyCode);
-
- $this->addColumn('refunded', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Total Refunded'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'refunded',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('online_refunded', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Online Refunded'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'online_refunded',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('offline_refunded', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Offline Refunded'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'offline_refunded',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addExportType('*/*/exportRefundedCsv', Mage::helper('Mage_Adminhtml_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportRefundedExcel', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php
deleted file mode 100644
index ade7c5db0c6e5..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php
+++ /dev/null
@@ -1,237 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Sales_Sales_Grid extends Mage_Adminhtml_Block_Report_Grid_Abstract
-{
- protected $_columnGroupBy = 'period';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setCountTotals(true);
- }
-
- public function getResourceCollectionName()
- {
- return ($this->getFilterData()->getData('report_type') == 'updated_at_order')
- ? 'Mage_Sales_Model_Resource_Report_Order_Updatedat_Collection'
- : 'Mage_Sales_Model_Resource_Report_Order_Collection';
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('period', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Period'),
- 'index' => 'period',
- 'width' => 100,
- 'sortable' => false,
- 'period_type' => $this->getPeriodType(),
- 'renderer' => 'Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date',
- 'totals_label' => Mage::helper('Mage_Sales_Helper_Data')->__('Total'),
- 'html_decorators' => array('nobr'),
- ));
-
- $this->addColumn('orders_count', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Orders'),
- 'index' => 'orders_count',
- 'type' => 'number',
- 'total' => 'sum',
- 'sortable' => false
- ));
-
- $this->addColumn('total_qty_ordered', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Sales Items'),
- 'index' => 'total_qty_ordered',
- 'type' => 'number',
- 'total' => 'sum',
- 'sortable' => false
- ));
-
- $this->addColumn('total_qty_invoiced', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Items'),
- 'index' => 'total_qty_invoiced',
- 'type' => 'number',
- 'total' => 'sum',
- 'sortable' => false,
- 'visibility_filter' => array('show_actual_columns')
- ));
-
- if ($this->getFilterData()->getStoreIds()) {
- $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
- }
- $currencyCode = $this->getCurrentCurrencyCode();
- $rate = $this->getRate($currencyCode);
-
- $this->addColumn('total_income_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Sales Total'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_income_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_revenue_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Revenue'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_revenue_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'visibility_filter' => array('show_actual_columns'),
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_profit_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Profit'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_profit_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'visibility_filter' => array('show_actual_columns'),
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_invoiced_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Invoiced'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_invoiced_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_paid_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Paid'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_paid_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'visibility_filter' => array('show_actual_columns'),
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_refunded_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Refunded'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_refunded_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_tax_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Sales Tax'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_tax_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_tax_amount_actual', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Tax'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_tax_amount_actual',
- 'total' => 'sum',
- 'sortable' => false,
- 'visibility_filter' => array('show_actual_columns'),
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_shipping_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Sales Shipping'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_shipping_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_shipping_amount_actual', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Shipping'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_shipping_amount_actual',
- 'total' => 'sum',
- 'sortable' => false,
- 'visibility_filter' => array('show_actual_columns'),
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_discount_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Sales Discount'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_discount_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_discount_amount_actual', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Discount'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_discount_amount_actual',
- 'total' => 'sum',
- 'sortable' => false,
- 'visibility_filter' => array('show_actual_columns'),
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_canceled_amount', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Canceled'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_canceled_amount',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
-
- $this->addExportType('*/*/exportSalesCsv', Mage::helper('Mage_Adminhtml_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportSalesExcel', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php
deleted file mode 100644
index ced90fa698005..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php
+++ /dev/null
@@ -1,116 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Sales_Shipping_Grid extends Mage_Adminhtml_Block_Report_Grid_Abstract
-{
- protected $_columnGroupBy = 'period';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setCountTotals(true);
- $this->setCountSubTotals(true);
- }
-
- public function getResourceCollectionName()
- {
- return ($this->getFilterData()->getData('report_type') == 'created_at_shipment')
- ? 'Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment'
- : 'Mage_Sales_Model_Resource_Report_Shipping_Collection_Order';
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('period', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Period'),
- 'index' => 'period',
- 'width' => 100,
- 'sortable' => false,
- 'period_type' => $this->getPeriodType(),
- 'renderer' => 'Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date',
- 'totals_label' => Mage::helper('Mage_Sales_Helper_Data')->__('Total'),
- 'subtotals_label' => Mage::helper('Mage_Sales_Helper_Data')->__('Subtotal'),
- 'html_decorators' => array('nobr'),
- ));
-
- $this->addColumn('shipping_description', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Carrier/Method'),
- 'index' => 'shipping_description',
- 'sortable' => false
- ));
-
- $this->addColumn('orders_count', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Number of Orders'),
- 'index' => 'orders_count',
- 'total' => 'sum',
- 'type' => 'number',
- 'width' => 100,
- 'sortable' => false
- ));
-
- if ($this->getFilterData()->getStoreIds()) {
- $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
- }
-
- $currencyCode = $this->getCurrentCurrencyCode();
- $rate = $this->getRate($currencyCode);
-
- $this->addColumn('total_shipping', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Total Sales Shipping'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_shipping',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addColumn('total_shipping_actual', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Total Shipping'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'total_shipping_actual',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $rate,
- ));
-
- $this->addExportType('*/*/exportShippingCsv', Mage::helper('Mage_Adminhtml_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportShippingExcel', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-}
-
-
-
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php
deleted file mode 100644
index b8955c589d155..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php
+++ /dev/null
@@ -1,133 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Sales_Tax_Grid extends Mage_Adminhtml_Block_Report_Grid_Abstract
-{
- protected $_columnGroupBy = 'period';
-
- protected function _construct()
- {
- parent::_construct();
- $this->setCountTotals(true);
- $this->setCountSubTotals(true);
- }
-
- public function getResourceCollectionName()
- {
- return ($this->getFilterData()->getData('report_type') == 'updated_at_order')
- ? 'Mage_Tax_Model_Resource_Report_Updatedat_Collection'
- : 'Mage_Tax_Model_Resource_Report_Collection';
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('period', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Period'),
- 'index' => 'period',
- 'width' => '100',
- 'sortable' => false,
- 'period_type' => $this->getPeriodType(),
- 'renderer' => 'Mage_Adminhtml_Block_Report_Sales_Grid_Column_Renderer_Date',
- 'totals_label' => Mage::helper('Mage_Sales_Helper_Data')->__('Total'),
- 'subtotals_label' => Mage::helper('Mage_Sales_Helper_Data')->__('Subtotal'),
- 'html_decorators' => array('nobr'),
- ));
-
- $this->addColumn('code', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Tax'),
- 'index' => 'code',
- 'type' => 'string',
- 'sortable' => false
- ));
-
- $this->addColumn('percent', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Rate'),
- 'index' => 'percent',
- 'type' => 'number',
- 'width' => '100',
- 'sortable' => false
- ));
-
- $this->addColumn('orders_count', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Number of Orders'),
- 'index' => 'orders_count',
- 'total' => 'sum',
- 'type' => 'number',
- 'width' => '100',
- 'sortable' => false
- ));
-
- if ($this->getFilterData()->getStoreIds()) {
- $this->setStoreIds(explode(',', $this->getFilterData()->getStoreIds()));
- }
- $currencyCode = $this->getCurrentCurrencyCode();
-
- $this->addColumn('tax_base_amount_sum', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Tax Amount'),
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'tax_base_amount_sum',
- 'total' => 'sum',
- 'sortable' => false,
- 'rate' => $this->getRate($currencyCode),
- ));
-
- $this->addExportType('*/*/exportTaxCsv', Mage::helper('Mage_Adminhtml_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportTaxExcel', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-
- /**
- * Preparing collection
- * Filter canceled statuses for orders in taxes
- *
- *@return Mage_Adminhtml_Block_Report_Sales_Tax_Grid
- */
- protected function _prepareCollection()
- {
- $filterData = $this->getFilterData();
- if(!$filterData->hasData('order_statuses')) {
- $orderConfig = Mage::getModel('Mage_Sales_Model_Order_Config');
- $statusValues = array();
- $canceledStatuses = $orderConfig->getStateStatuses(Mage_Sales_Model_Order::STATE_CANCELED);
- foreach ($orderConfig->getStatuses() as $code => $label) {
- if (!isset($canceledStatuses[$code])) {
- $statusValues[] = $code;
- }
- }
- $filterData->setOrderStatuses($statusValues);
- }
- return parent::_prepareCollection();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
deleted file mode 100644
index d8f5d3bf494cb..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
+++ /dev/null
@@ -1,174 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Shopcart_Abandoned_Grid extends Mage_Adminhtml_Block_Report_Grid_Shopcart
-{
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('gridAbandoned');
- }
-
- protected function _prepareCollection()
- {
- /** @var $collection Mage_Reports_Model_Resource_Quote_Collection */
- $collection = Mage::getResourceModel('Mage_Reports_Model_Resource_Quote_Collection');
-
- $filter = $this->getParam($this->getVarNameFilter(), array());
- if ($filter) {
- $filter = base64_decode($filter);
- parse_str(urldecode($filter), $data);
- }
-
- if (!empty($data)) {
- $collection->prepareForAbandonedReport($this->_storeIds, $data);
- } else {
- $collection->prepareForAbandonedReport($this->_storeIds);
- }
-
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- protected function _addColumnFilterToCollection($column)
- {
- $field = ( $column->getFilterIndex() ) ? $column->getFilterIndex() : $column->getIndex();
- $skip = array('subtotal', 'customer_name', 'email'/*, 'created_at', 'updated_at'*/);
-
- if (in_array($field, $skip)) {
- return $this;
- }
-
- parent::_addColumnFilterToCollection($column);
- return $this;
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('customer_name', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Customer Name'),
- 'index' =>'customer_name',
- 'sortable' =>false
- ));
-
- $this->addColumn('email', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Email'),
- 'index' =>'email',
- 'sortable' =>false
- ));
-
- $this->addColumn('items_count', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Number of Items'),
- 'width' =>'80px',
- 'align' =>'right',
- 'index' =>'items_count',
- 'sortable' =>false,
- 'type' =>'number'
- ));
-
- $this->addColumn('items_qty', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Quantity of Items'),
- 'width' =>'80px',
- 'align' =>'right',
- 'index' =>'items_qty',
- 'sortable' =>false,
- 'type' =>'number'
- ));
-
- if ($this->getRequest()->getParam('website')) {
- $storeIds = Mage::app()->getWebsite($this->getRequest()->getParam('website'))->getStoreIds();
- } else if ($this->getRequest()->getParam('group')) {
- $storeIds = Mage::app()->getGroup($this->getRequest()->getParam('group'))->getStoreIds();
- } else if ($this->getRequest()->getParam('store')) {
- $storeIds = array((int)$this->getRequest()->getParam('store'));
- } else {
- $storeIds = array();
- }
- $this->setStoreIds($storeIds);
- $currencyCode = $this->getCurrentCurrencyCode();
-
- $this->addColumn('subtotal', array(
- 'header' => Mage::helper('Mage_Reports_Helper_Data')->__('Subtotal'),
- 'width' => '80px',
- 'type' => 'currency',
- 'currency_code' => $currencyCode,
- 'index' => 'subtotal',
- 'sortable' => false,
- 'renderer' => 'Mage_Adminhtml_Block_Report_Grid_Column_Renderer_Currency',
- 'rate' => $this->getRate($currencyCode),
- ));
-
- $this->addColumn('coupon_code', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Applied Coupon'),
- 'width' =>'80px',
- 'index' =>'coupon_code',
- 'sortable' =>false
- ));
-
- $this->addColumn('created_at', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Created At'),
- 'width' =>'170px',
- 'type' =>'datetime',
- 'index' =>'created_at',
- 'filter_index'=>'main_table.created_at',
- 'sortable' =>false
- ));
-
- $this->addColumn('updated_at', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Updated At'),
- 'width' =>'170px',
- 'type' =>'datetime',
- 'index' =>'updated_at',
- 'filter_index'=>'main_table.updated_at',
- 'sortable' =>false
- ));
-
- $this->addColumn('remote_ip', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('IP Address'),
- 'width' =>'80px',
- 'index' =>'remote_ip',
- 'sortable' =>false
- ));
-
- $this->addExportType('*/*/exportAbandonedCsv', Mage::helper('Mage_Reports_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportAbandonedExcel', Mage::helper('Mage_Reports_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-
- public function getRowUrl($row)
- {
- return $this->getUrl('*/customer/edit', array('id'=>$row->getCustomerId(), 'active_tab'=>'cart'));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php
deleted file mode 100644
index 6531f02b379da..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Report_Shopcart_Product_Grid extends Mage_Adminhtml_Block_Report_Grid_Shopcart
-{
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('gridProducts');
- }
-
- protected function _prepareCollection()
- {
- /** @var $collection Mage_Reports_Model_Resource_Quote_Collection */
- $collection = Mage::getResourceModel('Mage_Reports_Model_Resource_Quote_Collection');
- $collection->prepareForProductsInCarts()
- ->setSelectCountSqlType(Mage_Reports_Model_Resource_Quote_Collection::SELECT_COUNT_SQL_TYPE_CART);
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('entity_id', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('ID'),
- 'width' =>'50px',
- 'align' =>'right',
- 'index' =>'entity_id'
- ));
-
- $this->addColumn('name', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Product Name'),
- 'index' =>'name'
- ));
-
- $currencyCode = $this->getCurrentCurrencyCode();
-
- $this->addColumn('price', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Price'),
- 'width' =>'80px',
- 'type' =>'currency',
- 'currency_code' => $currencyCode,
- 'index' =>'price',
- 'renderer' =>'Mage_Adminhtml_Block_Report_Grid_Column_Renderer_Currency',
- 'rate' => $this->getRate($currencyCode),
- ));
-
- $this->addColumn('carts', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Carts'),
- 'width' =>'80px',
- 'align' =>'right',
- 'index' =>'carts'
- ));
-
- $this->addColumn('orders', array(
- 'header' =>Mage::helper('Mage_Reports_Helper_Data')->__('Orders'),
- 'width' =>'80px',
- 'align' =>'right',
- 'index' =>'orders'
- ));
-
- $this->setFilterVisibility(false);
-
- $this->addExportType('*/*/exportProductCsv', Mage::helper('Mage_Reports_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportProductExcel', Mage::helper('Mage_Reports_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-
- public function getRowUrl($row)
- {
- return $this->getUrl('*/catalog_product/edit', array('id'=>$row->getEntityId()));
- }
-}
-
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
deleted file mode 100644
index 5d5321f770208..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
+++ /dev/null
@@ -1,167 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Sales_Creditmemo_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('sales_creditmemo_grid');
- $this->setDefaultSort('created_at');
- $this->setDefaultDir('DESC');
- }
-
- /**
- * Retrieve collection class
- *
- * @return string
- */
- protected function _getCollectionClass()
- {
- return 'Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection';
- }
-
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceModel($this->_getCollectionClass());
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
-
- protected function _prepareColumns()
- {
- $this->addColumn('increment_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Credit Memo #'),
- 'index' => 'increment_id',
- 'type' => 'text',
- ));
-
- $this->addColumn('created_at', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Created At'),
- 'index' => 'created_at',
- 'type' => 'datetime',
- ));
-
- $this->addColumn('order_increment_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Order #'),
- 'index' => 'order_increment_id',
- 'type' => 'text',
- ));
-
- $this->addColumn('order_created_at', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Order Date'),
- 'index' => 'order_created_at',
- 'type' => 'datetime',
- ));
-
- $this->addColumn('billing_name', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Bill to Name'),
- 'index' => 'billing_name',
- ));
-
- $this->addColumn('state', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Status'),
- 'index' => 'state',
- 'type' => 'options',
- 'options' => Mage::getModel('Mage_Sales_Model_Order_Creditmemo')->getStates(),
- ));
-
- $this->addColumn('grand_total', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('Refunded'),
- 'index' => 'grand_total',
- 'type' => 'currency',
- 'align' => 'right',
- 'currency' => 'order_currency_code',
- ));
-
- $this->addColumn('action',
- array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Action'),
- 'width' => '50px',
- 'type' => 'action',
- 'getter' => 'getId',
- 'actions' => array(
- array(
- 'caption' => Mage::helper('Mage_Sales_Helper_Data')->__('View'),
- 'url' => array('base'=>'*/sales_creditmemo/view'),
- 'field' => 'creditmemo_id'
- )
- ),
- 'filter' => false,
- 'sortable' => false,
- 'is_system' => true
- ));
-
- $this->addExportType('*/*/exportCsv', Mage::helper('Mage_Sales_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportExcel', Mage::helper('Mage_Sales_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-
- protected function _prepareMassaction()
- {
- $this->setMassactionIdField('entity_id');
- $this->getMassactionBlock()->setFormFieldName('creditmemo_ids');
- $this->getMassactionBlock()->setUseSelectAll(false);
-
- $this->getMassactionBlock()->addItem('pdfcreditmemos_order', array(
- 'label'=> Mage::helper('Mage_Sales_Helper_Data')->__('PDF Credit Memos'),
- 'url' => $this->getUrl('*/sales_creditmemo/pdfcreditmemos'),
- ));
-
- return $this;
- }
-
- public function getRowUrl($row)
- {
- if (!Mage::getSingleton('Mage_Core_Model_Authorization')
- ->isAllowed(Mage_Backend_Model_Acl_Config::ACL_RESOURCE_ALL)
- ) {
- return false;
- }
-
- return $this->getUrl('*/sales_creditmemo/view',
- array(
- 'creditmemo_id'=> $row->getId(),
- )
- );
- }
-
- public function getGridUrl()
- {
- return $this->getUrl('*/*/*', array('_current' => true));
- }
-
-
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
deleted file mode 100644
index 9568afb0dd376..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Sales_Invoice_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('sales_invoice_grid');
- $this->setUseAjax(true);
- $this->setDefaultSort('created_at');
- $this->setDefaultDir('DESC');
- $this->setSaveParametersInSession(true);
- }
-
- /**
- * Retrieve collection class
- *
- * @return string
- */
- protected function _getCollectionClass()
- {
- return 'Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection';
- }
-
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceModel($this->_getCollectionClass());
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('increment_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Invoice #'),
- 'index' => 'increment_id',
- 'type' => 'text',
- ));
-
- $this->addColumn('created_at', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Invoice Date'),
- 'index' => 'created_at',
- 'type' => 'datetime',
- ));
-
- $this->addColumn('order_increment_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Order #'),
- 'index' => 'order_increment_id',
- 'type' => 'text',
- ));
-
- $this->addColumn('order_created_at', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Order Date'),
- 'index' => 'order_created_at',
- 'type' => 'datetime',
- ));
-
- $this->addColumn('billing_name', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Bill to Name'),
- 'index' => 'billing_name',
- ));
-
- $this->addColumn('state', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Status'),
- 'index' => 'state',
- 'type' => 'options',
- 'options' => Mage::getModel('Mage_Sales_Model_Order_Invoice')->getStates(),
- ));
-
- $this->addColumn('grand_total', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('Amount'),
- 'index' => 'grand_total',
- 'type' => 'currency',
- 'align' => 'right',
- 'currency' => 'order_currency_code',
- ));
-
- $this->addColumn('action',
- array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Action'),
- 'width' => '50px',
- 'type' => 'action',
- 'getter' => 'getId',
- 'actions' => array(
- array(
- 'caption' => Mage::helper('Mage_Sales_Helper_Data')->__('View'),
- 'url' => array('base'=>'*/sales_invoice/view'),
- 'field' => 'invoice_id'
- )
- ),
- 'filter' => false,
- 'sortable' => false,
- 'is_system' => true
- ));
-
- $this->addExportType('*/*/exportCsv', Mage::helper('Mage_Sales_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportExcel', Mage::helper('Mage_Sales_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-
- protected function _prepareMassaction()
- {
- $this->setMassactionIdField('entity_id');
- $this->getMassactionBlock()->setFormFieldName('invoice_ids');
- $this->getMassactionBlock()->setUseSelectAll(false);
-
- $this->getMassactionBlock()->addItem('pdfinvoices_order', array(
- 'label'=> Mage::helper('Mage_Sales_Helper_Data')->__('PDF Invoices'),
- 'url' => $this->getUrl('*/sales_invoice/pdfinvoices'),
- ));
-
- return $this;
- }
-
- public function getRowUrl($row)
- {
- if (!Mage::getSingleton('Mage_Core_Model_Authorization')
- ->isAllowed(Mage_Backend_Model_Acl_Config::ACL_RESOURCE_ALL)
- ) {
- return false;
- }
-
- return $this->getUrl('*/sales_invoice/view',
- array(
- 'invoice_id'=> $row->getId(),
- )
- );
- }
-
- public function getGridUrl()
- {
- return $this->getUrl('*/*/grid', array('_current' => true));
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php
deleted file mode 100644
index 2381423e830ba..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php
+++ /dev/null
@@ -1,137 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Sales_Order_Create extends Mage_Adminhtml_Block_Widget_Form_Container
-{
- protected function _construct()
- {
- $this->_objectId = 'order_id';
- $this->_controller = 'sales_order';
- $this->_mode = 'create';
-
- parent::_construct();
-
- $this->setId('sales_order_create');
-
- $customerId = $this->_getSession()->getCustomerId();
- $storeId = $this->_getSession()->getStoreId();
-
-
- $this->_updateButton('save', 'label', Mage::helper('Mage_Sales_Helper_Data')->__('Submit Order'));
- $this->_updateButton('save', 'onclick', "order.submit()");
- $this->_updateButton('save', 'id', 'submit_order_top_button');
- if (is_null($customerId) || !$storeId) {
- $this->_updateButton('save', 'style', 'display:none');
- }
-
- $this->_updateButton('back', 'id', 'back_order_top_button');
- $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getBackUrl() . '\')');
-
- $this->_updateButton('reset', 'id', 'reset_order_top_button');
-
- if (is_null($customerId)) {
- $this->_updateButton('reset', 'style', 'display:none');
- } else {
- $this->_updateButton('back', 'style', 'display:none');
- }
-
- $confirm = Mage::helper('Mage_Sales_Helper_Data')->__('Are you sure you want to cancel this order?');
- $this->_updateButton('reset', 'label', Mage::helper('Mage_Sales_Helper_Data')->__('Cancel'));
- $this->_updateButton('reset', 'class', 'cancel');
- $this->_updateButton('reset', 'onclick', 'deleteConfirm(\''.$confirm.'\', \'' . $this->getCancelUrl() . '\')');
- }
-
- /**
- * Prepare header html
- *
- * @return string
- */
- public function getHeaderHtml()
- {
- $out = '';
- return $out;
- }
-
- /**
- * Prepare form html. Add block for configurable product modification interface
- *
- * @return string
- */
- public function getFormHtml()
- {
- $html = parent::getFormHtml();
- $html .= $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Composite_Configure')->toHtml();
- return $html;
- }
-
- public function getHeaderWidth()
- {
- return 'width: 70%;';
- }
-
- /**
- * Retrieve quote session object
- *
- * @return Mage_Adminhtml_Model_Session_Quote
- */
- protected function _getSession()
- {
- return Mage::getSingleton('Mage_Adminhtml_Model_Session_Quote');
- }
-
- public function getCancelUrl()
- {
- if ($this->_getSession()->getOrder()->getId()) {
- $url = $this->getUrl('*/sales_order/view', array(
- 'order_id' => Mage::getSingleton('Mage_Adminhtml_Model_Session_Quote')->getOrder()->getId()
- ));
- } else {
- $url = $this->getUrl('*/*/cancel');
- }
-
- return $url;
- }
-
- /**
- * Get URL for back (reset) button
- *
- * @return string
- */
- public function getBackUrl()
- {
- return $this->getUrl('*/' . $this->_controller . '/');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
deleted file mode 100644
index 9fbc6290c7f78..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Sales_Order_Create_Customer extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
-{
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('sales_order_create_customer');
- }
-
- public function getHeaderText()
- {
- return Mage::helper('Mage_Sales_Helper_Data')->__('Please Select a Customer');
- }
-
- public function getButtonsHtml()
- {
- $addButtonData = array(
- 'label' => Mage::helper('Mage_Sales_Helper_Data')->__('Create New Customer'),
- 'onclick' => 'order.setCustomerId(false)',
- 'class' => 'add',
- );
- return $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')->setData($addButtonData)->toHtml();
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php
deleted file mode 100644
index cd41790847f50..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Sales_Order_Create_Header extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract
-{
- protected function _toHtml()
- {
- if ($this->_getSession()->getOrder()->getId()) {
- return '
'.Mage::helper('Mage_Sales_Helper_Data')->__('Edit Order #%s', $this->_getSession()->getOrder()->getIncrementId()).' ';
- }
-
- $customerId = $this->getCustomerId();
- $storeId = $this->getStoreId();
- $out = '';
- if ($customerId && $storeId) {
- $out.= Mage::helper('Mage_Sales_Helper_Data')->__('Create New Order for %s in %s', $this->getCustomer()->getName(), $this->getStore()->getName());
- }
- elseif (!is_null($customerId) && $storeId){
- $out.= Mage::helper('Mage_Sales_Helper_Data')->__('Create New Order for New Customer in %s', $this->getStore()->getName());
- }
- elseif ($customerId) {
- $out.= Mage::helper('Mage_Sales_Helper_Data')->__('Create New Order for %s', $this->getCustomer()->getName());
- }
- elseif (!is_null($customerId)){
- $out.= Mage::helper('Mage_Sales_Helper_Data')->__('Create New Order for New Customer');
- }
- else {
- $out.= Mage::helper('Mage_Sales_Helper_Data')->__('Create New Order');
- }
- $out = $this->escapeHtml($out);
- $out = '
' . $out . ' ';
- return $out;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php
deleted file mode 100644
index 918ccfde892dd..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Product extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Text
-{
- /**
- * Render product name to add Configure link
- *
- * @param Varien_Object $row
- * @return string
- */
- public function render(Varien_Object $row)
- {
- $rendered = parent::render($row);
- $isConfigurable = $row->canConfigure();
- $style = $isConfigurable ? '' : 'style="color: #CCC;"';
- $prodAttributes = $isConfigurable ? sprintf('list_type = "product_to_add" product_id = %s', $row->getId()) : 'disabled="disabled"';
- return sprintf('
%s ',
- $style, $prodAttributes, Mage::helper('Mage_Sales_Helper_Data')->__('Configure')) . $rendered;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php
deleted file mode 100644
index ca28389bb446d..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php
+++ /dev/null
@@ -1,189 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Sales_Shipment_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
-
- /**
- * Initialization
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setId('sales_shipment_grid');
- $this->setDefaultSort('created_at');
- $this->setDefaultDir('DESC');
- }
-
- /**
- * Retrieve collection class
- *
- * @return string
- */
- protected function _getCollectionClass()
- {
- return 'Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection';
- }
-
- /**
- * Prepare and set collection of grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceModel($this->_getCollectionClass());
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- /**
- * Prepare and add columns to grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareColumns()
- {
- $this->addColumn('increment_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Shipment #'),
- 'index' => 'increment_id',
- 'type' => 'text',
- ));
-
- $this->addColumn('created_at', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Date Shipped'),
- 'index' => 'created_at',
- 'type' => 'datetime',
- ));
-
- $this->addColumn('order_increment_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Order #'),
- 'index' => 'order_increment_id',
- 'type' => 'text',
- ));
-
- $this->addColumn('order_created_at', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Order Date'),
- 'index' => 'order_created_at',
- 'type' => 'datetime',
- ));
-
- $this->addColumn('shipping_name', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Ship to Name'),
- 'index' => 'shipping_name',
- ));
-
- $this->addColumn('total_qty', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Total Qty'),
- 'index' => 'total_qty',
- 'type' => 'number',
- ));
-
- $this->addColumn('action',
- array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Action'),
- 'width' => '50px',
- 'type' => 'action',
- 'getter' => 'getId',
- 'actions' => array(
- array(
- 'caption' => Mage::helper('Mage_Sales_Helper_Data')->__('View'),
- 'url' => array('base'=>'*/sales_shipment/view'),
- 'field' => 'shipment_id'
- )
- ),
- 'filter' => false,
- 'sortable' => false,
- 'is_system' => true
- ));
-
- $this->addExportType('*/*/exportCsv', Mage::helper('Mage_Sales_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportExcel', Mage::helper('Mage_Sales_Helper_Data')->__('Excel XML'));
-
- return parent::_prepareColumns();
- }
-
- /**
- * Get url for row
- *
- * @param string $row
- * @return string
- */
- public function getRowUrl($row)
- {
- if (!Mage::getSingleton('Mage_Core_Model_Authorization')
- ->isAllowed(Mage_Backend_Model_Acl_Config::ACL_RESOURCE_ALL)
- ) {
- return false;
- }
-
- return $this->getUrl('*/sales_shipment/view',
- array(
- 'shipment_id'=> $row->getId(),
- )
- );
- }
-
- /**
- * Prepare and set options for massaction
- *
- * @return Mage_Adminhtml_Block_Sales_Shipment_Grid
- */
- protected function _prepareMassaction()
- {
- $this->setMassactionIdField('entity_id');
- $this->getMassactionBlock()->setFormFieldName('shipment_ids');
- $this->getMassactionBlock()->setUseSelectAll(false);
-
- $this->getMassactionBlock()->addItem('pdfshipments_order', array(
- 'label'=> Mage::helper('Mage_Sales_Helper_Data')->__('PDF Packing Slips'),
- 'url' => $this->getUrl('*/sales_shipment/pdfshipments'),
- ));
-
- $this->getMassactionBlock()->addItem('print_shipping_label', array(
- 'label'=> Mage::helper('Mage_Sales_Helper_Data')->__('Print Shipping Labels'),
- 'url' => $this->getUrl('*/sales_order_shipment/massPrintShippingLabel'),
- ));
-
- return $this;
- }
-
- /**
- * Get url of grid
- *
- * @return string
- */
- public function getGridUrl()
- {
- return $this->getUrl('*/*/*', array('_current' => true));
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php
deleted file mode 100644
index f43e033108b4d..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Sales_Transactions_Detail_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
- /**
- * Initialize default sorting and html ID
- */
- protected function _construct()
- {
- $this->setId('transactionDetailsGrid');
- $this->setPagerVisibility(false);
- $this->setFilterVisibility(false);
- }
-
- /**
- * Prepare collection for grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- $collection = new Varien_Data_Collection();
- foreach ($this->getTransactionAdditionalInfo() as $key => $value) {
- $data = new Varien_Object(array('key' => $key, 'value' => $value));
- $collection->addItem($data);
- }
-
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- /**
- * Add columns to grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareColumns()
- {
- $this->addColumn('key', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Key'),
- 'index' => 'key',
- 'sortable' => false,
- 'type' => 'text',
- 'width' => '50%'
- ));
-
- $this->addColumn('value', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Value'),
- 'index' => 'value',
- 'sortable' => false,
- 'type' => 'text',
- 'escape' => true
- ));
-
- return parent::_prepareColumns();
- }
-
- /**
- * Retrieve Transaction addtitional info
- *
- * @return array
- */
- public function getTransactionAdditionalInfo()
- {
- $info = Mage::registry('current_transaction')->getAdditionalInformation(
- Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS
- );
- return (is_array($info)) ? $info : array();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php
deleted file mode 100644
index ac62611078982..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php
+++ /dev/null
@@ -1,161 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Sales_Transactions_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
- /**
- * Set grid params
- *
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setId('order_transactions');
- $this->setUseAjax(true);
- $this->setDefaultSort('created_at');
- $this->setDefaultDir('DESC');
- $this->setSaveParametersInSession(true);
- }
-
- /**
- * Prepare collection for grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareCollection()
- {
- $collection = $this->getCollection();
- if (!$collection) {
- $collection = Mage::getResourceModel('Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection');
- }
- $order = Mage::registry('current_order');
- if ($order) {
- $collection->addOrderIdFilter($order->getId());
- }
- $collection->addOrderInformation(array('increment_id'));
- $collection->addPaymentInformation(array('method'));
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- /**
- * Add columns to grid
- *
- * @return Mage_Adminhtml_Block_Widget_Grid
- */
- protected function _prepareColumns()
- {
- $this->addColumn('transaction_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('ID #'),
- 'index' => 'transaction_id',
- 'type' => 'number'
- ));
-
- $this->addColumn('increment_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Order ID'),
- 'index' => 'increment_id',
- 'type' => 'text'
- ));
-
- $this->addColumn('txn_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Transaction ID'),
- 'index' => 'txn_id',
- 'type' => 'text'
- ));
-
- $this->addColumn('parent_txn_id', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Parent Transaction ID'),
- 'index' => 'parent_txn_id',
- 'type' => 'text'
- ));
-
- $this->addColumn('method', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Payment Method Name'),
- 'index' => 'method',
- 'type' => 'options',
- 'options' => Mage::helper('Mage_Payment_Helper_Data')->getPaymentMethodList(true),
- 'option_groups' => Mage::helper('Mage_Payment_Helper_Data')->getPaymentMethodList(true, true, true),
- ));
-
- $this->addColumn('txn_type', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Transaction Type'),
- 'index' => 'txn_type',
- 'type' => 'options',
- 'options' => Mage::getSingleton('Mage_Sales_Model_Order_Payment_Transaction')->getTransactionTypes()
- ));
-
- $this->addColumn('is_closed', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Is Closed'),
- 'index' => 'is_closed',
- 'width' => 1,
- 'type' => 'options',
- 'align' => 'center',
- 'options' => array(
- 1 => Mage::helper('Mage_Sales_Helper_Data')->__('Yes'),
- 0 => Mage::helper('Mage_Sales_Helper_Data')->__('No'),
- )
- ));
-
- $this->addColumn('created_at', array(
- 'header' => Mage::helper('Mage_Sales_Helper_Data')->__('Created At'),
- 'index' => 'created_at',
- 'width' => 1,
- 'type' => 'datetime',
- 'align' => 'center',
- 'default' => $this->__('N/A'),
- 'html_decorators' => array('nobr')
- ));
-
- return parent::_prepareColumns();
- }
-
- /**
- * Retrieve grid url
- *
- * @return string
- */
- public function getGridUrl()
- {
- return $this->getUrl('*/*/grid', array('_current' => true));
- }
-
- /**
- * Retrieve row url
- *
- * @return string
- */
- public function getRowUrl($item)
- {
- return $this->getUrl('*/*/view', array('txn_id' => $item->getId()));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php
deleted file mode 100644
index b07b38302cc9f..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/System/Design.php
+++ /dev/null
@@ -1,42 +0,0 @@
-setTemplate('system/design/index.phtml');
-
- $this->addChild('add_new_button', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Add Design Change'),
- 'onclick' => "setLocation('".$this->getUrl('*/*/new')."')",
- 'class' => 'add'
- ));
-
- return parent::_prepareLayout();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
deleted file mode 100644
index 2ada9fa34bf25..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
+++ /dev/null
@@ -1,492 +0,0 @@
-
- * @method array getTemplateOptions()
- */
-class Mage_Adminhtml_Block_System_Email_Template_Edit extends Mage_Adminhtml_Block_Widget
-{
- /**
- * @var Mage_Core_Model_Registry
- */
- protected $_registryManager;
-
- /**
- * @var Mage_Backend_Model_Menu_Config
- */
- protected $_menuConfig;
-
- /**
- * @var Mage_Backend_Model_Config_Structure
- */
- protected $_configStructure;
-
- /**
- * @param Mage_Core_Controller_Request_Http $request
- * @param Mage_Core_Model_Layout $layout
- * @param Mage_Core_Model_Event_Manager $eventManager
- * @param Mage_Backend_Model_Url $urlBuilder
- * @param Mage_Core_Model_Translate $translator
- * @param Mage_Core_Model_Cache $cache
- * @param Mage_Core_Model_Design_Package $designPackage
- * @param Mage_Core_Model_Session $session
- * @param Mage_Core_Model_Store_Config $storeConfig
- * @param Mage_Core_Controller_Varien_Front $frontController
- * @param Mage_Core_Model_Factory_Helper $helperFactory
- * @param Mage_Core_Model_Dir $dirs
- * @param Mage_Core_Model_Logger $logger
- * @param Magento_Filesystem $filesystem
- * @param Mage_Core_Model_Registry $registry
- * @param Mage_Backend_Model_Menu_Config $menuConfig
- * @param Mage_Backend_Model_Config_Structure $configStructure
- * @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- */
- public function __construct(
- Mage_Core_Controller_Request_Http $request,
- Mage_Core_Model_Layout $layout,
- Mage_Core_Model_Event_Manager $eventManager,
- Mage_Backend_Model_Url $urlBuilder,
- Mage_Core_Model_Translate $translator,
- Mage_Core_Model_Cache $cache,
- Mage_Core_Model_Design_Package $designPackage,
- Mage_Core_Model_Session $session,
- Mage_Core_Model_Store_Config $storeConfig,
- Mage_Core_Controller_Varien_Front $frontController,
- Mage_Core_Model_Factory_Helper $helperFactory,
- Mage_Core_Model_Dir $dirs,
- Mage_Core_Model_Logger $logger,
- Magento_Filesystem $filesystem,
- Mage_Core_Model_Registry $registry,
- Mage_Backend_Model_Menu_Config $menuConfig,
- Mage_Backend_Model_Config_Structure $configStructure,
- array $data = array()
- )
- {
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache,
- $designPackage, $session, $storeConfig, $frontController, $helperFactory, $dirs, $logger, $filesystem, $data
- );
- $this->_registryManager = $registry;
- $this->_menuConfig = $menuConfig;
- $this->_configStructure = $configStructure;
- }
-
-
- protected $_template = 'system/email/template/edit.phtml';
-
- protected function _prepareLayout()
- {
- $this->setChild('back_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Back'),
- 'onclick' => "window.location.href = '" . $this->getUrl('*/*') . "'",
- 'class' => 'back'
- )
- )
- );
-
-
- $this->setChild('reset_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Reset'),
- 'onclick' => 'window.location.href = window.location.href'
- )
- )
- );
-
-
- $this->setChild('delete_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Delete Template'),
- 'onclick' => 'templateControl.deleteTemplate();',
- 'class' => 'delete'
- )
- )
- );
-
- $this->setChild('to_plain_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Convert to Plain Text'),
- 'onclick' => 'templateControl.stripTags();',
- 'id' => 'convert_button'
- )
- )
- );
-
-
- $this->setChild('to_html_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Return Html Version'),
- 'onclick' => 'templateControl.unStripTags();',
- 'id' => 'convert_button_back',
- 'style' => 'display:none'
- )
- )
- );
-
- $this->setChild('toggle_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Toggle Editor'),
- 'onclick' => 'templateControl.toggleEditor();',
- 'id' => 'toggle_button'
- )
- )
- );
-
-
- $this->setChild('preview_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Preview Template'),
- 'onclick' => 'templateControl.preview();'
- )
- )
- );
-
- $this->setChild('save_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Save Template'),
- 'onclick' => 'templateControl.save();',
- 'class' => 'save'
- )
- )
- );
-
- $this->setChild('load_button',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Button')
- ->setData(
- array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Load Template'),
- 'onclick' => 'templateControl.load();',
- 'type' => 'button',
- 'class' => 'save'
- )
- )
- );
-
-
- $this->addChild('form', 'Mage_Adminhtml_Block_System_Email_Template_Edit_Form');
- return parent::_prepareLayout();
- }
-
- /**
- * Collect, sort and set template options
- *
- * @return Mage_Adminhtml_Block_System_Email_Template_Edit
- */
- protected function _beforeToHtml()
- {
- $groupedOptions = array();
- foreach (Mage_Core_Model_Email_Template::getDefaultTemplatesAsOptionsArray() as $option) {
- $groupedOptions[$option['group']][] = $option;
- }
- ksort($groupedOptions);
- $this->setData('template_options', $groupedOptions);
-
- return parent::_beforeToHtml();
- }
-
- public function getBackButtonHtml()
- {
- return $this->getChildHtml('back_button');
- }
-
- public function getToggleButtonHtml()
- {
- return $this->getChildHtml('toggle_button');
- }
-
-
- public function getResetButtonHtml()
- {
- return $this->getChildHtml('reset_button');
- }
-
- public function getToPlainButtonHtml()
- {
- return $this->getChildHtml('to_plain_button');
- }
-
- public function getToHtmlButtonHtml()
- {
- return $this->getChildHtml('to_html_button');
- }
-
- public function getSaveButtonHtml()
- {
- return $this->getChildHtml('save_button');
- }
-
- public function getPreviewButtonHtml()
- {
- return $this->getChildHtml('preview_button');
- }
-
- public function getDeleteButtonHtml()
- {
- return $this->getChildHtml('delete_button');
- }
-
- public function getLoadButtonHtml()
- {
- return $this->getChildHtml('load_button');
- }
-
- /**
- * Return edit flag for block
- *
- * @return boolean
- */
- public function getEditMode()
- {
- return $this->getEmailTemplate()->getId();
- }
-
- /**
- * Return header text for form
- *
- * @return string
- */
- public function getHeaderText()
- {
- if($this->getEditMode()) {
- return Mage::helper('Mage_Adminhtml_Helper_Data')->__('Edit Email Template');
- }
-
- return Mage::helper('Mage_Adminhtml_Helper_Data')->__('New Email Template');
- }
-
-
- /**
- * Return form block HTML
- *
- * @return string
- */
- public function getFormHtml()
- {
- return $this->getChildHtml('form');
- }
-
- /**
- * Return action url for form
- *
- * @return string
- */
- public function getSaveUrl()
- {
- return $this->getUrl('*/*/save', array('_current' => true));
- }
-
- /**
- * Return preview action url for form
- *
- * @return string
- */
- public function getPreviewUrl()
- {
- return $this->getUrl('*/*/preview');
- }
-
- public function isTextType()
- {
- return $this->getEmailTemplate()->isPlain();
- }
-
- /**
- * Return delete url for customer group
- *
- * @return string
- */
- public function getDeleteUrl()
- {
- return $this->getUrl('*/*/delete', array('_current' => true));
- }
-
- /**
- * Retrive email template model
- *
- * @return Mage_Core_Model_Email_Template
- */
- public function getEmailTemplate()
- {
- return $this->_registryManager->registry('current_email_template');
- }
-
- /**
- * Load template url
- *
- * @return string
- */
- public function getLoadUrl()
- {
- return $this->getUrl('*/*/defaultTemplate');
- }
-
- /**
- * Get paths of where current template is used as default
- *
- * @param bool $asJSON
- * @return string
- */
- public function getUsedDefaultForPaths($asJSON = true)
- {
- /** @var $template Mage_Adminhtml_Model_Email_Template */
- $template = $this->getEmailTemplate();
- $paths = $template->getSystemConfigPathsWhereUsedAsDefault();
- $pathsParts = $this->_getSystemConfigPathsParts($paths);
- if($asJSON){
- return $this->helper('Mage_Core_Helper_Data')->jsonEncode($pathsParts);
- }
- return $pathsParts;
- }
-
- /**
- * Get paths of where current template is currently used
- *
- * @param bool $asJSON
- * @return string
- */
- public function getUsedCurrentlyForPaths($asJSON = true)
- {
- /** @var $template Mage_Adminhtml_Model_Email_Template */
- $template = $this->getEmailTemplate();
- $paths = $template->getSystemConfigPathsWhereUsedCurrently();
- $pathsParts = $this->_getSystemConfigPathsParts($paths);
- if($asJSON){
- return Mage::helper('Mage_Core_Helper_Data')->jsonEncode($pathsParts);
- }
- return $pathsParts;
- }
-
- /**
- * Convert xml config pathes to decorated names
- *
- * @param array $paths
- * @return array
- */
- protected function _getSystemConfigPathsParts($paths)
- {
- $result = $urlParams = $prefixParts = array();
- $scopeLabel = $this->helper('Mage_Backend_Helper_Data')->__('GLOBAL');
- if ($paths) {
- /** @var $menu Mage_Backend_Model_Menu */
- $menu = $this->_menuConfig->getMenu();
- $item = $menu->get('Mage_Adminhtml::system');
- // create prefix path parts
- $prefixParts[] = array(
- 'title' => $item->getModuleHelper()->__($item->getTitle()),
- );
- $item = $menu->get('Mage_Adminhtml::system_config');
- $prefixParts[] = array(
- 'title' => $item->getModuleHelper()->__($item->getTitle()),
- 'url' => $this->getUrl('adminhtml/system_config/'),
- );
-
- $pathParts = $prefixParts;
- foreach ($paths as $pathData) {
- $pathDataParts = explode('/', $pathData['path']);
- $sectionName = array_shift($pathDataParts);
-
- $urlParams = array('section' => $sectionName);
- if (isset($pathData['scope']) && isset($pathData['scope_id'])) {
- switch ($pathData['scope']) {
- case 'stores':
- $store = Mage::app()->getStore($pathData['scope_id']);
- if ($store) {
- $urlParams['website'] = $store->getWebsite()->getCode();
- $urlParams['store'] = $store->getCode();
- $scopeLabel = $store->getWebsite()->getName() . '/' . $store->getName();
- }
- break;
- case 'websites':
- $website = Mage::app()->getWebsite($pathData['scope_id']);
- if ($website) {
- $urlParams['website'] = $website->getCode();
- $scopeLabel = $website->getName();
- }
- break;
- default:
- break;
- }
- }
- $pathParts[] = array(
- 'title' => $this->_configStructure->getElement($sectionName)->getLabel(),
- 'url' => $this->getUrl('adminhtml/system_config/edit', $urlParams),
- );
- $elementPathParts = array($sectionName);
- while (count($pathDataParts) != 1) {
- $elementPathParts[] = array_shift($pathDataParts);
- $pathParts[] = array(
- 'title' => $this->_configStructure
- ->getElementByPathParts($elementPathParts)
- ->getLabel()
- );
- }
- $elementPathParts[] = array_shift($pathDataParts);
- $pathParts[] = array(
- 'title' => $this->_configStructure
- ->getElementByPathParts($elementPathParts)
- ->getLabel(),
- 'scope' => $scopeLabel
- );
- $result[] = $pathParts;
- $pathParts = $prefixParts;
- }
- }
- return $result;
- }
-
- /**
- * Return original template code of current template
- *
- * @return string
- */
- public function getOrigTemplateCode()
- {
- return $this->getEmailTemplate()->getOrigTemplateCode();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php
deleted file mode 100644
index b5f4d35ba57f8..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php
+++ /dev/null
@@ -1,191 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_System_Email_Template_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
-{
- /**
- * Prepare layout.
- * Add files to use dialog windows
- *
- * @return Mage_Adminhtml_Block_System_Email_Template_Edit_Form
- */
- protected function _prepareLayout()
- {
- if ($head = $this->getLayout()->getBlock('head')) {
- $head->addJs('prototype/window.js')
- ->addCss('prototype/windows/themes/default.css')
- ->addCss('Mage_Core::prototype/magento.css')
- ->addJs('Mage_Adminhtml::variables.js');
- }
- return parent::_prepareLayout();
- }
-
- /**
- * Add fields to form and create template info form
- *
- * @return Mage_Adminhtml_Block_Widget_Form
- */
- protected function _prepareForm()
- {
- $form = new Varien_Data_Form();
-
- $fieldset = $form->addFieldset('base_fieldset', array(
- 'legend' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Template Information'),
- 'class' => 'fieldset-wide'
- ));
-
- $templateId = $this->getEmailTemplate()->getId();
- if ($templateId) {
- $fieldset->addField('used_currently_for', 'label', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Used Currently For'),
- 'container_id' => 'used_currently_for',
- 'after_element_html' =>
- '',
- ));
- }
-
- if (!$templateId) {
- $fieldset->addField('used_default_for', 'label', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Used as Default For'),
- 'container_id' => 'used_default_for',
- 'after_element_html' =>
- '',
- ));
- }
-
- $fieldset->addField('template_code', 'text', array(
- 'name'=>'template_code',
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Template Name'),
- 'required' => true
-
- ));
-
- $fieldset->addField('template_subject', 'text', array(
- 'name'=>'template_subject',
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Template Subject'),
- 'required' => true
- ));
-
- $fieldset->addField('orig_template_variables', 'hidden', array(
- 'name' => 'orig_template_variables',
- ));
-
- $fieldset->addField('variables', 'hidden', array(
- 'name' => 'variables',
- 'value' => Zend_Json::encode($this->getVariables())
- ));
-
- $fieldset->addField('template_variables', 'hidden', array(
- 'name' => 'template_variables',
- ));
-
- $insertVariableButton = $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Widget_Button', '', array(
- 'type' => 'button',
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Insert Variable...'),
- 'onclick' => 'templateControl.openVariableChooser();return false;'
- ));
-
- $fieldset->addField('insert_variable', 'note', array(
- 'text' => $insertVariableButton->toHtml()
- ));
-
- $fieldset->addField('template_text', 'textarea', array(
- 'name'=>'template_text',
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Template Content'),
- 'title' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Template Content'),
- 'required' => true,
- 'style' => 'height:24em;',
- ));
-
- if (!$this->getEmailTemplate()->isPlain()) {
- $fieldset->addField('template_styles', 'textarea', array(
- 'name'=>'template_styles',
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Template Styles'),
- 'container_id' => 'field_template_styles'
- ));
- }
-
- if ($templateId) {
- $form->addValues($this->getEmailTemplate()->getData());
- }
-
- if ($values = Mage::getSingleton('Mage_Adminhtml_Model_Session')->getData('email_template_form_data', true)) {
- $form->setValues($values);
- }
-
- $this->setForm($form);
-
- return parent::_prepareForm();
- }
-
- /**
- * Return current email template model
- *
- * @return Mage_Core_Model_Email_Template
- */
- public function getEmailTemplate()
- {
- return Mage::registry('current_email_template');
- }
-
- /**
- * Retrieve variables to insert into email
- *
- * @return array
- */
- public function getVariables()
- {
- $variables = array();
- $variables[] = Mage::getModel('Mage_Core_Model_Source_Email_Variables')
- ->toOptionArray(true);
- $customVariables = Mage::getModel('Mage_Core_Model_Variable')
- ->getVariablesOptionArray(true);
- if ($customVariables) {
- $variables[] = $customVariables;
- }
- /* @var $template Mage_Core_Model_Email_Template */
- $template = Mage::registry('current_email_template');
- if ($template->getId() && $templateVariables = $template->getVariablesOptionArray(true)) {
- $variables[] = $templateVariables;
- }
- return $variables;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php
deleted file mode 100644
index 87bed8c704bad..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php
+++ /dev/null
@@ -1,210 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Tax_Rate_Form extends Mage_Adminhtml_Block_Widget_Form
-{
- const FORM_ELEMENT_ID = 'rate-form';
-
- protected $_titles = null;
-
- protected $_template = 'tax/rate/form.phtml';
-
-
- protected function _construct()
- {
- parent::_construct();
- $this->setDestElementId(self::FORM_ELEMENT_ID);
-
- }
-
- protected function _prepareForm()
- {
- $rateObject = new Varien_Object(Mage::getSingleton('Mage_Tax_Model_Calculation_Rate')->getData());
- $form = new Varien_Data_Form();
-
- $countries = Mage::getModel('Mage_Directory_Model_Config_Source_Country')->toOptionArray();
- unset($countries[0]);
-
- if (!$rateObject->hasTaxCountryId()) {
- $rateObject->setTaxCountryId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_COUNTRY));
- }
-
- if (!$rateObject->hasTaxRegionId()) {
- $rateObject->setTaxRegionId(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_REGION));
- }
-
- $regionCollection = Mage::getModel('Mage_Directory_Model_Region')
- ->getCollection()
- ->addCountryFilter($rateObject->getTaxCountryId());
-
- $regions = $regionCollection->toOptionArray();
- if ($regions) {
- $regions[0]['label'] = '*';
- } else {
- $regions = array(array('value' => '', 'label' => '*'));
- }
-
- $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('Mage_Tax_Helper_Data')->__('Tax Rate Information')));
-
- if ($rateObject->getTaxCalculationRateId() > 0) {
- $fieldset->addField('tax_calculation_rate_id', 'hidden', array(
- 'name' => 'tax_calculation_rate_id',
- 'value' => $rateObject->getTaxCalculationRateId()
- ));
- }
-
- $fieldset->addField('code', 'text', array(
- 'name' => 'code',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Tax Identifier'),
- 'title' => Mage::helper('Mage_Tax_Helper_Data')->__('Tax Identifier'),
- 'class' => 'required-entry',
- 'required' => true,
- ));
-
- $fieldset->addField('tax_country_id', 'select', array(
- 'name' => 'tax_country_id',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Country'),
- 'required' => true,
- 'values' => $countries
- ));
-
- $fieldset->addField('tax_region_id', 'select', array(
- 'name' => 'tax_region_id',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('State'),
- 'values' => $regions
- ));
-
- $fieldset->addField('zip_is_range', 'select', array(
- 'name' => 'zip_is_range',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Zip/Post is Range'),
- 'options' => array(
- '0' => Mage::helper('Mage_Tax_Helper_Data')->__('No'),
- '1' => Mage::helper('Mage_Tax_Helper_Data')->__('Yes'),
- )
- ));
-
- if (!$rateObject->hasTaxPostcode()) {
- $rateObject->setTaxPostcode(Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_DEFAULT_POSTCODE));
- }
-
- $fieldset->addField('tax_postcode', 'text', array(
- 'name' => 'tax_postcode',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Zip/Post Code'),
- 'note' => Mage::helper('Mage_Tax_Helper_Data')->__("'*' - matches any; 'xyz*' - matches any that begins on 'xyz' and not longer than %d.", Mage::helper('Mage_Tax_Helper_Data')->getPostCodeSubStringLength()),
- ));
-
- $fieldset->addField('zip_from', 'text', array(
- 'name' => 'zip_from',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Range From'),
- 'required' => true,
- 'maxlength' => 9,
- 'class' => 'validate-digits'
- ));
-
- $fieldset->addField('zip_to', 'text', array(
- 'name' => 'zip_to',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Range To'),
- 'required' => true,
- 'maxlength' => 9,
- 'class' => 'validate-digits'
- ));
-
- $fieldset->addField('rate', 'text', array(
- 'name' => 'rate',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Rate Percent'),
- 'title' => Mage::helper('Mage_Tax_Helper_Data')->__('Rate Percent'),
- 'required' => true,
- 'class' => 'validate-not-negative-number'
- ));
-
- $form->setAction($this->getUrl('*/tax_rate/save'));
- $form->setUseContainer(true);
- $form->setId(self::FORM_ELEMENT_ID);
- $form->setMethod('post');
-
- if (!Mage::app()->hasSingleStore()) {
- $form->addElement(
- Mage::getBlockSingleton('Mage_Adminhtml_Block_Tax_Rate_Title_Fieldset')
- ->setLegend(Mage::helper('Mage_Tax_Helper_Data')
- ->__('Tax Titles'))
- );
- }
-
- $rateData = $rateObject->getData();
- if ($rateObject->getZipIsRange()) {
- list($rateData['zip_from'], $rateData['zip_to']) = explode('-', $rateData['tax_postcode']);
- }
- $form->setValues($rateData);
- $this->setForm($form);
-
- $this->setChild(
- 'form_after',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Widget_Form_Element_Dependence')
- ->addFieldMap('zip_is_range', 'zip_is_range')
- ->addFieldMap('tax_postcode', 'tax_postcode')
- ->addFieldMap('zip_from', 'zip_from')
- ->addFieldMap('zip_to', 'zip_to')
- ->addFieldDependence('zip_from', 'zip_is_range', '1')
- ->addFieldDependence('zip_to', 'zip_is_range', '1')
- ->addFieldDependence('tax_postcode', 'zip_is_range', '0')
- );
-
- return parent::_prepareForm();
- }
-
- /**
- * Get Tax Rates Collection
- *
- * @return array
- */
- public function getRateCollection()
- {
- if ($this->getData('rate_collection') == null) {
- $rateCollection = Mage::getModel('Mage_Tax_Model_Calculation_Rate')->getCollection()
- ->joinRegionTable();
- $rates = array();
-
- foreach ($rateCollection as $rate) {
- $item = $rate->getData();
- foreach ($rate->getTitles() as $title) {
- $item['title[' . $title->getStoreId() . ']'] = $title->getValue();
- }
- $rates[] = $item;
- }
-
- $this->setRateCollection($rates);
- }
- return $this->getData('rate_collection');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php
deleted file mode 100644
index a0530d0070169..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php
+++ /dev/null
@@ -1,232 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Block_Tax_Rule_Edit_Form extends Mage_Backend_Block_Widget_Form
-{
- /**
- * Init class
- *
- */
- protected function _construct()
- {
- parent::_construct();
-
- $this->setId('taxRuleForm');
- $this->setTitle(Mage::helper('Mage_Tax_Helper_Data')->__('Tax Rule Information'));
- }
-
- /**
- *
- * return Mage_Adminhtml_Block_Widget_Form
- */
- protected function _prepareForm()
- {
- $model = Mage::registry('tax_rule');
- $form = new Varien_Data_Form(array(
- 'id' => 'edit_form',
- 'action' => $this->getData('action'),
- 'method' => 'post'
- ));
-
- $fieldset = $form->addFieldset('base_fieldset', array(
- 'legend' => Mage::helper('Mage_Tax_Helper_Data')->__('Tax Rule Information')
- ));
-
- $rates = Mage::getModel('Mage_Tax_Model_Calculation_Rate')
- ->getCollection()
- ->toOptionArray();
-
- $fieldset->addField('code', 'text',
- array(
- 'name' => 'code',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Name'),
- 'class' => 'required-entry',
- 'required' => true,
- )
- );
-
- // Editable multiselect for customer tax class
- $selectConfig = $this->getTaxClassSelectConfig(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER);
- $selectedCustomerTax = $model->getId()
- ? $model->getCustomerTaxClasses()
- : $model->getCustomerTaxClassWithDefault();
- $fieldset->addField($this->getTaxClassSelectHtmlId(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER),
- 'editablemultiselect',
- array(
- 'name' => $this->getTaxClassSelectHtmlId(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER),
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Customer Tax Class'),
- 'class' => 'required-entry',
- 'values' => $model->getAllOptionsForClass(Mage_Tax_Model_Class::TAX_CLASS_TYPE_CUSTOMER),
- 'value' => $selectedCustomerTax,
- 'required' => true,
- 'select_config' => $selectConfig,
- ),
- false,
- true
- );
-
- // Editable multiselect for product tax class
- $selectConfig = $this->getTaxClassSelectConfig(Mage_Tax_Model_Class::TAX_CLASS_TYPE_PRODUCT);
- $selectedProductTax = $model->getId()
- ? $model->getProductTaxClasses()
- : $model->getProductTaxClassWithDefault();
- $fieldset->addField($this->getTaxClassSelectHtmlId(Mage_Tax_Model_Class::TAX_CLASS_TYPE_PRODUCT),
- 'editablemultiselect',
- array(
- 'name' => $this->getTaxClassSelectHtmlId(Mage_Tax_Model_Class::TAX_CLASS_TYPE_PRODUCT),
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Product Tax Class'),
- 'class' => 'required-entry',
- 'values' => $model->getAllOptionsForClass(Mage_Tax_Model_Class::TAX_CLASS_TYPE_PRODUCT),
- 'value' => $selectedProductTax,
- 'required' => true,
- 'select_config' => $selectConfig
- ),
- false,
- true
- );
-
- $fieldset->addField('tax_rate',
- 'editablemultiselect',
- array(
- 'name' => 'tax_rate',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Tax Rate'),
- 'class' => 'required-entry',
- 'values' => $rates,
- 'value' => $model->getRates(),
- 'required' => true,
- 'element_js_class' => 'TaxRateEditableMultiselect',
- 'select_config' => array('is_entity_editable' => true),
- )
- );
-
- $fieldset->addField('priority', 'text',
- array(
- 'name' => 'priority',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Priority'),
- 'class' => 'validate-not-negative-number',
- 'value' => (int) $model->getPriority(),
- 'required' => true,
- 'note' => Mage::helper('Mage_Tax_Helper_Data')->__('Tax rates at the same priority are added, others are compounded.'),
- ),
- false,
- true
- );
- $fieldset->addField('position', 'text',
- array(
- 'name' => 'position',
- 'label' => Mage::helper('Mage_Tax_Helper_Data')->__('Sort Order'),
- 'class' => 'validate-not-negative-number',
- 'value' => (int) $model->getPosition(),
- 'required' => true,
- ),
- false,
- true
- );
-
- if ($model->getId() > 0 ) {
- $fieldset->addField('tax_calculation_rule_id', 'hidden',
- array(
- 'name' => 'tax_calculation_rule_id',
- 'value' => $model->getId(),
- 'no_span' => true
- )
- );
- }
-
- $form->addValues($model->getData());
- $form->setAction($this->getUrl('*/tax_rule/save'));
- $form->setUseContainer(true);
- $this->setForm($form);
-
- return parent::_prepareForm();
- }
-
- /**
- * Retrieve HTML element ID for corresponding tax class selector
- *
- * @param string $classType
- * @return string
- */
- public function getTaxClassSelectHtmlId($classType)
- {
- return 'tax_' . strtolower($classType) . '_class';
- }
-
-
- /**
- * Retrieve configuration options for tax class editable multiselect
- *
- * @param string $classType
- * @return array
- */
- public function getTaxClassSelectConfig($classType)
- {
- $config = array(
- 'new_url' => $this->getUrl('*/tax_class/ajaxSave/'),
- 'save_url' => $this->getUrl('*/tax_class/ajaxSave/'),
- 'delete_url' => $this->getUrl('*/tax_class/ajaxDelete/'),
- 'delete_confirm_message' => Mage::helper('Mage_Tax_Helper_Data')->__('Do you really want to delete this tax class?'),
- 'target_select_id' => $this->getTaxClassSelectHtmlId($classType),
- 'add_button_caption' => Mage::helper('Mage_Tax_Helper_Data')->__('Add New Tax Class'),
- 'submit_data' => array(
- 'class_type' => $classType,
- 'form_key' => Mage::getSingleton('Mage_Core_Model_Session')->getFormKey(),
- ),
- 'entity_id_name' => 'class_id',
- 'entity_value_name' => 'class_name',
- 'is_entity_editable' => true
- );
- return $config;
- }
-
- /**
- * Retrieve Tax Rate delete URL
- *
- * @return string
- */
- public function getTaxRateDeleteUrl()
- {
- return $this->getUrl('*/tax_rate/ajaxDelete/');
- }
-
- /**
- * Retrieve Tax Rate save URL
- *
- * @return string
- */
- public function getTaxRateSaveUrl()
- {
- return $this->getUrl('*/tax_rate/ajaxSave/');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Text/List.php b/app/code/core/Mage/Adminhtml/Block/Text/List.php
deleted file mode 100644
index 643c6f82d0aa3..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Text/List.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Text_List extends Mage_Core_Block_Text_List
-{
- /**
- * @param Mage_Core_Controller_Request_Http $request
- * @param Mage_Core_Model_Layout $layout
- * @param Mage_Core_Model_Event_Manager $eventManager
- * @param Mage_Backend_Model_Url $urlBuilder
- * @param Mage_Core_Model_Translate $translator
- * @param Mage_Core_Model_Cache $cache
- * @param Mage_Core_Model_Design_Package $designPackage
- * @param Mage_Core_Model_Session $session
- * @param Mage_Core_Model_Store_Config $storeConfig
- * @param Mage_Core_Controller_Varien_Front $frontController
- * @param Mage_Core_Model_Factory_Helper $helperFactory
- * @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- */
- public function __construct(
- Mage_Core_Controller_Request_Http $request,
- Mage_Core_Model_Layout $layout,
- Mage_Core_Model_Event_Manager $eventManager,
- Mage_Backend_Model_Url $urlBuilder,
- Mage_Core_Model_Translate $translator,
- Mage_Core_Model_Cache $cache,
- Mage_Core_Model_Design_Package $designPackage,
- Mage_Core_Model_Session $session,
- Mage_Core_Model_Store_Config $storeConfig,
- Mage_Core_Controller_Varien_Front $frontController,
- Mage_Core_Model_Factory_Helper $helperFactory,
- array $data = array()
- ) {
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache, $designPackage,
- $session, $storeConfig, $frontController, $helperFactory, $data
- );
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php
deleted file mode 100644
index 7a302becffea5..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php
+++ /dev/null
@@ -1,110 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Urlrewrite_Catalog_Category_Edit extends Mage_Adminhtml_Block_Urlrewrite_Edit
-{
- /**
- * Prepare layout for URL rewrite creating for category
- */
- protected function _prepareLayoutFeatures()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
-
- if ($this->_getUrlRewrite()->getId()) {
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Edit URL Rewrite for a Category');
- } else {
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Add URL Rewrite for a Category');
- }
-
- if ($this->_getCategory()->getId()) {
- $this->_addCategoryLinkBlock();
- $this->_addEditFormBlock();
- $this->_updateBackButtonLink($helper->getUrl('*/*/edit') . 'category');
- } else {
- $this->_addUrlRewriteSelectorBlock();
- $this->_addCategoryTreeBlock();
- }
- }
-
- /**
- * Get or create new instance of category
- *
- * @return Mage_Catalog_Model_Product
- */
- private function _getCategory()
- {
- if (!$this->hasData('category')) {
- $this->setCategory(Mage::getModel('Mage_Catalog_Model_Category'));
- }
- return $this->getCategory();
- }
-
- /**
- * Add child category link block
- */
- private function _addCategoryLinkBlock()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
- $this->addChild('category_link', 'Mage_Adminhtml_Block_Urlrewrite_Link', array(
- 'item_url' => $helper->getUrl('*/*/*') . 'category',
- 'item_name' => $this->_getCategory()->getName(),
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Category:')
- ));
- }
-
- /**
- * Add child category tree block
- */
- private function _addCategoryTreeBlock()
- {
- $this->addChild('categories_tree', 'Mage_Adminhtml_Block_Urlrewrite_Catalog_Category_Tree');
- }
-
- /**
- * Creates edit form block
- *
- * @return Mage_Adminhtml_Block_Urlrewrite_Catalog_Edit_Form
- */
- protected function _createEditFormBlock()
- {
- return $this->getLayout()->createBlock('Mage_Adminhtml_Block_Urlrewrite_Catalog_Edit_Form', '', array(
- 'category' => $this->_getCategory(),
- 'url_rewrite' => $this->_getUrlRewrite()
- ));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Catalog/Product/Edit.php
deleted file mode 100644
index 8086290b417b7..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Catalog/Product/Edit.php
+++ /dev/null
@@ -1,181 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Urlrewrite_Catalog_Product_Edit extends Mage_Adminhtml_Block_Urlrewrite_Edit
-{
- /**
- * Prepare layout for URL rewrite creating for product
- */
- protected function _prepareLayoutFeatures()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
-
- if ($this->_getUrlRewrite()->getId()) {
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Edit URL Rewrite for a Product');
- } else {
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Add URL Rewrite for a Product');
- }
-
- if ($this->_getProduct()->getId()) {
- $this->_addProductLinkBlock($this->_getProduct());
- }
-
- if ($this->_getCategory()->getId()) {
- $this->_addCategoryLinkBlock();
- }
-
- if ($this->_getProduct()->getId()) {
- if ($this->_getCategory()->getId() || !$this->getIsCategoryMode()) {
- $this->_addEditFormBlock();
- $this->_updateBackButtonLink(
- $helper->getUrl('*/*/edit', array('product' => $this->_getProduct()->getId())) . 'category'
- );
- } else {
- // categories selector & skip categories button
- $this->_addCategoriesTreeBlock();
- $this->_addSkipCategoriesBlock();
- $this->_updateBackButtonLink($helper->getUrl('*/*/edit') . 'product');
- }
- } else {
- $this->_addUrlRewriteSelectorBlock();
- $this->_addProductsGridBlock();
- }
- }
-
- /**
- * Get or create new instance of product
- *
- * @return Mage_Catalog_Model_Product
- */
- private function _getProduct()
- {
- if (!$this->hasData('product')) {
- $this->setProduct(Mage::getModel('Mage_Catalog_Model_Product'));
- }
- return $this->getProduct();
- }
-
- /**
- * Get or create new instance of category
- *
- * @return Mage_Catalog_Model_Category
- */
- private function _getCategory()
- {
- if (!$this->hasData('category')) {
- $this->setCategory(Mage::getModel('Mage_Catalog_Model_Category'));
- }
- return $this->getCategory();
- }
-
- /**
- * Add child product link block
- */
- private function _addProductLinkBlock()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
- $this->addChild('product_link', 'Mage_Adminhtml_Block_Urlrewrite_Link', array(
- 'item_url' => $helper->getUrl('*/*/*') . 'product',
- 'item_name' => $this->_getProduct()->getName(),
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Product:')
- ));
- }
-
- /**
- * Add child category link block
- */
- private function _addCategoryLinkBlock()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
- $this->addChild('category_link', 'Mage_Adminhtml_Block_Urlrewrite_Link', array(
- 'item_url' => $helper->getUrl('*/*/*', array('product' => $this->_getProduct()->getId())) . 'category',
- 'item_name' => $this->_getCategory()->getName(),
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Category:')
- ));
- }
-
- /**
- * Add child products grid block
- */
- private function _addProductsGridBlock()
- {
- $this->addChild('products_grid', 'Mage_Adminhtml_Block_Urlrewrite_Catalog_Product_Grid');
- }
-
- /**
- * Add child Categories Tree block
- */
- private function _addCategoriesTreeBlock()
- {
- $this->addChild('categories_tree', 'Mage_Adminhtml_Block_Urlrewrite_Catalog_Category_Tree');
- }
-
- /**
- * Add child Skip Categories block
- */
- private function _addSkipCategoriesBlock()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
- $this->addChild('skip_categories', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Skip Category Selection'),
- 'onclick' => 'window.location = \''
- . $helper->getUrl('*/*/*', array('product' => $this->_getProduct()->getId())) . '\'',
- 'class' => 'save',
- 'level' => -1
- ));
- }
-
- /**
- * Creates edit form block
- *
- * @return Mage_Adminhtml_Block_Urlrewrite_Catalog_Edit_Form
- */
- protected function _createEditFormBlock()
- {
- return $this->getLayout()->createBlock('Mage_Adminhtml_Block_Urlrewrite_Catalog_Edit_Form', '', array(
- 'product' => $this->_getProduct(),
- 'category' => $this->_getCategory(),
- 'url_rewrite' => $this->_getUrlRewrite()
- ));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Cms/Page/Edit.php
deleted file mode 100644
index 4b3fe0a349c0a..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Cms/Page/Edit.php
+++ /dev/null
@@ -1,110 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Urlrewrite_Cms_Page_Edit extends Mage_Adminhtml_Block_Urlrewrite_Edit
-{
- /**
- * Prepare layout for URL rewrite creating for CMS page
- */
- protected function _prepareLayoutFeatures()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
-
- if ($this->_getUrlRewrite()->getId()) {
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Edit URL Rewrite for CMS page');
- } else {
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Add URL Rewrite for CMS page');
- }
-
- if ($this->_getCmsPage()->getId()) {
- $this->_addCmsPageLinkBlock();
- $this->_addEditFormBlock();
- $this->_updateBackButtonLink($helper->getUrl('*/*/edit') . 'cms_page');
- } else {
- $this->_addUrlRewriteSelectorBlock();
- $this->_addCmsPageGridBlock();
- }
- }
-
- /**
- * Get or create new instance of CMS page
- *
- * @return Mage_Cms_Model_Page
- */
- private function _getCmsPage()
- {
- if (!$this->hasData('cms_page')) {
- $this->setCmsPage(Mage::getModel('Mage_Cms_Model_Page'));
- }
- return $this->getCmsPage();
- }
-
- /**
- * Add child CMS page link block
- */
- private function _addCmsPageLinkBlock()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
- $this->addChild('cms_page_link', 'Mage_Adminhtml_Block_Urlrewrite_Link', array(
- 'item_url' => $helper->getUrl('*/*/*') . 'cms_page',
- 'item_name' => $this->getCmsPage()->getTitle(),
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('CMS page:')
- ));
- }
-
- /**
- * Add child CMS page block
- */
- private function _addCmsPageGridBlock()
- {
- $this->addChild('cms_pages_grid', 'Mage_Adminhtml_Block_Urlrewrite_Cms_Page_Grid');
- }
-
- /**
- * Creates edit form block
- *
- * @return Mage_Adminhtml_Block_Urlrewrite_Cms_Page_Edit_Form
- */
- protected function _createEditFormBlock()
- {
- return $this->getLayout()->createBlock('Mage_Adminhtml_Block_Urlrewrite_Cms_Page_Edit_Form', '', array(
- 'cms_page' => $this->_getCmsPage(),
- 'url_rewrite' => $this->_getUrlRewrite()
- ));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
deleted file mode 100644
index e386a6b831dc9..0000000000000
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ /dev/null
@@ -1,251 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Urlrewrite_Edit extends Mage_Adminhtml_Block_Widget_Container
-{
- /**
- * @var Mage_Adminhtml_Block_Urlrewrite_Selector
- */
- private $_selectorBlock;
-
- /**
- * Part for building some blocks names
- *
- * @var string
- */
- protected $_controller = 'urlrewrite';
-
- /**
- * Generated buttons html cache
- *
- * @var string
- */
- protected $_buttonsHtml;
-
- /**
- * Prepare URL rewrite editing layout
- *
- * @return Mage_Adminhtml_Block_Urlrewrite_Edit
- */
- protected function _prepareLayout()
- {
- $this->setTemplate('urlrewrite/edit.phtml');
-
- $this->_addBackButton();
- $this->_prepareLayoutFeatures();
-
- return parent::_prepareLayout();
- }
-
- /**
- * Prepare featured blocks for layout of URL rewrite editing
- */
- protected function _prepareLayoutFeatures()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
-
- if ($this->_getUrlRewrite()->getId()) {
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Edit URL Rewrite');
- } else {
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Add New URL Rewrite');
- }
-
- $this->_updateBackButtonLink($helper->getUrl('*/*/edit') . $this->_getSelectorBlock()->getDefaultMode());
- $this->_addUrlRewriteSelectorBlock();
- $this->_addEditFormBlock();
- }
-
- /**
- * Add child edit form block
- */
- protected function _addEditFormBlock()
- {
- $this->setChild('form', $this->_createEditFormBlock());
-
- if ($this->_getUrlRewrite()->getId()) {
- $this->_addResetButton();
- $this->_addDeleteButton();
- }
-
- $this->_addSaveButton();
- }
-
- /**
- * Add reset button
- */
- protected function _addResetButton()
- {
- $this->_addButton('reset', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Reset'),
- 'onclick' => '$(\'edit_form\').reset()',
- 'class' => 'scalable',
- 'level' => -1
- ));
- }
-
- /**
- * Add back button
- */
- protected function _addBackButton()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
-
- $this->_addButton('back', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Back'),
- 'onclick' => 'setLocation(\'' . $helper->getUrl('*/*/') . '\')',
- 'class' => 'back',
- 'level' => -1
- ));
- }
-
- /**
- * Update Back button location link
- *
- * @param string $link
- */
- protected function _updateBackButtonLink($link)
- {
- $this->_updateButton('back', 'onclick', 'setLocation(\'' . $link . '\')');
- }
-
- /**
- * Add delete button
- */
- protected function _addDeleteButton()
- {
- /** @var $helper Mage_Adminhtml_Helper_Data */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Data');
-
- $this->_addButton('delete', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Delete'),
- 'onclick' => 'deleteConfirm(\''
- . addslashes(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Are you sure you want to do this?'))
- . '\', \'' . $helper->getUrl('*/*/delete', array('id' => $this->getUrlRewrite()->getId())) . '\')',
- 'class' => 'scalable delete',
- 'level' => -1
- ));
- }
-
- /**
- * Add save button
- */
- protected function _addSaveButton()
- {
- $this->_addButton('save', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Save'),
- 'class' => 'save',
- 'level' => -1,
- 'data_attribute' => array(
- 'mage-init' => array(
- 'button' => array('event' => 'save', 'target' => '#edit_form'),
- ),
- ),
- ));
- }
-
- /**
- * Creates edit form block
- *
- * @return Mage_Adminhtml_Block_Urlrewrite_Edit_Form
- */
- protected function _createEditFormBlock()
- {
- return $this->getLayout()->createBlock('Mage_Adminhtml_Block_Urlrewrite_Edit_Form', '', array(
- 'url_rewrite' => $this->_getUrlRewrite()
- ));
- }
-
- /**
- * Add child URL rewrite selector block
- */
- protected function _addUrlRewriteSelectorBlock()
- {
- $this->setChild('selector', $this->_getSelectorBlock());
- }
-
- /**
- * Get selector block
- *
- * @return Mage_Adminhtml_Block_Urlrewrite_Selector
- */
- private function _getSelectorBlock()
- {
- if (!$this->_selectorBlock) {
- $this->_selectorBlock = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Urlrewrite_Selector');
- }
- return $this->_selectorBlock;
- }
-
- /**
- * Get container buttons HTML
- *
- * Since buttons are set as children, we remove them as children after generating them
- * not to duplicate them in future
- *
- * @param null $area
- * @return string
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- public function getButtonsHtml($area = null)
- {
- if (null === $this->_buttonsHtml) {
- $this->_buttonsHtml = parent::getButtonsHtml();
- $layout = $this->getLayout();
- foreach ($this->getChildNames() as $name) {
- $alias = $layout->getElementAlias($name);
- if (false !== strpos($alias, '_button')) {
- $layout->unsetChild($this->getNameInLayout(), $alias);
- }
- }
- }
- return $this->_buttonsHtml;
- }
-
- /**
- * Get or create new instance of URL rewrite
- *
- * @return Mage_Core_Model_Url_Rewrite
- */
- protected function _getUrlRewrite()
- {
- if (!$this->hasData('url_rewrite')) {
- $this->setUrlRewrite(Mage::getModel('Mage_Core_Model_Url_Rewrite'));
- }
- return $this->getUrlRewrite();
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php
deleted file mode 100644
index 9c522520ef3d2..0000000000000
--- a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- */
-class Mage_Adminhtml_Helper_Media_Js extends Mage_Core_Helper_Js
-{
- /**
- * @param Mage_Core_Model_Translate $translator
- * @param Mage_Core_Model_Config_Modules_Reader $configReader
- */
- public function __construct(
- Mage_Core_Model_Translate $translator,
- Mage_Core_Model_Config_Modules_Reader $configReader
- ) {
- parent::__construct($translator, $configReader);
-
- $this->_translateData = array(
- 'Complete' => $this->__('Complete'),
- 'File size should be more than 0 bytes' => $this->__('File size should be more than 0 bytes'),
- 'Upload Security Error' => $this->__('Upload Security Error'),
- 'Upload HTTP Error' => $this->__('Upload HTTP Error'),
- 'Upload I/O Error' => $this->__('Upload I/O Error'),
- 'SSL Error: Invalid or self-signed certificate' => $this->__('SSL Error: Invalid or self-signed certificate'),
- 'Tb' => $this->__('Tb'),
- 'Gb' => $this->__('Gb'),
- 'Mb' => $this->__('Mb'),
- 'Kb' => $this->__('Kb'),
- 'b' => $this->__('b')
- );
- }
-
- /**
- * Retrieve JS translator initialization javascript
- *
- * @return string
- */
- public function getTranslatorScript()
- {
- $script = '(function($) {$.mage.translate.add(' . $this->getTranslateJson() . ')})(jQuery);';
- return $this->getScript($script);
- }
-
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/CacheController.php
deleted file mode 100644
index fa1e513671396..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/CacheController.php
+++ /dev/null
@@ -1,195 +0,0 @@
-_title($this->__('System'))->_title($this->__('Cache Management'));
-
- $this->loadLayout()
- ->_setActiveMenu('Mage_Adminhtml::system_cache')
- ->renderLayout();
- }
-
- /**
- * Flush cache storage
- */
- public function flushAllAction()
- {
- Mage::dispatchEvent('adminhtml_cache_flush_all');
- Mage::app()->getCacheInstance()->flush();
- $this->_getSession()->addSuccess(Mage::helper('Mage_Adminhtml_Helper_Data')->__("The cache storage has been flushed."));
- $this->_redirect('*/*');
- }
-
- /**
- * Flush all magento cache
- */
- public function flushSystemAction()
- {
- Mage::app()->cleanCache();
- Mage::dispatchEvent('adminhtml_cache_flush_system');
- $this->_getSession()->addSuccess(Mage::helper('Mage_Adminhtml_Helper_Data')->__("The Magento cache storage has been flushed."));
- $this->_redirect('*/*');
- }
-
- /**
- * Mass action for cache enabeling
- */
- public function massEnableAction()
- {
- $types = $this->getRequest()->getParam('types');
- $allTypes = Mage::app()->useCache();
-
- $updatedTypes = 0;
- foreach ($types as $code) {
- if (empty($allTypes[$code])) {
- $allTypes[$code] = 1;
- $updatedTypes++;
- }
- }
- if ($updatedTypes > 0) {
- Mage::app()->saveUseCache($allTypes);
- $this->_getSession()->addSuccess(Mage::helper('Mage_Adminhtml_Helper_Data')->__("%s cache type(s) enabled.", $updatedTypes));
- }
- $this->_redirect('*/*');
- }
-
- /**
- * Mass action for cache disabeling
- */
- public function massDisableAction()
- {
- $types = $this->getRequest()->getParam('types');
- $allTypes = Mage::app()->useCache();
-
- $updatedTypes = 0;
- foreach ($types as $code) {
- if (!empty($allTypes[$code])) {
- $allTypes[$code] = 0;
- $updatedTypes++;
- }
- $tags = Mage::app()->getCacheInstance()->cleanType($code);
- }
- if ($updatedTypes > 0) {
- Mage::app()->saveUseCache($allTypes);
- $this->_getSession()->addSuccess(Mage::helper('Mage_Adminhtml_Helper_Data')->__("%s cache type(s) disabled.", $updatedTypes));
- }
- $this->_redirect('*/*');
- }
-
- /**
- * Mass action for cache refresh
- */
- public function massRefreshAction()
- {
- $types = $this->getRequest()->getParam('types');
- $updatedTypes = 0;
- if (!empty($types)) {
- foreach ($types as $type) {
- $tags = Mage::app()->getCacheInstance()->cleanType($type);
- Mage::dispatchEvent('adminhtml_cache_refresh_type', array('type' => $type));
- $updatedTypes++;
- }
- }
- if ($updatedTypes > 0) {
- $this->_getSession()->addSuccess(Mage::helper('Mage_Adminhtml_Helper_Data')->__("%s cache type(s) refreshed.", $updatedTypes));
- }
- $this->_redirect('*/*');
- }
-
- /**
- * Clean JS/css files cache
- */
- public function cleanMediaAction()
- {
- try {
- Mage::getModel('Mage_Core_Model_Design_Package')->cleanMergedJsCss();
- Mage::dispatchEvent('clean_media_cache_after');
- $this->_getSession()->addSuccess(
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('The JavaScript/CSS cache has been cleaned.')
- );
- }
- catch (Exception $e) {
- $this->_getSession()->addException(
- $e,
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('An error occurred while clearing the JavaScript/CSS cache.')
- );
- }
- catch (Mage_Core_Exception $e) {
- $this->_getSession()->addError($e->getMessage());
- }
- $this->_redirect('*/*');
- }
-
- /**
- * Clean JS/css files cache
- */
- public function cleanImagesAction()
- {
- try {
- Mage::getModel('Mage_Catalog_Model_Product_Image')->clearCache();
- Mage::dispatchEvent('clean_catalog_images_cache_after');
- $this->_getSession()->addSuccess(
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('The image cache was cleaned.')
- );
- }
- catch (Mage_Core_Exception $e) {
- $this->_getSession()->addError($e->getMessage());
- }
- catch (Exception $e) {
- $this->_getSession()->addException(
- $e,
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('An error occurred while clearing the image cache.')
- );
- }
- $this->_redirect('*/*');
- }
-
- /**
- * Check if cache management is allowed
- *
- * @return bool
- */
- protected function _isAllowed()
- {
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Adminhtml::cache');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php
deleted file mode 100644
index 1d458835ac67d..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php
+++ /dev/null
@@ -1,72 +0,0 @@
-
- */
-class Mage_Adminhtml_Catalog_Category_WidgetController extends Mage_Adminhtml_Controller_Action
-{
- /**
- * Chooser Source action
- */
- public function chooserAction()
- {
- $this->getResponse()->setBody(
- $this->_getCategoryTreeBlock()->toHtml()
- );
- }
-
- /**
- * Categories tree node (Ajax version)
- */
- public function categoriesJsonAction()
- {
- if ($categoryId = (int) $this->getRequest()->getPost('id')) {
-
- $category = Mage::getModel('Mage_Catalog_Model_Category')->load($categoryId);
- if ($category->getId()) {
- Mage::register('category', $category);
- Mage::register('current_category', $category);
- }
- $this->getResponse()->setBody(
- $this->_getCategoryTreeBlock()->getTreeJson($category)
- );
- }
- }
-
- protected function _getCategoryTreeBlock()
- {
- return $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Category_Widget_Chooser', '', array(
- 'id' => $this->getRequest()->getParam('uniq_id'),
- 'use_massaction' => $this->getRequest()->getParam('use_massaction', false)
- ));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
deleted file mode 100644
index d4c8566e27469..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
+++ /dev/null
@@ -1,540 +0,0 @@
-
- */
-class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controller_Action
-{
- /**
- * Initialize requested category and put it into registry.
- * Root category can be returned, if inappropriate store/category is specified
- *
- * @param bool $getRootInstead
- * @return Mage_Catalog_Model_Category
- */
- protected function _initCategory($getRootInstead = false)
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Categories'))
- ->_title($this->__('Manage Categories'));
-
- $categoryId = (int) $this->getRequest()->getParam('id',false);
- $storeId = (int) $this->getRequest()->getParam('store');
- $category = Mage::getModel('Mage_Catalog_Model_Category');
- $category->setStoreId($storeId);
-
- if ($categoryId) {
- $category->load($categoryId);
- if ($storeId) {
- $rootId = Mage::app()->getStore($storeId)->getRootCategoryId();
- if (!in_array($rootId, $category->getPathIds())) {
- // load root category instead wrong one
- if ($getRootInstead) {
- $category->load($rootId);
- }
- else {
- $this->_redirect('*/*/', array('_current'=>true, 'id'=>null));
- return false;
- }
- }
- }
- }
-
- if ($activeTabId = (string) $this->getRequest()->getParam('active_tab_id')) {
- Mage::getSingleton('Mage_Backend_Model_Auth_Session')->setActiveTabId($activeTabId);
- }
-
- Mage::register('category', $category);
- Mage::register('current_category', $category);
- Mage::getSingleton('Mage_Cms_Model_Wysiwyg_Config')->setStoreId($this->getRequest()->getParam('store'));
- return $category;
- }
- /**
- * Catalog categories index action
- */
- public function indexAction()
- {
- $this->_forward('edit');
- }
-
- /**
- * Add new category form
- */
- public function addAction()
- {
- Mage::getSingleton('Mage_Backend_Model_Auth_Session')->unsActiveTabId();
- $this->_forward('edit');
- }
-
- /**
- * Edit category page
- */
- public function editAction()
- {
- $params['_current'] = true;
- $redirect = false;
-
- $storeId = (int) $this->getRequest()->getParam('store');
- $parentId = (int) $this->getRequest()->getParam('parent');
- $_prevStoreId = Mage::getSingleton('Mage_Backend_Model_Auth_Session')
- ->getLastViewedStore(true);
-
- if (!empty($_prevStoreId) && !$this->getRequest()->getQuery('isAjax')) {
- $params['store'] = $_prevStoreId;
- $redirect = true;
- }
-
- $categoryId = (int) $this->getRequest()->getParam('id');
- $_prevCategoryId = Mage::getSingleton('Mage_Backend_Model_Auth_Session')
- ->getLastEditedCategory(true);
-
-
- if ($_prevCategoryId
- && !$this->getRequest()->getQuery('isAjax')
- && !$this->getRequest()->getParam('clear')) {
- // $params['id'] = $_prevCategoryId;
- $this->getRequest()->setParam('id',$_prevCategoryId);
- //$redirect = true;
- }
-
- if ($redirect) {
- $this->_redirect('*/*/edit', $params);
- return;
- }
-
- if ($storeId && !$categoryId && !$parentId) {
- $store = Mage::app()->getStore($storeId);
- $_prevCategoryId = (int) $store->getRootCategoryId();
- $this->getRequest()->setParam('id', $_prevCategoryId);
- }
-
- if (!($category = $this->_initCategory(true))) {
- return;
- }
-
- $this->_title($categoryId ? $category->getName() : $this->__('New Category'));
-
- /**
- * Check if we have data in session (if duering category save was exceprion)
- */
- $data = $this->_getSession()->getCategoryData(true);
- if (isset($data['general'])) {
- $category->addData($data['general']);
- }
-
- /**
- * Build response for ajax request
- */
- if ($this->getRequest()->getQuery('isAjax')) {
- // prepare breadcrumbs of selected category, if any
- $breadcrumbsPath = $category->getPath();
- if (empty($breadcrumbsPath)) {
- // but if no category, and it is deleted - prepare breadcrumbs from path, saved in session
- $breadcrumbsPath = Mage::getSingleton('Mage_Backend_Model_Auth_Session')->getDeletedPath(true);
- if (!empty($breadcrumbsPath)) {
- $breadcrumbsPath = explode('/', $breadcrumbsPath);
- // no need to get parent breadcrumbs if deleting category level 1
- if (count($breadcrumbsPath) <= 1) {
- $breadcrumbsPath = '';
- }
- else {
- array_pop($breadcrumbsPath);
- $breadcrumbsPath = implode('/', $breadcrumbsPath);
- }
- }
- }
-
- Mage::getSingleton('Mage_Backend_Model_Auth_Session')
- ->setLastViewedStore($this->getRequest()->getParam('store'));
- Mage::getSingleton('Mage_Backend_Model_Auth_Session')
- ->setLastEditedCategory($category->getId());
-// $this->_initLayoutMessages('Mage_Adminhtml_Model_Session');
- $this->loadLayout();
-
- $eventResponse = new Varien_Object(array(
- 'content' => $this->getLayout()->getBlock('category.edit')->getFormHtml()
- . $this->getLayout()->getBlock('category.tree')
- ->getBreadcrumbsJavascript($breadcrumbsPath, 'editingCategoryBreadcrumbs'),
- 'messages' => $this->getLayout()->getMessagesBlock()->getGroupedHtml(),
- ));
-
- Mage::dispatchEvent('category_prepare_ajax_response', array(
- 'response' => $eventResponse,
- 'controller' => $this
- ));
-
- $this->getResponse()->setBody(
- Mage::helper('Mage_Core_Helper_Data')->jsonEncode($eventResponse->getData())
- );
-
- return;
- }
-
- $this->loadLayout();
- $this->_setActiveMenu('Mage_Catalog::catalog_categories');
- $this->getLayout()->getBlock('head')->setCanLoadExtJs(true)
- ->setContainerCssClass('catalog-categories');
-
- $this->_addBreadcrumb(Mage::helper('Mage_Catalog_Helper_Data')->__('Manage Catalog Categories'),
- Mage::helper('Mage_Catalog_Helper_Data')->__('Manage Categories')
- );
-
- $block = $this->getLayout()->getBlock('catalog.wysiwyg.js');
- if ($block) {
- $block->setStoreId($storeId);
- }
-
- $this->renderLayout();
- }
-
- /**
- * WYSIWYG editor action for ajax request
- *
- */
- public function wysiwygAction()
- {
- $elementId = $this->getRequest()->getParam('element_id', md5(microtime()));
- $storeId = $this->getRequest()->getParam('store_id', 0);
- $storeMediaUrl = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA);
-
- $content = $this->getLayout()->createBlock(
- 'Mage_Adminhtml_Block_Catalog_Helper_Form_Wysiwyg_Content',
- '',
- array(
- 'editor_element_id' => $elementId,
- 'store_id' => $storeId,
- 'store_media_url' => $storeMediaUrl,
- )
- );
-
- $this->getResponse()->setBody($content->toHtml());
- }
-
- /**
- * Get tree node (Ajax version)
- */
- public function categoriesJsonAction()
- {
- if ($this->getRequest()->getParam('expand_all')) {
- Mage::getSingleton('Mage_Backend_Model_Auth_Session')->setIsTreeWasExpanded(true);
- } else {
- Mage::getSingleton('Mage_Backend_Model_Auth_Session')->setIsTreeWasExpanded(false);
- }
- if ($categoryId = (int) $this->getRequest()->getPost('id')) {
- $this->getRequest()->setParam('id', $categoryId);
-
- if (!$category = $this->_initCategory()) {
- return;
- }
- $this->getResponse()->setBody(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Category_Tree')
- ->getTreeJson($category)
- );
- }
- }
-
- /**
- * Category save
- */
- public function saveAction()
- {
- if (!$category = $this->_initCategory()) {
- return;
- }
-
- $storeId = $this->getRequest()->getParam('store');
- $refreshTree = 'false';
- if ($data = $this->getRequest()->getPost()) {
- $category->addData($data['general']);
- if (!$category->getId()) {
- $parentId = $this->getRequest()->getParam('parent');
- if (!$parentId) {
- if ($storeId) {
- $parentId = Mage::app()->getStore($storeId)->getRootCategoryId();
- }
- else {
- $parentId = Mage_Catalog_Model_Category::TREE_ROOT_ID;
- }
- }
- $parentCategory = Mage::getModel('Mage_Catalog_Model_Category')->load($parentId);
- $category->setPath($parentCategory->getPath());
- }
-
- /**
- * Process "Use Config Settings" checkboxes
- */
- if ($useConfig = $this->getRequest()->getPost('use_config')) {
- foreach ($useConfig as $attributeCode) {
- $category->setData($attributeCode, null);
- }
- }
-
- /**
- * Create Permanent Redirect for old URL key
- */
- if ($category->getId() && isset($data['general']['url_key_create_redirect']))
- // && $category->getOrigData('url_key') != $category->getData('url_key')
- {
- $category->setData('save_rewrites_history', (bool)$data['general']['url_key_create_redirect']);
- }
-
- $category->setAttributeSetId($category->getDefaultAttributeSetId());
-
- if (isset($data['category_products']) &&
- !$category->getProductsReadonly()) {
- $products = array();
- parse_str($data['category_products'], $products);
- $category->setPostedProducts($products);
- }
-
- Mage::dispatchEvent('catalog_category_prepare_save', array(
- 'category' => $category,
- 'request' => $this->getRequest()
- ));
-
- /**
- * Check "Use Default Value" checkboxes values
- */
- if ($useDefaults = $this->getRequest()->getPost('use_default')) {
- foreach ($useDefaults as $attributeCode) {
- $category->setData($attributeCode, false);
- }
- }
-
- /**
- * Proceed with $_POST['use_config']
- * set into category model for processing through validation
- */
- $category->setData('use_post_data_config', $this->getRequest()->getPost('use_config'));
-
- try {
- $validate = $category->validate();
- if ($validate !== true) {
- foreach ($validate as $code => $error) {
- if ($error === true) {
- Mage::throwException(Mage::helper('Mage_Catalog_Helper_Data')->__('Attribute "%s" is required.', $category->getResource()->getAttribute($code)->getFrontend()->getLabel()));
- }
- else {
- Mage::throwException($error);
- }
- }
- }
-
- $category->unsetData('use_post_data_config');
- if (isset($data['general']['entity_id'])) {
- throw new Mage_Core_Exception($this->__('Unable to save the category'));
- }
-
- $category->save();
- $this->_getSession()->addSuccess(Mage::helper('Mage_Catalog_Helper_Data')->__('The category has been saved.'));
- $refreshTree = 'true';
- }
- catch (Exception $e){
- $this->_getSession()->addError($e->getMessage())
- ->setCategoryData($data);
- $refreshTree = 'false';
- }
- }
-
- if ($this->getRequest()->getPost('return_session_messages_only')) {
- $category->load($category->getId()); // to obtain truncated category name
-
- /** @var $block Mage_Core_Block_Messages */
- $block = Mage::getSingleton('Mage_Core_Block_Messages');
- $block->setMessages($this->_getSession()->getMessages(true));
- $body = Mage::helper('Mage_Core_Helper_Data')->jsonEncode(array(
- 'messages' => $block->getGroupedHtml(),
- 'error' => $refreshTree !== 'true',
- 'category' => $category->toArray(),
- ));
- } else {
- $url = $this->getUrl('*/*/edit', array('_current' => true, 'id' => $category->getId()));
- $body = '';
- }
-
- $this->getResponse()->setBody($body);
- }
-
- /**
- * Move category action
- */
- public function moveAction()
- {
- $category = $this->_initCategory();
- if (!$category) {
- $this->getResponse()->setBody(Mage::helper('Mage_Catalog_Helper_Data')->__('Category move error'));
- return;
- }
- /**
- * New parent category identifier
- */
- $parentNodeId = $this->getRequest()->getPost('pid', false);
- /**
- * Category id after which we have put our category
- */
- $prevNodeId = $this->getRequest()->getPost('aid', false);
-
- try {
- $category->move($parentNodeId, $prevNodeId);
- $this->getResponse()->setBody('SUCCESS');
- }
- catch (Mage_Core_Exception $e) {
- $this->getResponse()->setBody($e->getMessage());
- }
- catch (Exception $e){
- $this->getResponse()->setBody(Mage::helper('Mage_Catalog_Helper_Data')->__('Category move error %s', $e));
- Mage::logException($e);
- }
-
- }
-
- /**
- * Delete category action
- */
- public function deleteAction()
- {
- if ($id = (int) $this->getRequest()->getParam('id')) {
- try {
- $category = Mage::getModel('Mage_Catalog_Model_Category')->load($id);
- Mage::dispatchEvent('catalog_controller_category_delete', array('category'=>$category));
-
- Mage::getSingleton('Mage_Backend_Model_Auth_Session')->setDeletedPath($category->getPath());
-
- $category->delete();
- $this->_getSession()->addSuccess(Mage::helper('Mage_Catalog_Helper_Data')->__('The category has been deleted.'));
- }
- catch (Mage_Core_Exception $e){
- $this->_getSession()->addError($e->getMessage());
- $this->getResponse()->setRedirect($this->getUrl('*/*/edit', array('_current'=>true)));
- return;
- }
- catch (Exception $e){
- $this->_getSession()->addError(Mage::helper('Mage_Catalog_Helper_Data')->__('An error occurred while trying to delete the category.'));
- $this->getResponse()->setRedirect($this->getUrl('*/*/edit', array('_current'=>true)));
- return;
- }
- }
- $this->getResponse()->setRedirect($this->getUrl('*/*/', array('_current'=>true, 'id'=>null)));
- }
-
- /**
- * Grid Action
- * Display list of products related to current category
- *
- * @return void
- */
- public function gridAction()
- {
- if (!$category = $this->_initCategory(true)) {
- return;
- }
- $this->getResponse()->setBody(
- $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Catalog_Category_Tab_Product', 'category.product.grid')
- ->toHtml()
- );
- }
-
- /**
- * Tree Action
- * Retrieve category tree
- *
- * @return void
- */
- public function treeAction()
- {
- $storeId = (int) $this->getRequest()->getParam('store');
- $categoryId = (int) $this->getRequest()->getParam('id');
-
- if ($storeId) {
- if (!$categoryId) {
- $store = Mage::app()->getStore($storeId);
- $rootId = $store->getRootCategoryId();
- $this->getRequest()->setParam('id', $rootId);
- }
- }
-
- $category = $this->_initCategory(true);
-
- $block = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Category_Tree');
- $root = $block->getRoot();
- $this->getResponse()->setBody(Mage::helper('Mage_Core_Helper_Data')->jsonEncode(array(
- 'data' => $block->getTree(),
- 'parameters' => array(
- 'text' => $block->buildNodeName($root),
- 'draggable' => false,
- 'allowDrop' => ($root->getIsVisible()) ? true : false,
- 'id' => (int) $root->getId(),
- 'expanded' => (int) $block->getIsWasExpanded(),
- 'store_id' => (int) $block->getStore()->getId(),
- 'category_id' => (int) $category->getId(),
- 'root_visible'=> (int) $root->getIsVisible()
- ))));
- }
-
- /**
- * Build response for refresh input element 'path' in form
- */
- public function refreshPathAction()
- {
- if ($id = (int) $this->getRequest()->getParam('id')) {
- $category = Mage::getModel('Mage_Catalog_Model_Category')->load($id);
- $this->getResponse()->setBody(
- Mage::helper('Mage_Core_Helper_Data')->jsonEncode(array(
- 'id' => $id,
- 'path' => $category->getPath(),
- ))
- );
- }
- }
-
- /**
- * Category list suggestion based on already entered symbols
- */
- public function suggestCategoriesAction()
- {
- $this->getResponse()->setBody($this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Category_Tree')
- ->getSuggestedCategoriesJson($this->getRequest()->getParam('label_part'))
- );
- }
-
- /**
- * Check if admin has permissions to visit related pages
- *
- * @return boolean
- */
- protected function _isAllowed()
- {
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Catalog::categories');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
deleted file mode 100644
index b94587a4a1b02..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
+++ /dev/null
@@ -1,391 +0,0 @@
-
- */
-
-class Mage_Adminhtml_Catalog_Product_ReviewController extends Mage_Adminhtml_Controller_Action
-{
- /**
- * Array of actions which can be processed without secret key validation
- *
- * @var array
- */
- protected $_publicActions = array('edit');
-
- public function indexAction()
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Reviews and Ratings'))
- ->_title($this->__('Customer Reviews'));
-
- $this->_title($this->__('All Reviews'));
-
- if ($this->getRequest()->getParam('ajax')) {
- return $this->_forward('reviewGrid');
- }
-
- $this->loadLayout();
- $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_reviews_all');
-
- $this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Main'));
-
- $this->renderLayout();
- }
-
- public function pendingAction()
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Reviews and Ratings'))
- ->_title($this->__('Customer Reviews'));
-
- $this->_title($this->__('Pending Reviews'));
-
- if ($this->getRequest()->getParam('ajax')) {
- Mage::register('usePendingFilter', true);
- return $this->_forward('reviewGrid');
- }
-
- $this->loadLayout();
- $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_reviews_pending');
-
- Mage::register('usePendingFilter', true);
- $this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Main'));
-
- $this->renderLayout();
- }
-
- public function editAction()
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Reviews and Ratings'))
- ->_title($this->__('Customer Reviews'));
-
- $this->_title($this->__('Edit Review'));
-
- $this->loadLayout();
- $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_reviews_all');
-
- $this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Edit'));
-
- $this->renderLayout();
- }
-
- public function newAction()
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Reviews and Ratings'))
- ->_title($this->__('Customer Reviews'));
-
- $this->_title($this->__('New Review'));
-
- $this->loadLayout();
- $this->_setActiveMenu('Mage_Review::catalog_reviews_ratings_reviews_all');
-
- $this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
-
- $this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Add'));
- $this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Product_Grid'));
-
- $this->renderLayout();
- }
-
- public function saveAction()
- {
- if (($data = $this->getRequest()->getPost()) && ($reviewId = $this->getRequest()->getParam('id'))) {
- $review = Mage::getModel('Mage_Review_Model_Review')->load($reviewId);
- $session = Mage::getSingleton('Mage_Adminhtml_Model_Session');
- if (! $review->getId()) {
- $session->addError(Mage::helper('Mage_Catalog_Helper_Data')->__('The review was removed by another user or does not exist.'));
- } else {
- try {
- $review->addData($data)->save();
-
- $arrRatingId = $this->getRequest()->getParam('ratings', array());
- $votes = Mage::getModel('Mage_Rating_Model_Rating_Option_Vote')
- ->getResourceCollection()
- ->setReviewFilter($reviewId)
- ->addOptionInfo()
- ->load()
- ->addRatingOptions();
- foreach ($arrRatingId as $ratingId=>$optionId) {
- if($vote = $votes->getItemByColumnValue('rating_id', $ratingId)) {
- Mage::getModel('Mage_Rating_Model_Rating')
- ->setVoteId($vote->getId())
- ->setReviewId($review->getId())
- ->updateOptionVote($optionId);
- } else {
- Mage::getModel('Mage_Rating_Model_Rating')
- ->setRatingId($ratingId)
- ->setReviewId($review->getId())
- ->addOptionVote($optionId, $review->getEntityPkValue());
- }
- }
-
- $review->aggregate();
-
- $session->addSuccess(Mage::helper('Mage_Catalog_Helper_Data')->__('The review has been saved.'));
- } catch (Mage_Core_Exception $e) {
- $session->addError($e->getMessage());
- } catch (Exception $e){
- $session->addException($e, Mage::helper('Mage_Catalog_Helper_Data')->__('An error occurred while saving this review.'));
- }
- }
-
- $nextId = (int) $this->getRequest()->getParam('next_item');
- $url = $this->getUrl($this->getRequest()->getParam('ret') == 'pending' ? '*/*/pending' : '*/*/');
- if ($nextId) {
- $url = $this->getUrl('*/*/edit', array('id' => $nextId));
- }
- return $this->getResponse()->setRedirect($url);
- }
- $this->_redirect('*/*/');
- }
-
- public function deleteAction()
- {
- $reviewId = $this->getRequest()->getParam('id', false);
- $session = Mage::getSingleton('Mage_Adminhtml_Model_Session');
-
- try {
- Mage::getModel('Mage_Review_Model_Review')->setId($reviewId)
- ->aggregate()
- ->delete();
-
- $session->addSuccess(Mage::helper('Mage_Catalog_Helper_Data')->__('The review has been deleted'));
- if( $this->getRequest()->getParam('ret') == 'pending' ) {
- $this->getResponse()->setRedirect($this->getUrl('*/*/pending'));
- } else {
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
- }
- return;
- } catch (Mage_Core_Exception $e) {
- $session->addError($e->getMessage());
- } catch (Exception $e){
- $session->addException($e, Mage::helper('Mage_Catalog_Helper_Data')->__('An error occurred while deleting this review.'));
- }
-
- $this->_redirect('*/*/edit/',array('id'=>$reviewId));
- }
-
- public function massDeleteAction()
- {
- $reviewsIds = $this->getRequest()->getParam('reviews');
- $session = Mage::getSingleton('Mage_Adminhtml_Model_Session');
-
- if(!is_array($reviewsIds)) {
- $session->addError(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Please select review(s).'));
- } else {
- try {
- foreach ($reviewsIds as $reviewId) {
- $model = Mage::getModel('Mage_Review_Model_Review')->load($reviewId);
- $model->delete();
- }
- Mage::getSingleton('Mage_Adminhtml_Model_Session')->addSuccess(
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total of %d record(s) have been deleted.', count($reviewsIds))
- );
- } catch (Mage_Core_Exception $e) {
- $session->addError($e->getMessage());
- } catch (Exception $e){
- $session->addException($e, Mage::helper('Mage_Adminhtml_Helper_Data')->__('An error occurred while deleting record(s).'));
- }
- }
-
- $this->_redirect('*/*/' . $this->getRequest()->getParam('ret', 'index'));
- }
-
- public function massUpdateStatusAction()
- {
- $reviewsIds = $this->getRequest()->getParam('reviews');
- $session = Mage::getSingleton('Mage_Adminhtml_Model_Session');
-
- if(!is_array($reviewsIds)) {
- $session->addError(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Please select review(s).'));
- } else {
- /* @var $session Mage_Adminhtml_Model_Session */
- try {
- $status = $this->getRequest()->getParam('status');
- foreach ($reviewsIds as $reviewId) {
- $model = Mage::getModel('Mage_Review_Model_Review')->load($reviewId);
- $model->setStatusId($status)
- ->save()
- ->aggregate();
- }
- $session->addSuccess(
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total of %d record(s) have been updated.', count($reviewsIds))
- );
- } catch (Mage_Core_Exception $e) {
- $session->addError($e->getMessage());
- } catch (Exception $e) {
- $session->addException($e, Mage::helper('Mage_Adminhtml_Helper_Data')->__('An error occurred while updating the selected review(s).'));
- }
- }
-
- $this->_redirect('*/*/' . $this->getRequest()->getParam('ret', 'index'));
- }
-
- public function massVisibleInAction()
- {
- $reviewsIds = $this->getRequest()->getParam('reviews');
- $session = Mage::getSingleton('Mage_Adminhtml_Model_Session');
-
- if(!is_array($reviewsIds)) {
- $session->addError(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Please select review(s).'));
- } else {
- $session = Mage::getSingleton('Mage_Adminhtml_Model_Session');
- /* @var $session Mage_Adminhtml_Model_Session */
- try {
- $stores = $this->getRequest()->getParam('stores');
- foreach ($reviewsIds as $reviewId) {
- $model = Mage::getModel('Mage_Review_Model_Review')->load($reviewId);
- $model->setSelectStores($stores);
- $model->save();
- }
- $session->addSuccess(
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('Total of %d record(s) have been updated.', count($reviewsIds))
- );
- } catch (Mage_Core_Exception $e) {
- $session->addError($e->getMessage());
- } catch (Exception $e) {
- $session->addException($e, Mage::helper('Mage_Adminhtml_Helper_Data')->__('An error occurred while updating the selected review(s).'));
- }
- }
-
- $this->_redirect('*/*/pending');
- }
-
- public function productGridAction()
- {
- $this->getResponse()->setBody(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Product_Grid')->toHtml()
- );
- }
-
- public function reviewGridAction()
- {
- $this->getResponse()->setBody(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Review_Grid')->toHtml()
- );
- }
-
- public function jsonProductInfoAction()
- {
- $response = new Varien_Object();
- $id = $this->getRequest()->getParam('id');
- if( intval($id) > 0 ) {
- $product = Mage::getModel('Mage_Catalog_Model_Product')
- ->load($id);
-
- $response->setId($id);
- $response->addData($product->getData());
- $response->setError(0);
- } else {
- $response->setError(1);
- $response->setMessage(Mage::helper('Mage_Catalog_Helper_Data')->__('Unable to get the product ID.'));
- }
- $this->getResponse()->setBody($response->toJSON());
- }
-
- public function postAction()
- {
- $productId = $this->getRequest()->getParam('product_id', false);
- $session = Mage::getSingleton('Mage_Adminhtml_Model_Session');
-
- if ($data = $this->getRequest()->getPost()) {
- if (Mage::app()->hasSingleStore()) {
- $data['stores'] = array(Mage::app()->getStore(true)->getId());
- } else if (isset($data['select_stores'])) {
- $data['stores'] = $data['select_stores'];
- }
-
- $review = Mage::getModel('Mage_Review_Model_Review')->setData($data);
-
- $product = Mage::getModel('Mage_Catalog_Model_Product')
- ->load($productId);
-
- try {
- $review->setEntityId(1) // product
- ->setEntityPkValue($productId)
- ->setStoreId($product->getStoreId())
- ->setStatusId($data['status_id'])
- ->setCustomerId(null)//null is for administrator only
- ->save();
-
- $arrRatingId = $this->getRequest()->getParam('ratings', array());
- foreach ($arrRatingId as $ratingId=>$optionId) {
- Mage::getModel('Mage_Rating_Model_Rating')
- ->setRatingId($ratingId)
- ->setReviewId($review->getId())
- ->addOptionVote($optionId, $productId);
- }
-
- $review->aggregate();
-
- $session->addSuccess(Mage::helper('Mage_Catalog_Helper_Data')->__('The review has been saved.'));
- if( $this->getRequest()->getParam('ret') == 'pending' ) {
- $this->getResponse()->setRedirect($this->getUrl('*/*/pending'));
- } else {
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
- }
-
- return;
- } catch (Mage_Core_Exception $e) {
- $session->addError($e->getMessage());
- } catch (Exception $e) {
- $session->addException($e, Mage::helper('Mage_Adminhtml_Helper_Data')->__('An error occurred while saving review.'));
- }
- }
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
- return;
- }
-
- public function ratingItemsAction()
- {
- $this->getResponse()->setBody(
- $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Review_Rating_Detailed')
- ->setIndependentMode()
- ->toHtml()
- );
- }
-
- protected function _isAllowed()
- {
- switch ($this->getRequest()->getActionName()) {
- case 'pending':
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Review::pending');
- break;
- default:
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Review::reviews_all');
- break;
- }
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php
deleted file mode 100644
index 85b35919cd17d..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- */
-class Mage_Adminhtml_Catalog_Product_WidgetController extends Mage_Adminhtml_Controller_Action
-{
- /**
- * Chooser Source action
- */
- public function chooserAction()
- {
- $uniqId = $this->getRequest()->getParam('uniq_id');
- $massAction = $this->getRequest()->getParam('use_massaction', false);
- $productTypeId = $this->getRequest()->getParam('product_type_id', null);
-
- $productsGrid = $this->getLayout()->createBlock(
- 'Mage_Adminhtml_Block_Catalog_Product_Widget_Chooser',
- '',
- array(
- 'id' => $uniqId,
- 'use_massaction' => $massAction,
- 'product_type_id' => $productTypeId,
- 'category_id' => $this->getRequest()->getParam('category_id')
- )
- );
-
- $html = $productsGrid->toHtml();
-
- if (!$this->getRequest()->getParam('products_grid')) {
- $categoriesTree = $this->getLayout()->createBlock(
- 'Mage_Adminhtml_Block_Catalog_Category_Widget_Chooser',
- '',
- array(
- 'id' => $uniqId.'Tree',
- 'node_click_listener' => $productsGrid->getCategoryClickListenerJs(),
- 'with_empty_node' => true
- )
- );
-
- $html = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Widget_Chooser_Container')
- ->setTreeHtml($categoriesTree->toHtml())
- ->setGridHtml($html)
- ->toHtml();
- }
-
- $this->getResponse()->setBody($html);
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
deleted file mode 100644
index 66ac59b57e660..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
+++ /dev/null
@@ -1,1065 +0,0 @@
-
- */
-class Mage_Adminhtml_Catalog_ProductController extends Mage_Adminhtml_Controller_Action
-{
- /**
- * The greatest value which could be stored in CatalogInventory Qty field
- */
- const MAX_QTY_VALUE = 99999999.9999;
-
- /**
- * Array of actions which can be processed without secret key validation
- *
- * @var array
- */
- protected $_publicActions = array('edit');
-
- protected function _construct()
- {
- // Define module dependent translate
- $this->setUsedModuleName('Mage_Catalog');
- }
-
- /**
- * Initialize product from request parameters
- *
- * @return Mage_Catalog_Model_Product
- */
- protected function _initProduct()
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Manage Products'));
-
- $productId = (int) $this->getRequest()->getParam('id');
- /** @var $product Mage_Catalog_Model_Product */
- $product = Mage::getModel('Mage_Catalog_Model_Product')
- ->setStoreId($this->getRequest()->getParam('store', 0));
-
- if (!$productId) {
- if ($typeId = $this->getRequest()->getParam('type')) {
- $product->setTypeId($typeId);
- }
- }
-
- $product->setData('_edit_mode', true);
- if ($productId) {
- try {
- $product->load($productId);
- } catch (Exception $e) {
- $product->setTypeId(Mage_Catalog_Model_Product_Type::DEFAULT_TYPE);
- Mage::logException($e);
- }
- }
-
- $setId = (int)$this->getRequest()->getParam('set');
- if ($setId) {
- $product->setAttributeSetId($setId);
- }
-
- if ($this->getRequest()->has('attributes')) {
- $attributes = $this->getRequest()->getParam('attributes');
- if (!empty($attributes)) {
- $product->setTypeId(Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE);
- $this->_objectManager->get('Mage_Catalog_Model_Product_Type_Configurable')->setUsedProductAttributeIds(
- $attributes,
- $product
- );
- } else {
- $product->setTypeId(Mage_Catalog_Model_Product_Type::TYPE_SIMPLE);
- }
- }
-
- // Required attributes of simple product for configurable creation
- if ($this->getRequest()->getParam('popup')
- && $requiredAttributes = $this->getRequest()->getParam('required')) {
- $requiredAttributes = explode(",", $requiredAttributes);
- foreach ($product->getAttributes() as $attribute) {
- if (in_array($attribute->getId(), $requiredAttributes)) {
- $attribute->setIsRequired(1);
- }
- }
- }
-
- if ($this->getRequest()->getParam('popup')
- && $this->getRequest()->getParam('product')
- && !is_array($this->getRequest()->getParam('product'))
- && $this->getRequest()->getParam('id', false) === false) {
-
- $configProduct = Mage::getModel('Mage_Catalog_Model_Product')
- ->setStoreId(0)
- ->load($this->getRequest()->getParam('product'))
- ->setTypeId($this->getRequest()->getParam('type'));
-
- /* @var $configProduct Mage_Catalog_Model_Product */
- $data = array();
- foreach ($configProduct->getTypeInstance()->getEditableAttributes($configProduct) as $attribute) {
- /* @var $attribute Mage_Catalog_Model_Resource_Eav_Attribute */
- if(!$attribute->getIsUnique()
- && $attribute->getFrontend()->getInputType()!='gallery'
- && $attribute->getAttributeCode() != 'required_options'
- && $attribute->getAttributeCode() != 'has_options'
- && $attribute->getAttributeCode() != $configProduct->getIdFieldName()) {
- $data[$attribute->getAttributeCode()] = $configProduct->getData($attribute->getAttributeCode());
- }
- }
- $product->addData($data)
- ->setWebsiteIds($configProduct->getWebsiteIds());
- }
-
- if ($setId != $this->_getSession()->getAttributeSetId()) {
- $this->_initProductSave($product);
- $this->_getSession()->setAttributeSetId($setId);
- }
-
- Mage::register('product', $product);
- Mage::register('current_product', $product);
- Mage::getSingleton('Mage_Cms_Model_Wysiwyg_Config')->setStoreId($this->getRequest()->getParam('store'));
- return $product;
- }
-
- /**
- * Create serializer block for a grid
- *
- * @param string $inputName
- * @param Mage_Adminhtml_Block_Widget_Grid $gridBlock
- * @param array $productsArray
- * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Ajax_Serializer
- */
- protected function _createSerializerBlock($inputName, Mage_Adminhtml_Block_Widget_Grid $gridBlock, $productsArray)
- {
- return $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Ajax_Serializer')
- ->setGridBlock($gridBlock)
- ->setProducts($productsArray)
- ->setInputElementName($inputName)
- ;
- }
-
- /**
- * Output specified blocks as a text list
- */
- protected function _outputBlocks()
- {
- $blocks = func_get_args();
- $output = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Text_List');
- foreach ($blocks as $block) {
- $output->insert($block, '', true);
- }
- $this->getResponse()->setBody($output->toHtml());
- }
-
- /**
- * Product list page
- */
- public function indexAction()
- {
- $this->_title($this->__('Catalog'))
- ->_title($this->__('Manage Products'));
- /** @var $limitation Mage_Catalog_Model_Product_Limitation */
- $limitation = Mage::getObjectManager()->get('Mage_Catalog_Model_Product_Limitation');
- if ($limitation->isCreateRestricted()) {
- $this->_getSession()->addNotice($limitation->getCreateRestrictedMessage());
- }
- $this->loadLayout();
- $this->renderLayout();
- }
-
- /**
- * Create new product page
- */
- public function newAction()
- {
- if (!$this->getRequest()->getParam('set') || !$this->getRequest()->getParam('type')) {
- $this->_forward('noroute');
- return;
- }
- $product = $this->_initProduct();
-
- $productData = $this->getRequest()->getPost('product');
- if ($productData) {
- $this->_filterStockData($productData['stock_data']);
- $product->addData($productData);
- }
-
- $this->_title($this->__('New Product'));
-
- Mage::dispatchEvent('catalog_product_new_action', array('product' => $product));
-
- if ($this->getRequest()->getParam('popup')) {
- $this->loadLayout('popup');
- } else {
- $_additionalLayoutPart = '';
- if ($product->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE
- && !($product->getTypeInstance()->getUsedProductAttributeIds($product)))
- {
- $_additionalLayoutPart = '_new';
- }
- $this->loadLayout(array(
- 'default',
- strtolower($this->getFullActionName()),
- 'adminhtml_catalog_product_'.$product->getTypeId() . $_additionalLayoutPart
- ));
- $this->_setActiveMenu('Mage_Catalog::catalog_products');
- }
-
- $this->getLayout()->getBlock('head')->setCanLoadExtJs(false);
-
- $block = $this->getLayout()->getBlock('catalog.wysiwyg.js');
- if ($block) {
- $block->setStoreId($product->getStoreId());
- }
-
- $this->renderLayout();
- }
-
- /**
- * Product edit form
- */
- public function editAction()
- {
- /** @var $limitation Mage_Catalog_Model_Product_Limitation */
- $limitation = Mage::getObjectManager()->get('Mage_Catalog_Model_Product_Limitation');
- if ($limitation->isCreateRestricted()) {
- $this->_getSession()->addNotice($limitation->getCreateRestrictedMessage());
- }
-
- $productId = (int) $this->getRequest()->getParam('id');
- $product = $this->_initProduct();
-
- if ($productId && !$product->getId()) {
- $this->_getSession()->addError(Mage::helper('Mage_Catalog_Helper_Data')->__('This product no longer exists.'));
- $this->_redirect('*/*/');
- return;
- }
-
- $this->_title($product->getName());
-
- Mage::dispatchEvent('catalog_product_edit_action', array('product' => $product));
-
- $_additionalLayoutPart = '';
- if ($product->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE
- && !($product->getTypeInstance()->getUsedProductAttributeIds($product))
- ) {
- $_additionalLayoutPart = '_new';
- }
-
- $this->loadLayout(array(
- 'default',
- strtolower($this->getFullActionName()),
- 'adminhtml_catalog_product_'.$product->getTypeId() . $_additionalLayoutPart
- ));
-
- $this->_setActiveMenu('Mage_Catalog::catalog_products');
-
- if (!Mage::app()->isSingleStoreMode() && ($switchBlock = $this->getLayout()->getBlock('store_switcher'))) {
- $switchBlock->setDefaultStoreName($this->__('Default Values'))
- ->setWebsiteIds($product->getWebsiteIds())
- ->setSwitchUrl(
- $this->getUrl('*/*/*', array('_current'=>true, 'active_tab'=>null, 'tab' => null, 'store'=>null))
- );
- }
-
- $this->getLayout()->getBlock('head')->setCanLoadExtJs(false);
-
- $block = $this->getLayout()->getBlock('catalog.wysiwyg.js');
- if ($block) {
- $block->setStoreId($product->getStoreId());
- }
-
- $this->renderLayout();
- }
-
- /**
- * WYSIWYG editor action for ajax request
- *
- */
- public function wysiwygAction()
- {
- $elementId = $this->getRequest()->getParam('element_id', md5(microtime()));
- $storeId = $this->getRequest()->getParam('store_id', 0);
- $storeMediaUrl = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA);
-
- $content = $this->getLayout()->createBlock(
- 'Mage_Adminhtml_Block_Catalog_Helper_Form_Wysiwyg_Content',
- '',
- array(
- 'editor_element_id' => $elementId,
- 'store_id' => $storeId,
- 'store_media_url' => $storeMediaUrl,
- )
- );
- $this->getResponse()->setBody($content->toHtml());
- }
-
- /**
- * Product grid for AJAX request
- */
- public function gridAction()
- {
- $this->loadLayout();
- $this->renderLayout();
- }
-
- /**
- * Get specified tab grid
- */
- public function gridOnlyAction()
- {
- $this->_initProduct();
- $this->loadLayout();
-
- $block = $this->getRequest()->getParam('gridOnlyBlock');
- $blockClassSuffix = str_replace(' ', '_', ucwords(str_replace('_', ' ', $block)));
-
- $this->getResponse()->setBody(
- $this->getLayout()
- ->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_' . $blockClassSuffix)
- ->toHtml()
- );
- }
-
- /**
- * Get variations matrix block
- *
- */
- public function variationsMatrixAction()
- {
- $this->_initProductSave($this->_initProduct());
- $this->loadLayout();
- $this->renderLayout();
- }
-
- /**
- * Get categories fieldset block
- *
- */
- public function categoriesAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->renderLayout();
- }
-
- /**
- * Get options fieldset block
- *
- */
- public function optionsAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->renderLayout();
- }
-
- /**
- * Get related products grid and serializer block
- */
- public function relatedAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->getLayout()->getBlock('catalog.product.edit.tab.related')
- ->setProductsRelated($this->getRequest()->getPost('products_related', null));
- $this->renderLayout();
- }
-
- /**
- * Get upsell products grid and serializer block
- */
- public function upsellAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->getLayout()->getBlock('catalog.product.edit.tab.upsell')
- ->setProductsUpsell($this->getRequest()->getPost('products_upsell', null));
- $this->renderLayout();
- }
-
- /**
- * Get crosssell products grid and serializer block
- */
- public function crosssellAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->getLayout()->getBlock('catalog.product.edit.tab.crosssell')
- ->setProductsCrossSell($this->getRequest()->getPost('products_crosssell', null));
- $this->renderLayout();
- }
-
- /**
- * Get related products grid
- */
- public function relatedGridAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->getLayout()->getBlock('catalog.product.edit.tab.related')
- ->setProductsRelated($this->getRequest()->getPost('products_related', null));
- $this->renderLayout();
- }
-
- /**
- * Get upsell products grid
- */
- public function upsellGridAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->getLayout()->getBlock('catalog.product.edit.tab.upsell')
- ->setProductsRelated($this->getRequest()->getPost('products_upsell', null));
- $this->renderLayout();
- }
-
- /**
- * Get crosssell products grid
- */
- public function crosssellGridAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->getLayout()->getBlock('catalog.product.edit.tab.crosssell')
- ->setProductsRelated($this->getRequest()->getPost('products_crosssell', null));
- $this->renderLayout();
- }
-
- /**
- * Get associated grouped products grid
- */
- public function superGroupAction()
- {
- $this->loadLayout(false);
- $this->renderLayout();
- }
-
- /**
- * Get associated grouped products grid popup
- */
- public function superGroupPopupAction()
- {
- $this->_initProduct();
- $this->loadLayout(false);
- $this->renderLayout();
- }
-
- /**
- * Get product reviews grid
- *
- */
- public function reviewsAction()
- {
- $this->_initProduct();
- $this->loadLayout();
- $this->getLayout()->getBlock('admin.product.reviews')
- ->setProductId(Mage::registry('product')->getId())
- ->setUseAjax(true);
- $this->renderLayout();
- }
-
- /**
- * Get super config grid
- *
- */
- public function superConfigAction()
- {
- $this->_initProduct();
- $this->loadLayout(false);
- $this->renderLayout();
- }
-
- /**
- * Validate product
- *
- */
- public function validateAction()
- {
- $response = new Varien_Object();
- $response->setError(false);
-
- try {
- $productData = $this->getRequest()->getPost('product');
-
- if ($productData && !isset($productData['stock_data']['use_config_manage_stock'])) {
- $productData['stock_data']['use_config_manage_stock'] = 0;
- }
- /* @var $product Mage_Catalog_Model_Product */
- $product = Mage::getModel('Mage_Catalog_Model_Product');
- $product->setData('_edit_mode', true);
- if ($storeId = $this->getRequest()->getParam('store')) {
- $product->setStoreId($storeId);
- }
- if ($setId = $this->getRequest()->getParam('set')) {
- $product->setAttributeSetId($setId);
- }
- if ($typeId = $this->getRequest()->getParam('type')) {
- $product->setTypeId($typeId);
- }
- if ($productId = $this->getRequest()->getParam('id')) {
- $product->load($productId);
- }
-
- $dateFields = array();
- $attributes = $product->getAttributes();
- foreach ($attributes as $attrKey => $attribute) {
- if ($attribute->getBackend()->getType() == 'datetime') {
- if (array_key_exists($attrKey, $productData) && $productData[$attrKey] != '') {
- $dateFields[] = $attrKey;
- }
- }
- }
- $productData = $this->_filterDates($productData, $dateFields);
- $product->addData($productData);
-
- /* set restrictions for date ranges */
- $resource = $product->getResource();
- $resource->getAttribute('special_from_date')
- ->setMaxValue($product->getSpecialToDate());
- $resource->getAttribute('news_from_date')
- ->setMaxValue($product->getNewsToDate());
- $resource->getAttribute('custom_design_from')
- ->setMaxValue($product->getCustomDesignTo());
-
- if ($products = $this->getRequest()->getPost('variations-matrix')) {
- $validationResult = $this->_validateProductVariations($product, $products);
- if (!empty($validationResult)) {
- $response->setError(true)
- ->setMessage(Mage::helper('Mage_Catalog_Helper_Data')->__('Some product variations fields are not valid.'))
- ->setAttributes($validationResult);
- }
- }
- $product->validate();
- /**
- * @todo implement full validation process with errors returning which are ignoring now
- */
-// if (is_array($errors = $product->validate())) {
-// foreach ($errors as $code => $error) {
-// if ($error === true) {
-// Mage::throwException(Mage::helper('Mage_Catalog_Helper_Data')->__('Attribute "%s" is invalid.', $product->getResource()->getAttribute($code)->getFrontend()->getLabel()));
-// }
-// else {
-// Mage::throwException($error);
-// }
-// }
-// }
- }
- catch (Mage_Eav_Model_Entity_Attribute_Exception $e) {
- $response->setError(true);
- $response->setAttribute($e->getAttributeCode());
- $response->setMessage($e->getMessage());
- } catch (Mage_Core_Exception $e) {
- $response->setError(true);
- $response->setMessage($e->getMessage());
- } catch (Exception $e) {
- $this->_getSession()->addError($e->getMessage());
- $this->_initLayoutMessages('Mage_Adminhtml_Model_Session');
- $response->setError(true);
- $response->setMessage($this->getLayout()->getMessagesBlock()->getGroupedHtml());
- }
-
- $this->getResponse()->setBody($response->toJson());
- }
-
- /**
- * Product variations attributes validation
- *
- * @param Mage_Catalog_Model_Product $parentProduct
- * @param array $products
- *
- * @return array
- */
- protected function _validateProductVariations($parentProduct, $products)
- {
- $validationResult = array();
- foreach ($products as $productData) {
- $product = $this->_objectManager->create('Mage_Catalog_Model_Product');
- $product->setData('_edit_mode', true);
- if ($storeId = $this->getRequest()->getParam('store')) {
- $product->setStoreId($storeId);
- }
- $product->setAttributeSetId($parentProduct->getAttributeSetId());
-
- $product->addData($productData);
- $product->setCollectExceptionMessages(true);
- $configurableAttribute = Mage::helper('Mage_Core_Helper_Data')
- ->jsonDecode($productData['configurable_attribute']);
- $configurableAttribute = implode('-', $configurableAttribute);
- foreach ($product->validate() as $attributeCode => $result) {
- if (is_string($result)) {
- $validationResult['variations-matrix-' . $configurableAttribute . '-' . $attributeCode] = $result;
- }
- }
- }
-
- return $validationResult;
- }
-
- /**
- * Initialize product before saving
- *
- * @param $product Mage_Catalog_Model_Product
- * @return Mage_Catalog_Model_Product
- */
- protected function _initProductSave($product)
- {
- $productData = $this->getRequest()->getPost('product');
- if ($productData) {
- $this->_filterStockData($productData['stock_data']);
- }
-
- /**
- * Websites
- */
- if (!isset($productData['website_ids'])) {
- $productData['website_ids'] = array();
- }
-
- $wasLockedMedia = false;
- if ($product->isLockedAttribute('media')) {
- $product->unlockAttribute('media');
- $wasLockedMedia = true;
- }
-
- $product->addData($productData);
-
- if ($wasLockedMedia) {
- $product->lockAttribute('media');
- }
-
- if (Mage::app()->hasSingleStore()) {
- $product->setWebsiteIds(array(Mage::app()->getStore(true)->getWebsite()->getId()));
- }
-
- /**
- * Create Permanent Redirect for old URL key
- */
- if ($product->getId() && isset($productData['url_key_create_redirect']))
- // && $product->getOrigData('url_key') != $product->getData('url_key')
- {
- $product->setData('save_rewrites_history', (bool)$productData['url_key_create_redirect']);
- }
-
- /**
- * Check "Use Default Value" checkboxes values
- */
- if ($useDefaults = $this->getRequest()->getPost('use_default')) {
- foreach ($useDefaults as $attributeCode) {
- $product->setData($attributeCode, false);
- }
- }
-
- /**
- * Init product links data (related, upsell, crosssel)
- */
- $links = $this->getRequest()->getPost('links');
- if (isset($links['related']) && !$product->getRelatedReadonly()) {
- $product->setRelatedLinkData(
- Mage::helper('Mage_Adminhtml_Helper_Js')->decodeGridSerializedInput($links['related'])
- );
- }
- if (isset($links['upsell']) && !$product->getUpsellReadonly()) {
- $product->setUpSellLinkData(
- Mage::helper('Mage_Adminhtml_Helper_Js')->decodeGridSerializedInput($links['upsell'])
- );
- }
- if (isset($links['crosssell']) && !$product->getCrosssellReadonly()) {
- $product->setCrossSellLinkData(Mage::helper('Mage_Adminhtml_Helper_Js')
- ->decodeGridSerializedInput($links['crosssell']));
- }
- if (isset($links['grouped']) && !$product->getGroupedReadonly()) {
- $product->setGroupedLinkData(
- Mage::helper('Mage_Core_Helper_Data')->jsonDecode($links['grouped'])
- );
- }
-
- /**
- * Initialize data for configurable product
- */
-
- $attributes = $this->getRequest()->getParam('attributes');
- if (!empty($attributes)) {
- $this->_objectManager->get('Mage_Catalog_Model_Product_Type_Configurable')->setUsedProductAttributeIds(
- $attributes,
- $product
- );
-
- $product->setNewVariationsAttributeSetId($this->getRequest()->getPost('new-variations-attribute-set-id'));
- $associatedProductIds = $this->getRequest()->getPost('associated_product_ids', array());
- if ($this->getRequest()->getActionName() != 'variationsMatrix') {
- $generatedProductIds = $this->_objectManager->get('Mage_Catalog_Model_Product_Type_Configurable')
- ->generateSimpleProducts($product, $this->getRequest()->getPost('variations-matrix', array()));
- $associatedProductIds = array_merge($associatedProductIds, $generatedProductIds);
- }
- $product->setAssociatedProductIds(array_filter($associatedProductIds));
-
- $product->setCanSaveConfigurableAttributes(
- (bool)$this->getRequest()->getPost('affect_configurable_product_attributes')
- );
- }
-
- /**
- * Initialize product options
- */
- if (isset($productData['options']) && !$product->getOptionsReadonly()) {
- $product->setProductOptions($productData['options']);
- }
-
- $product->setCanSaveCustomOptions(
- (bool)$this->getRequest()->getPost('affect_product_custom_options')
- && !$product->getOptionsReadonly()
- );
-
- Mage::dispatchEvent(
- 'catalog_product_prepare_save',
- array('product' => $product, 'request' => $this->getRequest())
- );
-
- return $product;
- }
-
- /**
- * Filter product stock data
- *
- * @param array $stockData
- */
- protected function _filterStockData(&$stockData) {
- if (!isset($stockData['use_config_manage_stock'])) {
- $stockData['use_config_manage_stock'] = 0;
- }
- if (isset($stockData['qty']) && (float)$stockData['qty'] > self::MAX_QTY_VALUE) {
- $stockData['qty'] = self::MAX_QTY_VALUE;
- }
- if (isset($stockData['min_qty']) && (int)$stockData['min_qty'] < 0) {
- $stockData['min_qty'] = 0;
- }
- if (!isset($stockData['is_decimal_divided']) || $stockData['is_qty_decimal'] == 0) {
- $stockData['is_decimal_divided'] = 0;
- }
- }
-
- /**
- * Save product action
- */
- public function saveAction()
- {
- $storeId = $this->getRequest()->getParam('store');
- $redirectBack = $this->getRequest()->getParam('back', false);
- $productId = $this->getRequest()->getParam('id');
- $isEdit = (int)($this->getRequest()->getParam('id') != null);
-
- $data = $this->getRequest()->getPost();
- if ($data) {
- $this->_filterStockData($data['product']['stock_data']);
-
- $product = $this->_initProductSave($this->_initProduct());
- Mage::dispatchEvent(
- 'catalog_product_transition_product_type',
- array('product' => $product, 'request' => $this->getRequest())
- );
-
- try {
- if (isset($data['product'][$product->getIdFieldName()])) {
- throw new Mage_Core_Exception($this->__('Unable to save product'));
- }
-
- $originalSku = $product->getSku();
- $product->save();
- $productId = $product->getId();
-
- /**
- * Do copying data to stores
- */
- if (isset($data['copy_to_stores'])) {
- foreach ($data['copy_to_stores'] as $storeTo=>$storeFrom) {
- Mage::getModel('Mage_Catalog_Model_Product')
- ->setStoreId($storeFrom)
- ->load($productId)
- ->setStoreId($storeTo)
- ->save();
- }
- }
-
- Mage::getModel('Mage_CatalogRule_Model_Rule')->applyAllRulesToProduct($productId);
-
- $this->_getSession()->addSuccess($this->__('The product has been saved.'));
- if ($product->getSku() != $originalSku) {
- $this->_getSession()->addNotice(
- $this->__('SKU for product %s has been changed to %s.', Mage::helper('Mage_Core_Helper_Data')
- ->escapeHtml($product->getName()),
- Mage::helper('Mage_Core_Helper_Data')->escapeHtml($product->getSku()))
- );
- }
- } catch (Mage_Core_Exception $e) {
- $this->_getSession()->addError($e->getMessage())
- ->setProductData($data);
- $redirectBack = true;
- } catch (Exception $e) {
- Mage::logException($e);
- $this->_getSession()->addError($e->getMessage());
- $redirectBack = true;
- }
- }
-
- if ($redirectBack === 'new') {
- $this->_redirect('*/*/new', array(
- 'set' => $product->getAttributeSetId(),
- 'type' => $product->getTypeId()
- ));
- } elseif ($redirectBack) {
- $this->_redirect('*/*/edit', array(
- 'id' => $productId,
- '_current' => true
- ));
- } elseif ($this->getRequest()->getParam('popup')) {
- $this->_redirect('*/*/created', array(
- '_current' => true,
- 'id' => $productId,
- 'edit' => $isEdit
- ));
- } else {
- $this->_redirect('*/*/', array('store'=>$storeId));
- }
- }
-
- /**
- * Create product duplicate
- */
- public function duplicateAction()
- {
- $product = $this->_initProduct();
- try {
- $newProduct = $product->duplicate();
- $this->_getSession()->addSuccess($this->__('The product has been duplicated.'));
- $this->_redirect('*/*/edit', array('_current'=>true, 'id'=>$newProduct->getId()));
- } catch (Exception $e) {
- Mage::logException($e);
- $this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('_current'=>true));
- }
- }
-
- /**
- * Delete product action
- */
- public function deleteAction()
- {
- if ($id = $this->getRequest()->getParam('id')) {
- $product = Mage::getModel('Mage_Catalog_Model_Product')
- ->load($id);
- $sku = $product->getSku();
- try {
- $product->delete();
- $this->_getSession()->addSuccess($this->__('The product has been deleted.'));
- } catch (Exception $e) {
- $this->_getSession()->addError($e->getMessage());
- }
- }
- $this->getResponse()
- ->setRedirect($this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store'))));
- }
-
- /**
- * Get alerts price grid
- */
- public function alertsPriceGridAction()
- {
- $this->loadLayout(false);
- $this->renderLayout();
- }
-
- /**
- * Get alerts stock grid
- */
- public function alertsStockGridAction()
- {
- $this->loadLayout(false);
- $this->renderLayout();
- }
-
- public function addAttributeAction()
- {
- $this->_getSession()->addNotice(
- Mage::helper('Mage_Catalog_Helper_Data')->__('Please click on the Close Window button if it is not closed automatically.')
- );
- $this->loadLayout('popup');
- $this->_initProduct();
- $this->_addContent(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created')
- );
- $this->renderLayout();
- }
-
- public function createdAction()
- {
- $this->_getSession()->addNotice(
- Mage::helper('Mage_Catalog_Helper_Data')->__('Please click on the Close Window button if it is not closed automatically.')
- );
- $this->loadLayout('popup');
- $this->_addContent(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Created')
- );
- $this->renderLayout();
- }
-
- public function massDeleteAction()
- {
- $productIds = $this->getRequest()->getParam('product');
- if (!is_array($productIds)) {
- $this->_getSession()->addError($this->__('Please select product(s).'));
- } else {
- if (!empty($productIds)) {
- try {
- foreach ($productIds as $productId) {
- $product = Mage::getSingleton('Mage_Catalog_Model_Product')->load($productId);
- $product->delete();
- }
- $this->_getSession()->addSuccess(
- $this->__('Total of %d record(s) have been deleted.', count($productIds))
- );
- } catch (Exception $e) {
- $this->_getSession()->addError($e->getMessage());
- }
- }
- }
- $this->_redirect('*/*/index');
- }
-
- /**
- * Update product(s) status action
- *
- */
- public function massStatusAction()
- {
- $productIds = (array)$this->getRequest()->getParam('product');
- $storeId = (int)$this->getRequest()->getParam('store', 0);
- $status = (int)$this->getRequest()->getParam('status');
-
- try {
- $this->_validateMassStatus($productIds, $status);
- Mage::getSingleton('Mage_Catalog_Model_Product_Action')
- ->updateAttributes($productIds, array('status' => $status), $storeId);
-
- $this->_getSession()->addSuccess(
- $this->__('Total of %d record(s) have been updated.', count($productIds))
- );
- }
- catch (Mage_Core_Model_Exception $e) {
- $this->_getSession()->addError($e->getMessage());
- } catch (Mage_Core_Exception $e) {
- $this->_getSession()->addError($e->getMessage());
- } catch (Exception $e) {
- $this->_getSession()
- ->addException($e, $this->__('An error occurred while updating the product(s) status.'));
- }
-
- $this->_redirect('*/*/', array('store'=> $storeId));
- }
-
- /**
- * Validate batch of products before theirs status will be set
- *
- * @throws Mage_Core_Exception
- * @param array $productIds
- * @param int $status
- * @return void
- */
- public function _validateMassStatus(array $productIds, $status)
- {
- if ($status == Mage_Catalog_Model_Product_Status::STATUS_ENABLED) {
- if (!Mage::getModel('Mage_Catalog_Model_Product')->isProductsHasSku($productIds)) {
- throw new Mage_Core_Exception(
- $this->__('Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.')
- );
- }
- }
- }
-
- /**
- * Check for is allowed
- *
- * @return boolean
- */
- protected function _isAllowed()
- {
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Catalog::products');
- }
-
- /**
- * Show item update result from updateAction
- * in Wishlist and Cart controllers.
- *
- */
- public function showUpdateResultAction()
- {
- $session = Mage::getSingleton('Mage_Adminhtml_Model_Session');
- if ($session->hasCompositeProductResult() && $session->getCompositeProductResult() instanceof Varien_Object){
- /* @var $helper Mage_Adminhtml_Helper_Catalog_Product_Composite */
- $helper = Mage::helper('Mage_Adminhtml_Helper_Catalog_Product_Composite');
- $helper->renderUpdateResult($this, $session->getCompositeProductResult());
- $session->unsCompositeProductResult();
- } else {
- $session->unsCompositeProductResult();
- return false;
- }
- }
-
- /**
- * Show product grid for custom options import popup
- */
- public function optionsImportGridAction()
- {
- $this->loadLayout();
- $this->renderLayout();
- }
-
- /**
- * Show custom options in JSON format for specified products
- */
- public function customOptionsAction()
- {
- Mage::register('import_option_products', $this->getRequest()->getPost('products'));
- $this->loadLayout();
- $this->renderLayout();
- }
-
- /**
- * Action for product template selector
- */
- public function suggestProductTemplatesAction()
- {
- $this->_initProduct();
- $this->getResponse()->setBody(Mage::helper('Mage_Core_Helper_Data')->jsonEncode(
- $this->getLayout()->createBlock('Mage_Catalog_Block_Product_TemplateSelector')
- ->getSuggestedTemplates($this->getRequest()->getParam('label_part'))
- ));
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php
deleted file mode 100644
index a697f6c369315..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- */
-class Mage_Adminhtml_Cms_Block_WidgetController extends Mage_Adminhtml_Controller_Action
-{
- /**
- * Chooser Source action
- */
- public function chooserAction()
- {
- $uniqId = $this->getRequest()->getParam('uniq_id');
- $pagesGrid = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Cms_Block_Widget_Chooser', '', array(
- 'id' => $uniqId,
- ));
- $this->getResponse()->setBody($pagesGrid->toHtml());
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php
deleted file mode 100644
index 76b10c436d966..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- */
-class Mage_Adminhtml_Cms_Page_WidgetController extends Mage_Adminhtml_Controller_Action
-{
- /**
- * Chooser Source action
- */
- public function chooserAction()
- {
- $uniqId = $this->getRequest()->getParam('uniq_id');
- $pagesGrid = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Cms_Page_Widget_Chooser', '', array(
- 'id' => $uniqId,
- ));
- $this->getResponse()->setBody($pagesGrid->toHtml());
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
deleted file mode 100644
index 9bebca055032a..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
+++ /dev/null
@@ -1,133 +0,0 @@
-getRequest();
-
- switch ($request->getParam('attribute')) {
- case 'sku':
- $block = $this->getLayout()->createBlock(
- 'Mage_Adminhtml_Block_Promo_Widget_Chooser_Sku', 'promo_widget_chooser_sku',
- array('js_form_object' => $request->getParam('form'),
- ));
- break;
-
- case 'category_ids':
- $ids = $request->getParam('selected', array());
- if (is_array($ids)) {
- foreach ($ids as $key => &$id) {
- $id = (int) $id;
- if ($id <= 0) {
- unset($ids[$key]);
- }
- }
-
- $ids = array_unique($ids);
- } else {
- $ids = array();
- }
-
-
- $block = $this->getLayout()->createBlock(
- 'Mage_Adminhtml_Block_Catalog_Category_Checkboxes_Tree', 'promo_widget_chooser_category_ids',
- array('js_form_object' => $request->getParam('form'))
- )
- ->setCategoryIds($ids)
- ;
- break;
-
- default:
- $block = false;
- break;
- }
-
- if ($block) {
- $this->getResponse()->setBody($block->toHtml());
- }
- }
-
- protected function _isAllowed()
- {
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_CatalogRule::promo_catalog');
- }
-
- /**
- * Get tree node (Ajax version)
- */
- public function categoriesJsonAction()
- {
- if ($categoryId = (int) $this->getRequest()->getPost('id')) {
- $this->getRequest()->setParam('id', $categoryId);
-
- if (!$category = $this->_initCategory()) {
- return;
- }
- $this->getResponse()->setBody(
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Category_Tree')
- ->getTreeJson($category)
- );
- }
- }
-
- /**
- * Initialize category object in registry
- *
- * @return Mage_Catalog_Model_Category
- */
- protected function _initCategory()
- {
- $categoryId = (int) $this->getRequest()->getParam('id',false);
- $storeId = (int) $this->getRequest()->getParam('store');
-
- $category = Mage::getModel('Mage_Catalog_Model_Category');
- $category->setStoreId($storeId);
-
- if ($categoryId) {
- $category->load($categoryId);
- if ($storeId) {
- $rootId = Mage::app()->getStore($storeId)->getRootCategoryId();
- if (!in_array($rootId, $category->getPathIds())) {
- $this->_redirect('*/*/', array('_current'=>true, 'id'=>null));
- return false;
- }
- }
- }
-
- Mage::register('category', $category);
- Mage::register('current_category', $category);
-
- return $category;
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php
deleted file mode 100644
index 23d1289f3fcb7..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php
+++ /dev/null
@@ -1,178 +0,0 @@
-
- */
-class Mage_Adminhtml_Report_ReviewController extends Mage_Adminhtml_Controller_Action
-{
- public function _initAction()
- {
- $this->loadLayout()
- ->_addBreadcrumb(
- Mage::helper('Mage_Reports_Helper_Data')->__('Reports'),
- Mage::helper('Mage_Reports_Helper_Data')->__('Reports')
- )
- ->_addBreadcrumb(
- Mage::helper('Mage_Reports_Helper_Data')->__('Review'),
- Mage::helper('Mage_Reports_Helper_Data')->__('Reviews')
- );
- return $this;
- }
-
- public function customerAction()
- {
- $this->_title($this->__('Reports'))
- ->_title($this->__('Reviews'))
- ->_title($this->__('Customer Reviews'));
-
- $this->_initAction()
- ->_setActiveMenu('Mage_Review::report_review_customer')
- ->_addBreadcrumb(
- Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report'),
- Mage::helper('Mage_Reports_Helper_Data')->__('Customers Report')
- );
- $this->renderLayout();
- }
-
- /**
- * Export review customer report to CSV format
- */
- public function exportCustomerCsvAction()
- {
- $this->loadLayout(false);
- $fileName = 'review_customer.csv';
- $exportBlock = $this->getLayout()->getChildBlock('adminhtml.block.report.review.customer.grid','grid.export');
- $this->_prepareDownloadResponse($fileName, $exportBlock->getCsvFile());
- }
-
- /**
- * Export review customer report to Excel XML format
- */
- public function exportCustomerExcelAction()
- {
- $this->loadLayout(false);
- $fileName = 'review_customer.xml';
- $exportBlock = $this->getLayout()->getChildBlock('adminhtml.block.report.review.customer.grid','grid.export');
- $this->_prepareDownloadResponse($fileName, $exportBlock->getExcelFile());
-
- }
-
- public function productAction()
- {
- $this->_title($this->__('Reports'))
- ->_title($this->__('Reviews'))
- ->_title($this->__('Product Reviews'));
-
- $this->_initAction()
- ->_setActiveMenu('Mage_Review::report_review_product')
- ->_addBreadcrumb(
- Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'),
- Mage::helper('Mage_Reports_Helper_Data')->__('Products Report')
- );
- $this->renderLayout();
- }
-
- /**
- * Export review product report to CSV format
- */
- public function exportProductCsvAction()
- {
- $this->loadLayout(false);
- $fileName = 'review_product.csv';
- $exportBlock = $this->getLayout()->getChildBlock('adminhtml.block.report.review.product.grid','grid.export');
- $this->_prepareDownloadResponse($fileName, $exportBlock->getCsvFile());
- }
-
- /**
- * Export review product report to Excel XML format
- */
- public function exportProductExcelAction()
- {
- $this->loadLayout(false);
- $fileName = 'review_product.xml';
- $exportBlock = $this->getLayout()->getChildBlock('adminhtml.block.report.review.product.grid','grid.export');
- $this->_prepareDownloadResponse($fileName, $exportBlock->getExcelFile());
- }
-
- public function productDetailAction()
- {
- $this->_title($this->__('Reports'))
- ->_title($this->__('Reviews'))
- ->_title($this->__('Product Reviews'))
- ->_title($this->__('Details'));
-
- $this->_initAction()
- ->_setActiveMenu('Mage_Review::report_review')
- ->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'), Mage::helper('Mage_Reports_Helper_Data')->__('Products Report'))
- ->_addBreadcrumb(Mage::helper('Mage_Reports_Helper_Data')->__('Product Reviews'), Mage::helper('Mage_Reports_Helper_Data')->__('Product Reviews'))
- ->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Review_Detail'))
- ->renderLayout();
- }
-
- /**
- * Export review product detail report to CSV format
- */
- public function exportProductDetailCsvAction()
- {
- $fileName = 'review_product_detail.csv';
- $content = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Review_Detail_Grid')
- ->getCsv();
-
- $this->_prepareDownloadResponse($fileName, $content);
- }
-
- /**
- * Export review product detail report to ExcelXML format
- */
- public function exportProductDetailExcelAction()
- {
- $fileName = 'review_product_detail.xml';
- $content = $this->getLayout()->createBlock('Mage_Adminhtml_Block_Report_Review_Detail_Grid')
- ->getExcel($fileName);
-
- $this->_prepareDownloadResponse($fileName, $content);
- }
-
- protected function _isAllowed()
- {
- switch ($this->getRequest()->getActionName()) {
- case 'customer':
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Reports::review_customer');
- break;
- case 'product':
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Reports::review_product');
- break;
- default:
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Reports::review');
- break;
- }
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
deleted file mode 100644
index 739e018bcc92b..0000000000000
--- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
+++ /dev/null
@@ -1,91 +0,0 @@
-
- */
-
-class Mage_Adminhtml_System_AccountController extends Mage_Adminhtml_Controller_Action
-{
- public function indexAction()
- {
- $this->_title($this->__('System'))->_title($this->__('My Account'));
-
- $this->loadLayout();
- $this->_setActiveMenu('Mage_Adminhtml::system_myaccount');
- $this->_addContent($this->getLayout()->createBlock('Mage_Adminhtml_Block_System_Account_Edit'));
- $this->renderLayout();
- }
-
- /**
- * Saving edited user information
- */
- public function saveAction()
- {
- $userId = Mage::getSingleton('Mage_Backend_Model_Auth_Session')->getUser()->getId();
- $password = (string)$this->getRequest()->getParam('password');
- $passwordConfirmation = (string)$this->getRequest()->getParam('password_confirmation');
-
- /** @var $user Mage_User_Model_User */
- $user = Mage::getModel('Mage_User_Model_User')->load($userId);
-
- $user->setId($userId)
- ->setUsername($this->getRequest()->getParam('username', false))
- ->setFirstname($this->getRequest()->getParam('firstname', false))
- ->setLastname($this->getRequest()->getParam('lastname', false))
- ->setEmail(strtolower($this->getRequest()->getParam('email', false)));
-
- if ($password !== '') {
- $user->setPassword($password);
- }
- if ($passwordConfirmation !== '') {
- $user->setPasswordConfirmation($passwordConfirmation);
- }
-
- try {
- $user->save();
- $this->_getSession()->addSuccess(
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('The account has been saved.')
- );
- } catch (Mage_Core_Exception $e) {
- $this->_getSession()->addMessages($e->getMessages());
- } catch (Exception $e) {
- $this->_getSession()->addError(
- Mage::helper('Mage_Adminhtml_Helper_Data')->__('An error occurred while saving account.')
- );
- }
- $this->getResponse()->setRedirect($this->getUrl("*/*/"));
- }
-
- protected function _isAllowed()
- {
- return Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Adminhtml::myaccount');
- }
-}
diff --git a/app/code/core/Mage/Adminhtml/etc/adminhtml/acl.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml/acl.xml
deleted file mode 100644
index 84da7147c3957..0000000000000
--- a/app/code/core/Mage/Adminhtml/etc/adminhtml/acl.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/core/Mage/Adminhtml/etc/adminhtml/menu.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml/menu.xml
deleted file mode 100644
index ff092946bad04..0000000000000
--- a/app/code/core/Mage/Adminhtml/etc/adminhtml/menu.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml
deleted file mode 100644
index 896f64bd38d33..0000000000000
--- a/app/code/core/Mage/Adminhtml/etc/config.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-
-
-
- 0.7.1
- true
- core
-
-
-
-
-
-
-
- Mage_Adminhtml_Model_Observer
- massactionPrepareKey
-
-
-
-
-
-
- Mage_Adminhtml_Model_Observer
- clearCacheConfigurationFilesAccessLevelVerification
-
-
-
-
-
-
-
-
- admin
-
-
- Mage_Adminhtml
-
-
-
-
-
-
-
-
-
-
- Mage_Adminhtml_Model_Observer
- bindLocale
-
-
-
-
-
-
- Mage_Backend_Model_Config_Backend_Admin_Observer
- afterCustomUrlChanged
-
-
-
-
-
-
- Mage_Adminhtml_Model_Search_Catalog
- Mage_Catalog::catalog
-
-
- Mage_Adminhtml_Model_Search_Customer
- Mage_Customer::customer
-
-
- Mage_Adminhtml_Model_Search_Order
- Mage_Sales::sales
-
-
-
-
-
-
- Mage_Adminhtml.csv
-
-
-
-
-
-
-
- admin.xml
-
-
- main.xml
-
-
- adminnotification.xml
-
-
- backup.xml
-
-
- catalog.xml
-
-
- cms.xml
-
-
- customer.xml
-
-
- system/design/design.xml
-
-
- newsletter.xml
-
-
- promo.xml
-
-
- rating.xml
-
-
- report.xml
-
-
- sales.xml
-
-
- system/store/store.xml
-
-
- system/email/template.xml
-
-
- tax.xml
-
-
- urlrewrite.xml
-
-
- variable.xml
-
-
- search.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- email
-
-
-
- system_emails_forgot_email_template
- general
-
-
- 1
-
-
-
-
-
-
- /*/sitemap.xml
-
-
-
-
-
- price
- media_image
- gallery
-
-
-
-
-
- 1
-
-
-
-
-
-
-
- default
-
-
- default
-
-
-
-
-
-
-
-
-
- true
-
-
-
- admin/index/noRoute
-
-
-
-
-
diff --git a/app/code/core/Mage/Adminhtml/view/adminhtml/admin/page.phtml b/app/code/core/Mage/Adminhtml/view/adminhtml/admin/page.phtml
deleted file mode 100644
index 6916806d925a8..0000000000000
--- a/app/code/core/Mage/Adminhtml/view/adminhtml/admin/page.phtml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
- getChildHtml('head') ?>
-
-
-getBodyClass() ? ' class="' . $this->getBodyClass() . '"' : ''; ?>>
-
- getChildHtml('notification_window'); ?>
- getChildHtml('global_notices') ?>
- getChildHtml('header') ?>
- getChildHtml('menu') ?>
- getChildHtml('notifications'); ?>
-
-
- getChildHtml('main-top'); ?>
-
- getMessagesBlock()->getGroupedHtml() ?>
-
-
- getChildHtml('left')): ?>
-
-
-
- getChildHtml('content') ?>
-
-
-
- getChildHtml('left') ?>
-
-
- getChildHtml('content') ?>
-
-
-
-
- getChildHtml('js') ?>
-
-
-
__('Please wait...') ?>
-
-
-
-
- getChildHtml('before_body_end') ?>
-
-
diff --git a/app/code/core/Mage/Adminhtml/view/adminhtml/api/roleinfo.phtml b/app/code/core/Mage/Adminhtml/view/adminhtml/api/roleinfo.phtml
deleted file mode 100644
index 1d64e04c55492..0000000000000
--- a/app/code/core/Mage/Adminhtml/view/adminhtml/api/roleinfo.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
diff --git a/app/code/core/Mage/Adminhtml/view/adminhtml/api/roles.phtml b/app/code/core/Mage/Adminhtml/view/adminhtml/api/roles.phtml
deleted file mode 100644
index 422ad419ad8e0..0000000000000
--- a/app/code/core/Mage/Adminhtml/view/adminhtml/api/roles.phtml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-getGridHtml() ?>
diff --git a/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/category-selector.css b/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/category-selector.css
deleted file mode 100644
index 857ba8ff6d94d..0000000000000
--- a/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/category-selector.css
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-
-.mage-suggest.category-select:after {
- position: absolute;
- top: 0;
- right: 5px;
- font-family: 'MUI-Icons';
- font-style: normal;
- speak: none;
- font-weight: normal;
- -webkit-font-smoothing: antialiased;
- content: '\e013'; /* unordered list icon */
- font-size: 20px;
- color: #b2b2b2;
-}
-
-.category-selector-choices {
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
-.category-selector-choices > li {
- display: inline-block;
-}
-
-.category-selector-search-field {
- white-space: nowrap;
- margin: 0;
- padding: 0;
-}
-
-.category-selector-search-field > input,
-.category-selector-search-field > input:focus,
-.category-selector-search-field > input:active {
- height: 22px;
- line-height: 22px;
- outline: 0 none;
- border: 0 none;
- box-shadow: none;
- padding: 0 3px;
-}
-
-.category-selector-search-field > input.ui-autocomplete-loading {
- background: #fff url('images/spinner.gif') no-repeat 100%;
-}
-
-.category-selector-search-choice {
- position: relative;
- background: #cdecf6;
- border: 1px solid #a7cedb;
- border-radius: 3px;
- padding: 2px 22px 1px 9px;
- margin: 0 2px 2px 0;
- vertical-align: top;
- cursor: default;
- -moz-transition: background .3s;
- -webkit-transition: background .3s;
- transition: background .3s;
-}
-
-.category-selector-search-choice:hover {
- background: #aae3f5;
-}
-
-.category-selector-search-choice > input {
-}
-
-.category-selector-search-choice > div {
-}
-
-.category-selector-search-choice-close {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- width: 20px;
- line-height: 16px;
- text-align: center;
- color: #7b94a1;
- cursor: pointer;
-}
-
-.category-selector-search-choice-close:hover {
- color: #000;
-}
-
-.category-selector-search-choice-close:before {
- font-family: 'MUI-Icons';
- font-style: normal;
- speak: none;
- font-weight: normal;
- -webkit-font-smoothing: antialiased;
- content: '\e07d'; /* close icon */
- font-size: 6px;
-}
-
-.category-selector-input {
-}
-
-.ui-helper-hidden-accessible {
- display: none;
-}
\ No newline at end of file
diff --git a/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/category-selector.js b/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/category-selector.js
deleted file mode 100644
index bf80f782a0999..0000000000000
--- a/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/category-selector.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-(function ($) {
- 'use strict';
- var treeToList = function(list, nodes, level, path) {
- $.each(nodes, function() {
- list.push({
- label: this.name,
- value: this.id,
- level: level,
- item: this,
- path: path + this.name
- });
- if ('children' in this) {
- treeToList(list, this.children, level + 1, path + this.name + '/' );
- }
- });
- return list;
- };
- $.fn.categorySelector = function (options) {
- this.each(function () {
- var $element = $(
- '
' +
- '
' +
- 'New Category '
- ),
- $list = $element.children(),
- $this = $(this),
- name = $this.attr('name'),
- $searchField = $list.find('.category-selector-search-field'),
- $input = $element.find('.category-selector-input'),
- elementPresent = function(item) {
- var selector = '[name="product[category_ids][]"][value=' + parseInt(item.value, 10) + ']';
- return $list.find(selector).length > 0;
- };
-
- $this.bind('categorySelector:add', function(event, args) {
- $('
')
- .data(args.data || {})
- .append($('
').attr('name', name).val(args.value))
- .append($('
').text(args.text))
- .append('
'
- )
- .insertBefore($searchField);
- });
-
- $element.append($('
').attr('name', name));
- $this.find('option').each(function() {
- $this.trigger('categorySelector:add', {
- text: $(this).text(),
- value: $(this).val()
- });
- });
- $this.attr('disabled', 'disabled').hide();
- $this.data('category-selector-element', $element);
- $element.insertAfter($this);
- $list.delegate('.category-selector-search-choice-close', 'click', function() {
- $(this).parent().remove();
- });
- $input.bind('ajaxSend ajaxComplete', function(e) {
- e.stopPropagation();
- });
- $input.autocomplete({
- source: function(request, response) {
- $.ajax({
- url: options.url,
- context: $input,
- dataType: 'json',
- data: {label_part: request.term},
- success: function(data) {
- response(treeToList([], data || [], 0, ''));
- }
- });
- },
- minLength: 0,
- focus: function(event, ui) {
- $element.find('.category-selector-input').val(ui.item.label);
- return false;
- },
- select: function(event, ui) {
- if (elementPresent(ui.item)) {
- event.preventDefault();
- return false;
- }
- $this.trigger('categorySelector:add', {
- text: ui.item.label,
- value: ui.item.value,
- data: ui.item
- });
- $element.find('.category-selector-input').val('');
- return false;
- },
- close: function(event) {
- event.preventDefault();
- return false;
- }
- });
- $input.data('ui-autocomplete')._renderItem = function(ul, item) {
- var level = window.parseInt(item.level),
- $li = $("
");
- $li.data('ui-autocomplete-item', item);
- $li.append($("
- getChildHtml('form') ?>
-
-
diff --git a/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/form/renderer/fieldset/element.phtml b/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/form/renderer/fieldset/element.phtml
deleted file mode 100644
index b236ffefe1e5f..0000000000000
--- a/app/code/core/Mage/Adminhtml/view/adminhtml/catalog/form/renderer/fieldset/element.phtml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-getElement();
-$note = $element->getNote() ? '' . $element->getNote() . '
' : '';
-$elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
-$addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
-$fieldId = ($element->getHtmlId()) ? ' id="attribute-' . $element->getHtmlId() . '-container"' : '';
-$fieldClass = "field field-{$element->getId()} {$element->getCssClass()}";
-$fieldClass .= ($elementBeforeLabel) ? ' choice' : '';
-$fieldClass .= ($addOn) ? ' with-addon' : '';
-$fieldClass .= ($element->getRequired()) ? ' required' : '';
-$fieldClass .= ($note) ? ' with-note' : '';
-
-$fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
- . $this->getUiId('form-field', $element->getId());
-?>
-
-checkFieldDisable() ?>
-getToggleCode() ? $element->getToggleCode()
- : 'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
-?>
-getNoDisplay()): ?>
- getType() == 'hidden'): ?>
- getElementHtml() ?>
-
- >
-
- getElementHtml() ?>
- getLabelHtml() ?>
-
-
- getLabelHtml() ?>
-
- ' . $element->getElementHtml() . '
' : $element->getElementHtml(); ?>
-
- 