From 52967abf0a4d1e0d429fa4e30a1634d91631a16e Mon Sep 17 00:00:00 2001 From: Lee Saferite Date: Thu, 31 Dec 2009 10:53:47 -0500 Subject: [PATCH] Import Magento 1.4.0.0-alpha3 --- app/Mage.php | 5 +- app/code/core/Mage/Admin/Model/Acl.php | 10 +- .../core/Mage/Admin/Model/Acl/Assert/Ip.php | 10 +- .../core/Mage/Admin/Model/Acl/Assert/Time.php | 10 +- .../core/Mage/Admin/Model/Acl/Resource.php | 10 +- app/code/core/Mage/Admin/Model/Acl/Role.php | 10 +- .../Mage/Admin/Model/Acl/Role/Generic.php | 10 +- .../core/Mage/Admin/Model/Acl/Role/Group.php | 10 +- .../Mage/Admin/Model/Acl/Role/Registry.php | 8 +- .../core/Mage/Admin/Model/Acl/Role/User.php | 10 +- app/code/core/Mage/Admin/Model/Config.php | 16 +- app/code/core/Mage/Admin/Model/Mysql4/Acl.php | 14 +- .../core/Mage/Admin/Model/Mysql4/Acl/Role.php | 10 +- .../Model/Mysql4/Acl/Role/Collection.php | 10 +- .../Model/Mysql4/Permissions/Collection.php | 8 +- .../core/Mage/Admin/Model/Mysql4/Role.php | 8 +- .../Admin/Model/Mysql4/Role/Collection.php | 8 +- .../core/Mage/Admin/Model/Mysql4/Roles.php | 8 +- .../Admin/Model/Mysql4/Roles/Collection.php | 8 +- .../Model/Mysql4/Roles/User/Collection.php | 8 +- .../core/Mage/Admin/Model/Mysql4/Rules.php | 8 +- .../Admin/Model/Mysql4/Rules/Collection.php | 8 +- .../core/Mage/Admin/Model/Mysql4/User.php | 8 +- .../Admin/Model/Mysql4/User/Collection.php | 8 +- app/code/core/Mage/Admin/Model/Observer.php | 8 +- app/code/core/Mage/Admin/Model/Role.php | 8 +- app/code/core/Mage/Admin/Model/Roles.php | 10 +- app/code/core/Mage/Admin/Model/Rules.php | 8 +- app/code/core/Mage/Admin/Model/Session.php | 2 +- app/code/core/Mage/Admin/Model/User.php | 2 +- app/code/core/Mage/Admin/etc/config.xml | 8 +- .../sql/admin_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../Mage/AdminNotification/Helper/Data.php | 8 +- .../Mage/AdminNotification/Model/Feed.php | 10 +- .../Mage/AdminNotification/Model/Inbox.php | 10 +- .../AdminNotification/Model/Mysql4/Inbox.php | 10 +- .../Model/Mysql4/Inbox/Collection.php | 10 +- .../Mage/AdminNotification/Model/Observer.php | 10 +- .../Mage/AdminNotification/etc/config.xml | 5 +- .../Mage/AdminNotification/etc/system.xml | 10 +- .../mysql4-install-1.0.0.php | 10 +- .../core/Mage/Adminhtml/Block/Abstract.php | 8 +- .../core/Mage/Adminhtml/Block/Api/Buttons.php | 8 +- .../Mage/Adminhtml/Block/Api/Editroles.php | 10 +- .../Mage/Adminhtml/Block/Api/Edituser.php | 10 +- .../Mage/Adminhtml/Block/Api/Grid/Role.php | 8 +- .../core/Mage/Adminhtml/Block/Api/Role.php | 8 +- .../Adminhtml/Block/Api/Role/Grid/User.php | 8 +- .../core/Mage/Adminhtml/Block/Api/Roles.php | 8 +- .../Mage/Adminhtml/Block/Api/Tab/Roleinfo.php | 12 +- .../Adminhtml/Block/Api/Tab/Rolesedit.php | 8 +- .../Adminhtml/Block/Api/Tab/Rolesusers.php | 10 +- .../Adminhtml/Block/Api/Tab/Userroles.php | 8 +- .../core/Mage/Adminhtml/Block/Api/User.php | 8 +- .../Mage/Adminhtml/Block/Api/User/Edit.php | 8 +- .../Adminhtml/Block/Api/User/Edit/Form.php | 8 +- .../Block/Api/User/Edit/Tab/Main.php | 8 +- .../Block/Api/User/Edit/Tab/Roles.php | 8 +- .../Adminhtml/Block/Api/User/Edit/Tabs.php | 8 +- .../Mage/Adminhtml/Block/Api/User/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Api/Users.php | 8 +- app/code/core/Mage/Adminhtml/Block/Backup.php | 8 +- .../core/Mage/Adminhtml/Block/Backup/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Catalog.php | 8 +- .../Block/Catalog/Category/Abstract.php | 10 +- .../Catalog/Category/Checkboxes/Tree.php | 8 +- .../Adminhtml/Block/Catalog/Category/Edit.php | 8 +- .../Block/Catalog/Category/Edit/Form.php | 8 +- .../Block/Catalog/Category/Helper/Image.php | 8 +- .../Category/Helper/Sortby/Available.php | 8 +- .../Category/Helper/Sortby/Default.php | 8 +- .../Block/Catalog/Category/Tab/Attributes.php | 286 ++-- .../Block/Catalog/Category/Tab/Design.php | 10 +- .../Block/Catalog/Category/Tab/Feature.php | 8 +- .../Block/Catalog/Category/Tab/General.php | 8 +- .../Block/Catalog/Category/Tab/Product.php | 8 +- .../Adminhtml/Block/Catalog/Category/Tabs.php | 8 +- .../Adminhtml/Block/Catalog/Category/Tree.php | 10 +- .../Mage/Adminhtml/Block/Catalog/Form.php | 10 +- .../Form/Renderer/Config/DateFieldsOrder.php | 10 +- .../Form/Renderer/Config/YearRange.php | 10 +- .../Form/Renderer/Fieldset/Element.php | 10 +- .../Form/Renderer/Googleoptimizer/Import.php | 10 +- .../Mage/Adminhtml/Block/Catalog/Product.php | 8 +- .../Block/Catalog/Product/Attribute.php | 8 +- .../Block/Catalog/Product/Attribute/Edit.php | 8 +- .../Catalog/Product/Attribute/Edit/Form.php | 8 +- .../Product/Attribute/Edit/Tab/Front.php | 8 +- .../Product/Attribute/Edit/Tab/Main.php | 45 +- .../Product/Attribute/Edit/Tab/Options.php | 8 +- .../Product/Attribute/Edit/Tab/System.php | 10 +- .../Catalog/Product/Attribute/Edit/Tabs.php | 8 +- .../Block/Catalog/Product/Attribute/Grid.php | 10 +- .../Attribute/New/Product/Attributes.php | 18 +- .../Product/Attribute/New/Product/Created.php | 10 +- .../Catalog/Product/Attribute/Set/Grid.php | 8 +- .../Attribute/Set/Main/Formattribute.php | 14 +- .../Product/Attribute/Set/Main/Formgroup.php | 14 +- .../Product/Attribute/Set/Main/Formset.php | 10 +- .../Attribute/Set/Main/Tree/Attribute.php | 10 +- .../Product/Attribute/Set/Main/Tree/Group.php | 10 +- .../Product/Attribute/Set/Toolbar/Add.php | 10 +- .../Product/Attribute/Set/Toolbar/Main.php | 10 +- .../Attribute/Set/Toolbar/Main/Filter.php | 12 +- .../Block/Catalog/Product/Created.php | 10 +- .../Adminhtml/Block/Catalog/Product/Edit.php | 498 +++--- .../Catalog/Product/Edit/Action/Attribute.php | 8 +- .../Edit/Action/Attribute/Tab/Attributes.php | 8 +- .../Edit/Action/Attribute/Tab/Inventory.php | 10 +- .../Edit/Action/Attribute/Tab/Websites.php | 10 +- .../Product/Edit/Action/Attribute/Tabs.php | 10 +- .../Product/Edit/Tab/Ajax/Serializer.php | 8 +- .../Block/Catalog/Product/Edit/Tab/Alerts.php | 10 +- .../Catalog/Product/Edit/Tab/Alerts/Price.php | 10 +- .../Catalog/Product/Edit/Tab/Alerts/Stock.php | 10 +- .../Catalog/Product/Edit/Tab/Attributes.php | 8 +- .../Product/Edit/Tab/Attributes/Create.php | 10 +- .../Catalog/Product/Edit/Tab/Categories.php | 8 +- .../Catalog/Product/Edit/Tab/Crosssell.php | 16 +- .../Catalog/Product/Edit/Tab/Inventory.php | 8 +- .../Catalog/Product/Edit/Tab/Options.php | 10 +- .../Product/Edit/Tab/Options/Option.php | 8 +- .../Edit/Tab/Options/Type/Abstract.php | 10 +- .../Product/Edit/Tab/Options/Type/Date.php | 10 +- .../Product/Edit/Tab/Options/Type/File.php | 10 +- .../Product/Edit/Tab/Options/Type/Select.php | 10 +- .../Product/Edit/Tab/Options/Type/Text.php | 10 +- .../Block/Catalog/Product/Edit/Tab/Price.php | 10 +- .../Catalog/Product/Edit/Tab/Price/Tier.php | 8 +- .../Catalog/Product/Edit/Tab/Related.php | 20 +- .../Catalog/Product/Edit/Tab/Settings.php | 8 +- .../Catalog/Product/Edit/Tab/Super/Config.php | 8 +- .../Product/Edit/Tab/Super/Config/Grid.php | 584 +++---- .../Super/Config/Grid/Filter/Inventory.php | 8 +- .../Super/Config/Grid/Renderer/Checkbox.php | 52 +- .../Super/Config/Grid/Renderer/Inventory.php | 8 +- .../Product/Edit/Tab/Super/Config/Simple.php | 368 ++--- .../Catalog/Product/Edit/Tab/Super/Group.php | 26 +- .../Product/Edit/Tab/Super/Settings.php | 8 +- .../Block/Catalog/Product/Edit/Tab/Tag.php | 10 +- .../Catalog/Product/Edit/Tab/Tag/Customer.php | 10 +- .../Block/Catalog/Product/Edit/Tab/Upsell.php | 16 +- .../Catalog/Product/Edit/Tab/Websites.php | 8 +- .../Block/Catalog/Product/Edit/Tabs.php | 8 +- .../Product/Edit/Tabs/Configurable.php | 10 +- .../Catalog/Product/Edit/Tabs/Grouped.php | 10 +- .../Product/Frontend/Product/Watermark.php | 18 +- .../Adminhtml/Block/Catalog/Product/Grid.php | 8 +- .../Catalog/Product/Helper/Form/Apply.php | 8 +- .../Catalog/Product/Helper/Form/Boolean.php | 8 +- .../Catalog/Product/Helper/Form/Gallery.php | 8 +- .../Product/Helper/Form/Gallery/Content.php | 8 +- .../Catalog/Product/Helper/Form/Image.php | 8 +- .../Catalog/Product/Helper/Form/Price.php | 8 +- .../Block/Catalog/Product/Set/Main.php | 8 +- .../Catalog/Product/Set/Toolbar/Main.php | 8 +- .../Mage/Adminhtml/Block/Catalog/Search.php | 10 +- .../Adminhtml/Block/Catalog/Search/Edit.php | 10 +- .../Block/Catalog/Search/Edit/Form.php | 8 +- .../Adminhtml/Block/Catalog/Search/Grid.php | 8 +- .../Adminhtml/Block/Checkout/Agreement.php | 10 +- .../Block/Checkout/Agreement/Edit.php | 10 +- .../Block/Checkout/Agreement/Edit/Form.php | 10 +- .../Block/Checkout/Agreement/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Cms/Block.php | 8 +- .../Mage/Adminhtml/Block/Cms/Block/Edit.php | 8 +- .../Adminhtml/Block/Cms/Block/Edit/Form.php | 20 +- .../Mage/Adminhtml/Block/Cms/Block/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Cms/Page.php | 8 +- .../Mage/Adminhtml/Block/Cms/Page/Edit.php | 8 +- .../Adminhtml/Block/Cms/Page/Edit/Form.php | 8 +- .../Block/Cms/Page/Edit/Tab/Design.php | 19 +- .../Block/Cms/Page/Edit/Tab/Main.php | 17 +- .../Block/Cms/Page/Edit/Tab/Meta.php | 8 +- .../Adminhtml/Block/Cms/Page/Edit/Tabs.php | 8 +- .../Mage/Adminhtml/Block/Cms/Page/Grid.php | 10 +- .../Block/Cms/Page/Grid/Renderer/Action.php | 10 +- .../core/Mage/Adminhtml/Block/Customer.php | 8 +- .../Mage/Adminhtml/Block/Customer/Edit.php | 16 +- .../Adminhtml/Block/Customer/Edit/Form.php | 8 +- .../Block/Customer/Edit/Renderer/Newpass.php | 8 +- .../Block/Customer/Edit/Renderer/Region.php | 8 +- .../Block/Customer/Edit/Tab/Account.php | 8 +- .../Block/Customer/Edit/Tab/Addresses.php | 8 +- .../Block/Customer/Edit/Tab/Cart.php | 8 +- .../Block/Customer/Edit/Tab/Carts.php | 8 +- .../Block/Customer/Edit/Tab/Newsletter.php | 8 +- .../Customer/Edit/Tab/Newsletter/Grid.php | 8 +- .../Tab/Newsletter/Grid/Filter/Status.php | 8 +- .../Tab/Newsletter/Grid/Renderer/Action.php | 8 +- .../Tab/Newsletter/Grid/Renderer/Status.php | 8 +- .../Block/Customer/Edit/Tab/Orders.php | 8 +- .../Block/Customer/Edit/Tab/Reviews.php | 8 +- .../Adminhtml/Block/Customer/Edit/Tab/Tag.php | 8 +- .../Block/Customer/Edit/Tab/Tags.php | 8 +- .../Block/Customer/Edit/Tab/View.php | 8 +- .../Customer/Edit/Tab/View/Accordion.php | 8 +- .../Block/Customer/Edit/Tab/View/Cart.php | 8 +- .../Block/Customer/Edit/Tab/View/Orders.php | 8 +- .../Block/Customer/Edit/Tab/View/Sales.php | 8 +- .../Block/Customer/Edit/Tab/View/Wishlist.php | 8 +- .../Block/Customer/Edit/Tab/Wishlist.php | 8 +- .../Wishlist/Grid/Renderer/Description.php | 8 +- .../Adminhtml/Block/Customer/Edit/Tabs.php | 26 +- .../Mage/Adminhtml/Block/Customer/Grid.php | 8 +- .../Block/Customer/Grid/Filter/Country.php | 8 +- .../Mage/Adminhtml/Block/Customer/Group.php | 8 +- .../Adminhtml/Block/Customer/Group/Edit.php | 10 +- .../Block/Customer/Group/Edit/Form.php | 10 +- .../Adminhtml/Block/Customer/Group/Grid.php | 8 +- .../Mage/Adminhtml/Block/Customer/Online.php | 8 +- .../Block/Customer/Online/Filter.php | 8 +- .../Adminhtml/Block/Customer/Online/Grid.php | 8 +- .../Customer/Online/Grid/Renderer/Ip.php | 8 +- .../Customer/Online/Grid/Renderer/Type.php | 8 +- .../Customer/Online/Grid/Renderer/Url.php | 10 +- .../core/Mage/Adminhtml/Block/Dashboard.php | 8 +- .../Adminhtml/Block/Dashboard/Abstract.php | 10 +- .../Mage/Adminhtml/Block/Dashboard/Bar.php | 8 +- .../Adminhtml/Block/Dashboard/Diagrams.php | 8 +- .../Mage/Adminhtml/Block/Dashboard/Graph.php | 10 +- .../Mage/Adminhtml/Block/Dashboard/Grid.php | 8 +- .../Mage/Adminhtml/Block/Dashboard/Grids.php | 8 +- .../Adminhtml/Block/Dashboard/Orders/Grid.php | 10 +- .../Mage/Adminhtml/Block/Dashboard/Sales.php | 8 +- .../Block/Dashboard/Searches/Last.php | 10 +- .../Searches/Renderer/Searchquery.php | 10 +- .../Block/Dashboard/Searches/Top.php | 10 +- .../Adminhtml/Block/Dashboard/Tab/Amounts.php | 8 +- .../Block/Dashboard/Tab/Customers/Most.php | 10 +- .../Block/Dashboard/Tab/Customers/Newest.php | 10 +- .../Adminhtml/Block/Dashboard/Tab/Orders.php | 8 +- .../Block/Dashboard/Tab/Products/Ordered.php | 10 +- .../Block/Dashboard/Tab/Products/Viewed.php | 10 +- .../Mage/Adminhtml/Block/Dashboard/Totals.php | 8 +- app/code/core/Mage/Adminhtml/Block/Denied.php | 10 +- .../Block/Extensions/Config/Edit.php | 10 +- .../Block/Extensions/Config/Form.php | 10 +- .../Block/Extensions/Console/Edit.php | 8 +- .../Block/Extensions/Console/Edit/Form.php | 8 +- .../Block/Extensions/Custom/Edit.php | 8 +- .../Block/Extensions/Custom/Edit/Form.php | 8 +- .../Extensions/Custom/Edit/Tab/Abstract.php | 8 +- .../Extensions/Custom/Edit/Tab/Contents.php | 8 +- .../Extensions/Custom/Edit/Tab/Depends.php | 16 +- .../Block/Extensions/Custom/Edit/Tab/Grid.php | 8 +- .../Block/Extensions/Custom/Edit/Tab/Load.php | 8 +- .../Custom/Edit/Tab/Maintainers.php | 8 +- .../Extensions/Custom/Edit/Tab/Package.php | 16 +- .../Extensions/Custom/Edit/Tab/Release.php | 10 +- .../Block/Extensions/Custom/Edit/Tabs.php | 8 +- .../Adminhtml/Block/Extensions/File/Form.php | 10 +- .../Mage/Adminhtml/Block/Extensions/Local.php | 8 +- .../Adminhtml/Block/Extensions/Local/Edit.php | 8 +- .../Block/Extensions/Local/Edit/Form.php | 8 +- .../Extensions/Local/Edit/Tab/Abstract.php | 8 +- .../Extensions/Local/Edit/Tab/Actions.php | 8 +- .../Extensions/Local/Edit/Tab/Changelog.php | 8 +- .../Extensions/Local/Edit/Tab/Contents.php | 8 +- .../Extensions/Local/Edit/Tab/Depends.php | 8 +- .../Extensions/Local/Edit/Tab/Package.php | 8 +- .../Block/Extensions/Local/Edit/Tabs.php | 8 +- .../Adminhtml/Block/Extensions/Local/Grid.php | 28 +- .../Extensions/Local/Grid/Renderer/Action.php | 20 +- .../Block/Extensions/Local/Upgrade.php | 8 +- .../Block/Extensions/Mass/Install.php | 10 +- .../Block/Extensions/Mass/Uninstall.php | 8 +- .../Block/Extensions/Mass/Upgrade.php | 8 +- .../Adminhtml/Block/Extensions/Remote.php | 8 +- .../Block/Extensions/Remote/Edit.php | 8 +- .../Block/Extensions/Remote/Edit/Form.php | 8 +- .../Extensions/Remote/Edit/Tab/Abstract.php | 8 +- .../Extensions/Remote/Edit/Tab/Actions.php | 8 +- .../Extensions/Remote/Edit/Tab/Changelog.php | 8 +- .../Extensions/Remote/Edit/Tab/Package.php | 8 +- .../Block/Extensions/Remote/Edit/Tabs.php | 8 +- .../Block/Extensions/Remote/Grid.php | 38 +- .../Remote/Grid/Renderer/Action.php | 20 +- .../core/Mage/Adminhtml/Block/Html/Date.php | 8 +- .../core/Mage/Adminhtml/Block/Html/Select.php | 94 +- .../Mage/Adminhtml/Block/Media/Editor.php | 8 +- .../Mage/Adminhtml/Block/Media/Uploader.php | 8 +- .../core/Mage/Adminhtml/Block/Messages.php | 8 +- .../Adminhtml/Block/Newsletter/Problem.php | 8 +- .../Block/Newsletter/Problem/Grid.php | 18 +- .../Problem/Grid/Filter/Checkbox.php | 16 +- .../Problem/Grid/Renderer/Checkbox.php | 12 +- .../Mage/Adminhtml/Block/Newsletter/Queue.php | 10 +- .../Adminhtml/Block/Newsletter/Queue/Edit.php | 8 +- .../Block/Newsletter/Queue/Edit/Form.php | 10 +- .../Adminhtml/Block/Newsletter/Queue/Grid.php | 20 +- .../Newsletter/Queue/Grid/Renderer/Action.php | 58 +- .../Adminhtml/Block/Newsletter/Subscriber.php | 112 +- .../Block/Newsletter/Subscriber/Grid.php | 8 +- .../Subscriber/Grid/Filter/Checkbox.php | 14 +- .../Subscriber/Grid/Filter/Website.php | 8 +- .../Subscriber/Grid/Renderer/Checkbox.php | 18 +- .../Adminhtml/Block/Newsletter/Template.php | 8 +- .../Block/Newsletter/Template/Edit.php | 8 +- .../Block/Newsletter/Template/Edit/Form.php | 10 +- .../Block/Newsletter/Template/Grid.php | 14 +- .../Template/Grid/Renderer/Action.php | 8 +- .../Template/Grid/Renderer/Sender.php | 10 +- .../Block/Newsletter/Template/Preview.php | 12 +- .../Adminhtml/Block/Notification/Grid.php | 8 +- .../Notification/Grid/Renderer/Actions.php | 10 +- .../Notification/Grid/Renderer/Notice.php | 10 +- .../Notification/Grid/Renderer/Severity.php | 10 +- .../Adminhtml/Block/Notification/Inbox.php | 10 +- .../Adminhtml/Block/Notification/Toolbar.php | 10 +- .../Adminhtml/Block/Notification/Window.php | 49 +- app/code/core/Mage/Adminhtml/Block/Page.php | 154 +- .../core/Mage/Adminhtml/Block/Page/Footer.php | 8 +- .../core/Mage/Adminhtml/Block/Page/Head.php | 8 +- .../core/Mage/Adminhtml/Block/Page/Header.php | 8 +- .../core/Mage/Adminhtml/Block/Page/Menu.php | 15 +- .../Mage/Adminhtml/Block/Page/Notices.php | 2 +- .../Adminhtml/Block/Permissions/Buttons.php | 8 +- .../Adminhtml/Block/Permissions/Editroles.php | 8 +- .../Adminhtml/Block/Permissions/Edituser.php | 10 +- .../Adminhtml/Block/Permissions/Grid/Role.php | 8 +- .../Adminhtml/Block/Permissions/Grid/User.php | 8 +- .../Mage/Adminhtml/Block/Permissions/Role.php | 8 +- .../Block/Permissions/Role/Grid/User.php | 8 +- .../Adminhtml/Block/Permissions/Roles.php | 8 +- .../Block/Permissions/Tab/Roleinfo.php | 8 +- .../Block/Permissions/Tab/Rolesedit.php | 8 +- .../Block/Permissions/Tab/Rolesusers.php | 10 +- .../Block/Permissions/Tab/Useredit.php | 24 +- .../Block/Permissions/Tab/Userroles.php | 8 +- .../Mage/Adminhtml/Block/Permissions/User.php | 8 +- .../Adminhtml/Block/Permissions/User/Edit.php | 8 +- .../Block/Permissions/User/Edit/Form.php | 8 +- .../Block/Permissions/User/Edit/Tab/Main.php | 8 +- .../Block/Permissions/User/Edit/Tab/Roles.php | 8 +- .../Block/Permissions/User/Edit/Tabs.php | 8 +- .../Adminhtml/Block/Permissions/User/Grid.php | 8 +- .../Block/Permissions/Usernroles.php | 8 +- .../Adminhtml/Block/Permissions/Users.php | 8 +- .../Mage/Adminhtml/Block/Poll/Answer/Edit.php | 8 +- .../Adminhtml/Block/Poll/Answer/Edit/Form.php | 10 +- .../core/Mage/Adminhtml/Block/Poll/Edit.php | 8 +- .../Mage/Adminhtml/Block/Poll/Edit/Form.php | 10 +- .../Adminhtml/Block/Poll/Edit/Tab/Answers.php | 8 +- .../Block/Poll/Edit/Tab/Answers/Form.php | 10 +- .../Block/Poll/Edit/Tab/Answers/Grid.php | 8 +- .../Block/Poll/Edit/Tab/Answers/List.php | 10 +- .../Adminhtml/Block/Poll/Edit/Tab/Form.php | 10 +- .../Mage/Adminhtml/Block/Poll/Edit/Tabs.php | 10 +- .../core/Mage/Adminhtml/Block/Poll/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Poll/Poll.php | 8 +- .../Mage/Adminhtml/Block/Promo/Catalog.php | 10 +- .../Adminhtml/Block/Promo/Catalog/Edit.php | 10 +- .../Block/Promo/Catalog/Edit/Form.php | 8 +- .../Block/Promo/Catalog/Edit/Tab/Actions.php | 8 +- .../Promo/Catalog/Edit/Tab/Conditions.php | 14 +- .../Block/Promo/Catalog/Edit/Tab/Main.php | 30 +- .../Block/Promo/Catalog/Edit/Tabs.php | 8 +- .../Adminhtml/Block/Promo/Catalog/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Promo/Quote.php | 10 +- .../Mage/Adminhtml/Block/Promo/Quote/Edit.php | 10 +- .../Adminhtml/Block/Promo/Quote/Edit/Form.php | 8 +- .../Block/Promo/Quote/Edit/Tab/Actions.php | 8 +- .../Block/Promo/Quote/Edit/Tab/Conditions.php | 14 +- .../Block/Promo/Quote/Edit/Tab/Main.php | 8 +- .../Adminhtml/Block/Promo/Quote/Edit/Tabs.php | 8 +- .../Mage/Adminhtml/Block/Promo/Quote/Grid.php | 8 +- .../Block/Promo/Widget/Chooser/Sku.php | 52 +- .../core/Mage/Adminhtml/Block/Rating/Edit.php | 8 +- .../Mage/Adminhtml/Block/Rating/Edit/Form.php | 10 +- .../Adminhtml/Block/Rating/Edit/Tab/Form.php | 10 +- .../Block/Rating/Edit/Tab/Options.php | 8 +- .../Mage/Adminhtml/Block/Rating/Edit/Tabs.php | 10 +- .../core/Mage/Adminhtml/Block/Rating/Grid.php | 8 +- .../Mage/Adminhtml/Block/Rating/Rating.php | 10 +- .../Block/Report/Customer/Accounts.php | 10 +- .../Block/Report/Customer/Accounts/Grid.php | 10 +- .../Block/Report/Customer/Orders.php | 10 +- .../Block/Report/Customer/Orders/Grid.php | 10 +- .../Block/Report/Customer/Totals.php | 10 +- .../Block/Report/Customer/Totals/Grid.php | 10 +- .../core/Mage/Adminhtml/Block/Report/Grid.php | 10 +- .../Grid/Column/Renderer/Blanknumber.php | 8 +- .../Report/Grid/Column/Renderer/Currency.php | 10 +- .../Report/Grid/Column/Renderer/Customer.php | 10 +- .../Report/Grid/Column/Renderer/Product.php | 10 +- .../Mage/Adminhtml/Block/Report/Product.php | 10 +- .../Block/Report/Product/Downloads.php | 10 +- .../Block/Report/Product/Downloads/Grid.php | 8 +- .../Product/Downloads/Renderer/Purchases.php | 10 +- .../Adminhtml/Block/Report/Product/Grid.php | 8 +- .../Block/Report/Product/Lowstock.php | 10 +- .../Block/Report/Product/Lowstock/Grid.php | 8 +- .../Block/Report/Product/Ordered.php | 10 +- .../Block/Report/Product/Ordered/Grid.php | 10 +- .../Adminhtml/Block/Report/Product/Sold.php | 8 +- .../Block/Report/Product/Sold/Grid.php | 8 +- .../Adminhtml/Block/Report/Product/Viewed.php | 10 +- .../Block/Report/Product/Viewed/Grid.php | 10 +- .../Block/Report/Review/Customer.php | 8 +- .../Block/Report/Review/Customer/Grid.php | 8 +- .../Adminhtml/Block/Report/Review/Detail.php | 10 +- .../Block/Report/Review/Detail/Grid.php | 8 +- .../Adminhtml/Block/Report/Review/Product.php | 8 +- .../Block/Report/Review/Product/Grid.php | 10 +- .../Adminhtml/Block/Report/Sales/Coupons.php | 10 +- .../Block/Report/Sales/Coupons/Grid.php | 10 +- .../Adminhtml/Block/Report/Sales/Invoiced.php | 10 +- .../Block/Report/Sales/Invoiced/Grid.php | 10 +- .../Adminhtml/Block/Report/Sales/Refunded.php | 10 +- .../Block/Report/Sales/Refunded/Grid.php | 10 +- .../Adminhtml/Block/Report/Sales/Sales.php | 10 +- .../Block/Report/Sales/Sales/Grid.php | 10 +- .../Adminhtml/Block/Report/Sales/Shipping.php | 10 +- .../Block/Report/Sales/Shipping/Grid.php | 10 +- .../Mage/Adminhtml/Block/Report/Sales/Tax.php | 10 +- .../Adminhtml/Block/Report/Sales/Tax/Grid.php | 10 +- .../Mage/Adminhtml/Block/Report/Search.php | 10 +- .../Adminhtml/Block/Report/Search/Grid.php | 8 +- .../Block/Report/Shopcart/Abandoned.php | 10 +- .../Block/Report/Shopcart/Abandoned/Grid.php | 8 +- .../Block/Report/Shopcart/Customer.php | 10 +- .../Block/Report/Shopcart/Customer/Grid.php | 8 +- .../Block/Report/Shopcart/Product.php | 10 +- .../Block/Report/Shopcart/Product/Grid.php | 8 +- .../Adminhtml/Block/Report/Tag/Customer.php | 8 +- .../Block/Report/Tag/Customer/Detail.php | 10 +- .../Block/Report/Tag/Customer/Detail/Grid.php | 10 +- .../Block/Report/Tag/Customer/Grid.php | 8 +- .../Adminhtml/Block/Report/Tag/Popular.php | 8 +- .../Block/Report/Tag/Popular/Detail.php | 10 +- .../Block/Report/Tag/Popular/Detail/Grid.php | 8 +- .../Block/Report/Tag/Popular/Grid.php | 8 +- .../Adminhtml/Block/Report/Tag/Product.php | 8 +- .../Block/Report/Tag/Product/Detail.php | 10 +- .../Block/Report/Tag/Product/Detail/Grid.php | 8 +- .../Block/Report/Tag/Product/Grid.php | 8 +- .../Mage/Adminhtml/Block/Report/Wishlist.php | 8 +- .../Adminhtml/Block/Report/Wishlist/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Review/Add.php | 16 +- .../Mage/Adminhtml/Block/Review/Add/Form.php | 10 +- .../core/Mage/Adminhtml/Block/Review/Edit.php | 8 +- .../Mage/Adminhtml/Block/Review/Edit/Form.php | 10 +- .../core/Mage/Adminhtml/Block/Review/Grid.php | 8 +- .../Block/Review/Grid/Filter/Type.php | 40 +- .../Block/Review/Grid/Renderer/Type.php | 30 +- .../core/Mage/Adminhtml/Block/Review/Main.php | 10 +- .../Adminhtml/Block/Review/Product/Grid.php | 10 +- .../Block/Review/Rating/Detailed.php | 10 +- .../Adminhtml/Block/Review/Rating/Summary.php | 10 +- app/code/core/Mage/Adminhtml/Block/Sales.php | 8 +- .../Mage/Adminhtml/Block/Sales/Creditmemo.php | 8 +- .../Adminhtml/Block/Sales/Creditmemo/Grid.php | 10 +- .../Mage/Adminhtml/Block/Sales/Invoice.php | 8 +- .../Adminhtml/Block/Sales/Invoice/Grid.php | 8 +- .../Adminhtml/Block/Sales/Items/Abstract.php | 62 +- .../Block/Sales/Items/Column/Default.php | 10 +- .../Block/Sales/Items/Column/Name.php | 10 +- .../Block/Sales/Items/Column/Name/Grouped.php | 10 +- .../Block/Sales/Items/Column/Qty.php | 10 +- .../Sales/Items/Renderer/Configurable.php | 10 +- .../Block/Sales/Items/Renderer/Default.php | 10 +- .../core/Mage/Adminhtml/Block/Sales/Order.php | 8 +- .../Adminhtml/Block/Sales/Order/Abstract.php | 10 +- .../Block/Sales/Order/Comments/View.php | 8 +- .../Adminhtml/Block/Sales/Order/Create.php | 8 +- .../Block/Sales/Order/Create/Abstract.php | 8 +- .../Sales/Order/Create/Billing/Address.php | 10 +- .../Sales/Order/Create/Billing/Method.php | 8 +- .../Order/Create/Billing/Method/Form.php | 8 +- .../Block/Sales/Order/Create/Comment.php | 10 +- .../Block/Sales/Order/Create/Coupons.php | 10 +- .../Block/Sales/Order/Create/Coupons/Form.php | 8 +- .../Block/Sales/Order/Create/Customer.php | 8 +- .../Sales/Order/Create/Customer/Grid.php | 8 +- .../Block/Sales/Order/Create/Data.php | 8 +- .../Block/Sales/Order/Create/Form.php | 8 +- .../Block/Sales/Order/Create/Form/Account.php | 14 +- .../Block/Sales/Order/Create/Form/Address.php | 10 +- .../Block/Sales/Order/Create/Giftmessage.php | 2 +- .../Sales/Order/Create/Giftmessage/Form.php | 8 +- .../Block/Sales/Order/Create/Header.php | 10 +- .../Block/Sales/Order/Create/Items.php | 8 +- .../Block/Sales/Order/Create/Items/Grid.php | 8 +- .../Block/Sales/Order/Create/Load.php | 8 +- .../Block/Sales/Order/Create/Messages.php | 8 +- .../Block/Sales/Order/Create/Newsletter.php | 8 +- .../Sales/Order/Create/Newsletter/Form.php | 88 +- .../Block/Sales/Order/Create/Search.php | 8 +- .../Block/Sales/Order/Create/Search/Grid.php | 18 +- .../Search/Grid/Renderer/Giftmessage.php | 10 +- .../Sales/Order/Create/Shipping/Address.php | 10 +- .../Sales/Order/Create/Shipping/Method.php | 8 +- .../Order/Create/Shipping/Method/Form.php | 20 +- .../Block/Sales/Order/Create/Sidebar.php | 8 +- .../Sales/Order/Create/Sidebar/Abstract.php | 8 +- .../Block/Sales/Order/Create/Sidebar/Cart.php | 10 +- .../Sales/Order/Create/Sidebar/Compared.php | 8 +- .../Sales/Order/Create/Sidebar/Pcompared.php | 10 +- .../Sales/Order/Create/Sidebar/Pviewed.php | 10 +- .../Sales/Order/Create/Sidebar/Reorder.php | 10 +- .../Sales/Order/Create/Sidebar/Viewed.php | 8 +- .../Sales/Order/Create/Sidebar/Wishlist.php | 8 +- .../Block/Sales/Order/Create/Store.php | 8 +- .../Block/Sales/Order/Create/Store/Select.php | 8 +- .../Block/Sales/Order/Create/Totals.php | 8 +- .../Sales/Order/Create/Totals/Default.php | 10 +- .../Block/Sales/Order/Create/Totals/Table.php | 8 +- .../Block/Sales/Order/Create/Totals/Tax.php | 10 +- .../Block/Sales/Order/Creditmemo/Create.php | 10 +- .../Sales/Order/Creditmemo/Create/Form.php | 10 +- .../Sales/Order/Creditmemo/Create/Items.php | 48 +- .../Block/Sales/Order/Creditmemo/View.php | 8 +- .../Sales/Order/Creditmemo/View/Comments.php | 10 +- .../Sales/Order/Creditmemo/View/Form.php | 10 +- .../Sales/Order/Creditmemo/View/Items.php | 10 +- .../Mage/Adminhtml/Block/Sales/Order/Grid.php | 38 +- .../Block/Sales/Order/Invoice/Create.php | 10 +- .../Block/Sales/Order/Invoice/Create/Form.php | 10 +- .../Sales/Order/Invoice/Create/Items.php | 10 +- .../Sales/Order/Invoice/Create/Tracking.php | 22 +- .../Block/Sales/Order/Invoice/View.php | 10 +- .../Sales/Order/Invoice/View/Comments.php | 10 +- .../Block/Sales/Order/Invoice/View/Form.php | 10 +- .../Block/Sales/Order/Invoice/View/Items.php | 10 +- .../Block/Sales/Order/Invoice/Void.php | 1 + .../Block/Sales/Order/Invoice/Void/Form.php | 1 + .../Adminhtml/Block/Sales/Order/Payment.php | 2 +- .../Block/Sales/Order/Shipment/Create.php | 10 +- .../Sales/Order/Shipment/Create/Form.php | 10 +- .../Sales/Order/Shipment/Create/Items.php | 10 +- .../Sales/Order/Shipment/Create/Tracking.php | 10 +- .../Sales/Order/Shipment/Tracking/Info.php | 10 +- .../Block/Sales/Order/Shipment/View.php | 10 +- .../Sales/Order/Shipment/View/Comments.php | 10 +- .../Block/Sales/Order/Shipment/View/Form.php | 10 +- .../Block/Sales/Order/Shipment/View/Items.php | 10 +- .../Sales/Order/Shipment/View/Tracking.php | 10 +- .../Adminhtml/Block/Sales/Order/Totalbar.php | 10 +- .../Adminhtml/Block/Sales/Order/Totals.php | 8 +- .../Block/Sales/Order/Totals/Item.php | 8 +- .../Block/Sales/Order/Totals/Tax.php | 8 +- .../Mage/Adminhtml/Block/Sales/Order/View.php | 2 +- .../Adminhtml/Block/Sales/Order/View/Form.php | 4 +- .../Block/Sales/Order/View/Giftmessage.php | 8 +- .../Block/Sales/Order/View/History.php | 8 +- .../Adminhtml/Block/Sales/Order/View/Info.php | 8 +- .../Block/Sales/Order/View/Items.php | 10 +- .../Order/View/Items/Renderer/Default.php | 10 +- .../Block/Sales/Order/View/Messages.php | 8 +- .../Sales/Order/View/Tab/Creditmemos.php | 8 +- .../Block/Sales/Order/View/Tab/History.php | 10 +- .../Block/Sales/Order/View/Tab/Info.php | 10 +- .../Block/Sales/Order/View/Tab/Invoices.php | 8 +- .../Block/Sales/Order/View/Tab/Shipments.php | 10 +- .../Adminhtml/Block/Sales/Order/View/Tabs.php | 10 +- .../Block/Sales/Reorder/Renderer/Action.php | 8 +- .../Mage/Adminhtml/Block/Sales/Shipment.php | 8 +- .../Adminhtml/Block/Sales/Shipment/Grid.php | 10 +- .../core/Mage/Adminhtml/Block/Sitemap.php | 8 +- .../Mage/Adminhtml/Block/Sitemap/Edit.php | 8 +- .../Adminhtml/Block/Sitemap/Edit/Form.php | 10 +- .../Mage/Adminhtml/Block/Sitemap/Grid.php | 8 +- .../Block/Sitemap/Grid/Renderer/Action.php | 8 +- .../Block/Sitemap/Grid/Renderer/Link.php | 8 +- .../Block/Sitemap/Grid/Renderer/Time.php | 8 +- .../Mage/Adminhtml/Block/Store/Switcher.php | 8 +- .../Adminhtml/Block/System/Account/Edit.php | 10 +- .../Block/System/Account/Edit/Form.php | 8 +- .../Adminhtml/Block/System/Cache/Edit.php | 10 +- .../Adminhtml/Block/System/Cache/Form.php | 8 +- .../Adminhtml/Block/System/Config/Dwstree.php | 8 +- .../Adminhtml/Block/System/Config/Edit.php | 10 +- .../Adminhtml/Block/System/Config/Form.php | 39 +- .../Block/System/Config/Form/Field.php | 23 +- .../Config/Form/Field/Array/Abstract.php | 10 +- .../System/Config/Form/Field/Datetime.php | 10 +- .../Block/System/Config/Form/Field/Export.php | 8 +- .../Block/System/Config/Form/Field/Image.php | 8 +- .../Block/System/Config/Form/Field/Import.php | 8 +- .../System/Config/Form/Field/Notification.php | 86 +- .../Config/Form/Field/Regexceptions.php | 10 +- .../Form/Field/Select/Allowspecific.php | 8 +- .../Config/Form/Field/Select/Flatcatalog.php | 8 +- .../Config/Form/Field/Select/Flatproduct.php | 8 +- .../Block/System/Config/Form/Fieldset.php | 10 +- .../Form/Fieldset/Modules/DisableOutput.php | 70 +- .../Config/Form/Fieldset/Order/Statuses.php | 48 +- .../Block/System/Config/Switcher.php | 10 +- .../Adminhtml/Block/System/Config/Tabs.php | 8 +- .../Adminhtml/Block/System/Config/Xml.php | 1 + .../Adminhtml/Block/System/Convert/Gui.php | 8 +- .../Block/System/Convert/Gui/Edit.php | 8 +- .../Block/System/Convert/Gui/Edit/Form.php | 8 +- .../System/Convert/Gui/Edit/Tab/Upload.php | 8 +- .../System/Convert/Gui/Edit/Tab/View.php | 10 +- .../System/Convert/Gui/Edit/Tab/Wizard.php | 10 +- .../Block/System/Convert/Gui/Edit/Tabs.php | 8 +- .../Block/System/Convert/Gui/Grid.php | 8 +- .../Block/System/Convert/Profile.php | 8 +- .../Block/System/Convert/Profile/Edit.php | 8 +- .../Convert/Profile/Edit/Filter/Action.php | 10 +- .../System/Convert/Profile/Edit/Form.php | 8 +- .../Convert/Profile/Edit/Renderer/Action.php | 10 +- .../System/Convert/Profile/Edit/Tab/Edit.php | 12 +- .../Convert/Profile/Edit/Tab/History.php | 8 +- .../System/Convert/Profile/Edit/Tab/Run.php | 10 +- .../System/Convert/Profile/Edit/Tabs.php | 8 +- .../Block/System/Convert/Profile/Grid.php | 8 +- .../Block/System/Convert/Profile/Run.php | 8 +- .../Mage/Adminhtml/Block/System/Currency.php | 21 +- .../Block/System/Currency/Edit/Form.php | 10 +- .../Block/System/Currency/Edit/Tab/Main.php | 10 +- .../Block/System/Currency/Edit/Tab/Rates.php | 8 +- .../Block/System/Currency/Edit/Tabs.php | 10 +- .../Block/System/Currency/Rate/Matrix.php | 30 +- .../Mage/Adminhtml/Block/System/Design.php | 10 +- .../Adminhtml/Block/System/Design/Edit.php | 10 +- .../Block/System/Design/Edit/Tab/General.php | 8 +- .../Block/System/Design/Edit/Tabs.php | 8 +- .../Adminhtml/Block/System/Design/Grid.php | 2 +- .../Adminhtml/Block/System/Email/Template.php | 48 +- .../Block/System/Email/Template/Edit.php | 8 +- .../Block/System/Email/Template/Edit/Form.php | 14 +- .../Block/System/Email/Template/Grid.php | 12 +- .../Email/Template/Grid/Filter/Type.php | 48 +- .../Email/Template/Grid/Renderer/Action.php | 38 +- .../Email/Template/Grid/Renderer/Sender.php | 10 +- .../Email/Template/Grid/Renderer/Type.php | 16 +- .../Block/System/Email/Template/Preview.php | 8 +- .../Adminhtml/Block/System/Store/Delete.php | 200 +-- .../Block/System/Store/Delete/Form.php | 160 +- .../Block/System/Store/Delete/Group.php | 10 +- .../Block/System/Store/Delete/Website.php | 8 +- .../Adminhtml/Block/System/Store/Edit.php | 206 +-- .../Block/System/Store/Edit/Form.php | 680 ++++---- .../Adminhtml/Block/System/Store/Grid.php | 8 +- .../Block/System/Store/Grid/Render/Group.php | 10 +- .../Block/System/Store/Grid/Render/Store.php | 10 +- .../System/Store/Grid/Render/Website.php | 8 +- .../Adminhtml/Block/System/Store/Store.php | 10 +- app/code/core/Mage/Adminhtml/Block/Tag.php | 8 +- .../Mage/Adminhtml/Block/Tag/Customer.php | 8 +- .../Adminhtml/Block/Tag/Customer/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Tag/Edit.php | 10 +- .../Mage/Adminhtml/Block/Tag/Edit/Form.php | 8 +- .../Mage/Adminhtml/Block/Tag/Grid/All.php | 10 +- .../Adminhtml/Block/Tag/Grid/Customers.php | 8 +- .../Mage/Adminhtml/Block/Tag/Grid/Pending.php | 8 +- .../Adminhtml/Block/Tag/Grid/Products.php | 8 +- .../core/Mage/Adminhtml/Block/Tag/Pending.php | 8 +- .../core/Mage/Adminhtml/Block/Tag/Product.php | 8 +- .../Mage/Adminhtml/Block/Tag/Product/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Tag/Tag.php | 8 +- .../Mage/Adminhtml/Block/Tag/Tag/Edit.php | 8 +- .../Adminhtml/Block/Tag/Tag/Edit/Form.php | 8 +- .../Mage/Adminhtml/Block/Tag/Tag/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Tax/Class.php | 10 +- .../Mage/Adminhtml/Block/Tax/Class/Edit.php | 10 +- .../Adminhtml/Block/Tax/Class/Edit/Form.php | 10 +- .../Mage/Adminhtml/Block/Tax/Class/Grid.php | 8 +- .../Mage/Adminhtml/Block/Tax/Rate/Form.php | 20 +- .../Mage/Adminhtml/Block/Tax/Rate/Grid.php | 8 +- .../Block/Tax/Rate/Grid/Renderer/Country.php | 92 +- .../Block/Tax/Rate/Grid/Renderer/Data.php | 12 +- .../Adminhtml/Block/Tax/Rate/ImportExport.php | 10 +- .../Mage/Adminhtml/Block/Tax/Rate/Title.php | 10 +- .../Block/Tax/Rate/Title/Fieldset.php | 10 +- .../Adminhtml/Block/Tax/Rate/Toolbar/Add.php | 10 +- .../Adminhtml/Block/Tax/Rate/Toolbar/Save.php | 10 +- .../core/Mage/Adminhtml/Block/Tax/Rule.php | 10 +- .../Mage/Adminhtml/Block/Tax/Rule/Edit.php | 12 +- .../Adminhtml/Block/Tax/Rule/Edit/Form.php | 10 +- .../Mage/Adminhtml/Block/Tax/Rule/Grid.php | 8 +- .../core/Mage/Adminhtml/Block/Template.php | 8 +- .../core/Mage/Adminhtml/Block/Text/List.php | 8 +- .../core/Mage/Adminhtml/Block/Urlrewrite.php | 8 +- .../Block/Urlrewrite/Category/Tree.php | 8 +- .../Mage/Adminhtml/Block/Urlrewrite/Edit.php | 8 +- .../Adminhtml/Block/Urlrewrite/Edit/Form.php | 8 +- .../Mage/Adminhtml/Block/Urlrewrite/Grid.php | 8 +- .../Mage/Adminhtml/Block/Urlrewrite/Link.php | 8 +- .../Block/Urlrewrite/Product/Grid.php | 8 +- .../Adminhtml/Block/Urlrewrite/Selector.php | 8 +- app/code/core/Mage/Adminhtml/Block/Widget.php | 10 +- .../Mage/Adminhtml/Block/Widget/Accordion.php | 8 +- .../Adminhtml/Block/Widget/Accordion/Item.php | 8 +- .../Adminhtml/Block/Widget/Breadcrumbs.php | 10 +- .../Mage/Adminhtml/Block/Widget/Button.php | 8 +- .../Mage/Adminhtml/Block/Widget/Container.php | 2 +- .../core/Mage/Adminhtml/Block/Widget/Form.php | 2 +- .../Adminhtml/Block/Widget/Form/Container.php | 2 +- .../Adminhtml/Block/Widget/Form/Element.php | 8 +- .../Block/Widget/Form/Element/Gallery.php | 8 +- .../Block/Widget/Form/Renderer/Element.php | 8 +- .../Block/Widget/Form/Renderer/Fieldset.php | 10 +- .../Widget/Form/Renderer/Fieldset/Element.php | 8 +- .../core/Mage/Adminhtml/Block/Widget/Grid.php | 8 +- .../Adminhtml/Block/Widget/Grid/Block.php | 10 +- .../Adminhtml/Block/Widget/Grid/Column.php | 8 +- .../Widget/Grid/Column/Filter/Abstract.php | 8 +- .../Widget/Grid/Column/Filter/Checkbox.php | 10 +- .../Widget/Grid/Column/Filter/Country.php | 8 +- .../Block/Widget/Grid/Column/Filter/Date.php | 10 +- .../Widget/Grid/Column/Filter/Datetime.php | 10 +- .../Widget/Grid/Column/Filter/Interface.php | 8 +- .../Widget/Grid/Column/Filter/Massaction.php | 10 +- .../Block/Widget/Grid/Column/Filter/Price.php | 10 +- .../Block/Widget/Grid/Column/Filter/Radio.php | 10 +- .../Block/Widget/Grid/Column/Filter/Range.php | 10 +- .../Widget/Grid/Column/Filter/Select.php | 26 +- .../Block/Widget/Grid/Column/Filter/Store.php | 8 +- .../Block/Widget/Grid/Column/Filter/Text.php | 8 +- .../Widget/Grid/Column/Renderer/Abstract.php | 13 +- .../Widget/Grid/Column/Renderer/Action.php | 82 +- .../Widget/Grid/Column/Renderer/Checkbox.php | 8 +- .../Widget/Grid/Column/Renderer/Concat.php | 114 +- .../Widget/Grid/Column/Renderer/Country.php | 8 +- .../Widget/Grid/Column/Renderer/Currency.php | 10 +- .../Widget/Grid/Column/Renderer/Date.php | 8 +- .../Widget/Grid/Column/Renderer/Datetime.php | 50 +- .../Widget/Grid/Column/Renderer/Input.php | 8 +- .../Widget/Grid/Column/Renderer/Interface.php | 94 +- .../Block/Widget/Grid/Column/Renderer/Ip.php | 86 +- .../Widget/Grid/Column/Renderer/Longtext.php | 10 +- .../Grid/Column/Renderer/Massaction.php | 12 +- .../Widget/Grid/Column/Renderer/Number.php | 10 +- .../Widget/Grid/Column/Renderer/Options.php | 8 +- .../Widget/Grid/Column/Renderer/Price.php | 34 +- .../Widget/Grid/Column/Renderer/Radio.php | 8 +- .../Widget/Grid/Column/Renderer/Select.php | 10 +- .../Widget/Grid/Column/Renderer/Store.php | 8 +- .../Widget/Grid/Column/Renderer/Text.php | 10 +- .../Widget/Grid/Column/Renderer/Wrapline.php | 10 +- .../Adminhtml/Block/Widget/Grid/Container.php | 8 +- .../Block/Widget/Grid/Massaction.php | 8 +- .../Block/Widget/Grid/Massaction/Abstract.php | 8 +- .../Block/Widget/Grid/Massaction/Item.php | 8 +- .../Massaction/Item/Additional/Default.php | 8 +- .../Massaction/Item/Additional/Interface.php | 8 +- .../Adminhtml/Block/Widget/Tab/Interface.php | 82 +- .../core/Mage/Adminhtml/Block/Widget/Tabs.php | 8 +- .../core/Mage/Adminhtml/Block/Widget/Tree.php | 8 +- .../Adminhtml/Block/Widget/View/Container.php | 8 +- .../core/Mage/Adminhtml/Controller/Action.php | 2 +- .../Adminhtml/Controller/Sales/Creditmemo.php | 10 +- .../Adminhtml/Controller/Sales/Invoice.php | 8 +- .../Adminhtml/Controller/Sales/Shipment.php | 10 +- app/code/core/Mage/Adminhtml/Exception.php | 8 +- .../core/Mage/Adminhtml/Helper/Catalog.php | 8 +- .../Catalog/Product/Edit/Action/Attribute.php | 8 +- .../Adminhtml/Helper/Dashboard/Abstract.php | 8 +- .../Mage/Adminhtml/Helper/Dashboard/Data.php | 16 +- .../Mage/Adminhtml/Helper/Dashboard/Order.php | 8 +- app/code/core/Mage/Adminhtml/Helper/Data.php | 8 +- app/code/core/Mage/Adminhtml/Helper/Js.php | 45 +- .../core/Mage/Adminhtml/Helper/Media/Js.php | 8 +- app/code/core/Mage/Adminhtml/Helper/Rss.php | 10 +- app/code/core/Mage/Adminhtml/Model/Config.php | 8 +- .../core/Mage/Adminhtml/Model/Config/Data.php | 8 +- .../Model/Customer/Renderer/Region.php | 10 +- .../core/Mage/Adminhtml/Model/Extension.php | 16 +- .../Adminhtml/Model/Extension/Collection.php | 8 +- .../Model/Extension/Local/Collection.php | 27 +- .../Model/Extension/Remote/Collection.php | 27 +- .../Mage/Adminhtml/Model/Giftmessage/Save.php | 8 +- .../Model/Newsletter/Renderer/Text.php | 10 +- .../core/Mage/Adminhtml/Model/Observer.php | 8 +- .../core/Mage/Adminhtml/Model/Sales/Order.php | 22 +- .../Adminhtml/Model/Sales/Order/Create.php | 24 +- .../Adminhtml/Model/Sales/Order/Random.php | 10 +- .../Mage/Adminhtml/Model/Search/Catalog.php | 10 +- .../Mage/Adminhtml/Model/Search/Customer.php | 8 +- .../Mage/Adminhtml/Model/Search/Order.php | 8 +- .../core/Mage/Adminhtml/Model/Session.php | 8 +- .../Mage/Adminhtml/Model/Session/Quote.php | 16 +- .../Mage/Adminhtml/Model/Sitemap/Sitemap.php | 1 + .../System/Config/Backend/Admin/Custom.php | 10 +- .../System/Config/Backend/Admin/Usecustom.php | 10 +- .../Config/Backend/Admin/Usesecretkey.php | 10 +- .../Model/System/Config/Backend/Baseurl.php | 12 +- .../Model/System/Config/Backend/Cache.php | 100 +- .../Backend/Catalog/Inventory/Managestock.php | 114 +- .../Config/Backend/Catalog/Search/Type.php | 8 +- .../Model/System/Config/Backend/Category.php | 14 +- .../Config/Backend/Currency/Abstract.php | 190 +-- .../System/Config/Backend/Currency/Allow.php | 128 +- .../System/Config/Backend/Currency/Base.php | 106 +- .../System/Config/Backend/Currency/Cron.php | 8 +- .../Config/Backend/Currency/Default.php | 114 +- .../Model/System/Config/Backend/Datashare.php | 10 +- .../System/Config/Backend/Design/Package.php | 10 +- .../System/Config/Backend/Email/Address.php | 12 +- .../System/Config/Backend/Email/Sender.php | 10 +- .../Model/System/Config/Backend/Encrypted.php | 8 +- .../Model/System/Config/Backend/Image.php | 8 +- .../Model/System/Config/Backend/Image/Pdf.php | 10 +- .../System/Config/Backend/Layer/Children.php | 8 +- .../Model/System/Config/Backend/Locale.php | 8 +- .../Model/System/Config/Backend/Log/Cron.php | 10 +- .../System/Config/Backend/Price/Scope.php | 10 +- .../Config/Backend/Product/Alert/Cron.php | 10 +- .../System/Config/Backend/Seo/Product.php | 8 +- .../System/Config/Backend/Serialized.php | 10 +- .../Config/Backend/Serialized/Array.php | 8 +- .../Config/Backend/Shipping/Tablerate.php | 8 +- .../Model/System/Config/Backend/Sitemap.php | 18 +- .../System/Config/Backend/Sitemap/Cron.php | 8 +- .../Model/System/Config/Backend/Store.php | 10 +- .../Model/System/Config/Clone/Media/Image.php | 8 +- .../Model/System/Config/Source/Admin/Page.php | 10 +- .../Model/System/Config/Source/Allregion.php | 10 +- .../Config/Source/Catalog/GridPerPage.php | 10 +- .../System/Config/Source/Catalog/ListMode.php | 10 +- .../Config/Source/Catalog/ListPerPage.php | 8 +- .../System/Config/Source/Catalog/ListSort.php | 132 +- .../Config/Source/Catalog/Search/Type.php | 8 +- .../Config/Source/Catalog/TimeFormat.php | 10 +- .../Model/System/Config/Source/Category.php | 8 +- .../Model/System/Config/Source/Cms/Page.php | 8 +- .../Model/System/Config/Source/Country.php | 10 +- .../System/Config/Source/Country/Full.php | 10 +- .../System/Config/Source/Cron/Frequency.php | 8 +- .../Model/System/Config/Source/Currency.php | 10 +- .../System/Config/Source/Currency/Service.php | 10 +- .../System/Config/Source/Customer/Group.php | 10 +- .../Model/System/Config/Source/Date/Short.php | 10 +- .../System/Config/Source/Design/Package.php | 8 +- .../System/Config/Source/Design/Robots.php | 28 +- .../System/Config/Source/Dev/Dbautoup.php | 8 +- .../System/Config/Source/Email/Identity.php | 10 +- .../System/Config/Source/Email/Method.php | 10 +- .../System/Config/Source/Email/Smtpauth.php | 10 +- .../System/Config/Source/Email/Template.php | 8 +- .../System/Config/Source/Enabledisable.php | 10 +- .../Model/System/Config/Source/Frequency.php | 10 +- .../Model/System/Config/Source/Language.php | 8 +- .../Model/System/Config/Source/Locale.php | 8 +- .../System/Config/Source/Locale/Country.php | 8 +- .../System/Config/Source/Locale/Currency.php | 8 +- .../Config/Source/Locale/Currency/All.php | 86 +- .../System/Config/Source/Locale/Timezone.php | 8 +- .../System/Config/Source/Locale/Weekdays.php | 8 +- .../Model/System/Config/Source/Nooptreq.php | 8 +- .../Config/Source/Notification/Frequency.php | 10 +- .../System/Config/Source/Order/Status.php | 22 +- .../System/Config/Source/Order/Status/New.php | 8 +- .../Source/Order/Status/Newprocessing.php | 8 +- .../Config/Source/Order/Status/Processing.php | 8 +- .../Config/Source/Payment/Allmethods.php | 10 +- .../Config/Source/Payment/Allowedmethods.php | 10 +- .../Source/Payment/Allspecificcountries.php | 10 +- .../System/Config/Source/Payment/Cctype.php | 24 +- .../Config/Source/Paypal/Standardtypes.php | 10 +- .../Config/Source/Paypal/Transactiontype.php | 8 +- .../System/Config/Source/Price/Scope.php | 10 +- .../Config/Source/Product/Options/Price.php | 10 +- .../Config/Source/Product/Options/Type.php | 10 +- .../Config/Source/Product/Thumbnail.php | 10 +- .../System/Config/Source/Reports/Scope.php | 96 +- .../Config/Source/Shipping/Allmethods.php | 10 +- .../Config/Source/Shipping/Allowedmethods.php | 10 +- .../Source/Shipping/Allspecificcountries.php | 10 +- .../Config/Source/Shipping/Flatrate.php | 8 +- .../Config/Source/Shipping/Tablerate.php | 8 +- .../Config/Source/Shipping/Taxclass.php | 8 +- .../Model/System/Config/Source/Store.php | 10 +- .../System/Config/Source/Tax/Apply/On.php | 72 +- .../System/Config/Source/Tax/Basedon.php | 8 +- .../System/Config/Source/Tax/Catalog.php | 8 +- .../Config/Source/Watermark/Position.php | 8 +- .../System/Config/Source/Web/Protocol.php | 8 +- .../Model/System/Config/Source/Website.php | 8 +- .../Model/System/Config/Source/Yesno.php | 8 +- .../Mage/Adminhtml/Model/System/Store.php | 21 +- app/code/core/Mage/Adminhtml/Model/Url.php | 8 +- .../controllers/Api/RoleController.php | 10 +- .../controllers/Api/UserController.php | 8 +- .../Catalog/CategoryController.php | 8 +- .../Product/Action/AttributeController.php | 10 +- .../Catalog/Product/AttributeController.php | 12 +- .../Catalog/Product/DatafeedsController.php | 10 +- .../Catalog/Product/GalleryController.php | 10 +- .../Catalog/Product/GroupController.php | 17 +- .../Catalog/Product/ReviewController.php | 22 +- .../Catalog/Product/SetController.php | 10 +- .../controllers/Catalog/ProductController.php | 28 +- .../controllers/Catalog/SearchController.php | 12 +- .../controllers/CatalogController.php | 12 +- .../Checkout/AgreementController.php | 10 +- .../controllers/Cms/BlockController.php | 8 +- .../controllers/Cms/PageController.php | 8 +- .../controllers/Customer/ConfigController.php | 10 +- .../controllers/Customer/GroupController.php | 12 +- .../controllers/Customer/OnlineController.php | 20 +- .../controllers/CustomerController.php | 14 +- .../controllers/DashboardController.php | 10 +- .../Extensions/ConfigController.php | 11 +- .../Extensions/ConsoleController.php | 11 +- .../Extensions/CustomController.php | 11 +- .../controllers/Extensions/FileController.php | 209 ++- .../Extensions/LocalController.php | 413 +++-- .../Extensions/RemoteController.php | 273 ++-- .../Adminhtml/controllers/IndexController.php | 8 +- .../Adminhtml/controllers/JsonController.php | 10 +- .../controllers/Media/EditorController.php | 8 +- .../controllers/Media/UploaderController.php | 10 +- .../Newsletter/ProblemController.php | 10 +- .../Newsletter/QueueController.php | 8 +- .../Newsletter/SubscriberController.php | 2 +- .../Newsletter/TemplateController.php | 8 +- .../controllers/NotificationController.php | 18 +- .../Permissions/RoleController.php | 396 ++--- .../Permissions/UserController.php | 8 +- .../controllers/Poll/AnswerController.php | 10 +- .../Adminhtml/controllers/PollController.php | 10 +- .../controllers/Promo/CatalogController.php | 8 +- .../controllers/Promo/QuoteController.php | 8 +- .../controllers/Promo/WidgetController.php | 10 +- .../Adminhtml/controllers/PromoController.php | 8 +- .../controllers/RatingController.php | 10 +- .../controllers/Report/CustomerController.php | 10 +- .../controllers/Report/ProductController.php | 10 +- .../controllers/Report/ReviewController.php | 12 +- .../controllers/Report/SalesController.php | 8 +- .../controllers/Report/ShopcartController.php | 10 +- .../controllers/Report/TagController.php | 8 +- .../controllers/ReportController.php | 12 +- .../controllers/Rss/CatalogController.php | 10 +- .../controllers/Rss/OrderController.php | 10 +- .../Sales/CreditmemoController.php | 10 +- .../controllers/Sales/InvoiceController.php | 10 +- .../Sales/Order/CreateController.php | 10 +- .../Sales/Order/CreditmemoController.php | 8 +- .../Sales/Order/EditController.php | 10 +- .../Sales/Order/InvoiceController.php | 57 +- .../Sales/Order/ShipmentController.php | 8 +- .../Order/View/GiftmessageController.php | 8 +- .../controllers/Sales/OrderController.php | 23 +- .../controllers/Sales/ShipmentController.php | 10 +- .../Adminhtml/controllers/SalesController.php | 12 +- .../controllers/SitemapController.php | 10 +- .../controllers/System/AccountController.php | 8 +- .../controllers/System/BackupController.php | 294 ++-- .../controllers/System/CacheController.php | 10 +- .../controllers/System/ConfigController.php | 8 +- .../System/Convert/GuiController.php | 10 +- .../System/Convert/ProfileController.php | 8 +- .../controllers/System/CurrencyController.php | 14 +- .../controllers/System/DesignController.php | 26 +- .../System/Email/TemplateController.php | 20 +- .../controllers/System/StoreController.php | 2 +- .../controllers/SystemController.php | 10 +- .../Adminhtml/controllers/TagController.php | 46 +- .../Tax/Class/CustomerController.php | 12 +- .../Tax/Class/ProductController.php | 10 +- .../controllers/Tax/ClassController.php | 10 +- .../controllers/Tax/RateController.php | 8 +- .../controllers/Tax/RuleController.php | 10 +- .../controllers/UrlrewriteController.php | 8 +- app/code/core/Mage/Adminhtml/etc/config.xml | 6 +- .../Block/Adminhtml/Shipping/Methods.php | 10 +- .../Mage/AmazonPayments/Block/Asp/Form.php | 8 +- .../AmazonPayments/Block/Asp/Redirect.php | 8 +- .../AmazonPayments/Block/Asp/Shortcut.php | 12 +- .../Mage/AmazonPayments/Block/Cba/Form.php | 8 +- .../AmazonPayments/Block/Cba/Redirect.php | 10 +- .../Mage/AmazonPayments/Block/Cba/Success.php | 10 +- .../core/Mage/AmazonPayments/Block/Form.php | 8 +- .../AmazonPayments/Block/Link/Shortcut.php | 8 +- .../core/Mage/AmazonPayments/Helper/Data.php | 11 +- .../AmazonPayments/Model/Api/Abstract.php | 8 +- .../Mage/AmazonPayments/Model/Api/Asp.php | 8 +- .../AmazonPayments/Model/Api/Asp/Abstract.php | 8 +- .../AmazonPayments/Model/Api/Asp/Amount.php | 8 +- .../Mage/AmazonPayments/Model/Api/Asp/Fps.php | 8 +- .../Model/Api/Asp/Fps/Request/Abstract.php | 8 +- .../Model/Api/Asp/Fps/Request/Cancel.php | 8 +- .../Model/Api/Asp/Fps/Request/Refund.php | 8 +- .../Model/Api/Asp/Fps/Request/Settle.php | 8 +- .../Model/Api/Asp/Fps/Response/Abstract.php | 8 +- .../Model/Api/Asp/Fps/Response/Cancel.php | 8 +- .../Model/Api/Asp/Fps/Response/Error.php | 8 +- .../Model/Api/Asp/Fps/Response/Refund.php | 8 +- .../Model/Api/Asp/Fps/Response/Settle.php | 8 +- .../Model/Api/Asp/Ipn/Request.php | 8 +- .../Mage/AmazonPayments/Model/Api/Cba.php | 8 +- .../AmazonPayments/Model/Api/Cba/Document.php | 8 +- .../Mage/AmazonPayments/Model/Api/Debug.php | 10 +- .../AmazonPayments/Model/Mysql4/Api/Debug.php | 10 +- .../Model/Mysql4/Api/Debug/Collection.php | 10 +- .../AmazonPayments/Model/Mysql4/Setup.php | 10 +- .../Mage/AmazonPayments/Model/Observer.php | 8 +- .../Mage/AmazonPayments/Model/Payment/Asp.php | 10 +- .../Model/Payment/Asp/Abstract.php | 8 +- .../AmazonPayments/Model/Payment/Asp/Fps.php | 12 +- .../Model/Payment/Asp/Notification.php | 8 +- .../Payment/Asp/Source/PaymentAction.php | 10 +- .../Mage/AmazonPayments/Model/Payment/Cba.php | 10 +- .../Mage/AmazonPayments/Model/Session.php | 10 +- .../controllers/AspController.php | 2 +- .../controllers/CbaController.php | 10 +- .../core/Mage/AmazonPayments/etc/system.xml | 12 +- .../mysql4-install-0.1.2.php | 8 +- .../mysql4-upgrade-0.1.0-0.1.1.php | 8 +- .../mysql4-upgrade-0.1.1-0.1.2.php | 8 +- app/code/core/Mage/Api/Controller/Action.php | 10 +- app/code/core/Mage/Api/Exception.php | 10 +- app/code/core/Mage/Api/Helper/Data.php | 10 +- app/code/core/Mage/Api/Model/Acl.php | 10 +- .../core/Mage/Api/Model/Acl/Assert/Ip.php | 10 +- .../core/Mage/Api/Model/Acl/Assert/Time.php | 10 +- app/code/core/Mage/Api/Model/Acl/Resource.php | 10 +- app/code/core/Mage/Api/Model/Acl/Role.php | 10 +- .../core/Mage/Api/Model/Acl/Role/Generic.php | 10 +- .../core/Mage/Api/Model/Acl/Role/Group.php | 10 +- .../core/Mage/Api/Model/Acl/Role/Registry.php | 8 +- .../core/Mage/Api/Model/Acl/Role/User.php | 10 +- app/code/core/Mage/Api/Model/Config.php | 10 +- app/code/core/Mage/Api/Model/Mysql4/Acl.php | 14 +- .../core/Mage/Api/Model/Mysql4/Acl/Role.php | 10 +- .../Api/Model/Mysql4/Acl/Role/Collection.php | 10 +- .../Model/Mysql4/Permissions/Collection.php | 8 +- app/code/core/Mage/Api/Model/Mysql4/Role.php | 8 +- .../Mage/Api/Model/Mysql4/Role/Collection.php | 8 +- app/code/core/Mage/Api/Model/Mysql4/Roles.php | 8 +- .../Api/Model/Mysql4/Roles/Collection.php | 8 +- .../Model/Mysql4/Roles/User/Collection.php | 8 +- app/code/core/Mage/Api/Model/Mysql4/Rules.php | 8 +- .../Api/Model/Mysql4/Rules/Collection.php | 8 +- app/code/core/Mage/Api/Model/Mysql4/User.php | 8 +- .../Mage/Api/Model/Mysql4/User/Collection.php | 8 +- .../core/Mage/Api/Model/Resource/Abstract.php | 10 +- app/code/core/Mage/Api/Model/Role.php | 8 +- app/code/core/Mage/Api/Model/Roles.php | 10 +- app/code/core/Mage/Api/Model/Rules.php | 8 +- app/code/core/Mage/Api/Model/Server.php | 10 +- .../Api/Model/Server/Adapter/Interface.php | 10 +- .../Mage/Api/Model/Server/Adapter/Soap.php | 8 +- .../Mage/Api/Model/Server/Adapter/Xmlrpc.php | 10 +- .../core/Mage/Api/Model/Server/Handler.php | 10 +- .../Api/Model/Server/Handler/Abstract.php | 10 +- .../Mage/Api/Model/Server/V2/Adapter/Soap.php | 8 +- .../core/Mage/Api/Model/Server/V2/Handler.php | 10 +- app/code/core/Mage/Api/Model/Session.php | 28 +- app/code/core/Mage/Api/Model/User.php | 10 +- app/code/core/Mage/Api/Model/Wsdl/Config.php | 8 +- .../core/Mage/Api/Model/Wsdl/Config/Base.php | 8 +- .../Mage/Api/Model/Wsdl/Config/Element.php | 8 +- .../Mage/Api/controllers/IndexController.php | 10 +- .../Mage/Api/controllers/SoapController.php | 10 +- .../Api/controllers/V2/SoapController.php | 10 +- .../Mage/Api/controllers/XmlrpcController.php | 10 +- app/code/core/Mage/Api/etc/api.xml | 6 +- app/code/core/Mage/Api/etc/config.xml | 6 +- app/code/core/Mage/Api/etc/system.xml | 10 +- .../sql/api_setup/mysql4-install-0.7.0.php | 10 +- .../api_setup/mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../api_setup/mysql4-upgrade-0.8.0-0.8.1.php | 10 +- app/code/core/Mage/Backup/Exception.php | 8 +- app/code/core/Mage/Backup/Helper/Data.php | 8 +- app/code/core/Mage/Backup/Model/Backup.php | 10 +- app/code/core/Mage/Backup/Model/Db.php | 6 +- .../core/Mage/Backup/Model/Fs/Collection.php | 10 +- app/code/core/Mage/Backup/Model/Media.php | 8 +- app/code/core/Mage/Backup/Model/Mysql4/Db.php | 14 +- app/code/core/Mage/Backup/Model/View.php | 8 +- app/code/core/Mage/Backup/etc/config.xml | 10 +- .../Catalog/Product/Edit/Tab/Attributes.php | 8 +- .../Product/Edit/Tab/Attributes/Extend.php | 8 +- .../Product/Edit/Tab/Attributes/Special.php | 10 +- .../Catalog/Product/Edit/Tab/Bundle.php | 8 +- .../Product/Edit/Tab/Bundle/Option.php | 418 ++--- .../Product/Edit/Tab/Bundle/Option/Search.php | 8 +- .../Edit/Tab/Bundle/Option/Search/Grid.php | 8 +- .../Edit/Tab/Bundle/Option/Selection.php | 10 +- .../Adminhtml/Catalog/Product/Edit/Tabs.php | 10 +- .../Adminhtml/Sales/Order/Items/Renderer.php | 8 +- .../Sales/Order/View/Items/Renderer.php | 8 +- .../Block/Catalog/Product/List/Partof.php | 10 +- .../Bundle/Block/Catalog/Product/Price.php | 8 +- .../Bundle/Block/Catalog/Product/View.php | 8 +- .../Catalog/Product/View/Type/Bundle.php | 286 ++-- .../Product/View/Type/Bundle/Option.php | 8 +- .../View/Type/Bundle/Option/Checkbox.php | 10 +- .../Product/View/Type/Bundle/Option/Multi.php | 10 +- .../Product/View/Type/Bundle/Option/Radio.php | 10 +- .../View/Type/Bundle/Option/Select.php | 10 +- .../Block/Checkout/Cart/Item/Renderer.php | 242 +-- .../Block/Sales/Order/Items/Renderer.php | 338 ++-- app/code/core/Mage/Bundle/Helper/Data.php | 8 +- .../Bundle/Model/CatalogIndex/Data/Bundle.php | 10 +- .../core/Mage/Bundle/Model/Mysql4/Bundle.php | 8 +- .../core/Mage/Bundle/Model/Mysql4/Option.php | 8 +- .../Bundle/Model/Mysql4/Option/Collection.php | 10 +- .../Mage/Bundle/Model/Mysql4/Price/Index.php | 10 +- .../Mage/Bundle/Model/Mysql4/Selection.php | 10 +- .../Model/Mysql4/Selection/Collection.php | 8 +- app/code/core/Mage/Bundle/Model/Observer.php | 8 +- app/code/core/Mage/Bundle/Model/Option.php | 8 +- .../core/Mage/Bundle/Model/Price/Index.php | 8 +- .../Product/Attribute/Source/Price/View.php | 10 +- .../core/Mage/Bundle/Model/Product/Price.php | 10 +- .../core/Mage/Bundle/Model/Product/Type.php | 8 +- .../Model/Sales/Order/Pdf/Items/Abstract.php | 8 +- .../Sales/Order/Pdf/Items/Creditmemo.php | 8 +- .../Model/Sales/Order/Pdf/Items/Invoice.php | 8 +- .../Model/Sales/Order/Pdf/Items/Shipment.php | 8 +- app/code/core/Mage/Bundle/Model/Selection.php | 8 +- .../Source/Option/Selection/Price/Type.php | 10 +- .../Mage/Bundle/Model/Source/Option/Type.php | 10 +- .../controllers/Product/EditController.php | 8 +- .../controllers/SelectionController.php | 10 +- app/code/core/Mage/Bundle/etc/config.xml | 8 +- .../sql/bundle_setup/mysql4-install-0.1.0.php | 10 +- .../mysql4-upgrade-0.1.0-0.1.1.php | 8 +- .../mysql4-upgrade-0.1.1-0.1.2.php | 8 +- .../mysql4-upgrade-0.1.2-0.1.3.php | 8 +- .../mysql4-upgrade-0.1.3-0.1.4.php | 8 +- .../mysql4-upgrade-0.1.4-0.1.5.php | 8 +- .../mysql4-upgrade-0.1.5-0.1.6.php | 8 +- .../mysql4-upgrade-0.1.6-0.1.7.php | 8 +- .../core/Mage/Catalog/Block/Breadcrumbs.php | 8 +- .../core/Mage/Catalog/Block/Category/View.php | 8 +- .../Catalog/Block/Layer/Filter/Abstract.php | 8 +- .../Catalog/Block/Layer/Filter/Attribute.php | 8 +- .../Catalog/Block/Layer/Filter/Category.php | 2 +- .../Mage/Catalog/Block/Layer/Filter/Price.php | 8 +- .../core/Mage/Catalog/Block/Layer/State.php | 8 +- .../core/Mage/Catalog/Block/Navigation.php | 8 +- app/code/core/Mage/Catalog/Block/Product.php | 76 +- .../Mage/Catalog/Block/Product/Abstract.php | 104 +- .../Catalog/Block/Product/Compare/List.php | 15 +- .../Catalog/Block/Product/Compare/Sidebar.php | 8 +- .../Mage/Catalog/Block/Product/Gallery.php | 8 +- .../core/Mage/Catalog/Block/Product/List.php | 99 +- .../Catalog/Block/Product/List/Crosssell.php | 8 +- .../Catalog/Block/Product/List/Promotion.php | 27 +- .../Catalog/Block/Product/List/Random.php | 10 +- .../Catalog/Block/Product/List/Related.php | 10 +- .../Catalog/Block/Product/List/Toolbar.php | 8 +- .../Catalog/Block/Product/List/Upsell.php | 10 +- .../core/Mage/Catalog/Block/Product/New.php | 11 +- .../core/Mage/Catalog/Block/Product/Price.php | 8 +- .../core/Mage/Catalog/Block/Product/Send.php | 32 +- .../core/Mage/Catalog/Block/Product/View.php | 374 ++--- .../Catalog/Block/Product/View/Abstract.php | 102 +- .../Catalog/Block/Product/View/Additional.php | 8 +- .../Catalog/Block/Product/View/Attributes.php | 10 +- .../Block/Product/View/Description.php | 10 +- .../Mage/Catalog/Block/Product/View/Media.php | 10 +- .../Catalog/Block/Product/View/Options.php | 360 ++-- .../Block/Product/View/Options/Abstract.php | 320 ++-- .../Block/Product/View/Options/Type/Date.php | 10 +- .../Product/View/Options/Type/Default.php | 10 +- .../Block/Product/View/Options/Type/File.php | 10 +- .../Product/View/Options/Type/Select.php | 10 +- .../Block/Product/View/Options/Type/Text.php | 10 +- .../Mage/Catalog/Block/Product/View/Price.php | 8 +- .../Mage/Catalog/Block/Product/View/Tabs.php | 10 +- .../Block/Product/View/Type/Configurable.php | 10 +- .../Block/Product/View/Type/Grouped.php | 84 +- .../Block/Product/View/Type/Simple.php | 10 +- .../Block/Product/View/Type/Virtual.php | 10 +- .../Catalog/Block/Seo/Sitemap/Abstract.php | 8 +- .../Catalog/Block/Seo/Sitemap/Category.php | 8 +- .../Catalog/Block/Seo/Sitemap/Product.php | 2 +- .../Block/Seo/Sitemap/Tree/Category.php | 8 +- .../Catalog/Block/Seo/Sitemap/Tree/Pager.php | 360 ++-- app/code/core/Mage/Catalog/Exception.php | 10 +- .../core/Mage/Catalog/Helper/Category.php | 8 +- .../Mage/Catalog/Helper/Category/Flat.php | 10 +- app/code/core/Mage/Catalog/Helper/Data.php | 8 +- app/code/core/Mage/Catalog/Helper/Image.php | 10 +- app/code/core/Mage/Catalog/Helper/Map.php | 8 +- app/code/core/Mage/Catalog/Helper/Output.php | 14 +- app/code/core/Mage/Catalog/Helper/Product.php | 10 +- .../Mage/Catalog/Helper/Product/Compare.php | 8 +- .../core/Mage/Catalog/Helper/Product/Flat.php | 8 +- .../Mage/Catalog/Helper/Product/Options.php | 10 +- .../core/Mage/Catalog/Helper/Product/Url.php | 10 +- app/code/core/Mage/Catalog/Model/Abstract.php | 8 +- .../core/Mage/Catalog/Model/Api/Resource.php | 302 ++-- app/code/core/Mage/Catalog/Model/Category.php | 8 +- .../core/Mage/Catalog/Model/Category/Api.php | 10 +- .../Mage/Catalog/Model/Category/Api/V2.php | 8 +- .../Catalog/Model/Category/Attribute/Api.php | 10 +- .../Model/Category/Attribute/Api/V2.php | 10 +- .../Category/Attribute/Backend/Image.php | 8 +- .../Category/Attribute/Backend/Sortby.php | 8 +- .../Category/Attribute/Backend/Urlkey.php | 8 +- .../Category/Attribute/Source/Layout.php | 8 +- .../Model/Category/Attribute/Source/Mode.php | 8 +- .../Model/Category/Attribute/Source/Page.php | 8 +- .../Category/Attribute/Source/Sortby.php | 8 +- app/code/core/Mage/Catalog/Model/Config.php | 8 +- app/code/core/Mage/Catalog/Model/Convert.php | 62 +- .../Catalog/Model/Convert/Adapter/Catalog.php | 10 +- .../Catalog/Model/Convert/Adapter/Product.php | 8 +- .../Catalog/Model/Convert/Parser/Product.php | 8 +- app/code/core/Mage/Catalog/Model/Design.php | 10 +- .../Mage/Catalog/Model/Entity/Attribute.php | 10 +- .../Attribute/Design/Options/Container.php | 10 +- .../Product/Attribute/Frontend/Image.php | 10 +- app/code/core/Mage/Catalog/Model/Index.php | 8 +- app/code/core/Mage/Catalog/Model/Layer.php | 8 +- .../Catalog/Model/Layer/Filter/Abstract.php | 8 +- .../Catalog/Model/Layer/Filter/Attribute.php | 8 +- .../Catalog/Model/Layer/Filter/Category.php | 8 +- .../Mage/Catalog/Model/Layer/Filter/Item.php | 10 +- .../core/Mage/Catalog/Model/Layer/State.php | 10 +- app/code/core/Mage/Catalog/Model/Observer.php | 8 +- app/code/core/Mage/Catalog/Model/Product.php | 8 +- .../core/Mage/Catalog/Model/Product/Api.php | 10 +- .../Mage/Catalog/Model/Product/Api/V2.php | 10 +- .../Catalog/Model/Product/Attribute/Api.php | 10 +- .../Model/Product/Attribute/Api/V2.php | 10 +- .../Model/Product/Attribute/Backend/Media.php | 8 +- .../Model/Product/Attribute/Backend/Price.php | 8 +- .../Product/Attribute/Backend/Startdate.php | 8 +- .../Product/Attribute/Backend/Tierprice.php | 10 +- .../Product/Attribute/Backend/Urlkey.php | 8 +- .../Product/Attribute/Frontend/Image.php | 8 +- .../Model/Product/Attribute/Media/Api.php | 10 +- .../Model/Product/Attribute/Media/Api/V2.php | 10 +- .../Model/Product/Attribute/Set/Api.php | 10 +- .../Model/Product/Attribute/Set/Api/V2.php | 10 +- .../Model/Product/Attribute/Source/Layout.php | 10 +- .../Model/Product/Attribute/Tierprice/Api.php | 12 +- .../Product/Attribute/Tierprice/Api/V2.php | 12 +- .../Catalog/Model/Product/Compare/Item.php | 8 +- .../Catalog/Model/Product/Compare/List.php | 10 +- .../Mage/Catalog/Model/Product/Condition.php | 10 +- .../Model/Product/Condition/Interface.php | 10 +- .../Mage/Catalog/Model/Product/Flat/Flag.php | 8 +- .../Catalog/Model/Product/Flat/Indexer.php | 8 +- .../Catalog/Model/Product/Flat/Observer.php | 8 +- .../core/Mage/Catalog/Model/Product/Image.php | 28 +- .../core/Mage/Catalog/Model/Product/Link.php | 10 +- .../Mage/Catalog/Model/Product/Link/Api.php | 10 +- .../Catalog/Model/Product/Link/Api/V2.php | 10 +- .../Catalog/Model/Product/Media/Config.php | 10 +- .../Mage/Catalog/Model/Product/Option.php | 8 +- .../Catalog/Model/Product/Option/Observer.php | 8 +- .../Model/Product/Option/Type/Date.php | 10 +- .../Model/Product/Option/Type/Default.php | 10 +- .../Model/Product/Option/Type/File.php | 10 +- .../Model/Product/Option/Type/Select.php | 10 +- .../Model/Product/Option/Type/Text.php | 10 +- .../Catalog/Model/Product/Option/Value.php | 418 ++--- .../Mage/Catalog/Model/Product/Status.php | 8 +- .../core/Mage/Catalog/Model/Product/Type.php | 8 +- .../Catalog/Model/Product/Type/Abstract.php | 2 +- .../Mage/Catalog/Model/Product/Type/Api.php | 10 +- .../Catalog/Model/Product/Type/Api/V2.php | 10 +- .../Model/Product/Type/Configurable.php | 8 +- .../Product/Type/Configurable/Attribute.php | 8 +- .../Model/Product/Type/Configurable/Price.php | 206 +-- .../Catalog/Model/Product/Type/Grouped.php | 10 +- .../Mage/Catalog/Model/Product/Type/Price.php | 10 +- .../Catalog/Model/Product/Type/Simple.php | 10 +- .../Catalog/Model/Product/Type/Virtual.php | 92 +- .../core/Mage/Catalog/Model/Product/Url.php | 8 +- .../Mage/Catalog/Model/Product/Visibility.php | 10 +- .../Mage/Catalog/Model/Product/Website.php | 8 +- .../Catalog/Model/Resource/Eav/Attribute.php | 8 +- .../Model/Resource/Eav/Mysql4/Abstract.php | 8 +- .../Model/Resource/Eav/Mysql4/Category.php | 12 +- .../Category/Attribute/Frontend/Image.php | 8 +- .../Category/Attribute/Source/Layout.php | 8 +- .../Mysql4/Category/Attribute/Source/Mode.php | 8 +- .../Mysql4/Category/Attribute/Source/Page.php | 8 +- .../Eav/Mysql4/Category/Collection.php | 8 +- .../Resource/Eav/Mysql4/Category/Flat.php | 11 +- .../Eav/Mysql4/Category/Flat/Collection.php | 10 +- .../Resource/Eav/Mysql4/Category/Tree.php | 8 +- .../Eav/Mysql4/Collection/Abstract.php | 10 +- .../Model/Resource/Eav/Mysql4/Config.php | 8 +- .../Model/Resource/Eav/Mysql4/Product.php | 8 +- .../Product/Attribute/Backend/Gallery.php | 8 +- .../Product/Attribute/Backend/Image.php | 8 +- .../Product/Attribute/Backend/Media.php | 10 +- .../Product/Attribute/Backend/Tierprice.php | 14 +- .../Product/Attribute/Backend/Urlkey.php | 8 +- .../Product/Attribute/Frontend/Image.php | 8 +- .../Product/Attribute/Frontend/Tierprice.php | 8 +- .../Eav/Mysql4/Product/Collection.php | 13 +- .../Eav/Mysql4/Product/Compare/Item.php | 8 +- .../Product/Compare/Item/Collection.php | 8 +- .../Resource/Eav/Mysql4/Product/Flat.php | 8 +- .../Eav/Mysql4/Product/Flat/Indexer.php | 8 +- .../Resource/Eav/Mysql4/Product/Link.php | 8 +- .../Eav/Mysql4/Product/Link/Collection.php | 284 ++-- .../Product/Link/Product/Collection.php | 8 +- .../Resource/Eav/Mysql4/Product/Option.php | 8 +- .../Eav/Mysql4/Product/Option/Collection.php | 10 +- .../Eav/Mysql4/Product/Option/Value.php | 10 +- .../Product/Option/Value/Collection.php | 10 +- .../Resource/Eav/Mysql4/Product/Status.php | 8 +- .../Eav/Mysql4/Product/Type/Configurable.php | 10 +- .../Product/Type/Configurable/Attribute.php | 8 +- .../Configurable/Attribute/Collection.php | 8 +- .../Type/Configurable/Product/Collection.php | 8 +- .../Resource/Eav/Mysql4/Product/Website.php | 8 +- .../Model/Resource/Eav/Mysql4/Sendfriend.php | 10 +- .../Eav/Mysql4/Sendfriend/Collection.php | 10 +- .../Model/Resource/Eav/Mysql4/Setup.php | 10 +- .../Catalog/Model/Resource/Eav/Mysql4/Url.php | 8 +- .../core/Mage/Catalog/Model/Sendfriend.php | 10 +- app/code/core/Mage/Catalog/Model/Session.php | 8 +- app/code/core/Mage/Catalog/Model/Url.php | 10 +- .../controllers/CategoryController.php | 8 +- .../Catalog/controllers/IndexController.php | 8 +- .../controllers/Product/CompareController.php | 10 +- .../Catalog/controllers/ProductController.php | 8 +- .../controllers/Seo/SitemapController.php | 8 +- app/code/core/Mage/Catalog/etc/api.xml | 6 +- app/code/core/Mage/Catalog/etc/config.xml | 10 +- app/code/core/Mage/Catalog/etc/convert.xml | 2 +- app/code/core/Mage/Catalog/etc/system.xml | 8 +- app/code/core/Mage/Catalog/etc/wsdl.xml | 35 +- .../catalog_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.6.40-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.11-0.7.12.php | 8 +- .../mysql4-upgrade-0.7.12-0.7.13.php | 8 +- .../mysql4-upgrade-0.7.13-0.7.14.php | 8 +- .../mysql4-upgrade-0.7.14-0.7.15.php | 8 +- .../mysql4-upgrade-0.7.15-0.7.16.php | 10 +- .../mysql4-upgrade-0.7.16-0.7.17.php | 8 +- .../mysql4-upgrade-0.7.17-0.7.18.php | 8 +- .../mysql4-upgrade-0.7.18-0.7.19.php | 68 +- .../mysql4-upgrade-0.7.19-0.7.20.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../mysql4-upgrade-0.7.20-0.7.21.php | 8 +- .../mysql4-upgrade-0.7.21-0.7.22.php | 82 +- .../mysql4-upgrade-0.7.22-0.7.23.php | 54 +- .../mysql4-upgrade-0.7.23-0.7.24.php | 60 +- .../mysql4-upgrade-0.7.24-0.7.25.php | 8 +- .../mysql4-upgrade-0.7.25-0.7.26.php | 8 +- .../mysql4-upgrade-0.7.26-0.7.27.php | 10 +- .../mysql4-upgrade-0.7.27-0.7.28.php | 8 +- .../mysql4-upgrade-0.7.28-0.7.29.php | 8 +- .../mysql4-upgrade-0.7.29-0.7.30.php | 78 +- .../mysql4-upgrade-0.7.30-0.7.31.php | 70 +- .../mysql4-upgrade-0.7.31-0.7.32.php | 68 +- .../mysql4-upgrade-0.7.32-0.7.33.php | 8 +- .../mysql4-upgrade-0.7.33-0.7.34.php | 10 +- .../mysql4-upgrade-0.7.34-0.7.35.php | 10 +- .../mysql4-upgrade-0.7.35-0.7.36.php | 10 +- .../mysql4-upgrade-0.7.36-0.7.37.php | 94 +- .../mysql4-upgrade-0.7.37-0.7.38.php | 10 +- .../mysql4-upgrade-0.7.38-0.7.39.php | 10 +- .../mysql4-upgrade-0.7.39-0.7.40.php | 10 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 24 +- .../mysql4-upgrade-0.7.40-0.7.41.php | 8 +- .../mysql4-upgrade-0.7.41-0.7.42.php | 10 +- .../mysql4-upgrade-0.7.42-0.7.43.php | 8 +- .../mysql4-upgrade-0.7.43-0.7.44.php | 10 +- .../mysql4-upgrade-0.7.44-0.7.45.php | 10 +- .../mysql4-upgrade-0.7.45-0.7.46.php | 10 +- .../mysql4-upgrade-0.7.46-0.7.47.php | 14 +- .../mysql4-upgrade-0.7.47-0.7.48.php | 8 +- .../mysql4-upgrade-0.7.48-0.7.49.php | 8 +- .../mysql4-upgrade-0.7.49-0.7.50.php | 8 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 8 +- .../mysql4-upgrade-0.7.50-0.7.51.php | 10 +- .../mysql4-upgrade-0.7.51-0.7.52.php | 10 +- .../mysql4-upgrade-0.7.52-0.7.53.php | 10 +- .../mysql4-upgrade-0.7.53-0.7.54.php | 10 +- .../mysql4-upgrade-0.7.54-0.7.55.php | 10 +- .../mysql4-upgrade-0.7.55-0.7.56.php | 54 +- .../mysql4-upgrade-0.7.56-0.7.57.php | 8 +- .../mysql4-upgrade-0.7.57-0.7.58.php | 8 +- .../mysql4-upgrade-0.7.58-0.7.59.php | 8 +- .../mysql4-upgrade-0.7.59-0.7.60.php | 8 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 8 +- .../mysql4-upgrade-0.7.60-0.7.61.php | 8 +- .../mysql4-upgrade-0.7.61-0.7.62.php | 8 +- .../mysql4-upgrade-0.7.62-0.7.63.php | 8 +- .../mysql4-upgrade-0.7.63-0.7.64.php | 8 +- .../mysql4-upgrade-0.7.64-0.7.65.php | 52 +- .../mysql4-upgrade-0.7.65-0.7.66.php | 10 +- .../mysql4-upgrade-0.7.66-0.7.67.php | 8 +- .../mysql4-upgrade-0.7.67-0.7.68.php | 8 +- .../mysql4-upgrade-0.7.68-0.7.69.php | 8 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 8 +- .../mysql4-upgrade-0.7.8-0.7.9.php | 8 +- .../Mage/CatalogIndex/Model/Aggregation.php | 12 +- .../Mage/CatalogIndex/Model/Attribute.php | 10 +- .../CatalogIndex/Model/Catalog/Index/Flag.php | 10 +- .../Model/Catalog/Index/Kill/Flag.php | 16 +- .../Mage/CatalogIndex/Model/Data/Abstract.php | 8 +- .../CatalogIndex/Model/Data/Configurable.php | 10 +- .../Mage/CatalogIndex/Model/Data/Grouped.php | 10 +- .../Mage/CatalogIndex/Model/Data/Simple.php | 10 +- .../Mage/CatalogIndex/Model/Data/Virtual.php | 10 +- .../core/Mage/CatalogIndex/Model/Indexer.php | 10 +- .../CatalogIndex/Model/Indexer/Abstract.php | 10 +- .../Mage/CatalogIndex/Model/Indexer/Eav.php | 10 +- .../CatalogIndex/Model/Indexer/Interface.php | 10 +- .../Model/Indexer/Minimalprice.php | 244 +-- .../Mage/CatalogIndex/Model/Indexer/Price.php | 10 +- .../CatalogIndex/Model/Indexer/Tierprice.php | 10 +- .../CatalogIndex/Model/Mysql4/Abstract.php | 10 +- .../CatalogIndex/Model/Mysql4/Aggregation.php | 10 +- .../CatalogIndex/Model/Mysql4/Attribute.php | 10 +- .../Model/Mysql4/Data/Abstract.php | 10 +- .../Model/Mysql4/Data/Configurable.php | 8 +- .../Model/Mysql4/Data/Grouped.php | 8 +- .../CatalogIndex/Model/Mysql4/Indexer.php | 12 +- .../Model/Mysql4/Indexer/Abstract.php | 10 +- .../CatalogIndex/Model/Mysql4/Indexer/Eav.php | 10 +- .../Model/Mysql4/Indexer/Minimalprice.php | 10 +- .../Model/Mysql4/Indexer/Price.php | 10 +- .../Mage/CatalogIndex/Model/Mysql4/Price.php | 8 +- .../CatalogIndex/Model/Mysql4/Retreiver.php | 10 +- .../Mage/CatalogIndex/Model/Mysql4/Setup.php | 16 +- .../core/Mage/CatalogIndex/Model/Observer.php | 12 +- .../core/Mage/CatalogIndex/Model/Price.php | 10 +- .../Mage/CatalogIndex/Model/Retreiver.php | 10 +- .../core/Mage/CatalogIndex/etc/config.xml | 8 +- .../mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 8 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 8 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 10 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 8 +- .../mysql4-upgrade-0.7.7-0.7.8.php | 8 +- .../mysql4-upgrade-0.7.8-0.7.9.php | 8 +- .../mysql4-upgrade-0.7.9-0.7.10.php | 8 +- .../Mage/CatalogInventory/Helper/Data.php | 8 +- .../CatalogInventory/Model/Mysql4/Stock.php | 10 +- .../Model/Mysql4/Stock/Item.php | 10 +- .../Model/Mysql4/Stock/Item/Collection.php | 276 ++-- .../Model/Mysql4/Stock/Status.php | 22 +- .../Mage/CatalogInventory/Model/Observer.php | 8 +- .../Model/Source/Backorders.php | 10 +- .../CatalogInventory/Model/Source/Stock.php | 110 +- .../Mage/CatalogInventory/Model/Stock.php | 8 +- .../CatalogInventory/Model/Stock/Item.php | 8 +- .../CatalogInventory/Model/Stock/Item/Api.php | 10 +- .../Model/Stock/Item/Api/V2.php | 10 +- .../CatalogInventory/Model/Stock/Status.php | 14 +- .../core/Mage/CatalogInventory/etc/api.xml | 6 +- .../core/Mage/CatalogInventory/etc/config.xml | 8 +- .../core/Mage/CatalogInventory/etc/system.xml | 10 +- .../mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 10 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 10 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 10 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 2 +- .../core/Mage/CatalogRule/Helper/Data.php | 8 +- .../Mage/CatalogRule/Model/Mysql4/Rule.php | 49 +- .../Model/Mysql4/Rule/Collection.php | 10 +- .../Model/Mysql4/Rule/Product/Price.php | 8 +- .../Mysql4/Rule/Product/Price/Collection.php | 10 +- .../core/Mage/CatalogRule/Model/Observer.php | 10 +- app/code/core/Mage/CatalogRule/Model/Rule.php | 10 +- .../Model/Rule/Action/Collection.php | 8 +- .../CatalogRule/Model/Rule/Action/Product.php | 10 +- .../Model/Rule/Condition/Combine.php | 8 +- .../Model/Rule/Condition/Product.php | 10 +- app/code/core/Mage/CatalogRule/etc/config.xml | 11 +- .../mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 10 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 8 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 8 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 10 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 8 +- .../CatalogSearch/Block/Advanced/Form.php | 12 +- .../CatalogSearch/Block/Advanced/Result.php | 8 +- .../Mage/CatalogSearch/Block/Autocomplete.php | 10 +- .../core/Mage/CatalogSearch/Block/Layer.php | 10 +- .../core/Mage/CatalogSearch/Block/Result.php | 8 +- .../core/Mage/CatalogSearch/Block/Term.php | 28 +- .../core/Mage/CatalogSearch/Helper/Data.php | 14 +- .../Mage/CatalogSearch/Model/Advanced.php | 8 +- .../Mage/CatalogSearch/Model/Fulltext.php | 10 +- .../CatalogSearch/Model/Fulltext/Observer.php | 8 +- .../core/Mage/CatalogSearch/Model/Layer.php | 12 +- .../Model/Mysql4/Advanced/Collection.php | 10 +- .../CatalogSearch/Model/Mysql4/Fulltext.php | 8 +- .../Model/Mysql4/Fulltext/Collection.php | 8 +- .../Mage/CatalogSearch/Model/Mysql4/Query.php | 22 +- .../Model/Mysql4/Query/Collection.php | 8 +- .../Model/Mysql4/Search/Collection.php | 8 +- .../core/Mage/CatalogSearch/Model/Query.php | 8 +- .../core/Mage/CatalogSearch/Model/Session.php | 8 +- .../controllers/AdvancedController.php | 8 +- .../controllers/AjaxController.php | 8 +- .../controllers/ResultController.php | 8 +- .../controllers/TermController.php | 22 +- .../core/Mage/CatalogSearch/etc/config.xml | 10 +- .../core/Mage/CatalogSearch/etc/system.xml | 10 +- .../mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 8 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 62 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 150 +- .../core/Mage/Checkout/Block/Agreements.php | 27 +- app/code/core/Mage/Checkout/Block/Cart.php | 8 +- .../Mage/Checkout/Block/Cart/Abstract.php | 4 +- .../core/Mage/Checkout/Block/Cart/Coupon.php | 10 +- .../Mage/Checkout/Block/Cart/Crosssell.php | 8 +- .../Checkout/Block/Cart/Item/Renderer.php | 2 +- .../Block/Cart/Item/Renderer/Configurable.php | 4 +- .../Block/Cart/Item/Renderer/Grouped.php | 2 +- .../Mage/Checkout/Block/Cart/Shipping.php | 10 +- .../core/Mage/Checkout/Block/Cart/Sidebar.php | 65 +- .../core/Mage/Checkout/Block/Cart/Totals.php | 10 +- app/code/core/Mage/Checkout/Block/Links.php | 2 +- .../Checkout/Block/Multishipping/Abstract.php | 8 +- .../Block/Multishipping/Address/Select.php | 8 +- .../Block/Multishipping/Addresses.php | 8 +- .../Checkout/Block/Multishipping/Billing.php | 10 +- .../Block/Multishipping/Billing/Items.php | 10 +- .../Checkout/Block/Multishipping/Link.php | 8 +- .../Checkout/Block/Multishipping/Overview.php | 8 +- .../Block/Multishipping/Payment/Info.php | 10 +- .../Checkout/Block/Multishipping/Shipping.php | 8 +- .../Checkout/Block/Multishipping/State.php | 8 +- .../Checkout/Block/Multishipping/Success.php | 8 +- app/code/core/Mage/Checkout/Block/Onepage.php | 10 +- .../Mage/Checkout/Block/Onepage/Abstract.php | 8 +- .../Mage/Checkout/Block/Onepage/Billing.php | 10 +- .../Mage/Checkout/Block/Onepage/Failure.php | 10 +- .../core/Mage/Checkout/Block/Onepage/Link.php | 10 +- .../Mage/Checkout/Block/Onepage/Login.php | 10 +- .../Mage/Checkout/Block/Onepage/Payment.php | 10 +- .../Checkout/Block/Onepage/Payment/Info.php | 10 +- .../Block/Onepage/Payment/Methods.php | 8 +- .../Mage/Checkout/Block/Onepage/Progress.php | 10 +- .../Mage/Checkout/Block/Onepage/Review.php | 10 +- .../Checkout/Block/Onepage/Review/Info.php | 6 +- .../Mage/Checkout/Block/Onepage/Shipping.php | 10 +- .../Block/Onepage/Shipping/Method.php | 10 +- .../Onepage/Shipping/Method/Additional.php | 8 +- .../Onepage/Shipping/Method/Available.php | 14 +- .../Mage/Checkout/Block/Onepage/Success.php | 10 +- app/code/core/Mage/Checkout/Block/Success.php | 16 +- .../Mage/Checkout/Block/Total/Default.php | 10 +- .../core/Mage/Checkout/Block/Total/Tax.php | 10 +- .../core/Mage/Checkout/Controller/Action.php | 8 +- app/code/core/Mage/Checkout/Exception.php | 10 +- app/code/core/Mage/Checkout/Helper/Cart.php | 8 +- app/code/core/Mage/Checkout/Helper/Data.php | 12 +- app/code/core/Mage/Checkout/Helper/Url.php | 8 +- .../core/Mage/Checkout/Model/Agreement.php | 10 +- app/code/core/Mage/Checkout/Model/Cart.php | 8 +- .../Model/Config/Source/Cart/Summary.php | 70 +- .../Mage/Checkout/Model/Mysql4/Agreement.php | 8 +- .../Model/Mysql4/Agreement/Collection.php | 8 +- .../core/Mage/Checkout/Model/Mysql4/Cart.php | 8 +- .../core/Mage/Checkout/Model/Observer.php | 8 +- app/code/core/Mage/Checkout/Model/Session.php | 28 +- .../Mage/Checkout/Model/Type/Abstract.php | 8 +- .../Checkout/Model/Type/Multishipping.php | 238 ++- .../Model/Type/Multishipping/State.php | 8 +- .../core/Mage/Checkout/Model/Type/Onepage.php | 76 +- .../Mage/Checkout/Model/Type/Standard.php | 8 +- .../Checkout/controllers/CartController.php | 10 +- .../Checkout/controllers/IndexController.php | 10 +- .../Multishipping/AddressController.php | 8 +- .../controllers/MultishippingController.php | 8 +- .../controllers/OnepageController.php | 8 +- app/code/core/Mage/Checkout/etc/config.xml | 8 +- app/code/core/Mage/Checkout/etc/system.xml | 10 +- .../checkout_setup/mysql4-install-0.9.1.php | 8 +- .../mysql4-upgrade-0.9.0-0.9.1.php | 8 +- .../mysql4-upgrade-0.9.1-0.9.2.php | 8 +- .../mysql4-upgrade-0.9.2-0.9.3.php | 8 +- app/code/core/Mage/Cms/Block/Block.php | 8 +- app/code/core/Mage/Cms/Block/Page.php | 8 +- app/code/core/Mage/Cms/Helper/Data.php | 8 +- app/code/core/Mage/Cms/Helper/Page.php | 10 +- app/code/core/Mage/Cms/Model/Block.php | 8 +- app/code/core/Mage/Cms/Model/Mysql4/Block.php | 8 +- .../Cms/Model/Mysql4/Block/Collection.php | 8 +- app/code/core/Mage/Cms/Model/Mysql4/Page.php | 12 +- .../Mage/Cms/Model/Mysql4/Page/Collection.php | 8 +- app/code/core/Mage/Cms/Model/Observer.php | 23 +- .../Mage/Cms/controllers/IndexController.php | 8 +- .../Mage/Cms/controllers/PageController.php | 8 +- app/code/core/Mage/Cms/etc/config.xml | 20 +- app/code/core/Mage/Cms/etc/system.xml | 10 +- .../sql/cms_setup/mysql4-install-0.7.0.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.0-0.7.1.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.1-0.7.2.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.2-0.7.3.php | 2 +- .../cms_setup/mysql4-upgrade-0.7.4-0.7.5.php | 4 +- .../cms_setup/mysql4-upgrade-0.7.5-0.7.6.php | 4 +- .../cms_setup/mysql4-upgrade-0.7.7-0.7.8.php | 8 +- app/code/core/Mage/Compiler/Block/Process.php | 8 +- app/code/core/Mage/Compiler/Helper/Data.php | 72 +- app/code/core/Mage/Compiler/Model/Process.php | 10 +- .../controllers/ProcessController.php | 10 +- .../core/Mage/Compiler/etc/compilation.xml | 6 +- app/code/core/Mage/Compiler/etc/config.xml | 172 +- app/code/core/Mage/Contacts/Helper/Data.php | 8 +- .../Contacts/controllers/IndexController.php | 8 +- app/code/core/Mage/Contacts/etc/config.xml | 8 +- app/code/core/Mage/Contacts/etc/system.xml | 8 +- .../contacts_setup/mysql4-install-0.7.1.php | 8 +- .../contacts_setup/mysql4-install-0.8.0.php | 10 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- app/code/core/Mage/Core/Block/Abstract.php | 8 +- app/code/core/Mage/Core/Block/Flush.php | 8 +- .../core/Mage/Core/Block/Html/Calendar.php | 8 +- app/code/core/Mage/Core/Block/Html/Date.php | 8 +- app/code/core/Mage/Core/Block/Html/Select.php | 8 +- app/code/core/Mage/Core/Block/Messages.php | 8 +- app/code/core/Mage/Core/Block/Profiler.php | 20 +- app/code/core/Mage/Core/Block/Saver.php | 8 +- .../core/Mage/Core/Block/Store/Switcher.php | 8 +- app/code/core/Mage/Core/Block/Template.php | 8 +- .../core/Mage/Core/Block/Template/Facade.php | 10 +- .../core/Mage/Core/Block/Template/Smarty.php | 10 +- .../core/Mage/Core/Block/Template/Zend.php | 8 +- app/code/core/Mage/Core/Block/Text.php | 8 +- app/code/core/Mage/Core/Block/Text/List.php | 34 +- .../core/Mage/Core/Block/Text/List/Item.php | 8 +- .../core/Mage/Core/Block/Text/List/Link.php | 8 +- app/code/core/Mage/Core/Block/Text/Tag.php | 8 +- .../core/Mage/Core/Block/Text/Tag/Css.php | 8 +- .../Mage/Core/Block/Text/Tag/Css/Admin.php | 8 +- .../core/Mage/Core/Block/Text/Tag/Debug.php | 8 +- app/code/core/Mage/Core/Block/Text/Tag/Js.php | 8 +- .../core/Mage/Core/Block/Text/Tag/Meta.php | 10 +- .../Mage/Core/Controller/Front/Action.php | 8 +- .../Mage/Core/Controller/Front/Router.php | 10 +- .../Mage/Core/Controller/Request/Http.php | 10 +- .../Mage/Core/Controller/Response/Http.php | 10 +- .../Mage/Core/Controller/Varien/Action.php | 8 +- .../Mage/Core/Controller/Varien/Exception.php | 250 +-- .../Mage/Core/Controller/Varien/Front.php | 10 +- .../Controller/Varien/Router/Abstract.php | 10 +- .../Core/Controller/Varien/Router/Admin.php | 10 +- .../Core/Controller/Varien/Router/Default.php | 10 +- .../Controller/Varien/Router/Standard.php | 10 +- app/code/core/Mage/Core/Exception.php | 10 +- app/code/core/Mage/Core/Helper/Abstract.php | 12 +- app/code/core/Mage/Core/Helper/Data.php | 18 +- app/code/core/Mage/Core/Helper/Http.php | 2 +- app/code/core/Mage/Core/Helper/Js.php | 130 +- app/code/core/Mage/Core/Helper/String.php | 8 +- app/code/core/Mage/Core/Helper/Url.php | 2 +- app/code/core/Mage/Core/Model/Abstract.php | 8 +- app/code/core/Mage/Core/Model/App.php | 4 +- app/code/core/Mage/Core/Model/App/Area.php | 8 +- app/code/core/Mage/Core/Model/Config.php | 8 +- app/code/core/Mage/Core/Model/Config/Base.php | 10 +- app/code/core/Mage/Core/Model/Config/Data.php | 8 +- .../core/Mage/Core/Model/Config/Element.php | 8 +- .../core/Mage/Core/Model/Config/Options.php | 8 +- .../core/Mage/Core/Model/Config/System.php | 10 +- app/code/core/Mage/Core/Model/Convert.php | 11 +- .../Model/Convert/Adapter/Interactive.php | 2 +- .../core/Mage/Core/Model/Convert/History.php | 10 +- .../core/Mage/Core/Model/Convert/Profile.php | 8 +- app/code/core/Mage/Core/Model/Cookie.php | 8 +- app/code/core/Mage/Core/Model/Date.php | 10 +- app/code/core/Mage/Core/Model/Design.php | 16 +- .../core/Mage/Core/Model/Design/Package.php | 666 ++++---- .../Mage/Core/Model/Design/Source/Apply.php | 10 +- .../Mage/Core/Model/Design/Source/Design.php | 10 +- app/code/core/Mage/Core/Model/Email.php | 12 +- .../core/Mage/Core/Model/Email/Template.php | 10 +- .../Mage/Core/Model/Email/Template/Filter.php | 43 +- .../core/Mage/Core/Model/Email/Transport.php | 14 +- app/code/core/Mage/Core/Model/Encryption.php | 8 +- app/code/core/Mage/Core/Model/Flag.php | 10 +- app/code/core/Mage/Core/Model/Language.php | 10 +- app/code/core/Mage/Core/Model/Layout.php | 8 +- app/code/core/Mage/Core/Model/Layout/Data.php | 10 +- .../core/Mage/Core/Model/Layout/Element.php | 10 +- .../core/Mage/Core/Model/Layout/Update.php | 8 +- app/code/core/Mage/Core/Model/Locale.php | 12 +- app/code/core/Mage/Core/Model/Message.php | 10 +- .../core/Mage/Core/Model/Message/Abstract.php | 8 +- .../Mage/Core/Model/Message/Collection.php | 10 +- .../core/Mage/Core/Model/Message/Error.php | 8 +- .../core/Mage/Core/Model/Message/Notice.php | 10 +- .../core/Mage/Core/Model/Message/Success.php | 10 +- .../core/Mage/Core/Model/Message/Warning.php | 10 +- .../core/Mage/Core/Model/Mysql4/Abstract.php | 8 +- .../Core/Model/Mysql4/Collection/Abstract.php | 12 +- .../core/Mage/Core/Model/Mysql4/Config.php | 10 +- .../Mage/Core/Model/Mysql4/Config/Data.php | 10 +- .../Model/Mysql4/Config/Data/Collection.php | 10 +- .../Core/Model/Mysql4/Convert/History.php | 10 +- .../Mysql4/Convert/History/Collection.php | 10 +- .../Core/Model/Mysql4/Convert/Profile.php | 10 +- .../Mysql4/Convert/Profile/Collection.php | 10 +- .../core/Mage/Core/Model/Mysql4/Design.php | 8 +- .../Core/Model/Mysql4/Design/Collection.php | 26 +- .../Mysql4/Design/Package/Collection.php | 10 +- .../Model/Mysql4/Design/Theme/Collection.php | 10 +- .../Mage/Core/Model/Mysql4/Email/Template.php | 26 +- .../Mysql4/Email/Template/Collection.php | 10 +- app/code/core/Mage/Core/Model/Mysql4/Flag.php | 10 +- .../core/Mage/Core/Model/Mysql4/History.php | 10 +- .../core/Mage/Core/Model/Mysql4/Language.php | 10 +- .../Core/Model/Mysql4/Language/Collection.php | 10 +- .../core/Mage/Core/Model/Mysql4/Layout.php | 13 +- .../core/Mage/Core/Model/Mysql4/Resource.php | 16 +- .../core/Mage/Core/Model/Mysql4/Session.php | 8 +- .../core/Mage/Core/Model/Mysql4/Store.php | 10 +- .../Core/Model/Mysql4/Store/Collection.php | 10 +- .../Mage/Core/Model/Mysql4/Store/Group.php | 10 +- .../Model/Mysql4/Store/Group/Collection.php | 8 +- .../core/Mage/Core/Model/Mysql4/Translate.php | 8 +- .../Core/Model/Mysql4/Translate/String.php | 10 +- .../Mage/Core/Model/Mysql4/Url/Rewrite.php | 8 +- .../Model/Mysql4/Url/Rewrite/Collection.php | 10 +- .../core/Mage/Core/Model/Mysql4/Website.php | 10 +- .../Core/Model/Mysql4/Website/Collection.php | 8 +- app/code/core/Mage/Core/Model/Resource.php | 42 +- .../Mage/Core/Model/Resource/Abstract.php | 14 +- .../Core/Model/Resource/Entity/Abstract.php | 20 +- .../Mage/Core/Model/Resource/Entity/Table.php | 10 +- .../Mage/Core/Model/Resource/Iterator.php | 10 +- .../core/Mage/Core/Model/Resource/Setup.php | 13 +- .../Mage/Core/Model/Resource/Transaction.php | 8 +- .../Core/Model/Resource/Type/Abstract.php | 16 +- .../core/Mage/Core/Model/Resource/Type/Db.php | 10 +- .../Core/Model/Resource/Type/Db/Mysqli.php | 20 +- .../Model/Resource/Type/Db/Mysqli/Setup.php | 20 +- .../Core/Model/Resource/Type/Db/Pdo/Mysql.php | 12 +- app/code/core/Mage/Core/Model/Session.php | 8 +- .../core/Mage/Core/Model/Session/Abstract.php | 22 +- .../Core/Model/Session/Abstract/Varien.php | 8 +- .../Mage/Core/Model/Session/Abstract/Zend.php | 30 +- .../Mage/Core/Model/Session/Exception.php | 76 +- app/code/core/Mage/Core/Model/Store.php | 32 +- .../core/Mage/Core/Model/Store/Exception.php | 8 +- app/code/core/Mage/Core/Model/Store/Group.php | 8 +- app/code/core/Mage/Core/Model/Translate.php | 8 +- .../Mage/Core/Model/Translate/Abstract.php | 8 +- .../core/Mage/Core/Model/Translate/Expr.php | 8 +- .../core/Mage/Core/Model/Translate/Inline.php | 8 +- .../core/Mage/Core/Model/Translate/String.php | 8 +- app/code/core/Mage/Core/Model/Url.php | 10 +- app/code/core/Mage/Core/Model/Url/Rewrite.php | 14 +- app/code/core/Mage/Core/Model/Website.php | 8 +- .../Mage/Core/controllers/AjaxController.php | 48 +- .../Mage/Core/controllers/IndexController.php | 8 +- app/code/core/Mage/Core/etc/config.xml | 13 +- app/code/core/Mage/Core/etc/system.xml | 24 +- app/code/core/Mage/Core/functions.php | 8 +- .../sql/core_setup/mysql4-install-0.7.0.php | 8 +- .../sql/core_setup/mysql4-install-0.8.0.php | 10 +- .../mysql4-upgrade-0.6.26-0.7.0.php | 8 +- .../core_setup/mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../core_setup/mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../core_setup/mysql4-upgrade-0.7.3-0.7.4.php | 8 +- .../core_setup/mysql4-upgrade-0.7.4-0.7.5.php | 8 +- .../core_setup/mysql4-upgrade-0.7.5-0.7.6.php | 8 +- .../core_setup/mysql4-upgrade-0.7.6-0.7.7.php | 8 +- .../core_setup/mysql4-upgrade-0.7.7-0.7.8.php | 8 +- .../core_setup/mysql4-upgrade-0.7.8-0.7.9.php | 8 +- .../core_setup/mysql4-upgrade-0.8.0-0.8.1.php | 70 +- .../core_setup/mysql4-upgrade-0.8.1-0.8.2.php | 68 +- .../mysql4-upgrade-0.8.10-0.8.11.php | 10 +- .../mysql4-upgrade-0.8.11-0.8.12.php | 10 +- .../mysql4-upgrade-0.8.12-0.8.13.php | 8 +- .../core_setup/mysql4-upgrade-0.8.2-0.8.3.php | 10 +- .../core_setup/mysql4-upgrade-0.8.3-0.8.4.php | 10 +- .../core_setup/mysql4-upgrade-0.8.4-0.8.5.php | 8 +- .../core_setup/mysql4-upgrade-0.8.5-0.8.6.php | 10 +- .../core_setup/mysql4-upgrade-0.8.6-0.8.7.php | 8 +- .../core_setup/mysql4-upgrade-0.8.7-0.8.8.php | 8 +- .../core_setup/mysql4-upgrade-0.8.8-0.8.9.php | 8 +- .../mysql4-upgrade-0.8.9-0.8.10.php | 8 +- app/code/core/Mage/Cron/Exception.php | 10 +- app/code/core/Mage/Cron/Helper/Data.php | 8 +- .../core/Mage/Cron/Model/Mysql4/Schedule.php | 10 +- .../Cron/Model/Mysql4/Schedule/Collection.php | 10 +- app/code/core/Mage/Cron/Model/Observer.php | 8 +- app/code/core/Mage/Cron/Model/Schedule.php | 10 +- app/code/core/Mage/Cron/etc/config.xml | 8 +- app/code/core/Mage/Cron/etc/system.xml | 10 +- .../sql/cron_setup/mysql4-install-0.7.0.php | 8 +- .../cron_setup/mysql4-upgrade-0.7.0-0.7.1.php | 8 +- app/code/core/Mage/Customer/Block/Account.php | 10 +- .../Mage/Customer/Block/Account/Dashboard.php | 30 +- .../Block/Account/Dashboard/Address.php | 22 +- .../Block/Account/Dashboard/Block.php | 62 +- .../Block/Account/Dashboard/Hello.php | 72 +- .../Customer/Block/Account/Dashboard/Info.php | 22 +- .../Block/Account/Dashboard/Newsletter.php | 10 +- .../Block/Account/Dashboard/Sidebar.php | 134 +- .../Customer/Block/Account/Forgotpassword.php | 10 +- .../Customer/Block/Account/Navigation.php | 8 +- .../core/Mage/Customer/Block/Address/Book.php | 8 +- .../core/Mage/Customer/Block/Address/Edit.php | 8 +- .../Block/Address/Renderer/Default.php | 10 +- .../Block/Address/Renderer/Interface.php | 8 +- .../core/Mage/Customer/Block/Form/Edit.php | 8 +- .../core/Mage/Customer/Block/Form/Login.php | 8 +- .../Mage/Customer/Block/Form/Register.php | 10 +- .../core/Mage/Customer/Block/Newsletter.php | 8 +- .../Mage/Customer/Block/Widget/Abstract.php | 10 +- .../core/Mage/Customer/Block/Widget/Dob.php | 51 +- .../core/Mage/Customer/Block/Widget/Name.php | 10 +- .../Mage/Customer/Block/Widget/Taxvat.php | 8 +- app/code/core/Mage/Customer/Exception.php | 10 +- .../core/Mage/Customer/Helper/Address.php | 8 +- app/code/core/Mage/Customer/Helper/Data.php | 8 +- app/code/core/Mage/Customer/Model/Address.php | 10 +- .../Mage/Customer/Model/Address/Abstract.php | 66 +- .../core/Mage/Customer/Model/Address/Api.php | 10 +- .../Mage/Customer/Model/Address/Api/V2.php | 10 +- .../Mage/Customer/Model/Address/Config.php | 8 +- .../core/Mage/Customer/Model/Api/Resource.php | 10 +- .../core/Mage/Customer/Model/Config/Share.php | 8 +- .../Model/Convert/Adapter/Customer.php | 11 +- .../Model/Convert/Parser/Customer.php | 11 +- .../core/Mage/Customer/Model/Customer.php | 29 +- .../core/Mage/Customer/Model/Customer/Api.php | 10 +- .../Mage/Customer/Model/Customer/Api/V2.php | 10 +- .../Customer/Attribute/Backend/Billing.php | 8 +- .../Customer/Attribute/Backend/Password.php | 10 +- .../Customer/Attribute/Backend/Shipping.php | 8 +- .../Customer/Attribute/Backend/Store.php | 8 +- .../Customer/Attribute/Backend/Website.php | 8 +- .../Model/Customer/Attribute/Source/Group.php | 8 +- .../Model/Customer/Attribute/Source/Store.php | 10 +- .../Customer/Attribute/Source/Website.php | 10 +- .../Mage/Customer/Model/Entity/Address.php | 10 +- .../Address/Attribute/Backend/Region.php | 8 +- .../Address/Attribute/Backend/Street.php | 10 +- .../Address/Attribute/Source/Country.php | 10 +- .../Address/Attribute/Source/Region.php | 8 +- .../Model/Entity/Address/Collection.php | 10 +- .../Mage/Customer/Model/Entity/Customer.php | 17 +- .../Model/Entity/Customer/Collection.php | 8 +- .../core/Mage/Customer/Model/Entity/Group.php | 12 +- .../Model/Entity/Group/Collection.php | 10 +- .../core/Mage/Customer/Model/Entity/Setup.php | 19 +- .../Model/Entity/Wishlist/Collection.php | 10 +- app/code/core/Mage/Customer/Model/Group.php | 8 +- .../core/Mage/Customer/Model/Group/Api.php | 10 +- .../core/Mage/Customer/Model/Group/Api/V2.php | 10 +- .../core/Mage/Customer/Model/Observer.php | 12 +- app/code/core/Mage/Customer/Model/Session.php | 8 +- .../controllers/AccountController.php | 49 +- .../controllers/AddressController.php | 10 +- .../Customer/controllers/ReviewController.php | 8 +- app/code/core/Mage/Customer/etc/api.xml | 6 +- app/code/core/Mage/Customer/etc/config.xml | 12 +- app/code/core/Mage/Customer/etc/system.xml | 8 +- .../customer_setup/mysql4-install-0.7.0.php | 8 +- .../customer_setup/mysql4-install-0.8.0.php | 10 +- .../mysql4-upgrade-0.6.1-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 10 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 10 +- .../mysql4-upgrade-0.8.0-0.8.1.php | 54 +- .../mysql4-upgrade-0.8.10-0.8.11.php | 8 +- .../mysql4-upgrade-0.8.2-0.8.3.php | 8 +- .../mysql4-upgrade-0.8.4-0.8.5.php | 8 +- .../mysql4-upgrade-0.8.5-0.8.6.php | 8 +- .../mysql4-upgrade-0.8.6-0.8.7.php | 8 +- .../mysql4-upgrade-0.8.7-0.8.8.php | 8 +- .../mysql4-upgrade-0.8.8-0.8.9.php | 10 +- .../mysql4-upgrade-0.8.9-0.8.10.php | 10 +- app/code/core/Mage/Dataflow/Helper/Data.php | 8 +- app/code/core/Mage/Dataflow/Model/Batch.php | 8 +- .../Mage/Dataflow/Model/Batch/Abstract.php | 10 +- .../core/Mage/Dataflow/Model/Batch/Export.php | 10 +- .../core/Mage/Dataflow/Model/Batch/Import.php | 10 +- .../core/Mage/Dataflow/Model/Batch/Io.php | 10 +- app/code/core/Mage/Dataflow/Model/Convert.php | 8 +- .../Mage/Dataflow/Model/Convert/Action.php | 8 +- .../Model/Convert/Action/Abstract.php | 8 +- .../Model/Convert/Action/Interface.php | 8 +- .../Model/Convert/Adapter/Abstract.php | 8 +- .../Model/Convert/Adapter/Db/Table.php | 8 +- .../Dataflow/Model/Convert/Adapter/Http.php | 8 +- .../Model/Convert/Adapter/Http/Curl.php | 8 +- .../Model/Convert/Adapter/Interface.php | 8 +- .../Dataflow/Model/Convert/Adapter/Io.php | 10 +- .../Dataflow/Model/Convert/Adapter/Soap.php | 8 +- .../Dataflow/Model/Convert/Adapter/Std.php | 8 +- .../Model/Convert/Adapter/Zend/Cache.php | 8 +- .../Model/Convert/Adapter/Zend/Db.php | 8 +- .../Model/Convert/Container/Abstract.php | 12 +- .../Model/Convert/Container/Collection.php | 8 +- .../Model/Convert/Container/Generic.php | 8 +- .../Model/Convert/Container/Interface.php | 8 +- .../Mage/Dataflow/Model/Convert/Exception.php | 8 +- .../Mage/Dataflow/Model/Convert/Iterator.php | 27 +- .../Model/Convert/Iterator/File/Csv.php | 27 +- .../Dataflow/Model/Convert/Iterator/Http.php | 8 +- .../Model/Convert/Iterator/Interface.php | 8 +- .../Model/Convert/Mapper/Abstract.php | 8 +- .../Dataflow/Model/Convert/Mapper/Column.php | 10 +- .../Model/Convert/Mapper/Interface.php | 8 +- .../Model/Convert/Parser/Abstract.php | 10 +- .../Dataflow/Model/Convert/Parser/Csv.php | 8 +- .../Model/Convert/Parser/Interface.php | 8 +- .../Model/Convert/Parser/Serialize.php | 8 +- .../Model/Convert/Parser/Xml/Excel.php | 8 +- .../Mage/Dataflow/Model/Convert/Profile.php | 8 +- .../Model/Convert/Profile/Abstract.php | 10 +- .../Model/Convert/Profile/Collection.php | 8 +- .../Model/Convert/Profile/Interface.php | 8 +- .../Model/Convert/Validator/Abstract.php | 8 +- .../Model/Convert/Validator/Column.php | 8 +- .../Model/Convert/Validator/Dryrun.php | 8 +- .../Model/Convert/Validator/Interface.php | 8 +- app/code/core/Mage/Dataflow/Model/Import.php | 8 +- .../core/Mage/Dataflow/Model/Mysql4/Batch.php | 10 +- .../Dataflow/Model/Mysql4/Batch/Abstract.php | 10 +- .../Model/Mysql4/Batch/Collection.php | 10 +- .../Dataflow/Model/Mysql4/Batch/Export.php | 10 +- .../Dataflow/Model/Mysql4/Batch/Import.php | 10 +- .../Mage/Dataflow/Model/Mysql4/Catalogold.php | 478 +++--- .../Mage/Dataflow/Model/Mysql4/Import.php | 8 +- .../Model/Mysql4/Import/Collection.php | 8 +- .../Mage/Dataflow/Model/Mysql4/Profile.php | 10 +- .../Model/Mysql4/Profile/Collection.php | 10 +- .../Dataflow/Model/Mysql4/Profile/History.php | 10 +- .../Mysql4/Profile/History/Collection.php | 10 +- .../Mage/Dataflow/Model/Mysql4/Session.php | 8 +- app/code/core/Mage/Dataflow/Model/Profile.php | 8 +- .../Mage/Dataflow/Model/Profile/History.php | 10 +- app/code/core/Mage/Dataflow/Model/Session.php | 8 +- .../Dataflow/Model/Session/Adapter/Http.php | 3 +- .../Dataflow/Model/Session/Parser/Csv.php | 4 +- app/code/core/Mage/Dataflow/etc/config.xml | 10 +- .../dataflow_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 27 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 27 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 10 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 10 +- .../Adminhtml/Frontend/Currency/Base.php | 10 +- .../Adminhtml/Frontend/Region/Updater.php | 8 +- .../core/Mage/Directory/Block/Currency.php | 8 +- app/code/core/Mage/Directory/Block/Data.php | 96 +- app/code/core/Mage/Directory/Exception.php | 10 +- app/code/core/Mage/Directory/Helper/Data.php | 72 +- app/code/core/Mage/Directory/Helper/Url.php | 8 +- .../core/Mage/Directory/Model/Country.php | 10 +- .../core/Mage/Directory/Model/Country/Api.php | 10 +- .../Mage/Directory/Model/Country/Api/V2.php | 10 +- .../Mage/Directory/Model/Country/Format.php | 8 +- .../core/Mage/Directory/Model/Currency.php | 14 +- .../Mage/Directory/Model/Currency/Filter.php | 8 +- .../Model/Currency/Import/Abstract.php | 28 +- .../Model/Currency/Import/Webservicex.php | 8 +- .../Mage/Directory/Model/Mysql4/Country.php | 8 +- .../Model/Mysql4/Country/Collection.php | 8 +- .../Directory/Model/Mysql4/Country/Format.php | 8 +- .../Mysql4/Country/Format/Collection.php | 8 +- .../Mage/Directory/Model/Mysql4/Currency.php | 14 +- .../Model/Mysql4/Currency/Collection.php | 8 +- .../Mage/Directory/Model/Mysql4/Region.php | 8 +- .../Model/Mysql4/Region/Collection.php | 8 +- .../core/Mage/Directory/Model/Observer.php | 12 +- app/code/core/Mage/Directory/Model/Region.php | 8 +- .../core/Mage/Directory/Model/Region/Api.php | 10 +- .../Mage/Directory/Model/Region/Api/V2.php | 10 +- .../controllers/CurrencyController.php | 15 +- app/code/core/Mage/Directory/etc/api.xml | 6 +- app/code/core/Mage/Directory/etc/config.xml | 10 +- app/code/core/Mage/Directory/etc/system.xml | 40 +- .../directory_setup/mysql4-install-0.7.0.php | 8 +- .../directory_setup/mysql4-install-0.8.0.php | 10 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.8.0-0.8.1.php | 8 +- .../mysql4-upgrade-0.8.1-0.8.2.php | 8 +- .../mysql4-upgrade-0.8.2-0.8.3.php | 8 +- .../mysql4-upgrade-0.8.3-0.8.4.php | 8 +- .../mysql4-upgrade-0.8.4-0.8.5.php | 8 +- .../Catalog/Product/Edit/Tab/Downloadable.php | 2 +- .../Product/Edit/Tab/Downloadable/Links.php | 2 +- .../Product/Edit/Tab/Downloadable/Samples.php | 2 +- .../Sales/Items/Column/Downloadable/Name.php | 10 +- .../Block/Catalog/Product/Links.php | 2 +- .../Block/Catalog/Product/Samples.php | 2 +- .../Block/Catalog/Product/View/Type.php | 2 +- .../Block/Checkout/Cart/Item/Renderer.php | 4 +- .../Downloadable/Block/Checkout/Success.php | 10 +- .../Block/Customer/Products/List.php | 2 +- .../Sales/Order/Email/Items/Downloadable.php | 10 +- .../Order/Email/Items/Order/Downloadable.php | 10 +- .../Order/Item/Renderer/Downloadable.php | 4 +- .../core/Mage/Downloadable/Helper/Data.php | 2 +- .../Mage/Downloadable/Helper/Download.php | 2 +- .../core/Mage/Downloadable/Helper/File.php | 2 +- .../Model/CatalogIndex/Data/Downloadable.php | 2 +- .../core/Mage/Downloadable/Model/Link.php | 2 +- .../Downloadable/Model/Link/Purchased.php | 4 +- .../Model/Link/Purchased/Item.php | 4 +- .../Mage/Downloadable/Model/Mysql4/Link.php | 8 +- .../Model/Mysql4/Link/Collection.php | 2 +- .../Model/Mysql4/Link/Purchased.php | 10 +- .../Mysql4/Link/Purchased/Collection.php | 4 +- .../Model/Mysql4/Link/Purchased/Item.php | 10 +- .../Mysql4/Link/Purchased/Item/Collection.php | 4 +- .../Mage/Downloadable/Model/Mysql4/Sample.php | 8 +- .../Model/Mysql4/Sample/Collection.php | 2 +- .../core/Mage/Downloadable/Model/Observer.php | 2 +- .../Mage/Downloadable/Model/Product/Price.php | 2 +- .../Mage/Downloadable/Model/Product/Type.php | 9 +- .../Model/Sales/Order/Pdf/Items/Abstract.php | 8 +- .../Sales/Order/Pdf/Items/Creditmemo.php | 8 +- .../Model/Sales/Order/Pdf/Items/Invoice.php | 8 +- .../core/Mage/Downloadable/Model/Sample.php | 2 +- .../Config/Source/Contentdisposition.php | 100 +- .../System/Config/Source/Orderitemstatus.php | 2 +- .../controllers/CustomerController.php | 2 +- .../controllers/DownloadController.php | 2 +- .../controllers/FileController.php | 2 +- .../controllers/Product/EditController.php | 2 +- .../core/Mage/Downloadable/etc/config.xml | 2 +- .../core/Mage/Downloadable/etc/system.xml | 2 +- .../mysql4-install-0.1.0.php | 2 +- .../mysql4-upgrade-0.1.0-0.1.1.php | 2 +- .../mysql4-upgrade-0.1.1-0.1.2.php | 2 +- .../mysql4-upgrade-0.1.10-0.1.11.php | 2 +- .../mysql4-upgrade-0.1.11-0.1.12.php | 2 +- .../mysql4-upgrade-0.1.12-0.1.13.php | 2 +- .../mysql4-upgrade-0.1.13-0.1.14.php | 2 +- .../mysql4-upgrade-0.1.2-0.1.3.php | 2 +- .../mysql4-upgrade-0.1.3-0.1.4.php | 2 +- .../mysql4-upgrade-0.1.4-0.1.5.php | 2 +- .../mysql4-upgrade-0.1.5-0.1.6.php | 2 +- .../mysql4-upgrade-0.1.6-0.1.7.php | 2 +- .../mysql4-upgrade-0.1.7-0.1.8.php | 2 +- .../mysql4-upgrade-0.1.8-0.1.9.php | 2 +- .../mysql4-upgrade-0.1.9-0.1.10.php | 2 +- app/code/core/Mage/Eav/Exception.php | 10 +- app/code/core/Mage/Eav/Helper/Data.php | 8 +- app/code/core/Mage/Eav/Model/Config.php | 15 +- .../Mage/Eav/Model/Convert/Adapter/Entity.php | 8 +- .../Mage/Eav/Model/Convert/Adapter/Grid.php | 10 +- .../Eav/Model/Convert/Parser/Abstract.php | 12 +- app/code/core/Mage/Eav/Model/Entity.php | 8 +- .../core/Mage/Eav/Model/Entity/Abstract.php | 8 +- .../core/Mage/Eav/Model/Entity/Attribute.php | 8 +- .../Eav/Model/Entity/Attribute/Abstract.php | 12 +- .../Entity/Attribute/Backend/Abstract.php | 8 +- .../Model/Entity/Attribute/Backend/Array.php | 8 +- .../Entity/Attribute/Backend/Datetime.php | 8 +- .../Entity/Attribute/Backend/Default.php | 10 +- .../Entity/Attribute/Backend/Increment.php | 10 +- .../Entity/Attribute/Backend/Interface.php | 10 +- .../Model/Entity/Attribute/Backend/Store.php | 10 +- .../Entity/Attribute/Backend/Time/Created.php | 10 +- .../Entity/Attribute/Backend/Time/Updated.php | 10 +- .../Eav/Model/Entity/Attribute/Exception.php | 10 +- .../Entity/Attribute/Frontend/Abstract.php | 8 +- .../Entity/Attribute/Frontend/Datetime.php | 8 +- .../Entity/Attribute/Frontend/Default.php | 10 +- .../Entity/Attribute/Frontend/Interface.php | 10 +- .../Mage/Eav/Model/Entity/Attribute/Group.php | 15 +- .../Eav/Model/Entity/Attribute/Interface.php | 10 +- .../Eav/Model/Entity/Attribute/Option.php | 8 +- .../Mage/Eav/Model/Entity/Attribute/Set.php | 19 +- .../Entity/Attribute/Source/Abstract.php | 10 +- .../Model/Entity/Attribute/Source/Boolean.php | 8 +- .../Model/Entity/Attribute/Source/Config.php | 8 +- .../Entity/Attribute/Source/Interface.php | 10 +- .../Model/Entity/Attribute/Source/Store.php | 8 +- .../Model/Entity/Attribute/Source/Table.php | 10 +- .../core/Mage/Eav/Model/Entity/Collection.php | 74 +- .../Eav/Model/Entity/Collection/Abstract.php | 12 +- .../Eav/Model/Entity/Increment/Abstract.php | 10 +- .../Eav/Model/Entity/Increment/Alphanum.php | 8 +- .../Eav/Model/Entity/Increment/Interface.php | 10 +- .../Eav/Model/Entity/Increment/Numeric.php | 10 +- .../core/Mage/Eav/Model/Entity/Interface.php | 10 +- app/code/core/Mage/Eav/Model/Entity/Setup.php | 92 +- app/code/core/Mage/Eav/Model/Entity/Store.php | 10 +- app/code/core/Mage/Eav/Model/Entity/Type.php | 8 +- .../core/Mage/Eav/Model/Mysql4/Config.php | 18 +- .../Eav/Model/Mysql4/Entity/Attribute.php | 22 +- .../Mysql4/Entity/Attribute/Collection.php | 14 +- .../Model/Mysql4/Entity/Attribute/Group.php | 30 +- .../Entity/Attribute/Group/Collection.php | 10 +- .../Model/Mysql4/Entity/Attribute/Option.php | 8 +- .../Entity/Attribute/Option/Collection.php | 8 +- .../Eav/Model/Mysql4/Entity/Attribute/Set.php | 13 +- .../Entity/Attribute/Set/Collection.php | 10 +- .../Mage/Eav/Model/Mysql4/Entity/Store.php | 10 +- .../Mage/Eav/Model/Mysql4/Entity/Type.php | 8 +- .../Model/Mysql4/Entity/Type/Collection.php | 10 +- app/code/core/Mage/Eav/etc/config.xml | 8 +- .../sql/eav_setup/mysql4-install-0.7.0.php | 8 +- .../eav_setup/mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../eav_setup/mysql4-upgrade-0.7.1-0.7.2.php | 10 +- .../mysql4-upgrade-0.7.10-0.7.11.php | 8 +- .../mysql4-upgrade-0.7.11-0.7.12.php | 10 +- .../mysql4-upgrade-0.7.12-0.7.13.php | 8 +- .../eav_setup/mysql4-upgrade-0.7.2-0.7.3.php | 10 +- .../eav_setup/mysql4-upgrade-0.7.3-0.7.4.php | 10 +- .../eav_setup/mysql4-upgrade-0.7.4-0.7.5.php | 10 +- .../eav_setup/mysql4-upgrade-0.7.5-0.7.6.php | 10 +- .../eav_setup/mysql4-upgrade-0.7.6-0.7.7.php | 10 +- .../eav_setup/mysql4-upgrade-0.7.7-0.7.8.php | 8 +- .../eav_setup/mysql4-upgrade-0.7.8-0.7.9.php | 10 +- .../eav_setup/mysql4-upgrade-0.7.9-0.7.10.php | 8 +- .../Mage/GiftMessage/Block/Message/Form.php | 8 +- .../Mage/GiftMessage/Block/Message/Helper.php | 8 +- .../Mage/GiftMessage/Block/Message/Inline.php | 8 +- .../core/Mage/GiftMessage/Helper/Data.php | 8 +- .../core/Mage/GiftMessage/Helper/Message.php | 8 +- app/code/core/Mage/GiftMessage/Helper/Url.php | 8 +- .../Attribute/Backend/Boolean/Config.php | 8 +- .../Attribute/Source/Boolean/Config.php | 2 +- .../core/Mage/GiftMessage/Model/Message.php | 8 +- .../Mage/GiftMessage/Model/Mysql4/Message.php | 8 +- .../Model/Mysql4/Message/Collection.php | 8 +- .../Mage/GiftMessage/Model/Mysql4/Setup.php | 8 +- .../core/Mage/GiftMessage/Model/Observer.php | 8 +- .../controllers/IndexController.php | 8 +- app/code/core/Mage/GiftMessage/etc/config.xml | 10 +- app/code/core/Mage/GiftMessage/etc/system.xml | 10 +- .../mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.1.3-0.7.0.php | 10 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 10 +- .../core/Mage/GiftRegistry/Helper/Data.php | 1 + .../core/Mage/GiftRegistry/Model/Gift.php | 2 +- .../Mage/GiftRegistry/Model/Mysql4/Gift.php | 2 +- .../Model/Mysql4/Gift/Collection.php | 2 +- .../core/Mage/GiftRegistry/etc/config.xml | 10 +- .../core/Mage/GoogleAnalytics/Block/Ga.php | 8 +- .../core/Mage/GoogleAnalytics/Helper/Data.php | 8 +- .../Mage/GoogleAnalytics/Model/Observer.php | 8 +- .../core/Mage/GoogleAnalytics/etc/config.xml | 10 +- .../core/Mage/GoogleAnalytics/etc/system.xml | 10 +- .../GoogleBase/Block/Adminhtml/Captcha.php | 10 +- .../Mage/GoogleBase/Block/Adminhtml/Items.php | 10 +- .../GoogleBase/Block/Adminhtml/Items/Item.php | 10 +- .../Block/Adminhtml/Items/Product.php | 10 +- .../Block/Adminhtml/Items/Renderer/Id.php | 10 +- .../Block/Adminhtml/Store/Switcher.php | 10 +- .../Mage/GoogleBase/Block/Adminhtml/Types.php | 10 +- .../GoogleBase/Block/Adminhtml/Types/Edit.php | 26 +- .../Block/Adminhtml/Types/Edit/Attributes.php | 10 +- .../Block/Adminhtml/Types/Edit/Form.php | 10 +- .../GoogleBase/Block/Adminhtml/Types/Grid.php | 10 +- .../Adminhtml/Types/Renderer/Country.php | 10 +- app/code/core/Mage/GoogleBase/Helper/Data.php | 10 +- .../core/Mage/GoogleBase/Model/Attribute.php | 10 +- .../core/Mage/GoogleBase/Model/Config.php | 8 +- app/code/core/Mage/GoogleBase/Model/Item.php | 10 +- .../GoogleBase/Model/Mysql4/Attribute.php | 10 +- .../Model/Mysql4/Attribute/Collection.php | 74 +- .../Mage/GoogleBase/Model/Mysql4/Item.php | 10 +- .../Model/Mysql4/Item/Collection.php | 20 +- .../Mage/GoogleBase/Model/Mysql4/Type.php | 10 +- .../Model/Mysql4/Type/Collection.php | 80 +- .../core/Mage/GoogleBase/Model/Observer.php | 10 +- .../core/Mage/GoogleBase/Model/Service.php | 10 +- .../Mage/GoogleBase/Model/Service/Feed.php | 10 +- .../Mage/GoogleBase/Model/Service/Item.php | 14 +- .../GoogleBase/Model/Source/Accounttype.php | 10 +- .../Mage/GoogleBase/Model/Source/Authtype.php | 10 +- .../Mage/GoogleBase/Model/Source/Country.php | 10 +- .../Mage/GoogleBase/Model/Source/Statuses.php | 10 +- app/code/core/Mage/GoogleBase/Model/Type.php | 10 +- .../controllers/ItemsController.php | 8 +- .../controllers/SelectionController.php | 10 +- .../controllers/TypesController.php | 10 +- app/code/core/Mage/GoogleBase/etc/config.xml | 8 +- app/code/core/Mage/GoogleBase/etc/system.xml | 10 +- .../googlebase_setup/mysql4-install-0.1.0.php | 10 +- .../mysql4-upgrade-0.1.0-0.1.1.php | 8 +- .../Shipping/Applicable/Countries.php | 12 +- .../Block/Adminhtml/Shipping/Merchant.php | 14 +- .../core/Mage/GoogleCheckout/Block/Form.php | 8 +- .../core/Mage/GoogleCheckout/Block/Link.php | 10 +- .../Mage/GoogleCheckout/Block/Redirect.php | 10 +- .../core/Mage/GoogleCheckout/Exception.php | 10 +- .../core/Mage/GoogleCheckout/Helper/Data.php | 8 +- .../core/Mage/GoogleCheckout/Model/Api.php | 10 +- .../Mage/GoogleCheckout/Model/Api/Debug.php | 18 +- .../GoogleCheckout/Model/Api/Xml/Abstract.php | 8 +- .../Model/Api/Xml/Calculate.php | 10 +- .../GoogleCheckout/Model/Api/Xml/Callback.php | 10 +- .../GoogleCheckout/Model/Api/Xml/Checkout.php | 8 +- .../GoogleCheckout/Model/Api/Xml/Order.php | 10 +- .../GoogleCheckout/Model/Mysql4/Api/Debug.php | 18 +- .../Model/Mysql4/Api/Debug/Collection.php | 18 +- .../GoogleCheckout/Model/Mysql4/Setup.php | 10 +- .../Mage/GoogleCheckout/Model/Mysql4/Tax.php | 10 +- .../Mage/GoogleCheckout/Model/Observer.php | 8 +- .../Mage/GoogleCheckout/Model/Payment.php | 10 +- .../Mage/GoogleCheckout/Model/Shipping.php | 22 +- .../Model/Source/Checkout/Image.php | 10 +- .../GoogleCheckout/Model/Source/Locale.php | 10 +- .../Model/Source/Shipping/Carrier.php | 10 +- .../Model/Source/Shipping/Category.php | 10 +- .../Model/Source/Shipping/Units.php | 10 +- .../Model/Source/Shipping/Virtual/Method.php | 10 +- .../Source/Shipping/Virtual/Schedule.php | 10 +- .../controllers/ApiController.php | 10 +- .../controllers/RedirectController.php | 2 +- .../core/Mage/GoogleCheckout/etc/config.xml | 7 +- .../core/Mage/GoogleCheckout/etc/system.xml | 18 +- .../mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../Category/Edit/Tab/Googleoptimizer.php | 10 +- .../Product/Edit/Tab/Googleoptimizer.php | 8 +- .../Cms/Page/Edit/Renderer/Conversion.php | 10 +- .../Cms/Page/Edit/Tab/Googleoptimizer.php | 8 +- .../core/Mage/GoogleOptimizer/Block/Code.php | 10 +- .../GoogleOptimizer/Block/Code/Category.php | 10 +- .../GoogleOptimizer/Block/Code/Conversion.php | 10 +- .../Mage/GoogleOptimizer/Block/Code/Page.php | 10 +- .../GoogleOptimizer/Block/Code/Product.php | 10 +- .../core/Mage/GoogleOptimizer/Block/Js.php | 10 +- .../core/Mage/GoogleOptimizer/Helper/Data.php | 10 +- .../Googleoptimizer/Conversionpages.php | 4 +- .../core/Mage/GoogleOptimizer/Model/Code.php | 10 +- .../GoogleOptimizer/Model/Code/Category.php | 2 +- .../Mage/GoogleOptimizer/Model/Code/Page.php | 10 +- .../GoogleOptimizer/Model/Code/Product.php | 14 +- .../GoogleOptimizer/Model/Mysql4/Code.php | 10 +- .../Model/Mysql4/Code/Collection.php | 18 +- .../Mage/GoogleOptimizer/Model/Observer.php | 10 +- .../controllers/IndexController.php | 10 +- .../core/Mage/GoogleOptimizer/etc/config.xml | 6 +- .../core/Mage/GoogleOptimizer/etc/system.xml | 10 +- .../mysql4-install-0.1.0.php | 8 +- .../mysql4-upgrade-0.1.0-0.1.1.php | 10 +- .../mysql4-upgrade-0.1.1-0.1.2.php | 10 +- app/code/core/Mage/Install/Block/Abstract.php | 8 +- app/code/core/Mage/Install/Block/Admin.php | 8 +- app/code/core/Mage/Install/Block/Begin.php | 8 +- app/code/core/Mage/Install/Block/Config.php | 10 +- app/code/core/Mage/Install/Block/Download.php | 8 +- app/code/core/Mage/Install/Block/End.php | 8 +- app/code/core/Mage/Install/Block/Locale.php | 8 +- app/code/core/Mage/Install/Block/State.php | 10 +- .../core/Mage/Install/Controller/Action.php | 10 +- app/code/core/Mage/Install/Helper/Data.php | 8 +- app/code/core/Mage/Install/Model/Config.php | 8 +- .../core/Mage/Install/Model/Installer.php | 8 +- .../Mage/Install/Model/Installer/Abstract.php | 8 +- .../Mage/Install/Model/Installer/Config.php | 10 +- .../Mage/Install/Model/Installer/Console.php | 8 +- .../Mage/Install/Model/Installer/Data.php | 8 +- .../core/Mage/Install/Model/Installer/Db.php | 10 +- .../core/Mage/Install/Model/Installer/Env.php | 8 +- .../Install/Model/Installer/Filesystem.php | 8 +- .../Mage/Install/Model/Installer/Pear.php | 10 +- app/code/core/Mage/Install/Model/Observer.php | 8 +- app/code/core/Mage/Install/Model/Session.php | 8 +- app/code/core/Mage/Install/Model/Wizard.php | 10 +- .../Install/controllers/IndexController.php | 8 +- .../Install/controllers/WizardController.php | 8 +- app/code/core/Mage/Install/etc/config.xml | 224 +-- app/code/core/Mage/Install/etc/install.xml | 8 +- app/code/core/Mage/Log/Helper/Data.php | 8 +- app/code/core/Mage/Log/Model/Aggregation.php | 18 +- app/code/core/Mage/Log/Model/Cron.php | 206 +-- app/code/core/Mage/Log/Model/Customer.php | 10 +- app/code/core/Mage/Log/Model/Log.php | 8 +- .../Mage/Log/Model/Mysql4/Aggregation.php | 10 +- .../core/Mage/Log/Model/Mysql4/Customer.php | 10 +- app/code/core/Mage/Log/Model/Mysql4/Log.php | 10 +- .../core/Mage/Log/Model/Mysql4/Visitor.php | 10 +- .../Log/Model/Mysql4/Visitor/Aggregator.php | 70 +- .../Log/Model/Mysql4/Visitor/Collection.php | 10 +- .../Mage/Log/Model/Mysql4/Visitor/Online.php | 8 +- .../Mysql4/Visitor/Online/Collection.php | 8 +- app/code/core/Mage/Log/Model/Visitor.php | 10 +- .../Mage/Log/Model/Visitor/Aggregator.php | 10 +- .../core/Mage/Log/Model/Visitor/Online.php | 8 +- app/code/core/Mage/Log/etc/config.xml | 10 +- app/code/core/Mage/Log/etc/system.xml | 10 +- .../sql/log_setup/mysql4-install-0.7.0.php | 8 +- .../log_setup/mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../log_setup/mysql4-upgrade-0.7.1-0.7.2.php | 68 +- .../log_setup/mysql4-upgrade-0.7.3-0.7.4.php | 8 +- .../log_setup/mysql4-upgrade-0.7.4-0.7.5.php | 8 +- .../log_setup/mysql4-upgrade-0.7.5-0.7.6.php | 8 +- app/code/core/Mage/Media/Helper/Data.php | 8 +- app/code/core/Mage/Media/Model/File/Image.php | 8 +- app/code/core/Mage/Media/Model/Image.php | 8 +- .../Media/Model/Image/Config/Interface.php | 8 +- app/code/core/Mage/Media/etc/config.xml | 10 +- .../core/Mage/Newsletter/Block/Subscribe.php | 8 +- app/code/core/Mage/Newsletter/Helper/Data.php | 8 +- .../core/Mage/Newsletter/Model/Message.php | 10 +- .../Mage/Newsletter/Model/Mysql4/Problem.php | 8 +- .../Model/Mysql4/Problem/Collection.php | 8 +- .../Mage/Newsletter/Model/Mysql4/Queue.php | 8 +- .../Model/Mysql4/Queue/Collection.php | 12 +- .../Newsletter/Model/Mysql4/Subscriber.php | 143 +- .../Model/Mysql4/Subscriber/Collection.php | 64 +- .../Mage/Newsletter/Model/Mysql4/Template.php | 8 +- .../Model/Mysql4/Template/Collection.php | 10 +- .../core/Mage/Newsletter/Model/Observer.php | 8 +- .../core/Mage/Newsletter/Model/Problem.php | 8 +- app/code/core/Mage/Newsletter/Model/Queue.php | 8 +- .../core/Mage/Newsletter/Model/Session.php | 10 +- .../core/Mage/Newsletter/Model/Subscriber.php | 57 +- .../core/Mage/Newsletter/Model/Template.php | 8 +- .../controllers/ManageController.php | 10 +- .../controllers/SubscriberController.php | 10 +- app/code/core/Mage/Newsletter/etc/config.xml | 8 +- app/code/core/Mage/Newsletter/etc/system.xml | 10 +- .../newsletter_setup/mysql4-install-0.7.0.php | 8 +- .../newsletter_setup/mysql4-install-0.8.0.php | 10 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 10 +- app/code/core/Mage/Page/Block/Html.php | 8 +- .../core/Mage/Page/Block/Html/Breadcrumbs.php | 20 +- app/code/core/Mage/Page/Block/Html/Footer.php | 8 +- app/code/core/Mage/Page/Block/Html/Head.php | 8 +- app/code/core/Mage/Page/Block/Html/Header.php | 8 +- .../core/Mage/Page/Block/Html/Notices.php | 2 +- app/code/core/Mage/Page/Block/Html/Pager.php | 12 +- .../core/Mage/Page/Block/Html/Toplinks.php | 8 +- .../core/Mage/Page/Block/Js/Translate.php | 8 +- app/code/core/Mage/Page/Block/Redirect.php | 4 +- app/code/core/Mage/Page/Block/Switch.php | 10 +- .../Mage/Page/Block/Template/Container.php | 8 +- .../core/Mage/Page/Block/Template/Links.php | 8 +- app/code/core/Mage/Page/Helper/Data.php | 8 +- app/code/core/Mage/Page/Helper/Html.php | 10 +- app/code/core/Mage/Page/Helper/Layout.php | 242 +-- app/code/core/Mage/Page/Model/Config.php | 17 +- .../core/Mage/Page/Model/Source/Layout.php | 185 ++- app/code/core/Mage/Page/etc/config.xml | 1 + app/code/core/Mage/Page/etc/system.xml | 8 +- app/code/core/Mage/Paygate/Helper/Data.php | 8 +- .../core/Mage/Paygate/Model/Authorizenet.php | 8 +- .../Mage/Paygate/Model/Authorizenet/Debug.php | 20 +- .../Paygate/Model/Authorizenet/Request.php | 10 +- .../Paygate/Model/Authorizenet/Result.php | 10 +- .../Model/Authorizenet/Source/Cctype.php | 10 +- .../Authorizenet/Source/PaymentAction.php | 10 +- .../Model/Mysql4/Authorizenet/Debug.php | 20 +- .../Mysql4/Authorizenet/Debug/Collection.php | 20 +- .../core/Mage/Paygate/Model/Payflow/Pro.php | 28 +- .../Paygate/Model/Payflow/Pro/Request.php | 10 +- .../Mage/Paygate/Model/Payflow/Pro/Result.php | 10 +- .../Paygate/Model/Payflow/Source/Cctype.php | 10 +- .../Model/Payflow/Source/PaymentAction.php | 10 +- app/code/core/Mage/Paygate/etc/config.xml | 8 +- app/code/core/Mage/Paygate/etc/system.xml | 8 +- .../paygate_setup/mysql4-install-0.7.0.php | 8 +- app/code/core/Mage/Payment/Block/Form.php | 10 +- app/code/core/Mage/Payment/Block/Form/Cc.php | 10 +- .../core/Mage/Payment/Block/Form/Ccsave.php | 8 +- .../core/Mage/Payment/Block/Form/Checkmo.php | 8 +- .../Mage/Payment/Block/Form/Container.php | 16 +- .../Mage/Payment/Block/Form/Purchaseorder.php | 70 +- app/code/core/Mage/Payment/Block/Info.php | 10 +- app/code/core/Mage/Payment/Block/Info/Cc.php | 10 +- .../core/Mage/Payment/Block/Info/Ccsave.php | 10 +- .../core/Mage/Payment/Block/Info/Checkmo.php | 10 +- .../Mage/Payment/Block/Info/Container.php | 8 +- .../Mage/Payment/Block/Info/Purchaseorder.php | 82 +- app/code/core/Mage/Payment/Exception.php | 10 +- app/code/core/Mage/Payment/Helper/Data.php | 8 +- app/code/core/Mage/Payment/Model/Config.php | 8 +- app/code/core/Mage/Payment/Model/Info.php | 10 +- .../Mage/Payment/Model/Method/Abstract.php | 8 +- .../core/Mage/Payment/Model/Method/Cc.php | 8 +- .../core/Mage/Payment/Model/Method/Ccsave.php | 10 +- .../Mage/Payment/Model/Method/Checkmo.php | 10 +- .../core/Mage/Payment/Model/Method/Free.php | 8 +- .../Payment/Model/Method/Purchaseorder.php | 10 +- app/code/core/Mage/Payment/Model/Observer.php | 10 +- .../Mage/Payment/Model/Paygate/Request.php | 10 +- .../Mage/Payment/Model/Paygate/Result.php | 10 +- .../core/Mage/Payment/Model/Source/Cctype.php | 10 +- .../Mage/Payment/Model/Source/Invoice.php | 10 +- app/code/core/Mage/Payment/etc/config.xml | 10 +- app/code/core/Mage/Payment/etc/system.xml | 10 +- .../core/Mage/Paypal/Block/Express/Form.php | 10 +- .../core/Mage/Paypal/Block/Express/Info.php | 10 +- .../core/Mage/Paypal/Block/Express/Review.php | 14 +- .../Paypal/Block/Express/Review/Details.php | 10 +- .../core/Mage/Paypal/Block/Link/Shortcut.php | 12 +- .../core/Mage/Paypal/Block/Standard/Form.php | 10 +- .../Mage/Paypal/Block/Standard/Redirect.php | 27 +- app/code/core/Mage/Paypal/Helper/Data.php | 8 +- app/code/core/Mage/Paypal/Model/Abstract.php | 10 +- .../core/Mage/Paypal/Model/Api/Abstract.php | 10 +- app/code/core/Mage/Paypal/Model/Api/Debug.php | 10 +- app/code/core/Mage/Paypal/Model/Api/Nvp.php | 8 +- app/code/core/Mage/Paypal/Model/Direct.php | 10 +- app/code/core/Mage/Paypal/Model/Express.php | 18 +- .../core/Mage/Paypal/Model/Express/Review.php | 10 +- .../Mage/Paypal/Model/Mysql4/Api/Debug.php | 10 +- .../Model/Mysql4/Api/Debug/Collection.php | 10 +- .../core/Mage/Paypal/Model/Mysql4/Setup.php | 8 +- app/code/core/Mage/Paypal/Model/Session.php | 10 +- .../core/Mage/Paypal/Model/Source/Cctype.php | 10 +- .../Paypal/Model/Source/PaymentAction.php | 10 +- .../Paypal/Model/Source/StandardAction.php | 10 +- app/code/core/Mage/Paypal/Model/Standard.php | 8 +- .../Paypal/controllers/ExpressController.php | 10 +- .../Paypal/controllers/StandardController.php | 12 +- app/code/core/Mage/Paypal/etc/config.xml | 8 +- app/code/core/Mage/Paypal/etc/system.xml | 62 +- .../sql/paypal_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../core/Mage/PaypalUk/Block/Direct/Form.php | 10 +- .../core/Mage/PaypalUk/Block/Direct/Info.php | 10 +- .../core/Mage/PaypalUk/Block/Express/Form.php | 10 +- .../core/Mage/PaypalUk/Block/Express/Info.php | 10 +- .../Mage/PaypalUk/Block/Express/Review.php | 14 +- .../PaypalUk/Block/Express/Review/Details.php | 8 +- .../Mage/PaypalUk/Block/Link/Shortcut.php | 10 +- app/code/core/Mage/PaypalUk/Helper/Data.php | 8 +- .../core/Mage/PaypalUk/Model/Api/Abstract.php | 8 +- .../core/Mage/PaypalUk/Model/Api/Debug.php | 10 +- app/code/core/Mage/PaypalUk/Model/Api/Pro.php | 10 +- .../core/Mage/PaypalUk/Model/Api/Result.php | 2 +- app/code/core/Mage/PaypalUk/Model/Direct.php | 10 +- app/code/core/Mage/PaypalUk/Model/Express.php | 10 +- .../Mage/PaypalUk/Model/Express/Review.php | 10 +- .../Mage/PaypalUk/Model/Mysql4/Api/Debug.php | 18 +- .../Model/Mysql4/Api/Debug/Collection.php | 18 +- app/code/core/Mage/PaypalUk/Model/Session.php | 10 +- .../Mage/PaypalUk/Model/Source/Cctype.php | 10 +- .../PaypalUk/Model/Source/PaymentAction.php | 10 +- .../controllers/ExpressController.php | 10 +- app/code/core/Mage/PaypalUk/etc/config.xml | 8 +- app/code/core/Mage/PaypalUk/etc/system.xml | 10 +- .../paypaluk_setup/mysql4-install-0.7.0.php | 10 +- app/code/core/Mage/Poll/Block/ActivePoll.php | 8 +- app/code/core/Mage/Poll/Block/Poll.php | 10 +- app/code/core/Mage/Poll/Helper/Data.php | 8 +- app/code/core/Mage/Poll/Model/Mysql4/Poll.php | 10 +- .../Mage/Poll/Model/Mysql4/Poll/Answer.php | 10 +- .../Model/Mysql4/Poll/Answer/Collection.php | 10 +- .../Poll/Model/Mysql4/Poll/Collection.php | 10 +- .../core/Mage/Poll/Model/Mysql4/Poll/Vote.php | 10 +- app/code/core/Mage/Poll/Model/Poll.php | 24 +- app/code/core/Mage/Poll/Model/Poll/Answer.php | 10 +- app/code/core/Mage/Poll/Model/Poll/Vote.php | 10 +- .../Mage/Poll/controllers/VoteController.php | 10 +- app/code/core/Mage/Poll/etc/config.xml | 8 +- app/code/core/Mage/Poll/etc/system.xml | 10 +- .../sql/poll_setup/mysql4-install-0.7.0.php | 8 +- .../poll_setup/mysql4-upgrade-0.6.0-0.6.1.php | 8 +- .../poll_setup/mysql4-upgrade-0.7.1-0.7.2.php | 10 +- .../ProductAlert/Block/Email/Abstract.php | 8 +- .../Mage/ProductAlert/Block/Email/Price.php | 8 +- .../Mage/ProductAlert/Block/Email/Stock.php | 8 +- .../core/Mage/ProductAlert/Block/Price.php | 10 +- .../core/Mage/ProductAlert/Block/Stock.php | 10 +- .../core/Mage/ProductAlert/Helper/Data.php | 10 +- .../core/Mage/ProductAlert/Model/Email.php | 8 +- .../Mage/ProductAlert/Model/Mysql4/Price.php | 8 +- .../Model/Mysql4/Price/Collection.php | 10 +- .../Mysql4/Price/Customer/Collection.php | 10 +- .../Mage/ProductAlert/Model/Mysql4/Stock.php | 10 +- .../Model/Mysql4/Stock/Collection.php | 10 +- .../Mysql4/Stock/Customer/Collection.php | 10 +- .../core/Mage/ProductAlert/Model/Observer.php | 10 +- .../core/Mage/ProductAlert/Model/Price.php | 10 +- .../core/Mage/ProductAlert/Model/Stock.php | 10 +- .../controllers/AddController.php | 10 +- .../controllers/UnsubscribeController.php | 10 +- .../core/Mage/ProductAlert/etc/config.xml | 2 +- .../core/Mage/ProductAlert/etc/system.xml | 10 +- .../mysql4-install-0.7.0.php | 10 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../Mage/Rating/Block/Entity/Detailed.php | 10 +- app/code/core/Mage/Rating/Helper/Data.php | 8 +- .../core/Mage/Rating/Model/Mysql4/Rating.php | 10 +- .../Rating/Model/Mysql4/Rating/Collection.php | 10 +- .../Rating/Model/Mysql4/Rating/Entity.php | 10 +- .../Rating/Model/Mysql4/Rating/Option.php | 8 +- .../Model/Mysql4/Rating/Option/Collection.php | 8 +- .../Model/Mysql4/Rating/Option/Vote.php | 10 +- .../Mysql4/Rating/Option/Vote/Collection.php | 10 +- .../Mage/Rating/Model/Mysql4/Rating/Value.php | 8 +- app/code/core/Mage/Rating/Model/Rating.php | 8 +- .../core/Mage/Rating/Model/Rating/Entity.php | 10 +- .../core/Mage/Rating/Model/Rating/Option.php | 8 +- .../Mage/Rating/Model/Rating/Option/Vote.php | 10 +- .../core/Mage/Rating/Model/Rating/Value.php | 8 +- app/code/core/Mage/Rating/etc/config.xml | 8 +- .../sql/rating_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../Mage/Reports/Block/Product/Abstract.php | 8 +- .../Mage/Reports/Block/Product/Compared.php | 10 +- .../Mage/Reports/Block/Product/Viewed.php | 8 +- app/code/core/Mage/Reports/Exception.php | 10 +- app/code/core/Mage/Reports/Helper/Data.php | 8 +- app/code/core/Mage/Reports/Model/Config.php | 122 +- app/code/core/Mage/Reports/Model/Event.php | 8 +- .../Mage/Reports/Model/Event/Observer.php | 8 +- .../core/Mage/Reports/Model/Event/Type.php | 10 +- .../Model/Mysql4/Accounts/Collection.php | 10 +- .../Model/Mysql4/Coupons/Collection.php | 10 +- .../Model/Mysql4/Customer/Collection.php | 10 +- .../Mysql4/Customer/Orders/Collection.php | 10 +- .../Mysql4/Customer/Totals/Collection.php | 10 +- .../Entity/Summary/Collection/Abstract.php | 8 +- .../core/Mage/Reports/Model/Mysql4/Event.php | 10 +- .../Reports/Model/Mysql4/Event/Collection.php | 10 +- .../Mage/Reports/Model/Mysql4/Event/Type.php | 10 +- .../Model/Mysql4/Event/Type/Collection.php | 10 +- .../Model/Mysql4/Invoiced/Collection.php | 8 +- .../Reports/Model/Mysql4/Order/Collection.php | 8 +- .../Model/Mysql4/Product/Collection.php | 10 +- .../Mysql4/Product/Downloads/Collection.php | 10 +- .../Mysql4/Product/Lowstock/Collection.php | 2 +- .../Mysql4/Product/Ordered/Collection.php | 10 +- .../Model/Mysql4/Product/Sold/Collection.php | 8 +- .../Mysql4/Product/Viewed/Collection.php | 10 +- .../Reports/Model/Mysql4/Quote/Collection.php | 8 +- .../Model/Mysql4/Refunded/Collection.php | 8 +- .../Model/Mysql4/Report/Collection.php | 10 +- .../Model/Mysql4/Review/Collection.php | 8 +- .../Mysql4/Review/Customer/Collection.php | 10 +- .../Mysql4/Review/Product/Collection.php | 10 +- .../Model/Mysql4/Shipping/Collection.php | 8 +- .../Mysql4/Shopcart/Product/Collection.php | 10 +- .../Reports/Model/Mysql4/Tag/Collection.php | 8 +- .../Model/Mysql4/Tag/Customer/Collection.php | 10 +- .../Model/Mysql4/Tag/Product/Collection.php | 8 +- .../Reports/Model/Mysql4/Tax/Collection.php | 8 +- .../Model/Mysql4/Wishlist/Collection.php | 168 +- .../Mysql4/Wishlist/Product/Collection.php | 38 +- app/code/core/Mage/Reports/Model/Report.php | 10 +- app/code/core/Mage/Reports/Model/Session.php | 8 +- app/code/core/Mage/Reports/Model/Test.php | 296 ++-- app/code/core/Mage/Reports/Model/Totals.php | 8 +- app/code/core/Mage/Reports/etc/config.xml | 8 +- app/code/core/Mage/Reports/etc/system.xml | 10 +- .../reports_setup/mysql4-install-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 90 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 10 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 10 +- .../mysql4-upgrade-0.7.5-0.7.7.php | 8 +- .../core/Mage/Review/Block/Customer/List.php | 10 +- .../Mage/Review/Block/Customer/Recent.php | 10 +- .../core/Mage/Review/Block/Customer/View.php | 10 +- app/code/core/Mage/Review/Block/Form.php | 8 +- app/code/core/Mage/Review/Block/Helper.php | 94 +- .../core/Mage/Review/Block/Product/View.php | 10 +- .../Mage/Review/Block/Product/View/List.php | 10 +- app/code/core/Mage/Review/Block/View.php | 58 +- app/code/core/Mage/Review/Helper/Data.php | 8 +- .../core/Mage/Review/Model/Mysql4/Review.php | 10 +- .../Review/Model/Mysql4/Review/Collection.php | 10 +- .../Review/Model/Mysql4/Review/Comment.php | 8 +- .../Mysql4/Review/Product/Collection.php | 20 +- .../Model/Mysql4/Review/Status/Collection.php | 10 +- .../Review/Model/Mysql4/Review/Summary.php | 12 +- .../Mysql4/Review/Summary/Collection.php | 10 +- app/code/core/Mage/Review/Model/Observer.php | 8 +- app/code/core/Mage/Review/Model/Review.php | 36 +- .../core/Mage/Review/Model/Review/Comment.php | 8 +- .../core/Mage/Review/Model/Review/Summary.php | 8 +- app/code/core/Mage/Review/Model/Session.php | 10 +- .../Review/controllers/CustomerController.php | 10 +- .../Review/controllers/ProductController.php | 105 +- app/code/core/Mage/Review/etc/config.xml | 10 +- app/code/core/Mage/Review/etc/system.xml | 10 +- .../sql/review_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 8 +- app/code/core/Mage/Rss/Block/Abstract.php | 24 + .../core/Mage/Rss/Block/Catalog/Category.php | 8 +- app/code/core/Mage/Rss/Block/Catalog/New.php | 10 +- .../Mage/Rss/Block/Catalog/NotifyStock.php | 10 +- .../core/Mage/Rss/Block/Catalog/Review.php | 10 +- .../core/Mage/Rss/Block/Catalog/Salesrule.php | 10 +- .../core/Mage/Rss/Block/Catalog/Special.php | 10 +- app/code/core/Mage/Rss/Block/Catalog/Tag.php | 10 +- app/code/core/Mage/Rss/Block/List.php | 10 +- .../core/Mage/Rss/Block/Order/Details.php | 27 +- app/code/core/Mage/Rss/Block/Order/New.php | 8 +- app/code/core/Mage/Rss/Block/Order/Status.php | 10 +- app/code/core/Mage/Rss/Block/Wishlist.php | 8 +- app/code/core/Mage/Rss/Helper/Catalog.php | 10 +- app/code/core/Mage/Rss/Helper/Data.php | 8 +- app/code/core/Mage/Rss/Helper/Order.php | 10 +- app/code/core/Mage/Rss/Model/Mysql4/Order.php | 90 +- app/code/core/Mage/Rss/Model/Rss.php | 10 +- app/code/core/Mage/Rss/Model/Session.php | 10 +- .../Rss/controllers/CatalogController.php | 10 +- .../Mage/Rss/controllers/IndexController.php | 18 +- .../Mage/Rss/controllers/OrderController.php | 8 +- app/code/core/Mage/Rss/etc/config.xml | 10 +- app/code/core/Mage/Rss/etc/system.xml | 10 +- app/code/core/Mage/Rule/Block/Actions.php | 24 +- app/code/core/Mage/Rule/Block/Conditions.php | 24 +- app/code/core/Mage/Rule/Block/Editable.php | 10 +- app/code/core/Mage/Rule/Block/Newchild.php | 10 +- app/code/core/Mage/Rule/Block/Rule.php | 14 +- app/code/core/Mage/Rule/Helper/Data.php | 8 +- .../core/Mage/Rule/Model/Action/Abstract.php | 88 +- .../Mage/Rule/Model/Action/Collection.php | 16 +- .../core/Mage/Rule/Model/Action/Interface.php | 10 +- .../Mage/Rule/Model/Condition/Abstract.php | 114 +- .../Mage/Rule/Model/Condition/Combine.php | 8 +- .../Mage/Rule/Model/Condition/Interface.php | 10 +- app/code/core/Mage/Rule/Model/Environment.php | 10 +- app/code/core/Mage/Rule/Model/Mysql4/Rule.php | 18 +- .../Rule/Model/Mysql4/Rule/Collection.php | 10 +- .../core/Mage/Rule/Model/Renderer/Actions.php | 24 +- .../Mage/Rule/Model/Renderer/Conditions.php | 24 +- app/code/core/Mage/Rule/Model/Rule.php | 8 +- app/code/core/Mage/Rule/etc/config.xml | 10 +- .../core/Mage/Sales/Block/Items/Abstract.php | 4 +- .../Mage/Sales/Block/Order/Creditmemo.php | 10 +- .../Sales/Block/Order/Creditmemo/Items.php | 10 +- .../core/Mage/Sales/Block/Order/Details.php | 8 +- .../Block/Order/Email/Creditmemo/Items.php | 10 +- .../Sales/Block/Order/Email/Invoice/Items.php | 10 +- .../Mage/Sales/Block/Order/Email/Items.php | 10 +- .../Sales/Block/Order/Email/Items/Default.php | 10 +- .../Block/Order/Email/Items/Order/Default.php | 10 +- .../Block/Order/Email/Items/Order/Grouped.php | 10 +- .../Block/Order/Email/Shipment/Items.php | 10 +- .../core/Mage/Sales/Block/Order/History.php | 8 +- app/code/core/Mage/Sales/Block/Order/Info.php | 8 +- .../core/Mage/Sales/Block/Order/Invoice.php | 10 +- .../Mage/Sales/Block/Order/Invoice/Items.php | 10 +- .../Block/Order/Item/Renderer/Default.php | 4 +- .../Block/Order/Item/Renderer/Grouped.php | 114 +- .../core/Mage/Sales/Block/Order/Items.php | 10 +- .../core/Mage/Sales/Block/Order/Print.php | 8 +- .../Sales/Block/Order/Print/Creditmemo.php | 10 +- .../Mage/Sales/Block/Order/Print/Invoice.php | 8 +- .../Mage/Sales/Block/Order/Print/Shipment.php | 8 +- .../core/Mage/Sales/Block/Order/Recent.php | 8 +- .../core/Mage/Sales/Block/Order/Shipment.php | 10 +- .../Mage/Sales/Block/Order/Shipment/Items.php | 10 +- app/code/core/Mage/Sales/Block/Order/Tax.php | 10 +- app/code/core/Mage/Sales/Block/Order/View.php | 10 +- .../core/Mage/Sales/Block/Reorder/Sidebar.php | 10 +- app/code/core/Mage/Sales/Exception.php | 10 +- app/code/core/Mage/Sales/Helper/Data.php | 10 +- app/code/core/Mage/Sales/Helper/Reorder.php | 10 +- app/code/core/Mage/Sales/Model/Abstract.php | 8 +- .../core/Mage/Sales/Model/Api/Resource.php | 10 +- app/code/core/Mage/Sales/Model/Config.php | 10 +- .../core/Mage/Sales/Model/Convert/Order.php | 8 +- .../core/Mage/Sales/Model/Convert/Quote.php | 8 +- .../core/Mage/Sales/Model/Email/Template.php | 34 +- .../core/Mage/Sales/Model/Entity/Order.php | 10 +- .../Mage/Sales/Model/Entity/Order/Address.php | 10 +- .../Model/Entity/Order/Address/Collection.php | 8 +- .../Order/Attribute/Backend/Billing.php | 8 +- .../Entity/Order/Attribute/Backend/Child.php | 10 +- .../Entity/Order/Attribute/Backend/Parent.php | 20 +- .../Order/Attribute/Backend/Shipping.php | 14 +- .../Sales/Model/Entity/Order/Collection.php | 8 +- .../Sales/Model/Entity/Order/Creditmemo.php | 8 +- .../Creditmemo/Attribute/Backend/Child.php | 10 +- .../Creditmemo/Attribute/Backend/Parent.php | 10 +- .../Entity/Order/Creditmemo/Collection.php | 10 +- .../Model/Entity/Order/Creditmemo/Comment.php | 90 +- .../Order/Creditmemo/Comment/Collection.php | 106 +- .../Model/Entity/Order/Creditmemo/Item.php | 8 +- .../Order/Creditmemo/Item/Collection.php | 10 +- .../Mage/Sales/Model/Entity/Order/Invoice.php | 10 +- .../Order/Invoice/Attribute/Backend/Child.php | 10 +- .../Order/Invoice/Attribute/Backend/Item.php | 10 +- .../Order/Invoice/Attribute/Backend/Order.php | 10 +- .../Invoice/Attribute/Backend/Parent.php | 10 +- .../Model/Entity/Order/Invoice/Collection.php | 8 +- .../Model/Entity/Order/Invoice/Comment.php | 90 +- .../Order/Invoice/Comment/Collection.php | 106 +- .../Sales/Model/Entity/Order/Invoice/Item.php | 10 +- .../Entity/Order/Invoice/Item/Collection.php | 10 +- .../Mage/Sales/Model/Entity/Order/Item.php | 10 +- .../Model/Entity/Order/Item/Collection.php | 10 +- .../Mage/Sales/Model/Entity/Order/Payment.php | 10 +- .../Model/Entity/Order/Payment/Collection.php | 10 +- .../Sales/Model/Entity/Order/Shipment.php | 8 +- .../Shipment/Attribute/Backend/Child.php | 10 +- .../Shipment/Attribute/Backend/Parent.php | 10 +- .../Entity/Order/Shipment/Collection.php | 10 +- .../Model/Entity/Order/Shipment/Comment.php | 90 +- .../Order/Shipment/Comment/Collection.php | 106 +- .../Model/Entity/Order/Shipment/Item.php | 8 +- .../Entity/Order/Shipment/Item/Collection.php | 10 +- .../Model/Entity/Order/Shipment/Track.php | 88 +- .../Order/Shipment/Track/Collection.php | 10 +- .../Model/Entity/Order/Status/History.php | 8 +- .../Order/Status/History/Collection.php | 10 +- .../core/Mage/Sales/Model/Entity/Quote.php | 16 +- .../Mage/Sales/Model/Entity/Quote/Address.php | 14 +- .../Quote/Address/Attribute/Backend.php | 10 +- .../Quote/Address/Attribute/Backend/Child.php | 10 +- .../Address/Attribute/Backend/Parent.php | 10 +- .../Address/Attribute/Backend/Region.php | 10 +- .../Quote/Address/Attribute/Frontend.php | 10 +- .../Attribute/Frontend/Custbalance.php | 8 +- .../Address/Attribute/Frontend/Discount.php | 22 +- .../Address/Attribute/Frontend/Grand.php | 10 +- .../Address/Attribute/Frontend/Shipping.php | 10 +- .../Address/Attribute/Frontend/Subtotal.php | 10 +- .../Quote/Address/Attribute/Frontend/Tax.php | 10 +- .../Model/Entity/Quote/Address/Collection.php | 10 +- .../Sales/Model/Entity/Quote/Address/Item.php | 12 +- .../Entity/Quote/Address/Item/Collection.php | 10 +- .../Sales/Model/Entity/Quote/Address/Rate.php | 12 +- .../Entity/Quote/Address/Rate/Collection.php | 10 +- .../Sales/Model/Entity/Quote/Collection.php | 10 +- .../Mage/Sales/Model/Entity/Quote/Item.php | 12 +- .../Model/Entity/Quote/Item/Collection.php | 8 +- .../Mage/Sales/Model/Entity/Quote/Payment.php | 12 +- .../Model/Entity/Quote/Payment/Collection.php | 10 +- .../Sales/Model/Entity/Sale/Collection.php | 8 +- .../core/Mage/Sales/Model/Entity/Setup.php | 8 +- .../core/Mage/Sales/Model/Mysql4/Abstract.php | 4 +- .../core/Mage/Sales/Model/Mysql4/Order.php | 8 +- .../Mage/Sales/Model/Mysql4/Order/Address.php | 8 +- .../Model/Mysql4/Order/Address/Collection.php | 8 +- .../Order/Attribute/Backend/Billing.php | 8 +- .../Mysql4/Order/Attribute/Backend/Child.php | 10 +- .../Mysql4/Order/Attribute/Backend/Parent.php | 10 +- .../Order/Attribute/Backend/Shipping.php | 8 +- .../Sales/Model/Mysql4/Order/Collection.php | 8 +- .../Sales/Model/Mysql4/Order/Creditmemo.php | 8 +- .../Creditmemo/Attribute/Backend/Child.php | 10 +- .../Creditmemo/Attribute/Backend/Parent.php | 10 +- .../Mysql4/Order/Creditmemo/Collection.php | 10 +- .../Model/Mysql4/Order/Creditmemo/Comment.php | 90 +- .../Order/Creditmemo/Comment/Collection.php | 106 +- .../Model/Mysql4/Order/Creditmemo/Item.php | 8 +- .../Order/Creditmemo/Item/Collection.php | 10 +- .../Mage/Sales/Model/Mysql4/Order/Invoice.php | 10 +- .../Order/Invoice/Attribute/Backend/Child.php | 10 +- .../Order/Invoice/Attribute/Backend/Item.php | 10 +- .../Order/Invoice/Attribute/Backend/Order.php | 10 +- .../Invoice/Attribute/Backend/Parent.php | 10 +- .../Model/Mysql4/Order/Invoice/Collection.php | 8 +- .../Model/Mysql4/Order/Invoice/Comment.php | 90 +- .../Order/Invoice/Comment/Collection.php | 106 +- .../Sales/Model/Mysql4/Order/Invoice/Item.php | 10 +- .../Mysql4/Order/Invoice/Item/Collection.php | 10 +- .../Mage/Sales/Model/Mysql4/Order/Item.php | 4 +- .../Model/Mysql4/Order/Item/Collection.php | 10 +- .../Mage/Sales/Model/Mysql4/Order/Payment.php | 8 +- .../Model/Mysql4/Order/Payment/Collection.php | 10 +- .../Sales/Model/Mysql4/Order/Shipment.php | 8 +- .../Shipment/Attribute/Backend/Child.php | 10 +- .../Shipment/Attribute/Backend/Parent.php | 10 +- .../Mysql4/Order/Shipment/Collection.php | 10 +- .../Model/Mysql4/Order/Shipment/Comment.php | 90 +- .../Order/Shipment/Comment/Collection.php | 106 +- .../Model/Mysql4/Order/Shipment/Item.php | 8 +- .../Mysql4/Order/Shipment/Item/Collection.php | 10 +- .../Model/Mysql4/Order/Shipment/Track.php | 88 +- .../Order/Shipment/Track/Collection.php | 10 +- .../Model/Mysql4/Order/Status/History.php | 8 +- .../Order/Status/History/Collection.php | 10 +- .../Mage/Sales/Model/Mysql4/Order/Tax.php | 10 +- .../Model/Mysql4/Order/Tax/Collection.php | 10 +- .../core/Mage/Sales/Model/Mysql4/Quote.php | 6 +- .../Mage/Sales/Model/Mysql4/Quote/Address.php | 4 +- .../Quote/Address/Attribute/Backend.php | 10 +- .../Quote/Address/Attribute/Backend/Child.php | 10 +- .../Address/Attribute/Backend/Parent.php | 10 +- .../Address/Attribute/Backend/Region.php | 10 +- .../Quote/Address/Attribute/Frontend.php | 10 +- .../Attribute/Frontend/Custbalance.php | 8 +- .../Address/Attribute/Frontend/Discount.php | 10 +- .../Address/Attribute/Frontend/Grand.php | 10 +- .../Address/Attribute/Frontend/Shipping.php | 10 +- .../Address/Attribute/Frontend/Subtotal.php | 10 +- .../Quote/Address/Attribute/Frontend/Tax.php | 10 +- .../Model/Mysql4/Quote/Address/Collection.php | 4 +- .../Sales/Model/Mysql4/Quote/Address/Item.php | 4 +- .../Mysql4/Quote/Address/Item/Collection.php | 16 +- .../Sales/Model/Mysql4/Quote/Address/Rate.php | 4 +- .../Mysql4/Quote/Address/Rate/Collection.php | 4 +- .../Sales/Model/Mysql4/Quote/Collection.php | 10 +- .../Mage/Sales/Model/Mysql4/Quote/Item.php | 4 +- .../Sales/Model/Mysql4/Quote/Item/Option.php | 10 +- .../Mysql4/Quote/Item/Option/Collection.php | 26 +- .../Mage/Sales/Model/Mysql4/Quote/Payment.php | 4 +- .../Model/Mysql4/Quote/Payment/Collection.php | 4 +- .../Sales/Model/Mysql4/Sale/Collection.php | 8 +- .../core/Mage/Sales/Model/Mysql4/Setup.php | 8 +- app/code/core/Mage/Sales/Model/Observer.php | 8 +- app/code/core/Mage/Sales/Model/Order.php | 8 +- .../core/Mage/Sales/Model/Order/Address.php | 10 +- app/code/core/Mage/Sales/Model/Order/Api.php | 10 +- .../core/Mage/Sales/Model/Order/Api/V2.php | 10 +- .../core/Mage/Sales/Model/Order/Config.php | 8 +- .../Mage/Sales/Model/Order/Creditmemo.php | 10 +- .../Sales/Model/Order/Creditmemo/Comment.php | 8 +- .../Sales/Model/Order/Creditmemo/Config.php | 124 +- .../Sales/Model/Order/Creditmemo/Item.php | 10 +- .../Model/Order/Creditmemo/Total/Abstract.php | 10 +- .../Model/Order/Creditmemo/Total/Discount.php | 10 +- .../Model/Order/Creditmemo/Total/Grand.php | 10 +- .../Model/Order/Creditmemo/Total/Subtotal.php | 10 +- .../Model/Order/Creditmemo/Total/Tax.php | 10 +- .../core/Mage/Sales/Model/Order/Invoice.php | 10 +- .../Mage/Sales/Model/Order/Invoice/Api.php | 10 +- .../Mage/Sales/Model/Order/Invoice/Api/V2.php | 10 +- .../Sales/Model/Order/Invoice/Comment.php | 8 +- .../Mage/Sales/Model/Order/Invoice/Config.php | 10 +- .../Mage/Sales/Model/Order/Invoice/Item.php | 10 +- .../Model/Order/Invoice/Total/Abstract.php | 10 +- .../Model/Order/Invoice/Total/Discount.php | 10 +- .../Sales/Model/Order/Invoice/Total/Grand.php | 10 +- .../Model/Order/Invoice/Total/Shipping.php | 16 +- .../Model/Order/Invoice/Total/Subtotal.php | 10 +- .../Sales/Model/Order/Invoice/Total/Tax.php | 10 +- app/code/core/Mage/Sales/Model/Order/Item.php | 2 +- .../core/Mage/Sales/Model/Order/Payment.php | 10 +- .../Mage/Sales/Model/Order/Pdf/Abstract.php | 8 +- .../Mage/Sales/Model/Order/Pdf/Creditmemo.php | 10 +- .../Mage/Sales/Model/Order/Pdf/Invoice.php | 10 +- .../Sales/Model/Order/Pdf/Items/Abstract.php | 10 +- .../Order/Pdf/Items/Creditmemo/Default.php | 8 +- .../Order/Pdf/Items/Creditmemo/Grouped.php | 10 +- .../Model/Order/Pdf/Items/Invoice/Default.php | 10 +- .../Model/Order/Pdf/Items/Invoice/Grouped.php | 10 +- .../Order/Pdf/Items/Shipment/Default.php | 10 +- .../Mage/Sales/Model/Order/Pdf/Shipment.php | 10 +- .../core/Mage/Sales/Model/Order/Shipment.php | 8 +- .../Mage/Sales/Model/Order/Shipment/Api.php | 10 +- .../Sales/Model/Order/Shipment/Api/V2.php | 8 +- .../Sales/Model/Order/Shipment/Comment.php | 8 +- .../Mage/Sales/Model/Order/Shipment/Item.php | 8 +- .../Mage/Sales/Model/Order/Shipment/Track.php | 10 +- .../core/Mage/Sales/Model/Order/Status.php | 8 +- .../Mage/Sales/Model/Order/Status/History.php | 8 +- app/code/core/Mage/Sales/Model/Order/Tax.php | 10 +- .../core/Mage/Sales/Model/Order/Total.php | 10 +- app/code/core/Mage/Sales/Model/Quote.php | 31 +- .../core/Mage/Sales/Model/Quote/Address.php | 63 +- .../Mage/Sales/Model/Quote/Address/Item.php | 14 +- .../Mage/Sales/Model/Quote/Address/Rate.php | 10 +- .../Mage/Sales/Model/Quote/Address/Total.php | 29 +- .../Model/Quote/Address/Total/Abstract.php | 8 +- .../Model/Quote/Address/Total/Custbalance.php | 8 +- .../Model/Quote/Address/Total/Discount.php | 12 +- .../Sales/Model/Quote/Address/Total/Grand.php | 10 +- .../Model/Quote/Address/Total/Shipping.php | 390 ++--- .../Model/Quote/Address/Total/Subtotal.php | 10 +- .../Sales/Model/Quote/Address/Total/Tax.php | 11 +- .../core/Mage/Sales/Model/Quote/Config.php | 4 +- app/code/core/Mage/Sales/Model/Quote/Item.php | 8 +- .../Mage/Sales/Model/Quote/Item/Abstract.php | 8 +- .../Mage/Sales/Model/Quote/Item/Option.php | 10 +- .../core/Mage/Sales/Model/Quote/Payment.php | 8 +- .../Sales/controllers/DownloadController.php | 10 +- .../Sales/controllers/OrderController.php | 16 +- app/code/core/Mage/Sales/doc/test.php | 587 +++---- app/code/core/Mage/Sales/etc/api.xml | 6 +- app/code/core/Mage/Sales/etc/system.xml | 10 +- .../sql/sales_setup/mysql4-install-0.7.0.php | 8 +- .../sql/sales_setup/mysql4-install-0.8.11.php | 10 +- .../sql/sales_setup/mysql4-install-0.9.0.php | 10 +- .../mysql4-upgrade-0.6.2-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../mysql4-upgrade-0.7.9-0.7.10.php | 62 +- .../mysql4-upgrade-0.8.0-0.8.1.php | 58 +- .../mysql4-upgrade-0.8.1-0.8.2.php | 114 +- .../mysql4-upgrade-0.8.11-0.8.12.php | 60 +- .../mysql4-upgrade-0.8.12-0.8.13.php | 54 +- .../mysql4-upgrade-0.8.13-0.8.14.php | 8 +- .../mysql4-upgrade-0.8.14-0.8.15.php | 10 +- .../mysql4-upgrade-0.8.15-0.8.16.php | 10 +- .../mysql4-upgrade-0.8.16-0.8.17.php | 84 +- .../mysql4-upgrade-0.8.17-0.8.18.php | 128 +- .../mysql4-upgrade-0.8.18-0.8.19.php | 10 +- .../mysql4-upgrade-0.8.19-0.8.20.php | 8 +- .../mysql4-upgrade-0.8.2-0.8.3.php | 64 +- .../mysql4-upgrade-0.8.20-0.8.21.php | 8 +- .../mysql4-upgrade-0.8.21-0.8.22.php | 10 +- .../mysql4-upgrade-0.8.22-0.8.23.php | 60 +- .../mysql4-upgrade-0.8.23-0.8.24.php | 58 +- .../mysql4-upgrade-0.8.24-0.8.25.php | 94 +- .../mysql4-upgrade-0.8.25-0.8.26.php | 10 +- .../mysql4-upgrade-0.8.26-0.8.27.php | 8 +- .../mysql4-upgrade-0.8.27-0.8.28.php | 8 +- .../mysql4-upgrade-0.8.28-0.8.29.php | 8 +- .../mysql4-upgrade-0.8.29-0.9.0.php | 32 +- .../mysql4-upgrade-0.8.3-0.8.4.php | 72 +- .../mysql4-upgrade-0.8.6-0.8.7.php | 64 +- .../mysql4-upgrade-0.8.7-0.8.8.php | 10 +- .../mysql4-upgrade-0.8.8-0.8.9.php | 10 +- .../mysql4-upgrade-0.9.0-0.9.1.php | 8 +- .../mysql4-upgrade-0.9.1-0.9.2.php | 8 +- .../mysql4-upgrade-0.9.10-0.9.11.php | 10 +- .../mysql4-upgrade-0.9.11-0.9.12.php | 8 +- .../mysql4-upgrade-0.9.12-0.9.13.php | 10 +- .../mysql4-upgrade-0.9.13-0.9.14.php | 10 +- .../mysql4-upgrade-0.9.14-0.9.15.php | 10 +- .../mysql4-upgrade-0.9.15-0.9.16.php | 10 +- .../mysql4-upgrade-0.9.16-0.9.17.php | 10 +- .../mysql4-upgrade-0.9.17-0.9.18.php | 10 +- .../mysql4-upgrade-0.9.18-0.9.19.php | 10 +- .../mysql4-upgrade-0.9.19-0.9.20.php | 10 +- .../mysql4-upgrade-0.9.2-0.9.3.php | 8 +- .../mysql4-upgrade-0.9.20-0.9.21.php | 8 +- .../mysql4-upgrade-0.9.21-0.9.22.php | 10 +- .../mysql4-upgrade-0.9.22-0.9.23.php | 8 +- .../mysql4-upgrade-0.9.23-0.9.24.php | 62 +- .../mysql4-upgrade-0.9.24-0.9.25.php | 68 +- .../mysql4-upgrade-0.9.25-0.9.26.php | 82 +- .../mysql4-upgrade-0.9.26-0.9.27.php | 58 +- .../mysql4-upgrade-0.9.27-0.9.28.php | 88 +- .../mysql4-upgrade-0.9.28-0.9.29.php | 10 +- .../mysql4-upgrade-0.9.29-0.9.30.php | 8 +- .../mysql4-upgrade-0.9.3-0.9.4.php | 22 +- .../mysql4-upgrade-0.9.30-0.9.31.php | 8 +- .../mysql4-upgrade-0.9.31-0.9.32.php | 8 +- .../mysql4-upgrade-0.9.32-0.9.33.php | 8 +- .../mysql4-upgrade-0.9.33-0.9.34.php | 8 +- .../mysql4-upgrade-0.9.34-0.9.35.php | 8 +- .../mysql4-upgrade-0.9.35-0.9.36.php | 10 +- .../mysql4-upgrade-0.9.36-0.9.37.php | 10 +- .../mysql4-upgrade-0.9.37-0.9.38.php | 8 +- .../mysql4-upgrade-0.9.4-0.9.5.php | 10 +- .../mysql4-upgrade-0.9.5-0.9.6.php | 72 +- .../mysql4-upgrade-0.9.6-0.9.7.php | 8 +- .../mysql4-upgrade-0.9.7-0.9.8.php | 10 +- .../mysql4-upgrade-0.9.8-0.9.9.php | 8 +- .../mysql4-upgrade-0.9.9-0.9.10.php | 8 +- app/code/core/Mage/SalesRule/Exception.php | 10 +- app/code/core/Mage/SalesRule/Helper/Data.php | 8 +- .../core/Mage/SalesRule/Model/Mysql4/Rule.php | 10 +- .../Model/Mysql4/Rule/Collection.php | 14 +- .../SalesRule/Model/Mysql4/Rule/Customer.php | 8 +- .../Model/Mysql4/Rule/Customer/Collection.php | 10 +- .../SalesRule/Model/Mysql4/Rule/Product.php | 70 +- .../Model/Mysql4/Rule/Product/Collection.php | 10 +- .../core/Mage/SalesRule/Model/Observer.php | 10 +- app/code/core/Mage/SalesRule/Model/Rule.php | 10 +- .../Model/Rule/Action/Collection.php | 8 +- .../SalesRule/Model/Rule/Action/Product.php | 10 +- .../Model/Rule/Condition/Address.php | 8 +- .../Model/Rule/Condition/Combine.php | 8 +- .../Model/Rule/Condition/Product.php | 8 +- .../Model/Rule/Condition/Product/Combine.php | 8 +- .../Model/Rule/Condition/Product/Found.php | 32 +- .../Rule/Condition/Product/Subselect.php | 8 +- .../Mage/SalesRule/Model/Rule/Customer.php | 10 +- .../Mage/SalesRule/Model/Rule/Product.php | 10 +- .../core/Mage/SalesRule/Model/Validator.php | 8 +- app/code/core/Mage/SalesRule/etc/config.xml | 8 +- .../salesrule_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../mysql4-upgrade-0.7.3-0.7.4.php | 8 +- .../mysql4-upgrade-0.7.4-0.7.5.php | 10 +- .../mysql4-upgrade-0.7.5-0.7.6.php | 10 +- .../mysql4-upgrade-0.7.6-0.7.7.php | 8 +- app/code/core/Mage/Sendfriend/Helper/Data.php | 2 +- .../core/Mage/Sendfriend/Model/Sendfriend.php | 10 +- .../controllers/ProductController.php | 8 +- app/code/core/Mage/Sendfriend/etc/config.xml | 8 +- app/code/core/Mage/Sendfriend/etc/system.xml | 10 +- .../sendfriend_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../Mage/Shipping/Block/Tracking/Ajax.php | 8 +- .../Mage/Shipping/Block/Tracking/Popup.php | 8 +- app/code/core/Mage/Shipping/Exception.php | 10 +- app/code/core/Mage/Shipping/Helper/Data.php | 8 +- .../Mage/Shipping/Model/Carrier/Abstract.php | 8 +- .../Mage/Shipping/Model/Carrier/Flatrate.php | 8 +- .../Shipping/Model/Carrier/Freeshipping.php | 8 +- .../Mage/Shipping/Model/Carrier/Interface.php | 8 +- .../Mage/Shipping/Model/Carrier/Pickup.php | 8 +- .../Mage/Shipping/Model/Carrier/Tablerate.php | 8 +- app/code/core/Mage/Shipping/Model/Config.php | 12 +- .../Model/Mysql4/Carrier/Tablerate.php | 8 +- .../Mysql4/Carrier/Tablerate/Collection.php | 148 +- .../Mage/Shipping/Model/Rate/Abstract.php | 8 +- .../core/Mage/Shipping/Model/Rate/Request.php | 8 +- .../core/Mage/Shipping/Model/Rate/Result.php | 190 +-- .../Shipping/Model/Rate/Result/Abstract.php | 8 +- .../Mage/Shipping/Model/Rate/Result/Error.php | 10 +- .../Shipping/Model/Rate/Result/Method.php | 8 +- .../Mage/Shipping/Model/Rule/Abstract.php | 62 +- .../Shipping/Model/Rule/Action/Abstract.php | 8 +- .../Shipping/Model/Rule/Action/Carrier.php | 62 +- .../Shipping/Model/Rule/Action/Method.php | 8 +- .../Model/Rule/Condition/Abstract.php | 62 +- .../Model/Rule/Condition/Dest/Country.php | 62 +- .../Model/Rule/Condition/Dest/Region.php | 62 +- .../Model/Rule/Condition/Dest/Zip.php | 62 +- .../Model/Rule/Condition/Order/Subtotal.php | 62 +- .../Model/Rule/Condition/Order/Totalqty.php | 62 +- .../Model/Rule/Condition/Package/Weight.php | 62 +- .../core/Mage/Shipping/Model/Shipping.php | 8 +- .../Shipping/Model/Source/HandlingAction.php | 10 +- .../Shipping/Model/Source/HandlingType.php | 10 +- .../Mage/Shipping/Model/Tracking/Result.php | 90 +- .../Model/Tracking/Result/Abstract.php | 8 +- .../Shipping/Model/Tracking/Result/Error.php | 22 +- .../Shipping/Model/Tracking/Result/Status.php | 14 +- .../controllers/ShippingController.php | 8 +- .../controllers/TrackingController.php | 8 +- app/code/core/Mage/Shipping/etc/config.xml | 8 +- app/code/core/Mage/Shipping/etc/system.xml | 8 +- .../shipping_setup/mysql4-install-0.7.0.php | 8 +- app/code/core/Mage/Sitemap/Helper/Data.php | 8 +- .../Sitemap/Model/Mysql4/Catalog/Category.php | 18 +- .../Sitemap/Model/Mysql4/Catalog/Product.php | 10 +- .../Mage/Sitemap/Model/Mysql4/Cms/Page.php | 10 +- .../Mage/Sitemap/Model/Mysql4/Sitemap.php | 8 +- .../Model/Mysql4/Sitemap/Collection.php | 8 +- app/code/core/Mage/Sitemap/Model/Observer.php | 10 +- app/code/core/Mage/Sitemap/Model/Sitemap.php | 8 +- app/code/core/Mage/Sitemap/etc/config.xml | 10 +- app/code/core/Mage/Sitemap/etc/system.xml | 10 +- .../sitemap_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 10 +- app/code/core/Mage/Tag/Block/All.php | 11 +- .../core/Mage/Tag/Block/Customer/Edit.php | 10 +- .../core/Mage/Tag/Block/Customer/Recent.php | 10 +- .../core/Mage/Tag/Block/Customer/Tags.php | 10 +- .../core/Mage/Tag/Block/Customer/View.php | 8 +- app/code/core/Mage/Tag/Block/Popular.php | 191 ++- app/code/core/Mage/Tag/Block/Product/List.php | 15 +- .../core/Mage/Tag/Block/Product/Result.php | 10 +- app/code/core/Mage/Tag/Helper/Data.php | 8 +- .../Tag/Model/Entity/Customer/Collection.php | 10 +- .../Tag/Model/Mysql4/Customer/Collection.php | 8 +- .../Tag/Model/Mysql4/Popular/Collection.php | 166 +- .../Tag/Model/Mysql4/Product/Collection.php | 8 +- app/code/core/Mage/Tag/Model/Mysql4/Tag.php | 16 +- .../Mage/Tag/Model/Mysql4/Tag/Collection.php | 37 +- .../Mage/Tag/Model/Mysql4/Tag/Relation.php | 8 +- app/code/core/Mage/Tag/Model/Session.php | 10 +- app/code/core/Mage/Tag/Model/Tag.php | 22 +- app/code/core/Mage/Tag/Model/Tag/Relation.php | 8 +- .../Tag/controllers/CustomerController.php | 8 +- .../Mage/Tag/controllers/IndexController.php | 9 +- .../Mage/Tag/controllers/ListController.php | 10 +- .../Tag/controllers/ProductController.php | 14 +- app/code/core/Mage/Tag/etc/config.xml | 8 +- .../sql/tag_setup/mysql4-install-0.7.0.php | 8 +- .../tag_setup/mysql4-upgrade-0.7.0-0.7.1.php | 10 +- .../tag_setup/mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../Adminhtml/Frontend/Region/Updater.php | 8 +- app/code/core/Mage/Tax/Exception.php | 10 +- app/code/core/Mage/Tax/Helper/Data.php | 24 +- app/code/core/Mage/Tax/Model/Calculation.php | 20 +- .../core/Mage/Tax/Model/Calculation/Rate.php | 14 +- .../Mage/Tax/Model/Calculation/Rate/Title.php | 10 +- .../core/Mage/Tax/Model/Calculation/Rule.php | 10 +- app/code/core/Mage/Tax/Model/Class.php | 10 +- .../Mage/Tax/Model/Class/Source/Customer.php | 38 +- .../Mage/Tax/Model/Class/Source/Product.php | 40 +- app/code/core/Mage/Tax/Model/Config.php | 8 +- .../Mage/Tax/Model/Config/Price/Include.php | 27 +- .../Mage/Tax/Model/Mysql4/Calculation.php | 8 +- .../Model/Mysql4/Calculation/Collection.php | 10 +- .../Tax/Model/Mysql4/Calculation/Rate.php | 10 +- .../Mysql4/Calculation/Rate/Collection.php | 10 +- .../Model/Mysql4/Calculation/Rate/Title.php | 10 +- .../Calculation/Rate/Title/Collection.php | 10 +- .../Tax/Model/Mysql4/Calculation/Rule.php | 10 +- .../Mysql4/Calculation/Rule/Collection.php | 14 +- app/code/core/Mage/Tax/Model/Mysql4/Class.php | 10 +- .../Tax/Model/Mysql4/Class/Collection.php | 10 +- app/code/core/Mage/Tax/Model/Observer.php | 8 +- .../System/Config/Source/Tax/Country.php | 10 +- .../System/Config/Source/Tax/Display/Type.php | 10 +- .../Model/System/Config/Source/Tax/Region.php | 10 +- app/code/core/Mage/Tax/etc/config.xml | 8 +- app/code/core/Mage/Tax/etc/system.xml | 8 +- .../sql/tax_setup/mysql4-install-0.7.0.php | 8 +- .../tax_setup/mysql4-upgrade-0.6.1-0.7.0.php | 8 +- .../tax_setup/mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../tax_setup/mysql4-upgrade-0.7.1-0.7.2.php | 8 +- .../tax_setup/mysql4-upgrade-0.7.2-0.7.3.php | 8 +- .../tax_setup/mysql4-upgrade-0.7.3-0.7.4.php | 8 +- .../tax_setup/mysql4-upgrade-0.7.4-0.7.5.php | 92 +- .../tax_setup/mysql4-upgrade-0.7.5-0.7.6.php | 76 +- .../tax_setup/mysql4-upgrade-0.7.6-0.7.7.php | 8 +- .../tax_setup/mysql4-upgrade-0.7.7-0.7.8.php | 66 +- app/code/core/Mage/Usa/Helper/Data.php | 10 +- .../Usa/Model/Shipping/Carrier/Abstract.php | 8 +- .../Mage/Usa/Model/Shipping/Carrier/Dhl.php | 8 +- .../Carrier/Dhl/Source/Dutypaymenttype.php | 8 +- .../Carrier/Dhl/Source/Freemethod.php | 10 +- .../Shipping/Carrier/Dhl/Source/Method.php | 8 +- .../Dhl/Source/Protection/Rounding.php | 8 +- .../Carrier/Dhl/Source/Protection/Value.php | 8 +- .../Carrier/Dhl/Source/Shipmenttype.php | 8 +- .../Mage/Usa/Model/Shipping/Carrier/Fedex.php | 21 +- .../Shipping/Carrier/Fedex/Source/Dropoff.php | 8 +- .../Carrier/Fedex/Source/Freemethod.php | 10 +- .../Shipping/Carrier/Fedex/Source/Method.php | 8 +- .../Carrier/Fedex/Source/Packaging.php | 8 +- .../Mage/Usa/Model/Shipping/Carrier/Ups.php | 8 +- .../Shipping/Carrier/Ups/Source/Container.php | 10 +- .../Shipping/Carrier/Ups/Source/DestType.php | 10 +- .../Carrier/Ups/Source/Freemethod.php | 8 +- .../Shipping/Carrier/Ups/Source/Method.php | 8 +- .../Carrier/Ups/Source/OriginShipment.php | 8 +- .../Shipping/Carrier/Ups/Source/Pickup.php | 10 +- .../Shipping/Carrier/Ups/Source/Type.php | 8 +- .../Carrier/Ups/Source/Unitofmeasure.php | 20 +- .../Mage/Usa/Model/Shipping/Carrier/Usps.php | 8 +- .../Carrier/Usps/Source/Container.php | 8 +- .../Carrier/Usps/Source/Freemethod.php | 10 +- .../Carrier/Usps/Source/Machinable.php | 8 +- .../Shipping/Carrier/Usps/Source/Method.php | 8 +- .../Shipping/Carrier/Usps/Source/Size.php | 8 +- app/code/core/Mage/Usa/Model/Tax/Uszip.php | 62 +- app/code/core/Mage/Usa/etc/config.xml | 8 +- app/code/core/Mage/Usa/etc/system.xml | 10 +- .../core/Mage/Weee/Block/Element/Weee/Tax.php | 58 +- .../Mage/Weee/Block/Renderer/Weee/Tax.php | 10 +- app/code/core/Mage/Weee/Helper/Data.php | 8 +- .../Weee/Model/Attribute/Backend/Weee/Tax.php | 16 +- .../Mage/Weee/Model/Config/Source/Display.php | 8 +- .../Mysql4/Attribute/Backend/Weee/Tax.php | 8 +- .../core/Mage/Weee/Model/Mysql4/Setup.php | 8 +- app/code/core/Mage/Weee/Model/Mysql4/Tax.php | 16 +- app/code/core/Mage/Weee/Model/Observer.php | 10 +- app/code/core/Mage/Weee/Model/Tax.php | 418 ++--- .../Mage/Weee/Model/Total/Creditmemo/Weee.php | 10 +- .../Mage/Weee/Model/Total/Invoice/Weee.php | 8 +- .../core/Mage/Weee/Model/Total/Quote/Weee.php | 10 +- app/code/core/Mage/Weee/etc/config.xml | 84 +- app/code/core/Mage/Weee/etc/system.xml | 10 +- .../sql/weee_setup/mysql4-install-0.1.php | 10 +- .../sql/weee_setup/mysql4-upgrade-0.1-0.2.php | 10 +- .../weee_setup/mysql4-upgrade-0.10-0.11.php | 10 +- .../weee_setup/mysql4-upgrade-0.11-0.12.php | 10 +- .../weee_setup/mysql4-upgrade-0.12-0.13.php | 8 +- .../sql/weee_setup/mysql4-upgrade-0.2-0.3.php | 10 +- .../sql/weee_setup/mysql4-upgrade-0.3-0.4.php | 10 +- .../sql/weee_setup/mysql4-upgrade-0.4-0.5.php | 10 +- .../sql/weee_setup/mysql4-upgrade-0.5-0.6.php | 8 +- .../sql/weee_setup/mysql4-upgrade-0.6-0.7.php | 10 +- .../sql/weee_setup/mysql4-upgrade-0.7-0.8.php | 10 +- .../sql/weee_setup/mysql4-upgrade-0.8-0.9.php | 10 +- .../weee_setup/mysql4-upgrade-0.9-0.10.php | 8 +- .../Mage/Wishlist/Block/Customer/Sharing.php | 8 +- .../Mage/Wishlist/Block/Customer/Sidebar.php | 8 +- .../Mage/Wishlist/Block/Customer/Wishlist.php | 8 +- app/code/core/Mage/Wishlist/Block/Links.php | 8 +- .../Mage/Wishlist/Block/Share/Email/Items.php | 8 +- .../Mage/Wishlist/Block/Share/Email/Rss.php | 8 +- .../Mage/Wishlist/Block/Share/Wishlist.php | 8 +- app/code/core/Mage/Wishlist/Helper/Data.php | 13 +- app/code/core/Mage/Wishlist/Model/Item.php | 8 +- .../core/Mage/Wishlist/Model/Mysql4/Item.php | 8 +- .../Wishlist/Model/Mysql4/Item/Collection.php | 8 +- .../Model/Mysql4/Product/Collection.php | 8 +- .../Mage/Wishlist/Model/Mysql4/Wishlist.php | 8 +- .../Model/Mysql4/Wishlist/Collection.php | 8 +- .../core/Mage/Wishlist/Model/Observer.php | 10 +- app/code/core/Mage/Wishlist/Model/Session.php | 8 +- .../core/Mage/Wishlist/Model/Wishlist.php | 10 +- .../Wishlist/controllers/IndexController.php | 8 +- .../Wishlist/controllers/SharedController.php | 10 +- app/code/core/Mage/Wishlist/etc/config.xml | 10 +- app/code/core/Mage/Wishlist/etc/system.xml | 10 +- .../wishlist_setup/mysql4-install-0.7.0.php | 8 +- .../mysql4-upgrade-0.7.0-0.7.1.php | 8 +- .../mysql4-upgrade-0.7.1-0.7.2.php | 10 +- .../mysql4-upgrade-0.7.2-0.7.4.php | 8 +- .../default/default/layout/admin.xml | 8 +- .../default/default/layout/bundle.xml | 8 +- .../default/default/layout/catalog.xml | 23 +- .../default/default/layout/compiler.xml | 70 +- .../default/default/layout/customer.xml | 8 +- .../default/default/layout/downloadable.xml | 6 +- .../default/layout/googleoptimizer.xml | 8 +- .../adminhtml/default/default/layout/main.xml | 8 +- .../adminhtml/default/default/layout/rss.xml | 8 +- .../default/default/layout/sales.xml | 10 +- .../default/template/access_denied.phtml | 16 +- .../template/api/role_users_grid_js.phtml | 28 +- .../default/template/api/roleinfo.phtml | 10 +- .../default/default/template/api/roles.phtml | 8 +- .../default/template/api/rolesedit.phtml | 10 +- .../default/template/api/rolesusers.phtml | 10 +- .../template/api/user_roles_grid_js.phtml | 28 +- .../default/template/api/userinfo.phtml | 10 +- .../default/template/api/usernroles.phtml | 14 +- .../default/template/api/userroles.phtml | 14 +- .../default/default/template/api/users.phtml | 8 +- .../default/template/backup/left.phtml | 8 +- .../default/template/backup/list.phtml | 16 +- .../template/bundle/product/edit/bundle.phtml | 8 +- .../bundle/product/edit/bundle/option.phtml | 8 +- .../product/edit/bundle/option/search.phtml | 10 +- .../edit/bundle/option/selection.phtml | 8 +- .../creditmemo/create/items/renderer.phtml | 8 +- .../creditmemo/view/items/renderer.phtml | 8 +- .../sales/invoice/create/items/renderer.phtml | 8 +- .../sales/invoice/view/items/renderer.phtml | 8 +- .../sales/order/view/items/renderer.phtml | 8 +- .../shipment/create/items/renderer.phtml | 8 +- .../sales/shipment/view/items/renderer.phtml | 8 +- .../catalog/category/checkboxes/tree.phtml | 8 +- .../template/catalog/category/edit.phtml | 10 +- .../template/catalog/category/edit/form.phtml | 10 +- .../template/catalog/category/tree.phtml | 8 +- .../form/renderer/fieldset/element.phtml | 8 +- .../renderer/googleoptimizer/import.phtml | 8 +- .../default/template/catalog/product.phtml | 8 +- .../catalog/product/attribute/js.phtml | 10 +- .../product/attribute/new/created.phtml | 12 +- .../catalog/product/attribute/options.phtml | 96 +- .../catalog/product/attribute/set/main.phtml | 28 +- .../attribute/set/main/tree/attribute.phtml | 8 +- .../attribute/set/main/tree/group.phtml | 10 +- .../product/attribute/set/toolbar/add.phtml | 20 +- .../product/attribute/set/toolbar/main.phtml | 20 +- .../template/catalog/product/created.phtml | 10 +- .../template/catalog/product/edit.phtml | 8 +- .../product/edit/action/attribute.phtml | 10 +- .../product/edit/action/inventory.phtml | 10 +- .../product/edit/action/websites.phtml | 10 +- .../catalog/product/edit/categories.phtml | 32 +- .../catalog/product/edit/options.phtml | 8 +- .../catalog/product/edit/options/option.phtml | 8 +- .../product/edit/options/type/date.phtml | 10 +- .../product/edit/options/type/file.phtml | 10 +- .../product/edit/options/type/select.phtml | 24 +- .../product/edit/options/type/text.phtml | 10 +- .../catalog/product/edit/price/tier.phtml | 10 +- .../catalog/product/edit/serializer.phtml | 8 +- .../catalog/product/edit/super/config.phtml | 8 +- .../catalog/product/edit/websites.phtml | 8 +- .../catalog/product/helper/gallery.phtml | 8 +- .../default/template/catalog/product/js.phtml | 10 +- .../template/catalog/product/tab/alert.phtml | 14 +- .../catalog/product/tab/inventory.phtml | 8 +- .../default/default/template/coming.phtml | 8 +- .../default/template/compiler/process.phtml | 8 +- .../default/template/customer/edit/js.phtml | 10 +- .../template/customer/group/list.phtml | 16 +- .../default/template/customer/online.phtml | 10 +- .../template/customer/tab/addresses.phtml | 8 +- .../default/template/customer/tab/cart.phtml | 10 +- .../template/customer/tab/newsletter.phtml | 10 +- .../default/template/customer/tab/view.phtml | 10 +- .../template/customer/tab/view/sales.phtml | 10 +- .../template/customer/tab/wishlist.phtml | 22 +- .../default/template/dashboard/graph.phtml | 8 +- .../default/template/dashboard/grid.phtml | 10 +- .../default/template/dashboard/index.phtml | 8 +- .../default/template/dashboard/salebar.phtml | 10 +- .../default/template/dashboard/searches.phtml | 10 +- .../template/dashboard/store/switcher.phtml | 10 +- .../default/template/dashboard/totalbar.phtml | 10 +- .../product/edit/downloadable.phtml | 6 +- .../product/edit/downloadable/links.phtml | 8 +- .../product/edit/downloadable/samples.phtml | 8 +- .../column/downloadable/creditmemo/name.phtml | 10 +- .../column/downloadable/invoice/name.phtml | 10 +- .../items/column/downloadable/name.phtml | 10 +- .../create/items/renderer/downloadable.phtml | 10 +- .../view/items/renderer/downloadable.phtml | 12 +- .../create/items/renderer/downloadable.phtml | 12 +- .../view/items/renderer/downloadable.phtml | 12 +- .../view/items/renderer/downloadable.phtml | 16 +- .../default/template/email/order/items.phtml | 10 +- .../default/default/template/example.phtml | 512 +++--- .../template/extensions/console/form.phtml | 8 +- .../template/extensions/custom/contents.phtml | 8 +- .../template/extensions/custom/depends.phtml | 8 +- .../template/extensions/custom/load.phtml | 10 +- .../extensions/custom/maintainers.phtml | 8 +- .../template/extensions/custom/package.phtml | 8 +- .../template/extensions/custom/release.phtml | 8 +- .../template/extensions/file/form.phtml | 20 +- .../template/extensions/local/actions.phtml | 10 +- .../template/extensions/local/changelog.phtml | 10 +- .../template/extensions/local/contents.phtml | 10 +- .../template/extensions/local/depends.phtml | 8 +- .../template/extensions/local/package.phtml | 10 +- .../template/extensions/local/upgrade.phtml | 20 +- .../template/extensions/mass/install.phtml | 20 +- .../template/extensions/mass/uninstall.phtml | 20 +- .../template/extensions/mass/upgrade.phtml | 20 +- .../template/extensions/remote/actions.phtml | 10 +- .../extensions/remote/changelog.phtml | 10 +- .../template/extensions/remote/package.phtml | 10 +- .../default/template/forgotpassword.phtml | 8 +- .../default/default/template/formkey.phtml | 8 +- .../default/template/giftmessage/form.phtml | 10 +- .../default/template/giftmessage/helper.phtml | 10 +- .../default/template/googlebase/captcha.phtml | 8 +- .../default/template/googlebase/items.phtml | 10 +- .../googlebase/types/edit/attributes.phtml | 8 +- .../cms/edit/renderer/conversion.phtml | 10 +- .../default/template/googleoptimizer/js.phtml | 10 +- .../default/default/template/login.phtml | 8 +- .../default/template/media/editor.phtml | 10 +- .../default/template/media/uploader.phtml | 10 +- .../template/newsletter/problem/list.phtml | 106 +- .../template/newsletter/queue/edit.phtml | 10 +- .../template/newsletter/queue/list.phtml | 24 +- .../template/newsletter/subscriber/list.phtml | 90 +- .../template/newsletter/template/edit.phtml | 22 +- .../template/newsletter/template/list.phtml | 26 +- .../newsletter/template/preview.phtml | 8 +- .../template/notification/toolbar.phtml | 10 +- .../template/notification/window.phtml | 136 +- .../default/default/template/page.phtml | 10 +- .../default/template/page/footer.phtml | 8 +- .../default/default/template/page/head.phtml | 2 +- .../default/template/page/header.phtml | 8 +- .../default/template/page/js/calendar.phtml | 24 + .../default/template/page/js/translate.phtml | 8 +- .../default/default/template/page/menu.phtml | 98 +- .../default/template/page/notices.phtml | 8 +- .../default/template/payment/form/cc.phtml | 10 +- .../template/payment/form/ccsave.phtml | 10 +- .../template/payment/form/checkmo.phtml | 10 +- .../template/payment/form/purchaseorder.phtml | 10 +- .../default/template/payment/info/cc.phtml | 8 +- .../template/payment/info/ccsave.phtml | 10 +- .../template/payment/info/checkmo.phtml | 10 +- .../template/payment/info/default.phtml | 10 +- .../template/payment/info/pdf/cc.phtml | 10 +- .../template/payment/info/pdf/ccsave.phtml | 10 +- .../template/payment/info/pdf/checkmo.phtml | 10 +- .../template/payment/info/pdf/default.phtml | 10 +- .../payment/info/pdf/purchaseorder.phtml | 8 +- .../template/payment/info/purchaseorder.phtml | 8 +- .../template/paypal/express/info.phtml | 8 +- .../template/paypal/express/pdf/info.phtml | 8 +- .../template/paypaluk/direct/form.phtml | 10 +- .../template/paypaluk/direct/info.phtml | 10 +- .../template/paypaluk/direct/pdf/info.phtml | 10 +- .../template/paypaluk/express/info.phtml | 8 +- .../template/paypaluk/express/pdf/info.phtml | 8 +- .../permissions/role_users_grid_js.phtml | 16 +- .../template/permissions/roleinfo.phtml | 10 +- .../default/template/permissions/roles.phtml | 8 +- .../template/permissions/rolesedit.phtml | 10 +- .../template/permissions/rolesusers.phtml | 10 +- .../permissions/user_roles_grid_js.phtml | 2 +- .../template/permissions/userinfo.phtml | 10 +- .../template/permissions/usernroles.phtml | 14 +- .../template/permissions/userroles.phtml | 14 +- .../default/template/permissions/users.phtml | 8 +- .../default/template/poll/answers/list.phtml | 8 +- .../default/default/template/popup.phtml | 10 +- .../default/template/promo/fieldset.phtml | 10 +- .../default/default/template/promo/form.phtml | 22 +- .../default/template/rating/detailed.phtml | 14 +- .../default/template/rating/options.phtml | 8 +- .../template/rating/stars/detailed.phtml | 20 +- .../template/rating/stars/summary.phtml | 8 +- .../default/template/report/grid.phtml | 16 +- .../template/report/store/switcher.phtml | 8 +- .../default/template/report/wishlist.phtml | 8 +- .../default/default/template/review/add.phtml | 10 +- .../template/sales/items/column/name.phtml | 10 +- .../template/sales/items/column/qty.phtml | 10 +- .../sales/items/renderer/default.phtml | 10 +- .../template/sales/order/comments/view.phtml | 10 +- .../sales/order/create/abstract.phtml | 10 +- .../order/create/billing/method/form.phtml | 10 +- .../template/sales/order/create/comment.phtml | 10 +- .../sales/order/create/coupons/form.phtml | 10 +- .../template/sales/order/create/data.phtml | 8 +- .../template/sales/order/create/form.phtml | 10 +- .../sales/order/create/form/account.phtml | 10 +- .../sales/order/create/form/address.phtml | 29 +- .../sales/order/create/giftmessage.phtml | 8 +- .../template/sales/order/create/items.phtml | 10 +- .../sales/order/create/items/grid.phtml | 8 +- .../template/sales/order/create/js.phtml | 8 +- .../sales/order/create/newsletter/form.phtml | 8 +- .../order/create/shipping/method/form.phtml | 10 +- .../template/sales/order/create/sidebar.phtml | 10 +- .../sales/order/create/sidebar/items.phtml | 10 +- .../sales/order/create/store/select.phtml | 10 +- .../template/sales/order/create/totals.phtml | 10 +- .../sales/order/create/totals/default.phtml | 10 +- .../sales/order/create/totals/tax.phtml | 12 +- .../sales/order/creditmemo/create/form.phtml | 10 +- .../sales/order/creditmemo/create/items.phtml | 10 +- .../create/items/renderer/configurable.phtml | 8 +- .../create/items/renderer/default.phtml | 8 +- .../create/totals/adjustments.phtml | 25 +- .../sales/order/creditmemo/view/form.phtml | 10 +- .../sales/order/creditmemo/view/items.phtml | 10 +- .../view/items/renderer/configurable.phtml | 8 +- .../view/items/renderer/default.phtml | 8 +- .../sales/order/invoice/create/form.phtml | 10 +- .../sales/order/invoice/create/items.phtml | 10 +- .../create/items/renderer/configurable.phtml | 8 +- .../create/items/renderer/default.phtml | 8 +- .../sales/order/invoice/create/tracking.phtml | 8 +- .../sales/order/invoice/view/form.phtml | 10 +- .../sales/order/invoice/view/items.phtml | 10 +- .../view/items/renderer/configurable.phtml | 8 +- .../invoice/view/items/renderer/default.phtml | 8 +- .../sales/order/shipment/create/form.phtml | 12 +- .../sales/order/shipment/create/items.phtml | 8 +- .../create/items/renderer/configurable.phtml | 10 +- .../create/items/renderer/default.phtml | 10 +- .../order/shipment/create/tracking.phtml | 8 +- .../sales/order/shipment/tracking/info.phtml | 10 +- .../sales/order/shipment/view/form.phtml | 10 +- .../sales/order/shipment/view/items.phtml | 10 +- .../view/items/renderer/configurable.phtml | 8 +- .../view/items/renderer/default.phtml | 8 +- .../sales/order/shipment/view/tracking.phtml | 10 +- .../template/sales/order/totalbar.phtml | 10 +- .../default/template/sales/order/totals.phtml | 12 +- .../sales/order/totals/discount.phtml | 8 +- .../template/sales/order/totals/due.phtml | 64 +- .../template/sales/order/totals/footer.phtml | 8 +- .../template/sales/order/totals/grand.phtml | 10 +- .../template/sales/order/totals/item.phtml | 10 +- .../template/sales/order/totals/main.phtml | 8 +- .../template/sales/order/totals/paid.phtml | 66 +- .../sales/order/totals/refunded.phtml | 64 +- .../sales/order/totals/shipping.phtml | 8 +- .../template/sales/order/totals/tax.phtml | 8 +- .../template/sales/order/view/form.phtml | 8 +- .../sales/order/view/giftmessage.phtml | 8 +- .../template/sales/order/view/history.phtml | 10 +- .../template/sales/order/view/info.phtml | 10 +- .../template/sales/order/view/items.phtml | 10 +- .../order/view/items/renderer/default.phtml | 10 +- .../sales/order/view/tab/history.phtml | 10 +- .../template/sales/order/view/tab/info.phtml | 8 +- .../template/sales/order/view/tracking.phtml | 10 +- .../default/template/store/switcher.phtml | 10 +- .../template/store/switcher/enhanced.phtml | 10 +- .../template/system/autocomplete.phtml | 10 +- .../default/template/system/cache/edit.phtml | 8 +- .../default/template/system/config/edit.phtml | 8 +- .../system/config/form/field/array.phtml | 8 +- .../default/template/system/config/js.phtml | 22 +- .../template/system/config/switcher.phtml | 2 +- .../default/template/system/config/tabs.phtml | 8 +- .../template/system/convert/profile/run.phtml | 6 +- .../system/convert/profile/upload.phtml | 2 +- .../system/convert/profile/wizard.phtml | 8 +- .../system/currency/rate/matrix.phtml | 10 +- .../template/system/currency/rates.phtml | 16 +- .../default/template/system/design/edit.phtml | 8 +- .../template/system/design/index.phtml | 10 +- .../template/system/email/template/edit.phtml | 16 +- .../template/system/email/template/list.phtml | 26 +- .../system/email/template/preview.phtml | 8 +- .../default/template/system/info.phtml | 236 +-- .../system/shipping/applicable_country.phtml | 8 +- .../template/system/shipping/ups.phtml | 324 ++-- .../default/default/template/tag/index.phtml | 10 +- .../template/tax/class/page/edit.phtml | 20 +- .../default/template/tax/importExport.phtml | 8 +- .../default/template/tax/rate/form.phtml | 8 +- .../default/template/tax/rate/title.phtml | 8 +- .../template/tax/toolbar/class/add.phtml | 22 +- .../template/tax/toolbar/class/save.phtml | 20 +- .../template/tax/toolbar/rate/add.phtml | 22 +- .../template/tax/toolbar/rate/save.phtml | 20 +- .../template/tax/toolbar/rule/add.phtml | 22 +- .../template/tax/toolbar/rule/save.phtml | 20 +- .../template/urlrewrite/categories.phtml | 8 +- .../default/template/urlrewrite/edit.phtml | 8 +- .../template/urlrewrite/selector.phtml | 8 +- .../default/template/weee/renderer/tax.phtml | 10 +- .../default/template/widget/accordion.phtml | 78 +- .../default/template/widget/breadcrumbs.phtml | 94 +- .../default/template/widget/form.phtml | 14 +- .../template/widget/form/container.phtml | 92 +- .../template/widget/form/element.phtml | 80 +- .../widget/form/element/gallery.phtml | 26 +- .../widget/form/renderer/element.phtml | 10 +- .../widget/form/renderer/fieldset.phtml | 10 +- .../form/renderer/fieldset/element.phtml | 24 +- .../default/template/widget/grid.phtml | 108 +- .../template/widget/grid/container.phtml | 10 +- .../template/widget/grid/massaction.phtml | 8 +- .../default/template/widget/tabs.phtml | 8 +- .../default/template/widget/tabshoriz.phtml | 10 +- .../default/template/widget/tabsleft.phtml | 88 +- .../template/widget/view/container.phtml | 10 +- .../default/default/layout/amazonpayments.xml | 10 +- .../default/default/layout/bundle.xml | 10 +- .../default/default/layout/catalog.xml | 8 +- .../default/default/layout/catalogsearch.xml | 10 +- .../default/default/layout/checkout.xml | 14 +- .../frontend/default/default/layout/cms.xml | 8 +- .../default/default/layout/contacts.xml | 8 +- .../frontend/default/default/layout/core.xml | 8 +- .../default/default/layout/customer.xml | 24 +- .../default/default/layout/directory.xml | 10 +- .../default/default/layout/downloadable.xml | 8 +- .../default/default/layout/giftmessage.xml | 10 +- .../default/layout/googleanalytics.xml | 10 +- .../default/default/layout/googlecheckout.xml | 10 +- .../default/layout/googleoptimizer.xml | 10 +- .../default/default/layout/newsletter.xml | 10 +- .../frontend/default/default/layout/page.xml | 8 +- .../default/default/layout/paypal.xml | 10 +- .../default/default/layout/paypaluk.xml | 10 +- .../frontend/default/default/layout/poll.xml | 10 +- .../default/default/layout/productalert.xml | 10 +- .../default/default/layout/reports.xml | 10 +- .../default/default/layout/review.xml | 8 +- .../frontend/default/default/layout/rss.xml | 10 +- .../frontend/default/default/layout/sales.xml | 10 +- .../default/default/layout/sendfriend.xml | 10 +- .../default/default/layout/shipping.xml | 8 +- .../frontend/default/default/layout/tag.xml | 10 +- .../frontend/default/default/layout/weee.xml | 8 +- .../default/default/layout/wishlist.xml | 10 +- .../template/amazonpayments/asp/form.phtml | 10 +- .../amazonpayments/asp/redirect.phtml | 8 +- .../amazonpayments/asp/shortcut.phtml | 8 +- .../template/amazonpayments/cba/form.phtml | 10 +- .../template/amazonpayments/cba/success.phtml | 10 +- .../template/amazonpayments/link.phtml | 10 +- .../bundle/catalog/product/list/partof.phtml | 8 +- .../bundle/catalog/product/price.phtml | 526 +++--- .../bundle/catalog/product/view/price.phtml | 186 +-- .../catalog/product/view/tierprices.phtml | 10 +- .../catalog/product/view/type/bundle.phtml | 8 +- .../view/type/bundle/option/checkbox.phtml | 8 +- .../view/type/bundle/option/multi.phtml | 8 +- .../view/type/bundle/option/radio.phtml | 8 +- .../view/type/bundle/option/select.phtml | 8 +- .../product/view/type/bundle/options.phtml | 8 +- .../order/items/creditmemo/default.phtml | 10 +- .../email/order/items/invoice/default.phtml | 10 +- .../email/order/items/order/default.phtml | 10 +- .../email/order/items/shipment/default.phtml | 10 +- .../order/creditmemo/items/renderer.phtml | 10 +- .../sales/order/invoice/items/renderer.phtml | 10 +- .../bundle/sales/order/items/renderer.phtml | 10 +- .../sales/order/shipment/items/renderer.phtml | 10 +- .../default/template/callouts/left_col.phtml | 8 +- .../default/template/callouts/right_col.phtml | 8 +- .../template/catalog/category/page.phtml | 8 +- .../template/catalog/category/view.phtml | 10 +- .../template/catalog/layer/filter.phtml | 8 +- .../template/catalog/layer/state.phtml | 8 +- .../default/template/catalog/layer/view.phtml | 8 +- .../template/catalog/navigation/left.phtml | 8 +- .../template/catalog/navigation/top.phtml | 10 +- .../catalog/product/compare/list.phtml | 8 +- .../catalog/product/compare/sidebar.phtml | 8 +- .../template/catalog/product/gallery.phtml | 8 +- .../template/catalog/product/list.phtml | 8 +- .../catalog/product/list/related.phtml | 10 +- .../catalog/product/list/toolbar.phtml | 8 +- .../catalog/product/list/upsell.phtml | 8 +- .../template/catalog/product/new.phtml | 10 +- .../template/catalog/product/price.phtml | 24 +- .../template/catalog/product/view.phtml | 10 +- .../catalog/product/view/additional.phtml | 8 +- .../template/catalog/product/view/addto.phtml | 10 +- .../catalog/product/view/addtocart.phtml | 10 +- .../catalog/product/view/attributes.phtml | 10 +- .../catalog/product/view/description.phtml | 10 +- .../template/catalog/product/view/media.phtml | 8 +- .../catalog/product/view/options.phtml | 8 +- .../product/view/options/type/date.phtml | 8 +- .../product/view/options/type/default.phtml | 8 +- .../product/view/options/type/file.phtml | 8 +- .../product/view/options/type/select.phtml | 8 +- .../product/view/options/type/text.phtml | 8 +- .../product/view/options/wrapper.phtml | 10 +- .../product/view/options/wrapper/bottom.phtml | 8 +- .../template/catalog/product/view/price.phtml | 8 +- .../catalog/product/view/price_clone.phtml | 10 +- .../catalog/product/view/tierprices.phtml | 10 +- .../product/view/type/configurable.phtml | 8 +- .../catalog/product/view/type/grouped.phtml | 10 +- .../view/type/options/configurable.phtml | 8 +- .../catalog/product/view/type/simple.phtml | 8 +- .../catalog/product/view/type/virtual.phtml | 10 +- .../template/catalog/seo/sitemap.phtml | 8 +- .../catalog/seo/sitemap/container.phtml | 8 +- .../default/template/catalog/seo/tree.phtml | 8 +- .../catalogsearch/advanced/form.phtml | 10 +- .../catalogsearch/advanced/result.phtml | 10 +- .../template/catalogsearch/form.mini.phtml | 8 +- .../template/catalogsearch/result.phtml | 8 +- .../default/template/catalogsearch/term.phtml | 10 +- .../default/template/checkout/cart.phtml | 8 +- .../template/checkout/cart/coupon.phtml | 10 +- .../template/checkout/cart/crosssell.phtml | 8 +- .../template/checkout/cart/item/default.phtml | 16 +- .../template/checkout/cart/noItems.phtml | 8 +- .../checkout/cart/render/default.phtml | 10 +- .../checkout/cart/render/simple.phtml | 10 +- .../template/checkout/cart/shipping.phtml | 10 +- .../template/checkout/cart/sidebar.phtml | 10 +- .../checkout/cart/sidebar/default.phtml | 21 +- .../template/checkout/cart/totals.phtml | 10 +- .../default/template/checkout/links.phtml | 8 +- .../multishipping/address/select.phtml | 8 +- .../checkout/multishipping/addresses.phtml | 8 +- .../checkout/multishipping/agreements.phtml | 8 +- .../checkout/multishipping/billing.phtml | 8 +- .../multishipping/billing/items.phtml | 10 +- .../checkout/multishipping/item/default.phtml | 10 +- .../checkout/multishipping/link.phtml | 10 +- .../checkout/multishipping/overview.phtml | 8 +- .../checkout/multishipping/shipping.phtml | 8 +- .../checkout/multishipping/state.phtml | 80 +- .../checkout/multishipping/success.phtml | 8 +- .../default/template/checkout/onepage.phtml | 8 +- .../checkout/onepage/agreements.phtml | 8 +- .../template/checkout/onepage/billing.phtml | 8 +- .../template/checkout/onepage/failure.phtml | 10 +- .../template/checkout/onepage/link.phtml | 14 +- .../template/checkout/onepage/login.phtml | 10 +- .../template/checkout/onepage/payment.phtml | 8 +- .../checkout/onepage/payment/methods.phtml | 8 +- .../template/checkout/onepage/progress.phtml | 10 +- .../template/checkout/onepage/review.phtml | 8 +- .../checkout/onepage/review/info.phtml | 8 +- .../checkout/onepage/review/item.phtml | 8 +- .../checkout/onepage/review/totals.phtml | 8 +- .../template/checkout/onepage/shipping.phtml | 8 +- .../checkout/onepage/shipping_method.phtml | 8 +- .../onepage/shipping_method/additional.phtml | 10 +- .../onepage/shipping_method/available.phtml | 10 +- .../default/template/checkout/success.phtml | 10 +- .../template/checkout/total/default.phtml | 8 +- .../default/template/checkout/total/tax.phtml | 10 +- .../default/template/cms/content.phtml | 8 +- .../default/template/cms/default/home.phtml | 2 +- .../template/cms/default/no-route.phtml | 2 +- .../default/default/template/cms/meta.phtml | 8 +- .../default/template/contacts/form.phtml | 10 +- .../default/template/core/formkey.phtml | 54 +- .../default/template/core/messages.phtml | 8 +- .../template/customer/account/dashboard.phtml | 10 +- .../customer/account/dashboard/address.phtml | 8 +- .../customer/account/dashboard/hello.phtml | 10 +- .../customer/account/dashboard/info.phtml | 8 +- .../account/dashboard/newsletter.phtml | 8 +- .../customer/account/dashboard/sidebar.phtml | 8 +- .../template/customer/account/link/back.phtml | 8 +- .../customer/account/navigation.phtml | 88 +- .../default/template/customer/address.phtml | 10 +- .../template/customer/address/book.phtml | 10 +- .../template/customer/address/edit.phtml | 8 +- .../default/template/customer/balance.phtml | 62 +- .../default/template/customer/dashboard.phtml | 8 +- .../template/customer/form/address.phtml | 8 +- .../customer/form/changepassword.phtml | 10 +- .../template/customer/form/confirmation.phtml | 9 +- .../default/template/customer/form/edit.phtml | 8 +- .../customer/form/forgotpassword.phtml | 10 +- .../template/customer/form/login.phtml | 2 +- .../template/customer/form/mini.login.phtml | 8 +- .../customer/form/mini.newsletter.phtml | 8 +- .../template/customer/form/newsletter.phtml | 8 +- .../template/customer/form/register.phtml | 8 +- .../default/template/customer/logout.phtml | 8 +- .../template/customer/order/view.phtml | 10 +- .../default/template/customer/orders.phtml | 10 +- .../template/customer/widget/dob.phtml | 45 +- .../template/customer/widget/name.phtml | 10 +- .../template/customer/widget/taxvat.phtml | 8 +- .../default/template/customer/wishlist.phtml | 8 +- .../default/template/directory/currency.phtml | 10 +- .../template/directory/currency/switch.phtml | 62 +- .../downloadable/catalog/product/links.phtml | 6 +- .../catalog/product/samples.phtml | 8 +- .../downloadable/catalog/product/type.phtml | 8 +- .../checkout/cart/item/default.phtml | 8 +- .../multishipping/item/downloadable.phtml | 10 +- .../checkout/onepage/review/item.phtml | 10 +- .../downloadable/checkout/success.phtml | 10 +- .../downloadable/customer/products/list.phtml | 10 +- .../order/items/creditmemo/downloadable.phtml | 10 +- .../order/items/invoice/downloadable.phtml | 10 +- .../order/items/order/downloadable.phtml | 10 +- .../items/renderer/downloadable.phtml | 8 +- .../invoice/items/renderer/downloadable.phtml | 8 +- .../order/items/renderer/downloadable.phtml | 8 +- .../email/order/creditmemo/items.phtml | 10 +- .../template/email/order/invoice/items.phtml | 10 +- .../default/template/email/order/items.phtml | 8 +- .../order/items/creditmemo/default.phtml | 10 +- .../email/order/items/invoice/default.phtml | 10 +- .../email/order/items/order/default.phtml | 10 +- .../email/order/items/shipment/default.phtml | 10 +- .../template/email/order/shipment/items.phtml | 10 +- .../template/email/order/shipment/track.phtml | 92 +- .../template/email/productalert/price.phtml | 8 +- .../template/email/productalert/stock.phtml | 10 +- .../default/template/giftmessage/form.phtml | 10 +- .../default/template/giftmessage/helper.phtml | 10 +- .../default/template/giftmessage/inline.phtml | 10 +- .../template/googlecheckout/form.phtml | 10 +- .../template/googlecheckout/link.phtml | 10 +- .../template/newsletter/subscribe.phtml | 8 +- .../default/template/page/1column.phtml | 8 +- .../default/template/page/2columns-left.phtml | 10 +- .../template/page/2columns-right.phtml | 12 +- .../default/template/page/3columns.phtml | 10 +- .../default/template/page/dashboard.phtml | 10 +- .../template/page/html/breadcrumbs.phtml | 8 +- .../default/template/page/html/footer.phtml | 8 +- .../default/template/page/html/head.phtml | 8 +- .../default/template/page/html/header.phtml | 10 +- .../default/template/page/html/notices.phtml | 8 +- .../default/template/page/html/pager.phtml | 8 +- .../template/page/html/top.links.phtml | 8 +- .../default/template/page/html/wrapper.phtml | 10 +- .../default/template/page/js/calendar.phtml | 8 +- .../default/template/page/one-column.phtml | 10 +- .../default/default/template/page/print.phtml | 10 +- .../default/template/page/redirect.phtml | 10 +- .../default/template/page/switch/flags.phtml | 10 +- .../template/page/switch/languages.phtml | 10 +- .../default/template/page/switch/stores.phtml | 10 +- .../template/page/template/container.phtml | 8 +- .../template/page/template/links.phtml | 8 +- .../default/template/payment/form/cc.phtml | 10 +- .../template/payment/form/ccsave.phtml | 8 +- .../template/payment/form/checkmo.phtml | 8 +- .../template/payment/form/purchaseorder.phtml | 10 +- .../default/template/payment/info/cc.phtml | 10 +- .../template/payment/info/ccsave.phtml | 8 +- .../template/payment/info/checkmo.phtml | 10 +- .../template/payment/info/default.phtml | 10 +- .../template/payment/info/purchaseorder.phtml | 8 +- .../template/paypal/express/form.phtml | 10 +- .../template/paypal/express/info.phtml | 8 +- .../template/paypal/express/review.phtml | 8 +- .../paypal/express/review/details.phtml | 8 +- .../default/template/paypal/link.phtml | 10 +- .../template/paypal/standard/form.phtml | 10 +- .../template/paypaluk/direct/form.phtml | 8 +- .../template/paypaluk/direct/info.phtml | 10 +- .../template/paypaluk/express/form.phtml | 10 +- .../template/paypaluk/express/info.phtml | 8 +- .../template/paypaluk/express/review.phtml | 8 +- .../paypaluk/express/review/details.phtml | 8 +- .../default/template/paypaluk/link.phtml | 10 +- .../default/template/poll/active.phtml | 10 +- .../default/template/poll/result.phtml | 8 +- .../default/template/productalert/price.phtml | 10 +- .../default/template/productalert/stock.phtml | 10 +- .../default/template/rating/detailed.phtml | 10 +- .../default/template/rating/empty.phtml | 10 +- .../reports/home_product_compared.phtml | 10 +- .../reports/home_product_viewed.phtml | 10 +- .../template/reports/product_compared.phtml | 10 +- .../template/reports/product_viewed.phtml | 10 +- .../template/review/customer/list.phtml | 8 +- .../template/review/customer/recent.phtml | 8 +- .../template/review/customer/view.phtml | 8 +- .../default/template/review/form.phtml | 8 +- .../template/review/helper/summary.phtml | 8 +- .../review/helper/summary_short.phtml | 8 +- .../template/review/product/view/count.phtml | 10 +- .../template/review/product/view/list.phtml | 8 +- .../template/review/product/view/other.phtml | 8 +- .../default/template/review/view.phtml | 8 +- .../default/default/template/rss/list.phtml | 8 +- .../default/default/template/rss/nofeed.phtml | 2 +- .../default/template/rss/order/details.phtml | 10 +- .../template/sales/order/creditmemo.phtml | 10 +- .../sales/order/creditmemo/items.phtml | 10 +- .../creditmemo/items/renderer/default.phtml | 10 +- .../template/sales/order/details.phtml | 8 +- .../template/sales/order/history.phtml | 8 +- .../default/template/sales/order/info.phtml | 10 +- .../template/sales/order/invoice.phtml | 8 +- .../template/sales/order/invoice/items.phtml | 10 +- .../invoice/items/renderer/default.phtml | 8 +- .../default/template/sales/order/items.phtml | 10 +- .../sales/order/items/renderer/default.phtml | 10 +- .../default/template/sales/order/print.phtml | 10 +- .../sales/order/print/creditmemo.phtml | 10 +- .../template/sales/order/print/invoice.phtml | 10 +- .../template/sales/order/print/shipment.phtml | 10 +- .../default/template/sales/order/recent.phtml | 10 +- .../template/sales/order/shipment.phtml | 8 +- .../template/sales/order/shipment/items.phtml | 10 +- .../shipment/items/renderer/default.phtml | 10 +- .../template/sales/order/trackinginfo.phtml | 10 +- .../default/template/sales/order/view.phtml | 8 +- .../template/sales/reorder/sidebar.phtml | 8 +- .../default/template/sendfriend/send.phtml | 10 +- .../template/shipping/tracking/ajax.phtml | 1 + .../template/shipping/tracking/popup.phtml | 10 +- .../default/default/template/tag/cloud.phtml | 8 +- .../default/template/tag/customer/edit.phtml | 10 +- .../template/tag/customer/recent.phtml | 8 +- .../default/template/tag/customer/tags.phtml | 10 +- .../default/template/tag/customer/view.phtml | 18 +- .../default/default/template/tag/list.phtml | 10 +- .../default/default/template/tag/mytags.phtml | 8 +- .../default/template/tag/popular.phtml | 8 +- .../default/template/tag/product/result.phtml | 8 +- .../default/default/template/tag/result.phtml | 8 +- .../default/default/template/tag/search.phtml | 8 +- .../template/wishlist/email/items.phtml | 8 +- .../default/template/wishlist/email/rss.phtml | 10 +- .../default/template/wishlist/shared.phtml | 10 +- .../default/template/wishlist/sharing.phtml | 8 +- .../default/template/wishlist/sidebar.phtml | 8 +- .../default/template/wishlist/view.phtml | 8 +- .../install/default/default/layout/main.xml | 8 +- .../default/template/install/begin.phtml | 8 +- .../default/template/install/config.phtml | 10 +- .../template/install/create_admin.phtml | 8 +- .../default/template/install/download.phtml | 10 +- .../default/template/install/end.phtml | 10 +- .../default/template/install/locale.phtml | 10 +- .../default/template/install/state.phtml | 88 +- .../default/default/template/page.phtml | 8 +- app/etc/modules/Mage_All.xml | 8 +- app/etc/modules/Mage_AmazonPayments.xml | 8 +- app/etc/modules/Mage_Api.xml | 10 +- app/etc/modules/Mage_Bundle.xml | 10 +- app/etc/modules/Mage_Compiler.xml | 76 +- app/etc/modules/Mage_Downloadable.xml | 10 +- app/etc/modules/Mage_Weee.xml | 10 +- app/locale/en_US/Mage_Cms.csv | 2 +- js/lib/boxover.js | 22 - js/lib/ds-sleight.js | 22 - js/mage/adminhtml/accordion.js | 3 + js/mage/adminhtml/grid.js | 6 +- js/mage/adminhtml/hash.js | 22 - js/mage/adminhtml/loader.js | 22 +- js/mage/adminhtml/product.js | 1442 +++++++++-------- js/mage/adminhtml/tools.js | 8 + js/prototype/validation.js | 2 +- js/scriptaculous/slider.js | 4 +- js/varien/form.js | 8 +- js/varien/js.js | 16 +- js/varien/product.js | 49 +- lib/Varien/Data/Form/Element/Editor.php | 52 +- lib/Varien/Data/Form/Element/Note.php | 2 +- lib/Varien/Http/Client.php | 21 +- lib/Varien/Simplexml/Element.php | 32 +- lib/Zend/Acl.php | 20 +- lib/Zend/Acl/Role/Registry.php | 7 +- lib/Zend/Auth.php | 10 +- lib/Zend/Auth/Adapter/DbTable.php | 13 +- lib/Zend/Auth/Adapter/Ldap.php | 15 +- lib/Zend/Cache/Backend/File.php | 16 +- lib/Zend/Cache/Backend/Sqlite.php | 10 +- lib/Zend/Cache/Core.php | 28 +- lib/Zend/Captcha/ReCaptcha.php | 17 +- .../Action/HelperBroker/PriorityStack.php | 65 +- lib/Zend/Controller/Plugin/ActionStack.php | 47 +- lib/Zend/Controller/Request/Abstract.php | 13 +- lib/Zend/Controller/Request/Http.php | 46 +- lib/Zend/Controller/Request/HttpTestCase.php | 4 +- lib/Zend/Db.php | 13 +- lib/Zend/Db/Adapter/Exception.php | 7 +- lib/Zend/Db/Adapter/Pdo/Abstract.php | 8 +- lib/Zend/Db/Adapter/Pdo/Sqlite.php | 10 +- lib/Zend/Db/Select.php | 10 +- lib/Zend/Db/Statement.php | 28 +- lib/Zend/Db/Statement/Db2.php | 6 +- lib/Zend/Db/Statement/Exception.php | 36 +- lib/Zend/Db/Statement/Mysqli.php | 21 +- lib/Zend/Db/Statement/Oracle.php | 7 +- lib/Zend/Db/Statement/Pdo.php | 50 +- lib/Zend/Db/Statement/Pdo/Ibm.php | 4 +- lib/Zend/Db/Table/Abstract.php | 58 +- lib/Zend/Db/Table/Select.php | 34 +- lib/Zend/Dojo/View/Helper/Dojo/Container.php | 4 +- lib/Zend/Feed.php | 31 +- lib/Zend/Feed/Abstract.php | 4 +- lib/Zend/Feed/Entry/Atom.php | 4 +- lib/Zend/Feed/Rss.php | 8 +- lib/Zend/Filter/HtmlEntities.php | 6 +- lib/Zend/Filter/Input.php | 21 +- lib/Zend/Form.php | 22 +- lib/Zend/Form/Element.php | 14 +- lib/Zend/Http/Client.php | 2 +- lib/Zend/Http/Client/Adapter/Test.php | 2 +- lib/Zend/Ldap.php | 1090 +++++++------ lib/Zend/Ldap/Exception.php | 6 +- lib/Zend/Loader/PluginLoader.php | 9 +- lib/Zend/Mail/Transport/Sendmail.php | 5 +- lib/Zend/Rest/Client.php | 6 +- lib/Zend/Search/Lucene.php | 10 +- lib/Zend/Service/Nirvanix/Namespace/Imfs.php | 4 +- lib/Zend/Service/Twitter.php | 1133 +++++++------ lib/Zend/Service/Twitter/Search.php | 8 +- lib/Zend/Session.php | 5 +- lib/Zend/Soap/Client/DotNet.php | 4 +- lib/Zend/Test/PHPUnit/Constraint/DomQuery.php | 16 +- lib/Zend/Test/PHPUnit/ControllerTestCase.php | 30 +- lib/Zend/Validate/Abstract.php | 13 +- lib/Zend/Validate/File/Count.php | 8 +- lib/Zend/Validate/File/Crc32.php | 4 +- lib/Zend/Validate/File/ExcludeMimeType.php | 32 +- lib/Zend/Validate/File/Exists.php | 4 +- lib/Zend/Validate/File/Extension.php | 8 +- lib/Zend/Validate/File/FilesSize.php | 26 +- lib/Zend/Validate/File/Hash.php | 5 +- lib/Zend/Validate/File/ImageSize.php | 10 +- lib/Zend/Validate/File/IsCompressed.php | 57 +- lib/Zend/Validate/File/IsImage.php | 57 +- lib/Zend/Validate/File/MimeType.php | 89 +- lib/Zend/Validate/File/Size.php | 5 +- lib/Zend/Validate/File/Upload.php | 8 +- lib/Zend/Validate/NotEmpty.php | 8 +- lib/Zend/Version.php | 4 +- lib/Zend/View/Helper/RenderToPlaceholder.php | 13 +- lib/Zend/XmlRpc/Value.php | 12 +- lib/Zend/XmlRpc/Value/Double.php | 8 +- report/skin/default/index.phtml | 481 ++---- skin/adminhtml/default/default/boxes.css | 98 +- skin/adminhtml/default/default/iestyles.css | 7 +- skin/frontend/default/blue/css/boxes.css | 23 +- skin/frontend/default/blue/css/clears.css | 8 +- skin/frontend/default/blue/css/ie7minus.css | 8 +- skin/frontend/default/blue/css/iestyles.css | 10 +- skin/frontend/default/blue/css/menu.css | 8 +- skin/frontend/default/blue/css/print.css | 8 +- skin/frontend/default/blue/css/reset.css | 8 +- skin/frontend/default/blue/js/bundle.js | 22 +- skin/frontend/default/blue/js/giftmessage.js | 6 +- skin/frontend/default/blue/js/opcheckout.js | 10 +- skin/frontend/default/blue/js/paypal.js | 40 +- skin/frontend/default/default/css/boxes.css | 23 +- skin/frontend/default/default/css/clears.css | 8 +- .../frontend/default/default/css/ie7minus.css | 8 +- .../frontend/default/default/css/iestyles.css | 10 +- skin/frontend/default/default/css/menu.css | 8 +- skin/frontend/default/default/css/print.css | 8 +- skin/frontend/default/default/css/reset.css | 8 +- skin/frontend/default/default/js/bundle.js | 8 +- .../default/default/js/giftmessage.js | 6 +- .../frontend/default/default/js/opcheckout.js | 10 +- skin/frontend/default/default/js/paypal.js | 42 +- 3961 files changed, 36418 insertions(+), 34763 deletions(-) diff --git a/app/Mage.php b/app/Mage.php index 68be8b1bd8..be02585ba9 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -137,7 +137,8 @@ final class Mage */ public static function getVersion() { - return '1.4.0.0-alpha2'; + $i = self::getVersionInfo(); + return trim("{$i['major']}.{$i['minor']}.{$i['revision']}.{$i['patch']}-{$i['stability']}{$i['number']}", '.-'); } /** @@ -154,7 +155,7 @@ public static function getVersionInfo() 'revision' => '0', 'patch' => '0', 'stability' => 'alpha', - 'number' => '2', + 'number' => '3', ); } diff --git a/app/code/core/Mage/Admin/Model/Acl.php b/app/code/core/Mage/Admin/Model/Acl.php index a77de9d3e0..854051cc57 100644 --- a/app/code/core/Mage/Admin/Model/Acl.php +++ b/app/code/core/Mage/Admin/Model/Acl.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,4 +89,4 @@ public function addRoleParent($role, $parent) $this->_getRoleRegistry()->addParent($role, $parent); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php index a4fdd5b623..00f5ace01a 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,4 +53,4 @@ protected function _isCleanIP($ip) { // ... } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php index 6fb67c5879..ec0bcf6055 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,4 +53,4 @@ protected function _isCleanTime($time) { // ... } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Acl/Resource.php b/app/code/core/Mage/Admin/Model/Acl/Resource.php index c0221e6af7..cc539ea6ef 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Resource.php +++ b/app/code/core/Mage/Admin/Model/Acl/Resource.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Admin_Model_Acl_Resource extends Zend_Acl_Resource { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Acl/Role.php b/app/code/core/Mage/Admin/Model/Acl/Role.php index 5806bc1a6c..6928fc108d 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Admin_Model_Acl_Role extends Varien_Object { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php index 86ab04091b..7dbe7486bb 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Admin_Model_Acl_Role_Generic extends Zend_Acl_Role { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php index 257acea935..035d5d19cd 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Admin_Model_Acl_Role_Group extends Mage_Admin_Model_Acl_Role_Generic { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php index 3bfad4e095..09441f208c 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/User.php b/app/code/core/Mage/Admin/Model/Acl/Role/User.php index 707f778180..dcf99703d1 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/User.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Admin_Model_Acl_Role_User extends Mage_Admin_Model_Acl_Role_Generic { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Config.php b/app/code/core/Mage/Admin/Model/Config.php index 088f72a1e8..012b2aa06d 100644 --- a/app/code/core/Mage/Admin/Model/Config.php +++ b/app/code/core/Mage/Admin/Model/Config.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,12 +58,14 @@ public function __construct() Mage::getConfig()->loadModulesConfiguration('adminhtml.xml', $adminhtmlConfig); $this->_adminhtmlConfig = $adminhtmlConfig; - // support back compatibility with base config + /** + * @deprecated after 1.4.0.0-alpha2 + * support backwards compatibility with config.xml + */ $aclConfig = Mage::getConfig()->getNode('adminhtml/acl'); if ($aclConfig) { $adminhtmlConfig->getNode()->extendChild($aclConfig, true); } - $menuConfig = Mage::getConfig()->getNode('adminhtml/menu'); if ($menuConfig) { $adminhtmlConfig->getNode()->extendChild($menuConfig, true); @@ -165,4 +167,4 @@ public function getAdminhtmlConfig() { return $this->_adminhtmlConfig; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php index 87e46ca681..9884d1bdb4 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -125,7 +125,7 @@ function loadRoles(Mage_Admin_Model_Acl $acl, array $rolesArr) */ function loadRules(Mage_Admin_Model_Acl $acl, array $rulesArr) { - foreach ($rulesArr as $rule) { + foreach ($rulesArr as $rule) { $role = $rule['role_type'].$rule['role_id']; $resource = $rule['resource_id']; $privileges = !empty($rule['privileges']) ? explode(',', $rule['privileges']) : null; @@ -140,9 +140,9 @@ function loadRules(Mage_Admin_Model_Acl $acl, array $rulesArr) if ($resource === self::ACL_ALL_RULES) { $acl->allow($role, null, $privileges, $assert); } - $acl->allow($role, $resource, $privileges, $assert); + $acl->allow($role, $resource, $privileges, $assert); } else if ( $rule['permission'] == 'deny' ) { - $acl->deny($role, $resource, $privileges, $assert); + $acl->deny($role, $resource, $privileges, $assert); } } catch (Exception $e) { //$m = $e->getMessage(); diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php index d2b11bef5f..3b4baf525f 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -82,4 +82,4 @@ public function delete() { } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php index c278ae181a..1164dc6dba 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $this->setItemObjectClass(Mage::getConfig()->getModelClassName('admin/acl_role')); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php index b3db9126de..1f12bb85f3 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_Permissions_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Role.php index 2d39c87658..dccea2f2c7 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Role.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_Role extends Mage_Core_Model_Mysql4_Abstract diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php index fe66c06821..ef8e3c171e 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_Role_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php index d6ecda18ce..58ecd66ab5 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_Roles extends Mage_Core_Model_Mysql4_Abstract diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php index 42e25e5e01..323a3fc720 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_Roles_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php index aaea32e672..e545733f7a 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_Roles_User_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php index b3fa0a20ba..251c46605e 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_Rules extends Mage_Core_Model_Mysql4_Abstract diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php index 9b1c0bbd65..06f50a87b2 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_Rules_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User.php b/app/code/core/Mage/Admin/Model/Mysql4/User.php index 3f129d3927..38f2cecffd 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php index d63c4d8e9a..d01fb689b0 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Mysql4_User_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Admin/Model/Observer.php b/app/code/core/Mage/Admin/Model/Observer.php index 9fc1e39724..76a44b6386 100644 --- a/app/code/core/Mage/Admin/Model/Observer.php +++ b/app/code/core/Mage/Admin/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/Model/Role.php b/app/code/core/Mage/Admin/Model/Role.php index 2bbdd57691..20b03a910a 100644 --- a/app/code/core/Mage/Admin/Model/Role.php +++ b/app/code/core/Mage/Admin/Model/Role.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Role extends Mage_Core_Model_Abstract diff --git a/app/code/core/Mage/Admin/Model/Roles.php b/app/code/core/Mage/Admin/Model/Roles.php index fe49529e22..c26fa7d9a3 100644 --- a/app/code/core/Mage/Admin/Model/Roles.php +++ b/app/code/core/Mage/Admin/Model/Roles.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Roles extends Mage_Core_Model_Abstract @@ -116,4 +116,4 @@ protected function _buildResourcesArray(Varien_Simplexml_Element $resource=null, } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Admin/Model/Rules.php b/app/code/core/Mage/Admin/Model/Rules.php index 8feb518229..4a69fdefc8 100644 --- a/app/code/core/Mage/Admin/Model/Rules.php +++ b/app/code/core/Mage/Admin/Model/Rules.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Admin_Model_Rules extends Mage_Core_Model_Abstract diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php index 60c9720b4c..19a144fb61 100644 --- a/app/code/core/Mage/Admin/Model/Session.php +++ b/app/code/core/Mage/Admin/Model/Session.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php index 8c6407f349..06d66601b9 100644 --- a/app/code/core/Mage/Admin/Model/User.php +++ b/app/code/core/Mage/Admin/Model/User.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml index 686d5b1291..7dff9283a5 100644 --- a/app/code/core/Mage/Admin/etc/config.xml +++ b/app/code/core/Mage/Admin/etc/config.xml @@ -19,10 +19,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php index 5c5462f388..e64ffcb41f 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php index 027e968c5d..d1bd8b2b45 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Admin + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/AdminNotification/Helper/Data.php b/app/code/core/Mage/AdminNotification/Helper/Data.php index b827b3a3c0..971c5e58c4 100644 --- a/app/code/core/Mage/AdminNotification/Helper/Data.php +++ b/app/code/core/Mage/AdminNotification/Helper/Data.php @@ -18,10 +18,10 @@ * 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_AdminNotification - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Feed.php b/app/code/core/Mage/AdminNotification/Model/Feed.php index 317d79f1f2..2bf867652c 100644 --- a/app/code/core/Mage/AdminNotification/Model/Feed.php +++ b/app/code/core/Mage/AdminNotification/Model/Feed.php @@ -18,10 +18,10 @@ * 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_AdminNotification - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -191,4 +191,4 @@ public function getFeedXml() return $xml; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AdminNotification/Model/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Inbox.php index 06d7a317b5..a74b72e2ab 100644 --- a/app/code/core/Mage/AdminNotification/Model/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Inbox.php @@ -18,10 +18,10 @@ * 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_AdminNotification - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -100,4 +100,4 @@ public function parse(array $data) { return $this->getResource()->parse($this, $data);; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php index 4989f63810..66a286b333 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php @@ -18,10 +18,10 @@ * 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_AdminNotification - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,4 +89,4 @@ public function parse(Mage_AdminNotification_Model_Inbox $object, array $data) } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php index 7eb3a58d3b..f5fb63e5d9 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php @@ -18,10 +18,10 @@ * 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_AdminNotification - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function addRemoveFilter() ->where('is_remove=?', 0); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AdminNotification/Model/Observer.php b/app/code/core/Mage/AdminNotification/Model/Observer.php index fdfac46446..518062c8fc 100644 --- a/app/code/core/Mage/AdminNotification/Model/Observer.php +++ b/app/code/core/Mage/AdminNotification/Model/Observer.php @@ -18,10 +18,10 @@ * 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_AdminNotification - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,4 +52,4 @@ public function preDispatch(Varien_Event_Observer $observer) } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml index 62404ad191..91e4633b01 100644 --- a/app/code/core/Mage/AdminNotification/etc/config.xml +++ b/app/code/core/Mage/AdminNotification/etc/config.xml @@ -91,12 +91,13 @@ - www.magentocommerce.com/notifications_feed + notifications.magentocommerce.com/community/notifications.rss widgets.magentocommerce.com/notificationPopup + widgets.magentocommerce.com/%s/%s.gif 0 1 0 - \ No newline at end of file + diff --git a/app/code/core/Mage/AdminNotification/etc/system.xml b/app/code/core/Mage/AdminNotification/etc/system.xml index b82e372e3c..3fc8e7066e 100644 --- a/app/code/core/Mage/AdminNotification/etc/system.xml +++ b/app/code/core/Mage/AdminNotification/etc/system.xml @@ -19,10 +19,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php index 087dcf6998..3e5e54d36b 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php @@ -18,10 +18,10 @@ * 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_AdminNotification - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -45,4 +45,4 @@ KEY `IDX_IS_REMOVE` (`is_remove`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Adminhtml/Block/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Abstract.php index d06e6f5350..d05de0e08e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php index 03dc67f641..bfdbdd0f73 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Api_Buttons extends Mage_Adminhtml_Block_Template diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php index a2f9853258..2067e48fcd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs { @@ -61,4 +61,4 @@ protected function _beforeToHtml() } return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php index 85d6491f9a..ba9737459d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Api_Edituser extends Mage_Adminhtml_Block_Widget_Tabs { @@ -52,6 +52,6 @@ protected function _beforeToHtml() public function getUser() { - return Mage::registry('user_data'); + return Mage::registry('user_data'); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php index c6e3adc42e..277b941c66 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Role.php index 10bfbdcf92..d93cf0e7ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php index 268bb661e6..aa94255ad3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/Roles.php index b08a7aee46..6c68ea6588 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Roles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php index 6bdec27640..08474f9e6c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,9 +36,9 @@ public function __construct() } public function _beforeToHtml() { - $this->_initForm(); + $this->_initForm(); - return parent::_beforeToHtml(); + return parent::_beforeToHtml(); } protected function _initForm() diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php index 522717b75e..da1327580f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Api_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php index 75a785592e..d1ea44a431 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Api_Tab_Rolesusers extends Mage_Adminhtml_Block_Widget_Tabs { @@ -54,4 +54,4 @@ protected function _getJsObjectName() return $this->getChild('userGrid')->getJsObjectName(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php index 84d2b08e41..0b980c3604 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Api_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs { diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User.php b/app/code/core/Mage/Adminhtml/Block/Api/User.php index 7c675a900e..3580b46865 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php index 8a7ae901f3..ea5aac4a3b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php index e707236c72..4f2223c629 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php index b02f24424c..7ccaa0002b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php index 9e1e5f65a1..6c51fe6afb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles extends Mage_Adminhtml_Block_Widget_Grid diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php index 853d5ad314..2d0b5654a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php index 71738c6da0..49506c7fac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Users.php b/app/code/core/Mage/Adminhtml/Block/Api/Users.php index 2e76d89602..ee6e7a17af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Users.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Backup.php b/app/code/core/Mage/Adminhtml/Block/Backup.php index 1411a4cfc4..b071a00504 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php index a588c149cb..c741f98a78 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Catalog.php index 0399b0a34e..75931749f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php index 51c985d3e8..63a327209f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -204,4 +204,4 @@ public function getRootIds() } return $ids; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php index b484f5a3fd..3d0875175d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php index 889119cc5c..c2ae48c0b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php index 5b608bf301..cdf87d7b86 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php index c91166b007..4c4cc7057e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php index 879bd77150..00c7f22bf7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php index 6d5d74e9c9..8964fdade3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php index 7864b34dbb..077ab8888b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php @@ -1,143 +1,143 @@ - - */ -class Mage_Adminhtml_Block_Catalog_Category_Tab_Attributes extends Mage_Adminhtml_Block_Catalog_Form -{ - /** - * Retrieve Category object - * - * @return Mage_Catalog_Model_Category - */ - public function getCategory() - { - return Mage::registry('current_category'); - } - - /** - * Initialize tab - * - */ - public function __construct() { - parent::__construct(); - $this->setShowGlobalIcon(true); - } - - /** - * Prepare form before rendering HTML - * - * @return Mage_Adminhtml_Block_Catalog_Category_Tab_Attributes - */ - protected function _prepareForm() { - $group = $this->getGroup(); - $attributes = $this->getAttributes(); - - $form = new Varien_Data_Form(); - $form->setHtmlIdPrefix('group_' . $group->getId()); - $form->setDataObject($this->getCategory()); - - $fieldset = $form->addFieldset('fieldset_group_' . $group->getId(), array( - 'legend' => Mage::helper('catalog')->__($group->getAttributeGroupName()) - )); - - if ($this->getAddHiddenFields()) { - if (!$this->getCategory()->getId()) { - // path - if ($this->getRequest()->getParam('parent')) { - $fieldset->addField('path', 'hidden', array( - 'name' => 'path', - 'value' => $this->getRequest()->getParam('parent') - )); - } - else { - $fieldset->addField('path', 'hidden', array( - 'name' => 'path', - 'value' => 1 - )); - } - } - else { - $fieldset->addField('id', 'hidden', array( - 'name' => 'id', - 'value' => $this->getCategory()->getId() - )); - $fieldset->addField('path', 'hidden', array( - 'name' => 'path', - 'value' => $this->getCategory()->getPath() - )); - } - } - - $this->_setFieldset($attributes, $fieldset); - - foreach ($attributes as $attribute) { - /* @var $attribute Mage_Eav_Model_Entity_Attribute */ - if ($attribute->getAttributeCode() == 'url_key') { - if ($this->getCategory()->getLevel() == 1) { - $fieldset->removeField('url_key'); - $fieldset->addField('url_key', 'hidden', array( - 'name' => 'url_key', - 'value' => $this->getCategory()->getUrlKey() - )); - } - } - } - - if ($this->getCategory()->hasLockedAttributes()) { - foreach ($this->getCategory()->getLockedAttributes() as $attribute) { - if ($element = $form->getElement($attribute)) { - $element->setReadonly(true, true); - } - } - } - - $form->addValues($this->getCategory()->getData()); - - $form->setFieldNameSuffix('general'); - $this->setForm($form); - - return parent::_prepareForm(); - } - - /** - * Retrieve Additional Element Types - * - * @return array - */ - protected function _getAdditionalElementTypes() - { - return array( - 'image' => Mage::getConfig()->getBlockClassName('adminhtml/catalog_category_helper_image') - ); - } -} + + */ +class Mage_Adminhtml_Block_Catalog_Category_Tab_Attributes extends Mage_Adminhtml_Block_Catalog_Form +{ + /** + * Retrieve Category object + * + * @return Mage_Catalog_Model_Category + */ + public function getCategory() + { + return Mage::registry('current_category'); + } + + /** + * Initialize tab + * + */ + public function __construct() { + parent::__construct(); + $this->setShowGlobalIcon(true); + } + + /** + * Prepare form before rendering HTML + * + * @return Mage_Adminhtml_Block_Catalog_Category_Tab_Attributes + */ + protected function _prepareForm() { + $group = $this->getGroup(); + $attributes = $this->getAttributes(); + + $form = new Varien_Data_Form(); + $form->setHtmlIdPrefix('group_' . $group->getId()); + $form->setDataObject($this->getCategory()); + + $fieldset = $form->addFieldset('fieldset_group_' . $group->getId(), array( + 'legend' => Mage::helper('catalog')->__($group->getAttributeGroupName()) + )); + + if ($this->getAddHiddenFields()) { + if (!$this->getCategory()->getId()) { + // path + if ($this->getRequest()->getParam('parent')) { + $fieldset->addField('path', 'hidden', array( + 'name' => 'path', + 'value' => $this->getRequest()->getParam('parent') + )); + } + else { + $fieldset->addField('path', 'hidden', array( + 'name' => 'path', + 'value' => 1 + )); + } + } + else { + $fieldset->addField('id', 'hidden', array( + 'name' => 'id', + 'value' => $this->getCategory()->getId() + )); + $fieldset->addField('path', 'hidden', array( + 'name' => 'path', + 'value' => $this->getCategory()->getPath() + )); + } + } + + $this->_setFieldset($attributes, $fieldset); + + foreach ($attributes as $attribute) { + /* @var $attribute Mage_Eav_Model_Entity_Attribute */ + if ($attribute->getAttributeCode() == 'url_key') { + if ($this->getCategory()->getLevel() == 1) { + $fieldset->removeField('url_key'); + $fieldset->addField('url_key', 'hidden', array( + 'name' => 'url_key', + 'value' => $this->getCategory()->getUrlKey() + )); + } + } + } + + if ($this->getCategory()->hasLockedAttributes()) { + foreach ($this->getCategory()->getLockedAttributes() as $attribute) { + if ($element = $form->getElement($attribute)) { + $element->setReadonly(true, true); + } + } + } + + $form->addValues($this->getCategory()->getData()); + + $form->setFieldNameSuffix('general'); + $this->setForm($form); + + return parent::_prepareForm(); + } + + /** + * Retrieve Additional Element Types + * + * @return array + */ + protected function _getAdditionalElementTypes() + { + return array( + 'image' => Mage::getConfig()->getBlockClassName('adminhtml/catalog_category_helper_image') + ); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php index 9ed58df323..d237c795cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Catalog_Category_Tab_Design extends Mage_Adminhtml_Block_Catalog_Form { @@ -55,4 +55,4 @@ public function _prepareLayout() $this->setForm($form); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Feature.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Feature.php index 030dd2ff60..8e14c9f822 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Feature.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Feature.php @@ -18,8 +18,8 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php index eebfeec1a7..49a786738b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php index 268cf236d9..5e518e5bf7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php index 71d9ed3e40..df67e08299 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php index 993c5bbc67..d85e219b9d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -166,7 +166,7 @@ public function getMoveUrl() public function getTree($parenNodeCategory=null) { - $rootArray = $this->_getNodeJson($this->getRoot($parenNodeCategory)); + $rootArray = $this->_getNodeJson($this->getRoot($parenNodeCategory)); $tree = isset($rootArray['children']) ? $rootArray['children'] : array(); return $tree; } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php index eefe25719f..c9bd0945fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,4 +45,4 @@ protected function _prepareLayout() $this->getLayout()->createBlock('adminhtml/catalog_form_renderer_fieldset_element') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php index 68912b36a7..de77324552 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,4 +58,4 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) return implode(' / ', $_parts); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php index dd366bd289..2bdff4f940 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,4 +51,4 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) . ' ' . Mage::helper('adminhtml')->__('to') . ' ' . $to; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php index a0edfb0af7..8dd5d0a722 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -159,4 +159,4 @@ public function getElementHtml() { return $this->getElement()->getElementHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Googleoptimizer/Import.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Googleoptimizer/Import.php index 32c625796d..0e7754cad6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Googleoptimizer/Import.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Googleoptimizer/Import.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,4 +58,4 @@ public function getElement() protected function _prepareLayout() { } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php index ef124c0612..c45d2f08dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php index fc3ebbf054..2d50ea5e4e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** 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 index 8de5e13945..e64c913ba4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php index 198cd17156..38a1eb7f90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php index b921517ed4..55836239ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php index c8edeaf5f4..07068844ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,11 +60,29 @@ protected function _prepareForm() ) ); if ($attributeObject->getFrontendInput() == 'gallery') { - $inputTypes[] = array( + $additionalTypes[] = array( 'value' => 'gallery', 'label' => Mage::helper('catalog')->__('Gallery') ); } + + $response = new Varien_Object(); + $response->setTypes(array()); + Mage::dispatchEvent('adminhtml_product_attribute_types', array('response'=>$response)); + $_disabledTypes = array(); + $_hiddenFields = array(); + foreach ($response->getTypes() as $type) { + $additionalTypes[] = $type; + if (isset($type['hide_fields'])) { + $_hiddenFields[$type['value']] = $type['hide_fields']; + } + if (isset($type['disabled_types'])) { + $_disabledTypes[$type['value']] = $type['disabled_types']; + } + } + Mage::register('attribute_type_hidden_fields', $_hiddenFields); + Mage::register('attribute_type_disabled_types', $_disabledTypes); + $frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes); $frontendInputElm->setValues($frontendInputValues); @@ -205,23 +223,6 @@ protected function _prepareForm() $form->getElement('apply_to')->addClass('no-display ignore-validate'); } - $response = new Varien_Object(); - $response->setTypes(array()); - Mage::dispatchEvent('adminhtml_product_attribute_types', array('response'=>$response)); - $_disabledTypes = array(); - $_hiddenFields = array(); - foreach ($response->getTypes() as $type) { - $inputTypes[] = $type; - if (isset($type['hide_fields'])) { - $_hiddenFields[$type['value']] = $type['hide_fields']; - } - if (isset($type['disabled_types'])) { - $_disabledTypes[$type['value']] = $type['disabled_types']; - } - } - Mage::register('attribute_type_hidden_fields', $_hiddenFields); - Mage::register('attribute_type_disabled_types', $_disabledTypes); - return $this; } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php index 637333b377..2bd0b4dcd4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php index a1e6f3de18..521d92b0db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -131,4 +131,4 @@ protected function _prepareForm() return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php index acab190774..6460a66723 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php index 2137742cc2..237b5b39d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -120,4 +120,4 @@ protected function _prepareColumns() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php index b15cf9119c..d31d38cb4a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,9 +55,9 @@ protected function _prepareForm() */ if (!Mage::registry('product')->getId()) { foreach ($attributes as $attribute) { - if (!isset($values[$attribute->getAttributeCode()])) { - $values[$attribute->getAttributeCode()] = $attribute->getDefaultValue(); - } + if (!isset($values[$attribute->getAttributeCode()])) { + $values[$attribute->getAttributeCode()] = $attribute->getDefaultValue(); + } } } @@ -74,7 +74,7 @@ protected function _getAdditionalElementTypes() 'image' => Mage::getConfig()->getBlockClassName('adminhtml/catalog_product_helper_form_image'), 'boolean' => Mage::getConfig()->getBlockClassName('adminhtml/catalog_product_helper_form_boolean') ); - + $response = new Varien_Object(); $response->setTypes(array()); Mage::dispatchEvent('adminhtml_catalog_product_edit_element_types', array('response'=>$response)); @@ -82,7 +82,7 @@ protected function _getAdditionalElementTypes() foreach ($response->getTypes() as $typeName=>$typeClass) { $result[$typeName] = $typeClass; } - + return $result; } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php index d621842598..c741db121a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -86,4 +86,4 @@ public function getAttributesBlockJson() return Mage::helper('core')->jsonEncode($result); } -} // Class Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created End \ No newline at end of file +} // Class Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created End diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php index 9bd38243a3..898ed37e65 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php index aff457d440..8641478c35 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,13 +51,13 @@ protected function _prepareForm() ) ); - $fieldset->addField('submit', 'note', + $fieldset->addField('submit', 'note', array( 'text' => $this->getLayout()->createBlock('adminhtml/widget_button') ->setData(array( 'label' => Mage::helper('catalog')->__('Add Attribute'), 'onclick' => 'this.form.submit();', - 'class' => 'add' + 'class' => 'add' )) ->toHtml(), ) @@ -67,4 +67,4 @@ protected function _prepareForm() $form->setMethod('post'); $this->setForm($form); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php index 7f9411c6fd..b0028485a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,13 +51,13 @@ protected function _prepareForm() ) ); - $fieldset->addField('submit', 'note', + $fieldset->addField('submit', 'note', array( 'text' => $this->getLayout()->createBlock('adminhtml/widget_button') ->setData(array( 'label' => Mage::helper('catalog')->__('Add Group'), 'onclick' => 'this.form.submit();', - 'class' => 'add' + 'class' => 'add' )) ->toHtml(), ) @@ -85,4 +85,4 @@ protected function _getSetId() ->load(Mage::registry('entityType')) ->getDefaultAttributeSetId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php index c5678f1440..ca8e168881 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -83,4 +83,4 @@ protected function _prepareForm() $form->setOnsubmit('return false;'); $this->setForm($form); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php index d52c643767..534db4b3b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,4 +36,4 @@ protected function _construct() { $this->setTemplate('catalog/product/attribute/set/main/tree/attribute.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php index df6d29eebd..97863c23cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,4 +36,4 @@ protected function _construct() { $this->setTemplate('catalog/product/attribute/set/main/tree/group.phtml'); } -} \ No newline at end of file +} 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 index 0b9d73974a..4721156070 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -85,4 +85,4 @@ protected function getFormId() { return $this->getChild('setForm')->getForm()->getId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php index d922fc6799..91a70c3e96 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -68,4 +68,4 @@ protected function _toHtml() Mage::dispatchEvent('adminhtml_catalog_product_attribute_set_toolbar_main_html_before', array('block' => $this)); return parent::_toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php index 7ee8344d0c..0b49910538 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,7 +46,7 @@ protected function _prepareForm() ->load() ->toOptionArray(); - $form->addField('set_switcher', 'select', + $form->addField('set_switcher', 'select', array( 'name' => 'set_switcher', 'required' => true, @@ -61,4 +61,4 @@ protected function _prepareForm() $form->setMethod('post'); $this->setForm($form); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php index 318412ac26..0d37623ff1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -149,4 +149,4 @@ public function getProduct() } return $this->_product; } -} // Class Mage_Adminhtml_Block_Catalog_Product_Created End \ No newline at end of file +} // Class Mage_Adminhtml_Block_Catalog_Product_Created End diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php index cc23b6683d..15382d6a87 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php @@ -1,249 +1,249 @@ - - */ -class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Widget -{ - public function __construct() - { - parent::__construct(); - $this->setTemplate('catalog/product/edit.phtml'); - $this->setId('product_edit'); - } - - /** - * Retrieve currently edited product object - * - * @return Mage_Catalog_Model_Product - */ - public function getProduct() - { - return Mage::registry('current_product'); - } - - protected function _prepareLayout() - { - if (!$this->getRequest()->getParam('popup')) { - $this->setChild('back_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Back'), - 'onclick' => 'setLocation(\''.$this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store', 0))).'\')', - 'class' => 'back' - )) - ); - } else { - $this->setChild('back_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Close Window'), - 'onclick' => 'window.close()', - 'class' => 'cancel' - )) - ); - } - - if (!$this->getProduct()->isReadonly()) { - $this->setChild('reset_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Reset'), - 'onclick' => 'setLocation(\''.$this->getUrl('*/*/*', array('_current'=>true)).'\')' - )) - ); - - $this->setChild('save_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Save'), - 'onclick' => 'productForm.submit()', - 'class' => 'save' - )) - ); - } - - if (!$this->getRequest()->getParam('popup')) { - if (!$this->getProduct()->isReadonly()) { - $this->setChild('save_and_edit_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Save And Continue Edit'), - 'onclick' => 'saveAndContinueEdit(\''.$this->getSaveAndContinueUrl().'\')', - 'class' => 'save' - )) - ); - } - if ($this->getProduct()->isDeleteable()) { - $this->setChild('delete_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Delete'), - 'onclick' => 'confirmSetLocation(\''.Mage::helper('catalog')->__('Are you sure?').'\', \''.$this->getDeleteUrl().'\')', - 'class' => 'delete' - )) - ); - } - - if ($this->getProduct()->isDuplicable()) { - $this->setChild('duplicate_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Duplicate'), - 'onclick' => 'setLocation(\''.$this->getDuplicateUrl().'\')', - 'class' => 'add' - )) - ); - } - } - - 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'); - } - - 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() - { - $header = ''; - if ($this->getProduct()->getId()) { - $header = $this->htmlEscape($this->getProduct()->getName()); - } - else { - $header = Mage::helper('catalog')->__('New Product'); - } - if ($setName = $this->getAttributeSetName()) { - $header.= ' (' . $setName . ')'; - } - return $header; - } - - public function getAttributeSetName() - { - if ($setId = $this->getProduct()->getAttributeSetId()) { - $set = Mage::getModel('eav/entity_attribute_set') - ->load($setId); - return $set->getAttributeSetName(); - } - return ''; - } - - public function getIsConfigured() - { - if ($this->getProduct()->isConfigurable() - && !($superAttributes = $this->getProduct()->getTypeInstance(true)->getUsedProductAttributeIds($this->getProduct()))) { - $superAttributes = false; - } - - return !$this->getProduct()->isConfigurable() || $superAttributes !== false; - } - - public function getSelectedTabId() - { - return addslashes(htmlspecialchars($this->getRequest()->getParam('tab'))); - } -} + + */ +class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Widget +{ + public function __construct() + { + parent::__construct(); + $this->setTemplate('catalog/product/edit.phtml'); + $this->setId('product_edit'); + } + + /** + * Retrieve currently edited product object + * + * @return Mage_Catalog_Model_Product + */ + public function getProduct() + { + return Mage::registry('current_product'); + } + + protected function _prepareLayout() + { + if (!$this->getRequest()->getParam('popup')) { + $this->setChild('back_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Back'), + 'onclick' => 'setLocation(\''.$this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store', 0))).'\')', + 'class' => 'back' + )) + ); + } else { + $this->setChild('back_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Close Window'), + 'onclick' => 'window.close()', + 'class' => 'cancel' + )) + ); + } + + if (!$this->getProduct()->isReadonly()) { + $this->setChild('reset_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Reset'), + 'onclick' => 'setLocation(\''.$this->getUrl('*/*/*', array('_current'=>true)).'\')' + )) + ); + + $this->setChild('save_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Save'), + 'onclick' => 'productForm.submit()', + 'class' => 'save' + )) + ); + } + + if (!$this->getRequest()->getParam('popup')) { + if (!$this->getProduct()->isReadonly()) { + $this->setChild('save_and_edit_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Save And Continue Edit'), + 'onclick' => 'saveAndContinueEdit(\''.$this->getSaveAndContinueUrl().'\')', + 'class' => 'save' + )) + ); + } + if ($this->getProduct()->isDeleteable()) { + $this->setChild('delete_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Delete'), + 'onclick' => 'confirmSetLocation(\''.Mage::helper('catalog')->__('Are you sure?').'\', \''.$this->getDeleteUrl().'\')', + 'class' => 'delete' + )) + ); + } + + if ($this->getProduct()->isDuplicable()) { + $this->setChild('duplicate_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Duplicate'), + 'onclick' => 'setLocation(\''.$this->getDuplicateUrl().'\')', + 'class' => 'add' + )) + ); + } + } + + 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'); + } + + 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() + { + $header = ''; + if ($this->getProduct()->getId()) { + $header = $this->htmlEscape($this->getProduct()->getName()); + } + else { + $header = Mage::helper('catalog')->__('New Product'); + } + if ($setName = $this->getAttributeSetName()) { + $header.= ' (' . $setName . ')'; + } + return $header; + } + + public function getAttributeSetName() + { + if ($setId = $this->getProduct()->getAttributeSetId()) { + $set = Mage::getModel('eav/entity_attribute_set') + ->load($setId); + return $set->getAttributeSetName(); + } + return ''; + } + + public function getIsConfigured() + { + if ($this->getProduct()->isConfigurable() + && !($superAttributes = $this->getProduct()->getTypeInstance(true)->getUsedProductAttributeIds($this->getProduct()))) { + $superAttributes = false; + } + + return !$this->getProduct()->isConfigurable() || $superAttributes !== false; + } + + public function getSelectedTabId() + { + return addslashes(htmlspecialchars($this->getRequest()->getParam('tab'))); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php index dfecc6f583..7376318b2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php index 6ec5631624..52136a46d9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php index d31ab9feaf..604adebe5e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -99,4 +99,4 @@ public function isHidden() { return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php index c622a8c406..98d496e39f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -72,4 +72,4 @@ public function isHidden() { return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php index dce36cf38b..6a57501a46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,4 +42,4 @@ protected function _construct() $this->setDestElementId('attributes_edit_form'); $this->setTitle(Mage::helper('catalog')->__('Products Information')); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php index 3a48bb52ac..f71ac45da9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php index 5acc966091..6ba957ba8c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,4 +74,4 @@ public function getAccordionHtml() { return $this->getChildHtml('accordion'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php index 2adbe6148d..51b6bad272 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -117,4 +117,4 @@ public function getGridUrl() 'store' => $storeId )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php index adf1bbb187..2460b4d191 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -109,4 +109,4 @@ public function getGridUrl() 'store' => $storeId )); } -} \ No newline at end of file +} 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 index c036e04f56..4ce59db1d6 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** 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 index ec7caee367..c9baebe02e 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -100,4 +100,4 @@ public function getJsObjectName() { return $this->getId() . 'JsObject'; } -} // Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes_Create End \ No newline at end of file +} // Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes_Create End diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php index 4d99e52969..f87b49336a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php index 08e8578211..fc264565af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -234,7 +234,7 @@ protected function _getSelectedProducts() { $products = $this->getProductsCrossSell(); if (!is_array($products)) { - $products = $this->getSelectedCrossSellProducts(); + $products = array_keys($this->getSelectedCrossSellProducts()); } return $products; } @@ -246,6 +246,10 @@ protected function _getSelectedProducts() */ public function getSelectedCrossSellProducts() { - return Mage::registry('current_product')->getCrossSellProductIds(); + $products = array(); + foreach (Mage::registry('current_product')->getCrossSellProducts() as $product) { + $products[$product->getId()] = array('position' => $product->getPosition()); + } + return $products; } } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php index 2801b8ce87..e7f2bbe494 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** 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 index 1b93c2ba30..82ba7aa000 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,4 +69,4 @@ public function getOptionsBoxHtml() return $this->getChildHtml('options_box'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php index 63c23c3bc8..3c4d4e32d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php index 2d38dffe35..72dacd2e70 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,4 +58,4 @@ public function getPriceTypeSelectHtml() return $this->getChildHtml('option_price_type'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php index d5043f3b4f..9b24c7bc11 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() $this->setTemplate('catalog/product/edit/options/type/date.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php index 9956b386fb..e1ed76789c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,4 +40,4 @@ public function __construct() parent::__construct(); $this->setTemplate('catalog/product/edit/options/type/file.phtml'); } -} \ No newline at end of file +} 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 index d332c1891f..0262a0edd3 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -81,4 +81,4 @@ public function getPriceTypeSelectHtml() return parent::getPriceTypeSelectHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php index dcd780087b..0e87f68990 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() $this->setTemplate('catalog/product/edit/options/type/text.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php index f731371939..0fc236bfee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ protected function _prepareForm() $this->setForm($form); } -}// Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price END \ No newline at end of file +}// Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price END diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php index 654f4d8c54..780486cb16 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php index 50d351ad84..eb2a62232a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -219,7 +219,9 @@ protected function _prepareColumns() */ public function getGridUrl() { - return $this->getData('grid_url') ? $this->getData('grid_url') : $this->getUrl('*/*/relatedGrid', array('_current'=>true)); + return $this->getData('grid_url') + ? $this->getData('grid_url') + : $this->getUrl('*/*/relatedGrid', array('_current'=>true)); } /** @@ -231,7 +233,7 @@ protected function _getSelectedProducts() { $products = $this->getProductsRelated(); if (!is_array($products)) { - $products = $this->getSelectedRelatedProducts(); + $products = array_keys($this->getSelectedRelatedProducts()); } return $products; } @@ -243,6 +245,10 @@ protected function _getSelectedProducts() */ public function getSelectedRelatedProducts() { - return Mage::registry('current_product')->getRelatedProductIds(); + $products = array(); + foreach (Mage::registry('current_product')->getRelatedProducts() as $product) { + $products[$product->getId()] = array('position' => $product->getPosition()); + } + return $products; } } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php index f780537689..4ce85f88d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** 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 index 43bdf22d78..ea09d62248 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php index 381f67837e..88b73b6400 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php @@ -1,292 +1,292 @@ - - */ -class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid extends Mage_Adminhtml_Block_Widget_Grid -{ - - public function __construct() - { - parent::__construct(); - $this->setUseAjax(true); - $this->setId('super_product_links'); - - if ($this->_getProduct()->getId()) { - $this->setDefaultFilter(array('in_products'=>1)); - } - } - - /** - * Retrieve currently edited product object - * - * @return Mage_Catalog_Model_Product - */ - protected function _getProduct() - { - return Mage::registry('current_product'); - } - - protected function _addColumnFilterToCollection($column) - { - // Set custom filter for in product flag - if ($column->getId() == 'in_products') { - $productIds = $this->_getSelectedProducts(); - - if (empty($productIds)) { - $productIds = 0; - } - - $createdProducts = $this->_getCreatedProducts(); - - $existsProducts = $productIds; // Only for "Yes" Filter we will add created products - - if(count($createdProducts)>0) { - if(!is_array($existsProducts)) { - $existsProducts = $createdProducts; - } else { - $existsProducts = array_merge($createdProducts); - } - } - - if ($column->getFilter()->getValue()) { - $this->getCollection()->addFieldToFilter('entity_id', array('in'=>$existsProducts)); - } - else { - if($productIds) { - $this->getCollection()->addFieldToFilter('entity_id', array('nin'=>$productIds)); - } - } - } - else { - parent::_addColumnFilterToCollection($column); - } - return $this; - } - - protected function _getCreatedProducts() - { - $products = $this->getRequest()->getPost('new_products', null); - if (!is_array($products)) { - $products = array(); - } - - return $products; - } - - protected function _prepareCollection() - { - $allowProductTypes = array(); - foreach (Mage::getConfig()->getNode('global/catalog/product/type/configurable/allow_product_types')->children() as $type) { - $allowProductTypes[] = $type->getName(); - } - - $product = $this->_getProduct(); - $collection = $product->getCollection() - ->addAttributeToSelect('name') - ->addAttributeToSelect('sku') - ->addAttributeToSelect('attribute_set_id') - ->addAttributeToSelect('type_id') - ->addAttributeToSelect('price') - ->addFieldToFilter('attribute_set_id',$product->getAttributeSetId()) - ->addFieldToFilter('type_id', $allowProductTypes) - ->addFilterByRequiredOptions(); - - Mage::getModel('cataloginventory/stock_item')->addCatalogInventoryToProductCollection($collection); - - foreach ($product->getTypeInstance(true)->getUsedProductAttributes($product) as $attribute) { - $collection->addAttributeToSelect($attribute->getAttributeCode()); - $collection->addAttributeToFilter($attribute->getAttributeCode(), array('nin'=>array(null))); - } - - $this->setCollection($collection); - - if ($this->isReadonly()) { - $collection->addFieldToFilter('entity_id', array('in' => $this->_getSelectedProducts())); - } - - parent::_prepareCollection(); - return $this; - } - - protected function _getSelectedProducts() - { - $products = $this->getRequest()->getPost('products', null); - if (!is_array($products)) { - $products = $this->_getProduct()->getTypeInstance(true)->getUsedProductIds($this->_getProduct()); - } - return $products; - } - - /** - * Check block is readonly - * - * @return boolean - */ - public function isReadonly() - { - return $this->_getProduct()->getCompositeReadonly(); - } - - protected function _prepareColumns() - { - $product = $this->_getProduct(); - $attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product); - - if (!$this->isReadonly()) { - $this->addColumn('in_products', array( - 'header_css_class' => 'a-center', - 'type' => 'checkbox', - 'name' => 'in_products', - 'values' => $this->_getSelectedProducts(), - 'align' => 'center', - 'index' => 'entity_id', - 'renderer' => 'adminhtml/catalog_product_edit_tab_super_config_grid_renderer_checkbox', - 'attributes' => $attributes - )); - } - - $this->addColumn('entity_id', array( - 'header' => Mage::helper('catalog')->__('ID'), - 'sortable' => true, - 'width' => '60px', - 'index' => 'entity_id' - )); - $this->addColumn('name', array( - 'header' => Mage::helper('catalog')->__('Name'), - 'index' => 'name' - )); - - - $sets = Mage::getModel('eav/entity_attribute_set')->getCollection() - ->setEntityTypeFilter($this->_getProduct()->getResource()->getTypeId()) - ->load() - ->toOptionHash(); - - $this->addColumn('set_name', - array( - 'header'=> Mage::helper('catalog')->__('Attrib. Set Name'), - 'width' => '130px', - 'index' => 'attribute_set_id', - 'type' => 'options', - 'options' => $sets, - )); - - $this->addColumn('sku', array( - 'header' => Mage::helper('catalog')->__('SKU'), - 'width' => '80px', - 'index' => 'sku' - )); - - $this->addColumn('price', array( - 'header' => Mage::helper('catalog')->__('Price'), - 'type' => 'currency', - 'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE), - 'index' => 'price' - )); - - $this->addColumn('is_saleable', array( - 'header' => Mage::helper('catalog')->__('Inventory'), - 'renderer' => 'adminhtml/catalog_product_edit_tab_super_config_grid_renderer_inventory', - 'filter' => 'adminhtml/catalog_product_edit_tab_super_config_grid_filter_inventory', - 'index' => 'is_saleable' - )); - - foreach ($attributes as $attribute) { - $productAttribute = $attribute->getProductAttribute(); - $productAttribute->getSource(); - $this->addColumn($productAttribute->getAttributeCode(), array( - 'header' => $productAttribute->getFrontend()->getLabel(), - 'index' => $productAttribute->getAttributeCode(), - 'type' => $productAttribute->getSourceModel() ? 'options' : 'number', - 'options' => $productAttribute->getSourceModel() ? $this->getOptions($attribute) : '' - )); - } - - $this->addColumn('action', - array( - 'header' => Mage::helper('catalog')->__('Action'), - 'type' => 'action', - 'getter' => 'getId', - 'actions' => array( - array( - 'caption' => Mage::helper('catalog')->__('Edit'), - 'url' => $this->getEditParamsForAssociated(), - 'field' => 'id', - 'onclick' => 'superProduct.createPopup(this.href);return false;' - ) - ), - 'filter' => false, - 'sortable' => false - )); - - return parent::_prepareColumns(); - } - - public function getEditParamsForAssociated() - { - return array( - 'base' => '*/*/edit', - 'params' => array( - 'required' => $this->_getRequiredAttributesIds(), - 'popup' => 1, - 'product' => $this->_getProduct()->getId() - ) - ); - } - - protected function _getRequiredAttributesIds() - { - $attributesIds = array(); - foreach ($this->_getProduct()->getTypeInstance(true)->getConfigurableAttributes($this->_getProduct()) as $attribute) { - $attributesIds[] = $attribute->getProductAttribute()->getId(); - } - - return implode(',', $attributesIds); - } - - public function getOptions($attribute) { - $result = array(); - foreach ($attribute->getProductAttribute()->getSource()->getAllOptions() as $option) { - if($option['value']!='') { - $result[$option['value']] = $option['label']; - } - } - - return $result; - } - - public function getGridUrl() - { - return $this->getUrl('*/*/superConfig', array('_current'=>true)); - } - -} + + */ +class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid extends Mage_Adminhtml_Block_Widget_Grid +{ + + public function __construct() + { + parent::__construct(); + $this->setUseAjax(true); + $this->setId('super_product_links'); + + if ($this->_getProduct()->getId()) { + $this->setDefaultFilter(array('in_products'=>1)); + } + } + + /** + * Retrieve currently edited product object + * + * @return Mage_Catalog_Model_Product + */ + protected function _getProduct() + { + return Mage::registry('current_product'); + } + + protected function _addColumnFilterToCollection($column) + { + // Set custom filter for in product flag + if ($column->getId() == 'in_products') { + $productIds = $this->_getSelectedProducts(); + + if (empty($productIds)) { + $productIds = 0; + } + + $createdProducts = $this->_getCreatedProducts(); + + $existsProducts = $productIds; // Only for "Yes" Filter we will add created products + + if(count($createdProducts)>0) { + if(!is_array($existsProducts)) { + $existsProducts = $createdProducts; + } else { + $existsProducts = array_merge($createdProducts); + } + } + + if ($column->getFilter()->getValue()) { + $this->getCollection()->addFieldToFilter('entity_id', array('in'=>$existsProducts)); + } + else { + if($productIds) { + $this->getCollection()->addFieldToFilter('entity_id', array('nin'=>$productIds)); + } + } + } + else { + parent::_addColumnFilterToCollection($column); + } + return $this; + } + + protected function _getCreatedProducts() + { + $products = $this->getRequest()->getPost('new_products', null); + if (!is_array($products)) { + $products = array(); + } + + return $products; + } + + protected function _prepareCollection() + { + $allowProductTypes = array(); + foreach (Mage::getConfig()->getNode('global/catalog/product/type/configurable/allow_product_types')->children() as $type) { + $allowProductTypes[] = $type->getName(); + } + + $product = $this->_getProduct(); + $collection = $product->getCollection() + ->addAttributeToSelect('name') + ->addAttributeToSelect('sku') + ->addAttributeToSelect('attribute_set_id') + ->addAttributeToSelect('type_id') + ->addAttributeToSelect('price') + ->addFieldToFilter('attribute_set_id',$product->getAttributeSetId()) + ->addFieldToFilter('type_id', $allowProductTypes) + ->addFilterByRequiredOptions(); + + Mage::getModel('cataloginventory/stock_item')->addCatalogInventoryToProductCollection($collection); + + foreach ($product->getTypeInstance(true)->getUsedProductAttributes($product) as $attribute) { + $collection->addAttributeToSelect($attribute->getAttributeCode()); + $collection->addAttributeToFilter($attribute->getAttributeCode(), array('nin'=>array(null))); + } + + $this->setCollection($collection); + + if ($this->isReadonly()) { + $collection->addFieldToFilter('entity_id', array('in' => $this->_getSelectedProducts())); + } + + parent::_prepareCollection(); + return $this; + } + + protected function _getSelectedProducts() + { + $products = $this->getRequest()->getPost('products', null); + if (!is_array($products)) { + $products = $this->_getProduct()->getTypeInstance(true)->getUsedProductIds($this->_getProduct()); + } + return $products; + } + + /** + * Check block is readonly + * + * @return boolean + */ + public function isReadonly() + { + return $this->_getProduct()->getCompositeReadonly(); + } + + protected function _prepareColumns() + { + $product = $this->_getProduct(); + $attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product); + + if (!$this->isReadonly()) { + $this->addColumn('in_products', array( + 'header_css_class' => 'a-center', + 'type' => 'checkbox', + 'name' => 'in_products', + 'values' => $this->_getSelectedProducts(), + 'align' => 'center', + 'index' => 'entity_id', + 'renderer' => 'adminhtml/catalog_product_edit_tab_super_config_grid_renderer_checkbox', + 'attributes' => $attributes + )); + } + + $this->addColumn('entity_id', array( + 'header' => Mage::helper('catalog')->__('ID'), + 'sortable' => true, + 'width' => '60px', + 'index' => 'entity_id' + )); + $this->addColumn('name', array( + 'header' => Mage::helper('catalog')->__('Name'), + 'index' => 'name' + )); + + + $sets = Mage::getModel('eav/entity_attribute_set')->getCollection() + ->setEntityTypeFilter($this->_getProduct()->getResource()->getTypeId()) + ->load() + ->toOptionHash(); + + $this->addColumn('set_name', + array( + 'header'=> Mage::helper('catalog')->__('Attrib. Set Name'), + 'width' => '130px', + 'index' => 'attribute_set_id', + 'type' => 'options', + 'options' => $sets, + )); + + $this->addColumn('sku', array( + 'header' => Mage::helper('catalog')->__('SKU'), + 'width' => '80px', + 'index' => 'sku' + )); + + $this->addColumn('price', array( + 'header' => Mage::helper('catalog')->__('Price'), + 'type' => 'currency', + 'currency_code' => (string) Mage::getStoreConfig(Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE), + 'index' => 'price' + )); + + $this->addColumn('is_saleable', array( + 'header' => Mage::helper('catalog')->__('Inventory'), + 'renderer' => 'adminhtml/catalog_product_edit_tab_super_config_grid_renderer_inventory', + 'filter' => 'adminhtml/catalog_product_edit_tab_super_config_grid_filter_inventory', + 'index' => 'is_saleable' + )); + + foreach ($attributes as $attribute) { + $productAttribute = $attribute->getProductAttribute(); + $productAttribute->getSource(); + $this->addColumn($productAttribute->getAttributeCode(), array( + 'header' => $productAttribute->getFrontend()->getLabel(), + 'index' => $productAttribute->getAttributeCode(), + 'type' => $productAttribute->getSourceModel() ? 'options' : 'number', + 'options' => $productAttribute->getSourceModel() ? $this->getOptions($attribute) : '' + )); + } + + $this->addColumn('action', + array( + 'header' => Mage::helper('catalog')->__('Action'), + 'type' => 'action', + 'getter' => 'getId', + 'actions' => array( + array( + 'caption' => Mage::helper('catalog')->__('Edit'), + 'url' => $this->getEditParamsForAssociated(), + 'field' => 'id', + 'onclick' => 'superProduct.createPopup(this.href);return false;' + ) + ), + 'filter' => false, + 'sortable' => false + )); + + return parent::_prepareColumns(); + } + + public function getEditParamsForAssociated() + { + return array( + 'base' => '*/*/edit', + 'params' => array( + 'required' => $this->_getRequiredAttributesIds(), + 'popup' => 1, + 'product' => $this->_getProduct()->getId() + ) + ); + } + + protected function _getRequiredAttributesIds() + { + $attributesIds = array(); + foreach ($this->_getProduct()->getTypeInstance(true)->getConfigurableAttributes($this->_getProduct()) as $attribute) { + $attributesIds[] = $attribute->getProductAttribute()->getId(); + } + + return implode(',', $attributesIds); + } + + public function getOptions($attribute) { + $result = array(); + foreach ($attribute->getProductAttribute()->getSource()->getAllOptions() as $option) { + if($option['value']!='') { + $result[$option['value']] = $option['label']; + } + } + + return $result; + } + + public function getGridUrl() + { + return $this->getUrl('*/*/superConfig', array('_current'=>true)); + } + +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php index a948597e47..96e77999c1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php index 49d14c62a2..7db5702a40 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,7 +34,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid_Renderer_Checkbox extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Checkbox { - /** + /** * Renders grid column * * @param Varien_Object $row @@ -42,31 +42,31 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid_Renderer_C */ public function render(Varien_Object $row) { - $result = parent::render($row); - return $result.''; + $result = parent::render($row); + return $result.''; } public function getAttributesJson(Varien_Object $row) { - if(!$this->getColumn()->getAttributes()) { - return '[]'; - } + if(!$this->getColumn()->getAttributes()) { + return '[]'; + } - $result = array(); - foreach($this->getColumn()->getAttributes() as $attribute) { - $productAttribute = $attribute->getProductAttribute(); - if($productAttribute->getSourceModel()) { - $label = $productAttribute->getSource()->getOptionText($row->getData($productAttribute->getAttributeCode())); - } else { - $label = $row->getData($productAttribute->getAttributeCode()); - } - $item = array(); - $item['label'] = $label; - $item['attribute_id'] = $productAttribute->getId(); - $item['value_index'] = $row->getData($productAttribute->getAttributeCode()); - $result[] = $item; - } + $result = array(); + foreach($this->getColumn()->getAttributes() as $attribute) { + $productAttribute = $attribute->getProductAttribute(); + if($productAttribute->getSourceModel()) { + $label = $productAttribute->getSource()->getOptionText($row->getData($productAttribute->getAttributeCode())); + } else { + $label = $row->getData($productAttribute->getAttributeCode()); + } + $item = array(); + $item['label'] = $label; + $item['attribute_id'] = $productAttribute->getId(); + $item['value_index'] = $row->getData($productAttribute->getAttributeCode()); + $result[] = $item; + } - return Mage::helper('core')->jsonEncode($result); + return Mage::helper('core')->jsonEncode($result); } -}// Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid_Renderer_Checkbox END \ No newline at end of file +}// Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid_Renderer_Checkbox END diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php index 55186536e1..e965ad92d8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php index 0e47059657..ae32b57536 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php @@ -1,184 +1,184 @@ - - */ -class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes -{ - protected function _prepareForm() - { - $form = new Varien_Data_Form(); - - $form->setFieldNameSuffix('simple_product'); - - $fieldset = $form->addFieldset('simple_product', array( - 'legend' => Mage::helper('catalog')->__('Quick simple product creation') - )); - $this->_addElementTypes($fieldset); - $attributesConfig = array( - 'autogenerate' => array('name', 'sku'), - 'additional' => array('name', 'sku', 'visibility', 'status') - ); - - $availableTypes = array('text', 'select', 'multiselect', 'textarea', 'price'); - - $attributes = Mage::getModel('catalog/product') - ->setTypeId(Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) - ->setAttributeSetId($this->_getProduct()->getAttributeSetId()) - ->getAttributes(); - - /* Standart attributes */ - foreach ($attributes as $attribute) { - if (($attribute->getIsRequired() - && $attribute->getApplyTo() - // If not applied to configurable - && !in_array(Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE, $attribute->getApplyTo()) - // If not used in configurable - && !in_array($attribute->getId(),$this->_getProduct()->getTypeInstance(true)->getUsedProductAttributeIds($this->_getProduct()))) - // Or in additional - || in_array($attribute->getAttributeCode(), $attributesConfig['additional'])) { - - $inputType = $attribute->getFrontend()->getInputType(); - if (!in_array($inputType, $availableTypes)) { - continue; - } - $attributeCode = $attribute->getAttributeCode(); - $element = $fieldset->addField( - 'simple_product_' . $attributeCode, - $inputType, - array( - 'label' => $attribute->getFrontend()->getLabel(), - 'name' => $attributeCode, - 'required' => $attribute->getIsRequired(), - ) - )->setEntityAttribute($attribute); - - if (in_array($attributeCode, $attributesConfig['autogenerate'])) { - $element->setDisabled('true'); - $element->setValue($this->_getProduct()->getData($attributeCode)); - $element->setAfterElementHtml( - ' ' - . '' - ); - } - - - if ($inputType == 'select' || $inputType == 'multiselect') { - $element->setValues($attribute->getFrontend()->getSelectOptions()); - } - } - - } - - /* Configurable attributes */ - foreach ($this->_getProduct()->getTypeInstance(true)->getUsedProductAttributes($this->_getProduct()) as $attribute) { - $attributeCode = $attribute->getAttributeCode(); - $fieldset->addField( 'simple_product_' . $attributeCode, 'select', array( - 'label' => $attribute->getFrontend()->getLabel(), - 'name' => $attributeCode, - 'values' => $attribute->getSource()->getAllOptions(true, true), - 'required' => true, - 'class' => 'validate-configurable', - 'onchange' => 'superProduct.showPricing(this, \'' . $attributeCode . '\')' - )); - - $fieldset->addField('simple_product_' . $attributeCode . '_pricing_value', 'hidden', array( - 'name' => 'pricing[' . $attributeCode . '][value]' - )); - - $fieldset->addField('simple_product_' . $attributeCode . '_pricing_type', 'hidden', array( - 'name' => 'pricing[' . $attributeCode . '][is_percent]' - )); - } - - /* Inventory Data */ - $fieldset->addField('simple_product_inventory_qty', 'text', array( - 'label' => Mage::helper('catalog')->__('Qty'), - 'name' => 'stock_data[qty]', - 'class' => 'validate-number', - 'required' => true, - 'value' => 0 - )); - - $fieldset->addField('simple_product_inventory_is_in_stock', 'select', array( - 'label' => Mage::helper('catalog')->__('Stock Availability'), - 'name' => 'stock_data[is_in_stock]', - 'values' => array( - array('value'=>1, 'label'=> Mage::helper('catalog')->__('In Stock')), - array('value'=>0, 'label'=> Mage::helper('catalog')->__('Out of Stock')) - ), - 'value' => 1 - )); - - $stockHiddenFields = array( - 'use_config_min_qty' => 1, - 'use_config_min_sale_qty' => 1, - 'use_config_max_sale_qty' => 1, - 'use_config_backorders' => 1, - 'use_config_notify_stock_qty' => 1, - 'is_qty_decimal' => 0 - ); - - foreach ($stockHiddenFields as $fieldName=>$fieldValue) { - $fieldset->addField('simple_product_inventory_' . $fieldName, 'hidden', array( - 'name' => 'stock_data[' . $fieldName .']', - 'value' => $fieldValue - )); - } - - - $fieldset->addField('create_button', 'note', array( - 'text' => $this->getButtonHtml( - Mage::helper('catalog')->__('Quick Create'), - 'superProduct.quickCreateNewProduct()', - 'save' - ) - )); - - - - $this->setForm($form); - } - - /** - * Retrieve currently edited product object - * - * @return Mage_Catalog_Model_Product - */ - protected function _getProduct() - { - return Mage::registry('current_product'); - } -} // Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple End \ No newline at end of file + + */ +class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes +{ + protected function _prepareForm() + { + $form = new Varien_Data_Form(); + + $form->setFieldNameSuffix('simple_product'); + + $fieldset = $form->addFieldset('simple_product', array( + 'legend' => Mage::helper('catalog')->__('Quick simple product creation') + )); + $this->_addElementTypes($fieldset); + $attributesConfig = array( + 'autogenerate' => array('name', 'sku'), + 'additional' => array('name', 'sku', 'visibility', 'status') + ); + + $availableTypes = array('text', 'select', 'multiselect', 'textarea', 'price'); + + $attributes = Mage::getModel('catalog/product') + ->setTypeId(Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) + ->setAttributeSetId($this->_getProduct()->getAttributeSetId()) + ->getAttributes(); + + /* Standart attributes */ + foreach ($attributes as $attribute) { + if (($attribute->getIsRequired() + && $attribute->getApplyTo() + // If not applied to configurable + && !in_array(Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE, $attribute->getApplyTo()) + // If not used in configurable + && !in_array($attribute->getId(),$this->_getProduct()->getTypeInstance(true)->getUsedProductAttributeIds($this->_getProduct()))) + // Or in additional + || in_array($attribute->getAttributeCode(), $attributesConfig['additional'])) { + + $inputType = $attribute->getFrontend()->getInputType(); + if (!in_array($inputType, $availableTypes)) { + continue; + } + $attributeCode = $attribute->getAttributeCode(); + $element = $fieldset->addField( + 'simple_product_' . $attributeCode, + $inputType, + array( + 'label' => $attribute->getFrontend()->getLabel(), + 'name' => $attributeCode, + 'required' => $attribute->getIsRequired(), + ) + )->setEntityAttribute($attribute); + + if (in_array($attributeCode, $attributesConfig['autogenerate'])) { + $element->setDisabled('true'); + $element->setValue($this->_getProduct()->getData($attributeCode)); + $element->setAfterElementHtml( + ' ' + . '' + ); + } + + + if ($inputType == 'select' || $inputType == 'multiselect') { + $element->setValues($attribute->getFrontend()->getSelectOptions()); + } + } + + } + + /* Configurable attributes */ + foreach ($this->_getProduct()->getTypeInstance(true)->getUsedProductAttributes($this->_getProduct()) as $attribute) { + $attributeCode = $attribute->getAttributeCode(); + $fieldset->addField( 'simple_product_' . $attributeCode, 'select', array( + 'label' => $attribute->getFrontend()->getLabel(), + 'name' => $attributeCode, + 'values' => $attribute->getSource()->getAllOptions(true, true), + 'required' => true, + 'class' => 'validate-configurable', + 'onchange' => 'superProduct.showPricing(this, \'' . $attributeCode . '\')' + )); + + $fieldset->addField('simple_product_' . $attributeCode . '_pricing_value', 'hidden', array( + 'name' => 'pricing[' . $attributeCode . '][value]' + )); + + $fieldset->addField('simple_product_' . $attributeCode . '_pricing_type', 'hidden', array( + 'name' => 'pricing[' . $attributeCode . '][is_percent]' + )); + } + + /* Inventory Data */ + $fieldset->addField('simple_product_inventory_qty', 'text', array( + 'label' => Mage::helper('catalog')->__('Qty'), + 'name' => 'stock_data[qty]', + 'class' => 'validate-number', + 'required' => true, + 'value' => 0 + )); + + $fieldset->addField('simple_product_inventory_is_in_stock', 'select', array( + 'label' => Mage::helper('catalog')->__('Stock Availability'), + 'name' => 'stock_data[is_in_stock]', + 'values' => array( + array('value'=>1, 'label'=> Mage::helper('catalog')->__('In Stock')), + array('value'=>0, 'label'=> Mage::helper('catalog')->__('Out of Stock')) + ), + 'value' => 1 + )); + + $stockHiddenFields = array( + 'use_config_min_qty' => 1, + 'use_config_min_sale_qty' => 1, + 'use_config_max_sale_qty' => 1, + 'use_config_backorders' => 1, + 'use_config_notify_stock_qty' => 1, + 'is_qty_decimal' => 0 + ); + + foreach ($stockHiddenFields as $fieldName=>$fieldValue) { + $fieldset->addField('simple_product_inventory_' . $fieldName, 'hidden', array( + 'name' => 'stock_data[' . $fieldName .']', + 'value' => $fieldValue + )); + } + + + $fieldset->addField('create_button', 'note', array( + 'text' => $this->getButtonHtml( + Mage::helper('catalog')->__('Quick Create'), + 'superProduct.quickCreateNewProduct()', + 'save' + ) + )); + + + + $this->setForm($form); + } + + /** + * Retrieve currently edited product object + * + * @return Mage_Catalog_Model_Product + */ + protected function _getProduct() + { + return Mage::registry('current_product'); + } +} // Class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple End diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php index 9d2bd64756..2f50ff072f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,7 +56,7 @@ public function getTabClass() } /** - * Retirve currently edited product model + * Retrieve currently edited product model * * @return Mage_Catalog_Model_Product */ @@ -176,7 +176,7 @@ protected function _getSelectedProducts() { $products = $this->getProductsGrouped(); if (!is_array($products)) { - $products = $this->getSelectedGroupedProducts(); + $products = array_keys($this->getSelectedGroupedProducts()); } return $products; } @@ -188,8 +188,16 @@ protected function _getSelectedProducts() */ public function getSelectedGroupedProducts() { - return Mage::registry('current_product')->getTypeInstance(true) - ->getAssociatedProductIds(Mage::registry('current_product')); + $associatedProducts = Mage::registry('current_product')->getTypeInstance(true) + ->getAssociatedProducts(Mage::registry('current_product')); + $products = array(); + foreach ($associatedProducts as $product) { + $products[$product->getId()] = array( + 'qty' => $product->getQty(), + 'position' => $product->getPosition() + ); + } + return $products; } public function getTabLabel() @@ -208,4 +216,4 @@ public function isHidden() { return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php index 0884cefed5..c42d1d62ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php index caa5f4df25..ad2c1806f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -105,4 +105,4 @@ public function getGridUrl() 'product_id' => $this->getProductId(), )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php index 648bdb37df..92b361b3c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -99,4 +99,4 @@ public function getGridUrl() 'product_id' => $this->getProductId(), )); } -} \ No newline at end of file +} 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 index c3c0920305..8ec8174cca 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -232,7 +232,7 @@ protected function _getSelectedProducts() { $products = $this->getProductsUpsell(); if (!is_array($products)) { - $products = $this->getSelectedUpsellProducts(); + $products = array_keys($this->getSelectedUpsellProducts()); } return $products; } @@ -244,7 +244,11 @@ protected function _getSelectedProducts() */ public function getSelectedUpsellProducts() { - return Mage::registry('current_product')->getUpSellProductIds(); + $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/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php index 28d97949d5..fd93dc5f33 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** 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 index b9734b4ec7..d13654b386 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php index 483883a589..c4550b7492 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,4 +56,4 @@ protected function _prepareLayout() // $this->bindShadowTabs('configurable', 'customer_options'); // } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php index 565f663691..532c94adad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ protected function _prepareLayout() 'class' => 'ajax', )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php index 6a41e86f73..5e6277a1fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,7 +37,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Frontend_Product_Watermark extends Ma public function render(Varien_Data_Form_Element_Abstract $element) { - $html = $this->_getHeaderHtml($element); + $html = $this->_getHeaderHtml($element); $renderer = Mage::getBlockSingleton('adminhtml/system_config_form_field'); $attributes = Mage::getConfig()->getNode(self::XML_PATH_IMAGE_TYPES)->asArray(); @@ -51,7 +51,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) ->setForm( $this->getForm() ) ->setLabel(Mage::helper('adminhtml')->__('Size for %s', $attribute['title'])) ->setRenderer($renderer); - $html.= $field->toHtml(); + $html.= $field->toHtml(); /** * Watermark upload field @@ -61,7 +61,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) ->setForm( $this->getForm() ) ->setLabel(Mage::helper('adminhtml')->__('Watermark File for %s', $attribute['title'])) ->setRenderer($renderer); - $html.= $field->toHtml(); + $html.= $field->toHtml(); /** * Watermark position field @@ -72,7 +72,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) ->setLabel(Mage::helper('adminhtml')->__('Position of Watermark for %s', $attribute['title'])) ->setRenderer($renderer) ->setValues(Mage::getSingleton('adminhtml/system_config_source_catalog_product_watermark_position')->toOptionArray()); - $html.= $field->toHtml(); + $html.= $field->toHtml(); } $html .= $this->_getFooterHtml($element); @@ -104,4 +104,4 @@ protected function _getFooterHtml($element) $html = ''; return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php index ec7d02cf60..c395698fec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php index 569afad02e..88c7375d0f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php index bb35cac0ab..c000dc4e6e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php index 3159b2139b..287540bfd2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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 index 6bd38b042a..e1a6a08a42 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php index 5a21235ab0..9915f02a76 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php index 1e4952caf6..ae0de31db1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Main.php index 030dd2ff60..8e14c9f822 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Main.php @@ -18,8 +18,8 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Toolbar/Main.php index 030dd2ff60..8e14c9f822 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Toolbar/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Set/Toolbar/Main.php @@ -18,8 +18,8 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php index afebc174ce..fada21bddd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() parent::__construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php index 4a6b553894..8572d239ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,4 +56,4 @@ public function getHeaderText() } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php index da9e6eaf91..c09ade11df 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php index 67d8ed9526..73f10ff2b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php index a47ef56ff8..a282aefb38 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('checkout')->__('Add New Condition'); parent::__construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php index ceec4039cc..17f5172582 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -63,4 +63,4 @@ public function getHeaderText() return Mage::helper('checkout')->__('New Condition'); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php index 25cbd7d62b..2440f288b2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -61,7 +61,7 @@ protected function _prepareForm() $fieldset = $form->addFieldset('base_fieldset', array( 'legend' => Mage::helper('checkout')->__('Terms and Conditions Information'), - 'class' => 'fieldset-wide', + 'class' => 'fieldset-wide', )); if ($model->getId()) { diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php index 0f4bdfcfa1..b0f3a0052c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Checkout_Agreement_Grid extends Mage_Adminhtml_Block_Widget_Grid { diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php index 2d382ccce5..e752168be9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php index 2a403d8877..d2cb7e3d05 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php index 86de942ba2..e3daed878c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,19 +67,19 @@ protected function _prepareForm() $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('cms')->__('General Information'), 'class' => 'fieldset-wide')); if ($model->getBlockId()) { - $fieldset->addField('block_id', 'hidden', array( + $fieldset->addField('block_id', 'hidden', array( 'name' => 'block_id', )); } - $fieldset->addField('title', 'text', array( + $fieldset->addField('title', 'text', array( 'name' => 'title', 'label' => Mage::helper('cms')->__('Block Title'), 'title' => Mage::helper('cms')->__('Block Title'), 'required' => true, )); - $fieldset->addField('identifier', 'text', array( + $fieldset->addField('identifier', 'text', array( 'name' => 'identifier', 'label' => Mage::helper('cms')->__('Identifier'), 'title' => Mage::helper('cms')->__('Identifier'), @@ -91,7 +91,7 @@ protected function _prepareForm() * Check is single store mode */ if (!Mage::app()->isSingleStoreMode()) { - $fieldset->addField('store_id', 'multiselect', array( + $fieldset->addField('store_id', 'multiselect', array( 'name' => 'stores[]', 'label' => Mage::helper('cms')->__('Store View'), 'title' => Mage::helper('cms')->__('Store View'), @@ -107,7 +107,7 @@ protected function _prepareForm() $model->setStoreId(Mage::app()->getStore(true)->getId()); } - $fieldset->addField('is_active', 'select', array( + $fieldset->addField('is_active', 'select', array( 'label' => Mage::helper('cms')->__('Status'), 'title' => Mage::helper('cms')->__('Status'), 'name' => 'is_active', @@ -118,7 +118,7 @@ protected function _prepareForm() ), )); - $fieldset->addField('content', 'editor', array( + $fieldset->addField('content', 'editor', array( 'name' => 'content', 'label' => Mage::helper('cms')->__('Content'), 'title' => Mage::helper('cms')->__('Content'), diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php index 16d4116576..6aa1c037d2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php index b0a439dd18..c802d05f5e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php index 55f0ec0bf4..36ed254fe6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php index cfd1046f77..8ca0024bd9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php index ae4efb32ec..1f5ee5e5c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Cms_Page_Edit_Tab_Design extends Mage_Adminhtml_Block_Widget_Form @@ -57,12 +57,15 @@ protected function _prepareForm() )); $layoutFieldset->addField('root_template', 'select', array( - 'name' => 'root_template', - 'label' => Mage::helper('cms')->__('Layout'), - 'required' => true, + 'name' => 'root_template', + 'label' => Mage::helper('cms')->__('Layout'), + 'required' => true, 'values' => Mage::getSingleton('page/source_layout')->toOptionArray(), - 'disabled' => $isElementDisabled + 'disabled' => $isElementDisabled )); + if (!$model->getId()) { + $model->setRootTemplate(Mage::getSingleton('page/source_layout')->getDefaultValue()); + } $layoutFieldset->addField('layout_update_xml', 'textarea', array( 'name' => 'layout_update_xml', diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php index 8e76726d8a..d84ff34cce 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,7 +55,7 @@ protected function _prepareForm() $form->setHtmlIdPrefix('page_'); - $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('cms')->__('Page Information'),'class'=>'fieldset-wide')); + $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('cms')->__('Page Information'))); if ($model->getPageId()) { $fieldset->addField('page_id', 'hidden', array( @@ -77,7 +77,7 @@ protected function _prepareForm() 'title' => Mage::helper('cms')->__('URL Key'), 'required' => true, 'class' => 'validate-identifier', - 'after_element_html' => '

' . Mage::helper('cms')->__('(eg: domain.com/identifier)') . '

', + 'note' => Mage::helper('cms')->__('Relative to Website Base URL'), 'disabled' => $isElementDisabled )); @@ -108,8 +108,11 @@ protected function _prepareForm() 'name' => 'is_active', 'required' => true, 'options' => $model->getAvailableStatuses(), - 'disabled' => $isElementDisabled + 'disabled' => $isElementDisabled, )); + if (!$model->getId()) { + $model->setData('is_active', $isElementDisabled ? '0' : '1'); + } Mage::dispatchEvent('adminhtml_cms_page_edit_tab_main_prepare_form', array('form' => $form)); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php index a0f2121633..9f373d5161 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php index c2f85ff3e5..21ce6f6098 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php index 768e066c42..00cf2852fd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -63,7 +63,7 @@ protected function _prepareColumns() )); $this->addColumn('identifier', array( - 'header' => Mage::helper('cms')->__('Identifier'), + 'header' => Mage::helper('cms')->__('URL Key'), 'align' => 'left', 'index' => 'identifier' )); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php index ef2bce1bf8..97428eabfb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Cms_Page_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract @@ -32,4 +32,4 @@ public function render(Varien_Object $row) $href = $urlModel->getUrl('', array('_current'=>false)) . "{$row->getIdentifier()}?___store={$row->getStoreCode()}"; return ''.$this->__('Preview').''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Customer.php b/app/code/core/Mage/Adminhtml/Block/Customer.php index cbca1dc261..9a5a9986a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php index 7ab19295bb..ba4735aded 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -90,22 +90,22 @@ public function getValidationUrl() protected function _prepareLayout() { if (!Mage::registry('current_customer')->isReadonly()) { - $this->_addButton('save_and_continue', array( + $this->_addButton('save_and_continue', array( 'label' => Mage::helper('customer')->__('Save And Continue Edit'), 'onclick' => 'saveAndContinueEdit(\''.$this->_getSaveAndContinueUrl().'\')', 'class' => 'save' ), 10); } - return parent::_prepareLayout(); + return parent::_prepareLayout(); } protected function _getSaveAndContinueUrl() { - return $this->getUrl('*/*/save', array( + return $this->getUrl('*/*/save', array( '_current' => true, 'back' => 'edit', - 'tab' => '{{tab_id}}' + 'tab' => '{{tab_id}}' )); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php index f6410ba03a..d812fa9cfe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php index 15f2189a88..0ca1b77ddf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php index ad540f93f3..674e84cddf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php index c0626b55d5..699fb72311 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php index 90b10adf9f..1984fe9cc4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php index c06da85b84..1aa058b9f1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php index 2b15db400b..b9556c6af8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php index c27cd615cd..048373ff90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php index f26bb9424c..ee057c3e2f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php index 7c84fa7bbe..29b0c7a41e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php index b371bae18b..56bdfec7fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php index 9d47072842..95dcb694f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php index c4fd434dba..325c66b8db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php index 8d3e0ad395..71e4678ec4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php index 8c0ff3c7b2..04b782bcf9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php index 6e52beb6a2..1e91ec0ee5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php index 9665317dc5..45f95bdd00 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php index ee6fd3de77..d2d5788097 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php index 92512f5626..dc366c270a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php index d6e3e53a49..4c5c0ebe92 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php index 57b0109e7f..111f1cc503 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php index 84a6dd2e49..85ce0304c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php index f0f87f3b76..e73f0c8738 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php index db8ce654aa..a794c90ebf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php index acd905096b..9e75565168 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -103,7 +103,7 @@ protected function _beforeToHtml() 'url' => $this->getUrl('*/*/productTags', array('_current' => true)), )); } - + $this->_updateActiveTab(); Varien_Profiler::stop('customer/tabs'); return parent::_beforeToHtml(); @@ -111,12 +111,12 @@ protected function _beforeToHtml() protected function _updateActiveTab() { - $tabId = $this->getRequest()->getParam('tab'); - if( $tabId ) { - $tabId = preg_replace("#{$this->getId()}_#", '', $tabId); - if($tabId) { - $this->setActiveTab($tabId); - } - } + $tabId = $this->getRequest()->getParam('tab'); + if( $tabId ) { + $tabId = preg_replace("#{$this->getId()}_#", '', $tabId); + if($tabId) { + $this->setActiveTab($tabId); + } + } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php index 2aa174ba06..2b92dceba0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php index 6bf5192fa5..b022abe124 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php index e0206fee5d..6944340f23 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php index cb782d308f..5ee18b3c81 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -61,4 +61,4 @@ public function getHeaderText() public function getHeaderCssClass() { return 'icon-head head-customer-groups'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php index 8c1e8c2eb6..5ddca44af8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -91,4 +91,4 @@ protected function _prepareLayout() $form->setAction($this->getUrl('*/*/save')); $this->setForm($form); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php index fd34e7f4b8..ee9cbf89ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online.php index 8edaeaaa16..22b8a46257 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php index e5f60660b1..6e09862697 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php index e24e8c4185..247b165540 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php index 6d8d9a49b0..e95ec04acf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php index 0ff14ba1ec..4b5b4c9475 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php index 6fa186ac8d..cf85beed21 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,4 +44,4 @@ public function render(Varien_Object $row) { return htmlspecialchars($row->getData($this->getColumn()->getIndex())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard.php b/app/code/core/Mage/Adminhtml/Block/Dashboard.php index efa5f51e81..f61d80c588 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Dashboard extends Mage_Adminhtml_Block_Template diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php index ad466af345..446bb32bdb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -77,4 +77,4 @@ protected function _prepareLayout() $this->_prepareData(); return parent::_prepareLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php index c13c5772a3..fe66fd3edc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php index 49100c3e70..d2d8dc8bdf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index 911124641c..25b9e4bd39 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -393,4 +393,4 @@ protected function getHeight() { return $this->_height; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php index 2cd8e61b88..60bc360850 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php index 19aa66e056..2a399fb595 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php index fe6798de9f..f7300f10d7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -113,4 +113,4 @@ public function getRowUrl($row) { return $this->getUrl('*/sales_order/view', array('order_id'=>$row->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php index f792dea9b2..d5f3efa612 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php index cbec3abb48..1a25139642 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -96,4 +96,4 @@ public function getRowUrl($row) { return $this->getUrl('*/catalog_search/edit', array('id'=>$row->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php index f033eddcdb..ab64e06ee7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,4 +44,4 @@ public function render(Varien_Object $row) } return $value; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php index e2816b63f2..0a66025b86 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -98,4 +98,4 @@ public function getRowUrl($row) { return $this->getUrl('*/catalog_search/edit', array('id'=>$row->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php index accdc8a902..0ae1ca0fe4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php index 5adc7e53bc..9071b0a87f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -115,4 +115,4 @@ public function getRowUrl($row) { return $this->getUrl('*/customer/edit', array('id'=>$row->getCustomerId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php index 4b13db7ec9..8379015989 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -115,4 +115,4 @@ public function getRowUrl($row) { return $this->getUrl('*/customer/edit', array('id'=>$row->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php index e5e74494e2..aa1936bfe4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php index df0bc7a287..8721c3f548 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -106,4 +106,4 @@ public function getRowUrl($row) } return $this->getUrl('*/catalog_product/edit', $params); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php index 2d538c528c..e4c515a07b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -102,4 +102,4 @@ public function getRowUrl($row) } return $this->getUrl('*/catalog_product/edit', $params); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php index 3436ed55d9..be7db0ce5b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Denied.php b/app/code/core/Mage/Adminhtml/Block/Denied.php index d489a29758..43436c576f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Denied.php +++ b/app/code/core/Mage/Adminhtml/Block/Denied.php @@ -18,10 +18,10 @@ * 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 - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Denied extends Mage_Adminhtml_Block_Template @@ -34,4 +34,4 @@ public function hasAvailaleResources() } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Edit.php index c84befc7f3..686ff63df2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -71,4 +71,4 @@ public function initForm() ); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Form.php index 6dcd932d40..3725d1a54a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Config/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,4 +53,4 @@ public function initForm() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit.php index bc05dfdd7f..989ef8cdb7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit/Form.php index cec609fee2..3ec0226dd5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Console/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit.php index 590a9dcb08..8a08772075 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Form.php index f108c3e462..19d65983e5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Abstract.php index 577be09e01..89548669b7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Contents.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Contents.php index 54a6512410..a702b0c522 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Contents.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Contents.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Depends.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Depends.php index 513934b988..921cd9cb7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Depends.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Depends.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,26 +47,26 @@ public function initForm() $fieldset = $form->addFieldset('depends_php_fieldset', array('legend'=>Mage::helper('adminhtml')->__('PHP Version'))); - $fieldset->addField('depends_php_min', 'text', array( + $fieldset->addField('depends_php_min', 'text', array( 'name' => 'depends_php_min', 'label' => Mage::helper('adminhtml')->__('Minimum'), 'required' => true, 'value' => '5.2.0', )); - $fieldset->addField('depends_php_max', 'text', array( + $fieldset->addField('depends_php_max', 'text', array( 'name' => 'depends_php_max', 'label' => Mage::helper('adminhtml')->__('Maximum'), 'required' => true, 'value' => '6.0.0', )); - $fieldset->addField('depends_php_recommended', 'text', array( + $fieldset->addField('depends_php_recommended', 'text', array( 'name' => 'depends_php_recommended', 'label' => Mage::helper('adminhtml')->__('Recommended'), )); - $fieldset->addField('depends_php_exclude', 'text', array( + $fieldset->addField('depends_php_exclude', 'text', array( 'name' => 'depends_php_exclude', 'label' => Mage::helper('adminhtml')->__('Exclude (comma separated)'), )); diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Grid.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Grid.php index ada4be2d3a..b9177cdcc3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Load.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Load.php index 80f68ac14c..52b000555e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Load.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Load.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Maintainers.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Maintainers.php index e87cd28832..e91c1f56cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Maintainers.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Maintainers.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Package.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Package.php index 59b30122b7..11602a8408 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Package.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Package.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -61,13 +61,13 @@ public function initForm() 'name' => 'file_name', )); - $fieldset->addField('name', 'text', array( + $fieldset->addField('name', 'text', array( 'name' => 'name', 'label' => Mage::helper('adminhtml')->__('Name'), 'required' => true, )); - $fieldset->addField('channel', 'text', array( + $fieldset->addField('channel', 'text', array( 'name' => 'channel', 'label' => Mage::helper('adminhtml')->__('Channel'), 'required' => true, @@ -87,14 +87,14 @@ public function initForm() 'required' => true, )); - $fieldset->addField('license', 'text', array( + $fieldset->addField('license', 'text', array( 'name' => 'license', 'label' => Mage::helper('adminhtml')->__('License'), 'required' => true, 'value' => 'Open Software License (OSL 3.0)', )); - $fieldset->addField('license_uri', 'text', array( + $fieldset->addField('license_uri', 'text', array( 'name' => 'license_uri', 'label' => Mage::helper('adminhtml')->__('License URI'), 'value' => 'http://opensource.org/licenses/osl-3.0.php', diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Release.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Release.php index dc2ff97549..4687c6895f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Release.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tab/Release.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -73,7 +73,7 @@ public function initForm() 'options' => $stabilityOptions, )); - $fieldset->addField('notes', 'textarea', array( + $fieldset->addField('notes', 'textarea', array( 'name' => 'notes', 'label' => Mage::helper('adminhtml')->__('Notes'), 'style' => 'height:300px;', diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tabs.php index f4d8ec7c7e..a5f82b5494 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Custom/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/File/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/File/Form.php index e2ee282146..162a87c98b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/File/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/File/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -86,4 +86,4 @@ public function getBackButtonHtml() return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local.php index 0a78007c27..1c62a7eb60 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit.php index a7876bc62d..b39e4b2b91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Form.php index 6f9a92655e..1a2a05b009 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Abstract.php index d9869b620d..45af110280 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once "Varien/Pear/Package.php"; diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Actions.php index 691c5afc7d..03ee90c54d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Actions.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Changelog.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Changelog.php index eafbc3b5ca..b24154bac0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Changelog.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Changelog.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Contents.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Contents.php index 90da1c62eb..e2baf1a6e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Contents.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Contents.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Depends.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Depends.php index 5f740583cc..ac424022d2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Depends.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Depends.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Package.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Package.php index 7737e43adb..b1339c5374 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Package.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tab/Package.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tabs.php index 6058ac8c7a..8466e5c2f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid.php index 90acbc302a..0aabc445af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,28 +56,28 @@ protected function _prepareColumns() $this->addColumn('channel', array( 'header'=>Mage::helper('adminhtml')->__('Channel'), - 'index'=>'channel', - #'type'=>'options', - #'options'=>$ext->getKnownChannels(), + 'index'=>'channel', + #'type'=>'options', + #'options'=>$ext->getKnownChannels(), )); $this->addColumn('name', array( 'header'=>Mage::helper('adminhtml')->__('Extension Name'), - 'index'=>'name', + 'index'=>'name', )); $this->addColumn('version', array( 'header'=>Mage::helper('adminhtml')->__('Version'), - 'index'=>'version', - 'type'=>'range', - 'width'=>'140px', + 'index'=>'version', + 'type'=>'range', + 'width'=>'140px', )); $this->addColumn('stability', array( 'header'=>Mage::helper('adminhtml')->__('Stability'), - 'index'=>'stability', - 'type'=>'options', - 'options'=>$ext->getStabilityOptions(), + 'index'=>'stability', + 'type'=>'options', + 'options'=>$ext->getStabilityOptions(), )); /* diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid/Renderer/Action.php index 873c13a9d2..5d48579119 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Grid/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,15 +37,15 @@ class Mage_Adminhtml_Block_Extensions_Local_Grid_Renderer_Action { public function render(Varien_Object $row) { - $actions = array(); + $actions = array(); - $actions[] = array( - 'url' => Mage::getModel('adminhtml/url')->setQueryParam('id', $row->getId())->getUrl('*/*/edit'), - 'caption' => $this->__('View') - ); + $actions[] = array( + 'url' => Mage::getModel('adminhtml/url')->setQueryParam('id', $row->getId())->getUrl('*/*/edit'), + 'caption' => $this->__('View') + ); $this->getColumn()->setActions($actions); - return parent::render($row); + return parent::render($row); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Upgrade.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Upgrade.php index 870849f43e..03a459e17e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Upgrade.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Local/Upgrade.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Install.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Install.php index 128fe3bda9..591e55a18d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Install.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Install.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function getBackButtonHtml() return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Uninstall.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Uninstall.php index 0b91e8ad42..42b0628145 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Uninstall.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Uninstall.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Upgrade.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Upgrade.php index 605fa98e54..280587d379 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Upgrade.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Mass/Upgrade.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote.php index b730e84f23..e42ad8b068 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit.php index ce7ae87528..bab2a827fd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Form.php index 13354cab39..7fdd934ad3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Abstract.php index 72ddbc01a7..72a5a61187 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once "Varien/Pear/Package.php"; diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Actions.php index bd3f4d138d..1868256fa5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Actions.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Changelog.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Changelog.php index 9f5b47f08f..15310aa9bf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Changelog.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Changelog.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Package.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Package.php index be7dee63d9..e1bfda34d7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Package.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tab/Package.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tabs.php index e5d077e98f..c88eaeaf0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid.php index d6bdbe16ec..ad10969ebd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,38 +56,38 @@ protected function _prepareColumns() $this->addColumn('channel', array( 'header'=>Mage::helper('adminhtml')->__('Channel'), - 'index'=>'channel', - #'type'=>'options', - #'options'=>$ext->getKnownChannels(), + 'index'=>'channel', + #'type'=>'options', + #'options'=>$ext->getKnownChannels(), )); $this->addColumn('category', array( 'header'=>Mage::helper('adminhtml')->__('Category'), - 'index'=>'category', + 'index'=>'category', )); $this->addColumn('name', array( 'header'=>Mage::helper('adminhtml')->__('Extension Name'), - 'index'=>'name', + 'index'=>'name', )); $this->addColumn('summary', array( 'header'=>Mage::helper('adminhtml')->__('Summary'), - 'index'=>'summary', + 'index'=>'summary', )); $this->addColumn('remote_version', array( 'header'=>Mage::helper('adminhtml')->__('Available Version'), - 'index'=>'remote_version', - 'type'=>'range', - 'width'=>'140px', + 'index'=>'remote_version', + 'type'=>'range', + 'width'=>'140px', )); $this->addColumn('local_version', array( 'header'=>Mage::helper('adminhtml')->__('Installed Version'), - 'index'=>'local_version', - 'type'=>'range', - 'width'=>'140px', + 'index'=>'local_version', + 'type'=>'range', + 'width'=>'140px', )); /* $this->addColumn('action', @@ -102,9 +102,9 @@ protected function _prepareColumns() $this->addColumn('stability', array( 'header'=>Mage::helper('adminhtml')->__('Stability'), - 'index'=>'stability', - 'type'=>'options', - 'options'=>$ext->getStabilityOptions(), + 'index'=>'stability', + 'type'=>'options', + 'options'=>$ext->getStabilityOptions(), )); */ diff --git a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid/Renderer/Action.php index a64d16718c..94cc67f3de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Extensions/Remote/Grid/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,15 +37,15 @@ class Mage_Adminhtml_Block_Extensions_Remote_Grid_Renderer_Action { public function render(Varien_Object $row) { - $actions = array(); + $actions = array(); - $actions[] = array( - 'url' => Mage::getModel('adminhtml/url')->setQueryParam('id', $row->getId())->getUrl('*/*/edit'), - 'caption' => $this->__('View') - ); + $actions[] = array( + 'url' => Mage::getModel('adminhtml/url')->setQueryParam('id', $row->getId())->getUrl('*/*/edit'), + 'caption' => $this->__('View') + ); $this->getColumn()->setActions($actions); - return parent::render($row); + return parent::render($row); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Date.php b/app/code/core/Mage/Adminhtml/Block/Html/Date.php index f87002a724..05a1df1daa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Date.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Select.php b/app/code/core/Mage/Adminhtml/Block/Html/Select.php index 887b186c79..714871d9e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Select.php @@ -1,47 +1,47 @@ - - */ -class Mage_Adminhtml_Block_Html_Select extends Mage_Core_Block_Html_Select -{ - - /** - * Enter description here... - * - * @return string - */ - protected function _getUrlModelClass() - { - return 'adminhtml/url'; - } - -} + + */ +class Mage_Adminhtml_Block_Html_Select extends Mage_Core_Block_Html_Select +{ + + /** + * Enter description here... + * + * @return string + */ + protected function _getUrlModelClass() + { + return 'adminhtml/url'; + } + +} diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php index 0d35050481..e2d39b8232 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php index 7577080d13..1491db7ec5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Messages.php b/app/code/core/Mage/Adminhtml/Block/Messages.php index 66d6396a92..d7c9054414 100644 --- a/app/code/core/Mage/Adminhtml/Block/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Messages.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php index c5c5dcc765..aa3949bde7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php index 496b634fa3..0a78f699ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -57,11 +57,11 @@ protected function _prepareCollection() protected function _prepareColumns() { $this->addColumn('checkbox', array( - 'sortable' => false, - 'filter' => 'adminhtml/newsletter_problem_grid_filter_checkbox', - 'renderer' => 'adminhtml/newsletter_problem_grid_renderer_checkbox', - 'width' => '20px' - )); + 'sortable' => false, + 'filter' => 'adminhtml/newsletter_problem_grid_filter_checkbox', + 'renderer' => 'adminhtml/newsletter_problem_grid_renderer_checkbox', + 'width' => '20px' + )); $this->addColumn('problem_id', array( 'header' => Mage::helper('newsletter')->__('ID'), diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php index ec83d14723..bc0f7f0fb5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,13 +34,13 @@ class Mage_Adminhtml_Block_Newsletter_Problem_Grid_Filter_Checkbox extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract { - public function getCondition() + public function getCondition() { return array(); } - + public function getHtml() { return ''; - } -}// Class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Filter_Checkbox END \ No newline at end of file + } +}// Class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Filter_Checkbox END diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php index 0407f97d98..f6e780d686 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,7 +34,7 @@ class Mage_Adminhtml_Block_Newsletter_Problem_Grid_Renderer_Checkbox extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - /** + /** * Renders grid column * * @param Varien_Object $row @@ -44,4 +44,4 @@ public function render(Varien_Object $row) { return ''; } -}// Class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Checkbox END \ No newline at end of file +}// Class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Checkbox END diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php index 68b96410db..86596d12a2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,4 +44,4 @@ protected function _beforeToHtml() return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php index eac4bcf494..7ce2a47ccf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php index 0acd36e59c..8d96e956b4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -134,7 +134,7 @@ protected function _prepareForm() $fieldset->addField('text','editor', array( 'name' => 'text', - 'wysiwyg' => !$queue->getTemplate()->isPlain(), + 'wysiwyg' => false, 'label' => Mage::helper('newsletter')->__('Message'), 'state' => 'html', 'theme' => 'advanced', diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php index 4ed21e1e02..b463de3fdc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -89,18 +89,18 @@ protected function _prepareColumns() 'index' => 'queue_status', 'type' => 'options', 'options' => array( - Mage_Newsletter_Model_Queue::STATUS_SENT => Mage::helper('newsletter')->__('Sent'), - Mage_Newsletter_Model_Queue::STATUS_CANCEL => Mage::helper('newsletter')->__('Cancelled'), - Mage_Newsletter_Model_Queue::STATUS_NEVER => Mage::helper('newsletter')->__('Not Sent'), - Mage_Newsletter_Model_Queue::STATUS_SENDING => Mage::helper('newsletter')->__('Sending'), - Mage_Newsletter_Model_Queue::STATUS_PAUSE => Mage::helper('newsletter')->__('Paused'), + Mage_Newsletter_Model_Queue::STATUS_SENT => Mage::helper('newsletter')->__('Sent'), + Mage_Newsletter_Model_Queue::STATUS_CANCEL => Mage::helper('newsletter')->__('Cancelled'), + Mage_Newsletter_Model_Queue::STATUS_NEVER => Mage::helper('newsletter')->__('Not Sent'), + Mage_Newsletter_Model_Queue::STATUS_SENDING => Mage::helper('newsletter')->__('Sending'), + Mage_Newsletter_Model_Queue::STATUS_PAUSE => Mage::helper('newsletter')->__('Paused'), ), 'width' => '100px', )); $this->addColumn('subscribers_sent', array( 'header' => Mage::helper('newsletter')->__('Processed'), - 'type' => 'number', + 'type' => 'number', 'index' => 'subscribers_sent' )); diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php index 1156459a6d..f08d704ae5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,45 +36,45 @@ class Mage_Adminhtml_Block_Newsletter_Queue_Grid_Renderer_Action extends Mage_Ad { public function render(Varien_Object $row) { - $actions = array(); + $actions = array(); if($row->getQueueStatus()==Mage_Newsletter_Model_Queue::STATUS_NEVER) { - if(!$row->getQueueStartAt() && $row->getSubscribersTotal()) { - $actions[] = array( - 'url' => $this->getUrl('*/*/start', array('id'=>$row->getId())), - 'caption' => Mage::helper('newsletter')->__('Start') - ); - } + if(!$row->getQueueStartAt() && $row->getSubscribersTotal()) { + $actions[] = array( + 'url' => $this->getUrl('*/*/start', array('id'=>$row->getId())), + 'caption' => Mage::helper('newsletter')->__('Start') + ); + } } else if ($row->getQueueStatus()==Mage_Newsletter_Model_Queue::STATUS_SENDING) { - $actions[] = array( - 'url' => $this->getUrl('*/*/pause', array('id'=>$row->getId())), - 'caption' => Mage::helper('newsletter')->__('Pause') - ); + $actions[] = array( + 'url' => $this->getUrl('*/*/pause', array('id'=>$row->getId())), + 'caption' => Mage::helper('newsletter')->__('Pause') + ); - $actions[] = array( - 'url' => $this->getUrl('*/*/cancel', array('id'=>$row->getId())), - 'confirm' => Mage::helper('newsletter')->__('Do you really want to cancel the queue?'), - 'caption' => Mage::helper('newsletter')->__('Cancel') - ); + $actions[] = array( + 'url' => $this->getUrl('*/*/cancel', array('id'=>$row->getId())), + 'confirm' => Mage::helper('newsletter')->__('Do you really want to cancel the queue?'), + 'caption' => Mage::helper('newsletter')->__('Cancel') + ); } else if ($row->getQueueStatus()==Mage_Newsletter_Model_Queue::STATUS_PAUSE) { - $actions[] = array( - 'url' => $this->getUrl('*/*/resume', array('id'=>$row->getId())), - 'caption' => Mage::helper('newsletter')->__('Resume') - ); + $actions[] = array( + 'url' => $this->getUrl('*/*/resume', array('id'=>$row->getId())), + 'caption' => Mage::helper('newsletter')->__('Resume') + ); } $actions[] = array( - 'url' => $this->getUrl('*/newsletter_template/preview',array('id'=>$row->getTemplateId())), - 'caption' => Mage::helper('newsletter')->__('Preview'), - 'popup' => true - ); + 'url' => $this->getUrl('*/newsletter_template/preview',array('id'=>$row->getTemplateId())), + 'caption' => Mage::helper('newsletter')->__('Preview'), + 'popup' => true + ); - $this->getColumn()->setActions($actions); + $this->getColumn()->setActions($actions); return parent::render($row); } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php index ab3815af2c..fe1ab41000 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,63 +34,63 @@ class Mage_Adminhtml_Block_Newsletter_Subscriber extends Mage_Adminhtml_Block_Template { - /** - * Queue collection - * - * @var Mage_Newsletter_Model_Mysql4_Queue_Collection - */ - protected $_queueCollection = null; + /** + * Queue collection + * + * @var Mage_Newsletter_Model_Mysql4_Queue_Collection + */ + protected $_queueCollection = null; - /** - * Constructor - * - * Initializes block - */ - public function __construct() - { - $this->setTemplate('newsletter/subscriber/list.phtml'); - } + /** + * Constructor + * + * Initializes block + */ + public function __construct() + { + $this->setTemplate('newsletter/subscriber/list.phtml'); + } - /** - * Prepares block to render - * - * @return Mage_Adminhtml_Block_Newsletter_Subscriber - */ - protected function _beforeToHtml() - { - $this->setChild('grid', $this->getLayout()->createBlock('adminhtml/newsletter_subscriber_grid','grid')); - return parent::_beforeToHtml(); - } + /** + * Prepares block to render + * + * @return Mage_Adminhtml_Block_Newsletter_Subscriber + */ + protected function _beforeToHtml() + { + $this->setChild('grid', $this->getLayout()->createBlock('adminhtml/newsletter_subscriber_grid','grid')); + return parent::_beforeToHtml(); + } - /** - * Return queue collection with loaded neversent queues - * - * @return Mage_Newsletter_Model_Mysql4_Queue_Collection - */ - public function getQueueCollection() - { - if(is_null($this->_queueCollection)) { - $this->_queueCollection = Mage::getResourceSingleton('newsletter/queue_collection') - ->addTemplateInfo() - ->addOnlyUnsentFilter() - ->load(); - } + /** + * Return queue collection with loaded neversent queues + * + * @return Mage_Newsletter_Model_Mysql4_Queue_Collection + */ + public function getQueueCollection() + { + if(is_null($this->_queueCollection)) { + $this->_queueCollection = Mage::getResourceSingleton('newsletter/queue_collection') + ->addTemplateInfo() + ->addOnlyUnsentFilter() + ->load(); + } - return $this->_queueCollection; - } + return $this->_queueCollection; + } - public function getShowQueueAdd() + public function getShowQueueAdd() { - return $this->getChild('grid')->getShowQueueAdd(); + return $this->getChild('grid')->getShowQueueAdd(); } - /** - * Return list of neversent queues for select - * - * @return array - */ - public function getQueueAsOptions( ) - { - return $this->getQueueCollection()->toOptionArray(); - } -} \ No newline at end of file + /** + * Return list of neversent queues for select + * + * @return array + */ + public function getQueueAsOptions( ) + { + return $this->getQueueCollection()->toOptionArray(); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php index 32ef3d1fea..b15506b8b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php index 9e19f522a8..894a3c086f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,13 +34,13 @@ class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Filter_Checkbox extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract { - public function getCondition() + public function getCondition() { return array(); } - + public function getHtml() { return ''; } -}// Class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Filter_Checkbox END \ No newline at end of file +}// Class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Filter_Checkbox END diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php index b13046a09a..f148f2d123 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php index cb714f2e7f..1d7bcd7520 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,7 +34,7 @@ class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Checkbox extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - /** + /** * Renders grid column * * @param Varien_Object $row @@ -43,10 +43,10 @@ class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Checkbox extends public function render(Varien_Object $row) { if($row->getSubscriberStatus()==Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) { - return ''; + return ''; } else { - return ''; + return ''; } - + } -}// Class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Checkbox END \ No newline at end of file +}// Class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Checkbox END diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php index cfdcc23c74..dbe472bf1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php index fb3b3160f2..a51b731671 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php index 967afb36e3..e8dfd77e30 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,7 +114,7 @@ protected function _prepareForm() $fieldset->addField('text', 'editor', array( 'name' => 'text', - 'wysiwyg' => (!$model->isPlain()), + 'wysiwyg' => false, //(!$model->isPlain()), 'label' => Mage::helper('newsletter')->__('Template Content'), 'title' => Mage::helper('newsletter')->__('Template Content'), 'theme' => 'advanced', diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php index 20876dc296..0aae0a6222 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,7 +55,7 @@ protected function _prepareColumns() $this->addColumn('code', array( 'header'=>Mage::helper('newsletter')->__('Template Name'), - 'index'=>'template_code' + 'index'=>'template_code' )); $this->addColumn('added_at', @@ -93,8 +93,8 @@ protected function _prepareColumns() 'index'=>'template_type', 'type' => 'options', 'options' => array( - Mage_Newsletter_Model_Template::TYPE_HTML => 'html', - Mage_Newsletter_Model_Template::TYPE_TEXT => 'text' + Mage_Newsletter_Model_Template::TYPE_HTML => 'html', + Mage_Newsletter_Model_Template::TYPE_TEXT => 'text' ), )); diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php index 262eb2fbcf..5a0f23b1cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php index 71564104b1..8e7b4cef6a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function render(Varien_Object $row) } return $str; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php index 82b516a238..fc6c7c21cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,8 +48,8 @@ protected function _toHtml() $vars = array(); if($this->getRequest()->getParam('subscriber')) { - $vars['subscriber'] = Mage::getModel('newsletter/subscriber') - ->load($this->getRequest()->getParam('subscriber')); + $vars['subscriber'] = Mage::getModel('newsletter/subscriber') + ->load($this->getRequest()->getParam('subscriber')); } $templateProcessed = $template->getProcessedTemplate($vars, true); diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php index 5aef71adcd..d55a6f51a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php index aae5dbafa6..80e7cd598f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,4 +64,4 @@ public function render(Varien_Object $row) ); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php index d4a6cab77b..d89eda81e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function render(Varien_Object $row) return '' . $row->getTitle() . '' . ($row->getDescription() ? '
' . $row->getDescription() : ''); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php index 1c6ba21969..c031935d76 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,4 +65,4 @@ public function render(Varien_Object $row) } return '' . $value . ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php index 88839ab7f6..8cc20adfe1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ protected function _prepareLayout() return parent::_prepareLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php index 2e37e76804..f3aa85dbd9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -158,4 +158,4 @@ public function isMessageWindowAvailable() } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php index 343dca8623..5a40a21ea6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php @@ -18,14 +18,26 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Notification_Window extends Mage_Adminhtml_Block_Notification_Toolbar { + /** + * XML path of Severity icons url + */ + const XML_SEVERITY_ICONS_URL_PATH = 'system/adminnotification/severity_icons_url'; + + /** + * Severity icons url + * + * @var string + */ + protected $_severityIconsUrl; + /** * Is available flag * @@ -83,7 +95,7 @@ public function canShow() $this->_available = false; return false; } - + if (!$this->isOutputEnabled('Mage_AdminNotification')) { $this->_available = false; return false; @@ -126,6 +138,33 @@ public function getLastNotice() return $this->_getHelper()->getLatestNotice(); } + /** + * Retrieve severity icons url + * + * @return string + */ + public function getSeverityIconsUrl() + { + if (is_null($this->_severityIconsUrl)) { + $this->_severityIconsUrl = + (Mage::app()->getFrontController()->getRequest()->isSecure() ? 'https://' : 'http://') + . sprintf(Mage::getStoreConfig(self::XML_SEVERITY_ICONS_URL_PATH), Mage::getVersion(), + $this->getNoticeSeverity()) + ; + } + return $this->_severityIconsUrl; + } + + /** + * Retrieve severity text + * + * @return string + */ + public function getSeverityText() + { + return strtolower(str_replace('SEVERITY_', '', $this->getNoticeSeverity())); + } + /** * Check if current block allowed in ACL * diff --git a/app/code/core/Mage/Adminhtml/Block/Page.php b/app/code/core/Mage/Adminhtml/Block/Page.php index ba94292b49..3159a95ad2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page.php +++ b/app/code/core/Mage/Adminhtml/Block/Page.php @@ -1,77 +1,77 @@ - - */ -class Mage_Adminhtml_Block_Page extends Mage_Adminhtml_Block_Template -{ - - /** - * Class constructor - * - */ - public function __construct() - { - parent::__construct(); - $this->setTemplate('page.phtml'); - $action = Mage::app()->getFrontController()->getAction(); - if ($action) { - $this->addBodyClass($action->getFullActionName('-')); - } - } - - /** - * Get current language - * - * @return unknown - */ - public function getLang() - { - if (!$this->hasData('lang')) { - $this->setData('lang', substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2)); - } - return $this->getData('lang'); - } - - /** - * Add CSS class to page body tag - * - * @param string $className - * @return Mage_Adminhtml_Block_Page - */ - public function addBodyClass($className) - { - $className = preg_replace('#[^a-z0-9]+#', '-', strtolower($className)); - $this->setBodyClass($this->getBodyClass() . ' ' . $className); - return $this; - } - -} + + */ +class Mage_Adminhtml_Block_Page extends Mage_Adminhtml_Block_Template +{ + + /** + * Class constructor + * + */ + public function __construct() + { + parent::__construct(); + $this->setTemplate('page.phtml'); + $action = Mage::app()->getFrontController()->getAction(); + if ($action) { + $this->addBodyClass($action->getFullActionName('-')); + } + } + + /** + * Get current language + * + * @return unknown + */ + public function getLang() + { + if (!$this->hasData('lang')) { + $this->setData('lang', substr(Mage::app()->getLocale()->getLocaleCode(), 0, 2)); + } + return $this->getData('lang'); + } + + /** + * Add CSS class to page body tag + * + * @param string $className + * @return Mage_Adminhtml_Block_Page + */ + public function addBodyClass($className) + { + $className = preg_replace('#[^a-z0-9]+#', '-', strtolower($className)); + $this->setBodyClass($this->getBodyClass() . ' ' . $className); + return $this; + } + +} diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php index 9636620601..895e8911a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Head.php b/app/code/core/Mage/Adminhtml/Block/Page/Head.php index ca38867493..0002799658 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Head.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Head.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Header.php b/app/code/core/Mage/Adminhtml/Block/Page/Header.php index 7aab7a2b93..f83a5a84e7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Header.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php index 8160da3454..9c4d9b7b6e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -123,9 +123,12 @@ protected function _buildMenuArray(Varien_Simplexml_Element $parent=null, $path= $parentArr = array(); $sortOrder = 0; - foreach ($parent->children() as $childName=>$child) { + foreach ($parent->children() as $childName => $child) { + if (1 == $child->disabled) { + continue; + } - $aclResource = 'admin/'.$path.$childName; + $aclResource = 'admin/' . ($child->resource ? (string)$child->resource : $path . $childName); if (!$this->_checkAcl($aclResource)) { continue; } diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Notices.php b/app/code/core/Mage/Adminhtml/Block/Page/Notices.php index 43040bae20..30e8e39fd9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Notices.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Notices.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php index 93858f8ee0..504c8c6de6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Buttons extends Mage_Adminhtml_Block_Template diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php index 5c15a7b30f..b3964bdb58 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Editroles extends Mage_Adminhtml_Block_Widget_Tabs diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php index e656aed17f..9dcc0ceb0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Edituser extends Mage_Adminhtml_Block_Widget_Tabs { @@ -52,6 +52,6 @@ protected function _beforeToHtml() public function getUser() { - return Mage::registry('user_data'); + return Mage::registry('user_data'); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php index a0627750b5..5e853ce662 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php index c0a448bf56..a4f27e0a74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php index a7c3a16714..c3e4f77868 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php index d87b5d4130..1bd3fb5d8f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php index 01c9f6d503..168ff32981 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php index af3ac2bf0d..916b26e433 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php index eb452bf275..8ec5729838 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php index d569b2bf54..e7c2f82f46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Tab_Rolesusers extends Mage_Adminhtml_Block_Widget_Tabs { @@ -54,4 +54,4 @@ protected function _getJsObjectName() return $this->getChild('userGrid')->getJsObjectName(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php index 04df7bd9ee..dbe252c964 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Tab_Useredit extends Mage_Adminhtml_Block_Widget_Form { @@ -139,14 +139,14 @@ protected function _prepareForm() 'style' => 'width: 80px', 'value' => '1', 'values' => array( - array( - 'label' => Mage::helper('adminhtml')->__('Active'), - 'value' => '1', - ), - array( - 'label' => Mage::helper('adminhtml')->__('Inactive'), - 'value' => '0', - ), + array( + 'label' => Mage::helper('adminhtml')->__('Active'), + 'value' => '1', + ), + array( + 'label' => Mage::helper('adminhtml')->__('Inactive'), + 'value' => '0', + ), ), ) ); diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php index a253479d96..e5eeb2e9f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs { diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php index 552cf41e54..7b32804dd4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php index 3c84a3bd14..15f9d94b07 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php index c696b4d799..c8863950c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php index 389ef3b257..79a62c7913 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php index 525a46539f..0f908af179 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_User_Edit_Tab_Roles extends Mage_Adminhtml_Block_Widget_Grid diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php index e77f796d44..850389f72b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php index 1defe4f5a6..36696e034a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php index 0f0b75ebe6..7494e56dfe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Permissions_UsernRoles extends Mage_Adminhtml_Block_Template { diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php index 0b5d22698d..a3cebb659a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php index c1c3898b66..c6f376469e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php index e5c02a4488..1ce0e26f8a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -70,4 +70,4 @@ protected function _prepareForm() $form->setAction($this->getUrl('*/*/save', array('id' => Mage::registry('answer_data')->getAnswerId()))); $this->setForm($form); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php index 034a66a9a7..f53035549f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php index ed2ffa691a..8b8a5c616a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php index 8c15fdfc74..e1015f7e89 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php index 19a7ae716a..f3ccfaf658 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,4 +69,4 @@ protected function _prepareForm() $this->setForm($form); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php index 25a61b4912..62bcd64f47 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php index ef54dc5726..669cca7aa6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -84,4 +84,4 @@ public function getAddButtonHtml() { return $this->getChildHtml('addButton'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php index a4d8923642..0e82ee3f09 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -96,4 +96,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php index 4754bd7138..ba8bdd3ce3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -61,4 +61,4 @@ protected function _beforeToHtml() )); return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php index a550bcd3fe..2d4e057bdb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php b/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php index 0de03e5c22..b58cae5f23 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php index 427c7082f8..6d0ee2df93 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,4 +49,4 @@ public function __construct() parent::__construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php index 48009ca519..f4ec61d8d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,7 +58,7 @@ public function __construct() 'label'=>Mage::helper('catalogrule')->__('Save and Apply'), 'onclick'=>"$('rule_auto_apply').value=1; editForm.submit()", )); - $this->_addButton('save_and_continue', array( + $this->_addButton('save_and_continue', array( 'label' => Mage::helper('catalogrule')->__('Save And Continue Edit'), 'onclick' => 'saveAndContinueEdit()', 'class' => 'save' diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php index 21b8b20e79..2c0aeeb819 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php index 539bd95120..3d481011fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php index a864693a98..e2f28c7d35 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -93,7 +93,7 @@ protected function _prepareForm() 'legend'=>Mage::helper('catalogrule')->__('Conditions (leave blank for all products)')) )->setRenderer($renderer); - $fieldset->addField('conditions', 'text', array( + $fieldset->addField('conditions', 'text', array( 'name' => 'conditions', 'label' => Mage::helper('catalogrule')->__('Conditions'), 'title' => Mage::helper('catalogrule')->__('Conditions'), @@ -102,7 +102,7 @@ protected function _prepareForm() /* $fieldset = $form->addFieldset('actions_fieldset', array('legend'=>Mage::helper('catalogrule')->__('Actions'))); - $fieldset->addField('actions', 'text', array( + $fieldset->addField('actions', 'text', array( 'name' => 'actions', 'label' => Mage::helper('catalogrule')->__('Actions'), 'title' => Mage::helper('catalogrule')->__('Actions'), @@ -130,4 +130,4 @@ protected function _prepareForm() return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php index f010afe46f..0c24a68e62 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -88,16 +88,16 @@ protected function _prepareForm() $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('catalogrule')->__('General Information'))); $fieldset->addField('auto_apply', 'hidden', array( - 'name' => 'auto_apply', + 'name' => 'auto_apply', )); if ($model->getId()) { - $fieldset->addField('rule_id', 'hidden', array( + $fieldset->addField('rule_id', 'hidden', array( 'name' => 'rule_id', )); } - $fieldset->addField('name', 'text', array( + $fieldset->addField('name', 'text', array( 'name' => 'name', 'label' => Mage::helper('catalogrule')->__('Rule Name'), 'title' => Mage::helper('catalogrule')->__('Rule Name'), @@ -111,7 +111,7 @@ protected function _prepareForm() 'style' => 'width: 98%; height: 100px;', )); - $fieldset->addField('is_active', 'select', array( + $fieldset->addField('is_active', 'select', array( 'label' => Mage::helper('catalogrule')->__('Status'), 'title' => Mage::helper('catalogrule')->__('Status'), 'name' => 'is_active', @@ -144,15 +144,15 @@ protected function _prepareForm() $found = false; foreach ($customerGroups as $group) { - if ($group['value']==0) { - $found = true; - } + if ($group['value']==0) { + $found = true; + } } if (!$found) { - array_unshift($customerGroups, array('value'=>0, 'label'=>Mage::helper('catalogrule')->__('NOT LOGGED IN'))); + array_unshift($customerGroups, array('value'=>0, 'label'=>Mage::helper('catalogrule')->__('NOT LOGGED IN'))); } - $fieldset->addField('customer_group_ids', 'multiselect', array( + $fieldset->addField('customer_group_ids', 'multiselect', array( 'name' => 'customer_group_ids[]', 'label' => Mage::helper('catalogrule')->__('Customer Groups'), 'title' => Mage::helper('catalogrule')->__('Customer Groups'), @@ -161,7 +161,7 @@ protected function _prepareForm() )); $dateFormatIso = Mage::app()->getLocale()->getDateFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT); - $fieldset->addField('from_date', 'date', array( + $fieldset->addField('from_date', 'date', array( 'name' => 'from_date', 'label' => Mage::helper('catalogrule')->__('From Date'), 'title' => Mage::helper('catalogrule')->__('From Date'), @@ -169,7 +169,7 @@ protected function _prepareForm() 'input_format' => Varien_Date::DATE_INTERNAL_FORMAT, 'format' => $dateFormatIso )); - $fieldset->addField('to_date', 'date', array( + $fieldset->addField('to_date', 'date', array( 'name' => 'to_date', 'label' => Mage::helper('catalogrule')->__('To Date'), 'title' => Mage::helper('catalogrule')->__('To Date'), diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php index d1675452d4..c9952a6da2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php index 4445b38048..d6d920c38b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php index ae17768956..de736ecf6d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() parent::__construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php index efc74e3664..1cb14b05ff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,7 +56,7 @@ public function __construct() $this->_removeButton('save'); $this->_removeButton('reset'); } else { - $this->_addButton('save_and_continue', array( + $this->_addButton('save_and_continue', array( 'label' => Mage::helper('salesrule')->__('Save And Continue Edit'), 'onclick' => 'saveAndContinueEdit()', 'class' => 'save' diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php index b2ded96b71..77d54b5b36 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php index 79e88919c0..b03e589261 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php index 6f825fa450..c6cbd036ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -93,7 +93,7 @@ protected function _prepareForm() 'legend'=>Mage::helper('salesrule')->__('Apply the rule only if the following conditions are met (leave blank for all products)') ))->setRenderer($renderer); - $fieldset->addField('conditions', 'text', array( + $fieldset->addField('conditions', 'text', array( 'name' => 'conditions', 'label' => Mage::helper('salesrule')->__('Conditions'), 'title' => Mage::helper('salesrule')->__('Conditions'), @@ -103,7 +103,7 @@ protected function _prepareForm() 'legend'=>Mage::helper('salesrule')->__('Apply the rule to cart items matching the following conditions') ))->setRenderer($renderer); - $fieldset->addField('actions', 'text', array( + $fieldset->addField('actions', 'text', array( 'name' => 'actions', 'label' => Mage::helper('salesrule')->__('Apply to'), 'title' => Mage::helper('salesrule')->__('Apply to'), @@ -118,4 +118,4 @@ protected function _prepareForm() return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php index c344168094..4177debfc0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php index c7c4e51fe9..235b32f112 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php index 1939d7c527..b1b8bda243 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php index 64869d5370..fd3081cc21 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -73,9 +73,9 @@ protected function _addColumnFilterToCollection($column) $selected = ''; } if ($column->getFilter()->getValue()) { - $this->getCollection()->addFieldToFilter('sku', array('in'=>$selected)); + $this->getCollection()->addFieldToFilter('sku', array('in'=>$selected)); } else { - $this->getCollection()->addFieldToFilter('sku', array('nin'=>$selected)); + $this->getCollection()->addFieldToFilter('sku', array('nin'=>$selected)); } } else { parent::_addColumnFilterToCollection($column); @@ -83,22 +83,27 @@ protected function _addColumnFilterToCollection($column) return $this; } + /** + * Prepare Catalog Product Collection for attribute SKU in Promo Conditions SKU chooser + * + * @return Mage_Adminhtml_Block_Promo_Widget_Chooser_Sku + */ protected function _prepareCollection() { $collection = Mage::getResourceModel('catalog/product_collection') ->setStoreId(0) - ->addAttributeToSelect('name') - ->addAttributeToFilter('type_id', array('in'=>array( - Mage_Catalog_Model_Product_Type::TYPE_SIMPLE, - Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE, - Mage_Downloadable_Model_Product_Type::TYPE_DOWNLOADABLE - ))); + ->addAttributeToSelect('name', 'type_id', 'attribute_set_id'); $this->setCollection($collection); return parent::_prepareCollection(); } + /** + * Define Cooser Grid Columns and filters + * + * @return Mage_Adminhtml_Block_Promo_Widget_Chooser_Sku + */ protected function _prepareColumns() { $this->addColumn('in_products', array( @@ -118,6 +123,29 @@ protected function _prepareColumns() 'index' => 'entity_id' )); + $this->addColumn('type', + array( + 'header'=> Mage::helper('catalog')->__('Type'), + 'width' => '60px', + 'index' => 'type_id', + 'type' => 'options', + 'options' => Mage::getSingleton('catalog/product_type')->getOptionArray(), + )); + + $sets = Mage::getResourceModel('eav/entity_attribute_set_collection') + ->setEntityTypeFilter(Mage::getModel('catalog/product')->getResource()->getTypeId()) + ->load() + ->toOptionHash(); + + $this->addColumn('set_name', + array( + 'header'=> Mage::helper('catalog')->__('Attrib. Set Name'), + 'width' => '100px', + 'index' => 'attribute_set_id', + 'type' => 'options', + 'options' => $sets, + )); + $this->addColumn('chooser_sku', array( 'header' => Mage::helper('sales')->__('SKU'), 'name' => 'chooser_sku', diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php index db7511077c..f41e7581cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php index ba082023df..6dfd9c0447 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } -} \ No newline at end of file +} 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 index 2edccc2750..42b680046e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -155,4 +155,4 @@ protected function _getWarningHtml() } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php index adfeaaaf8c..80b1dfc100 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php index 96a3324dd0..bb5d1daafa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ protected function _beforeToHtml() ));*/ return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php index 66ae02bd8c..3866923a90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php index f35924d42e..318c5acc3a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('rating')->__('Add New Rating'); parent::__construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php index 5176587801..af3545276c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php index 71c383415c..6acdd7daab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php index fc74fb5176..8db8de0733 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() parent::__construct(); $this->_removeButton('add'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php index cbaca0af56..6ed222d897 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -95,4 +95,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php index 23b0750629..c087deb5b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() parent::__construct(); $this->_removeButton('add'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php index b84c07215a..fbb01ef024 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -95,4 +95,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php index e2c21886f9..11c780d732 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -592,4 +592,4 @@ public function getCurrentCurrencyCode() } return $this->_currentCurrencyCode; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php index d184151904..a177794c6b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php index 3178a3e395..a2b8511901 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function render(Varien_Object $row) $data = Mage::app()->getLocale()->currency($currency_code)->toCurrency($data); return $data; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php index 09cef03b91..6780f0a672 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,4 +54,4 @@ public function render(Varien_Object $row) Mage::helper('adminhtml')->__('Show reviews') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php index dbe3c37c91..261ce3e365 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,4 +50,4 @@ public function render(Varien_Object $row) Mage::helper('adminhtml')->__('Show reviews') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Product.php index 2f147425d6..102085f332 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php index e52dbacaba..b2c27e1358 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -65,4 +65,4 @@ public function getGridHtml() { return $this->getStoreSwitcherHtml() . parent::getGridHtml(); } -} \ No newline at end of file +} 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 index d99aa96e0f..bf5291fc0e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php index 3614541977..a1daeb1e09 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ public function render(Varien_Object $row) } return $this->__('Unlimited'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php index 610f6e5e00..3e21dbd43a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php index 3cb9d0874f..0710fb6537 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -66,4 +66,4 @@ public function getGridHtml() { return $this->getStoreSwitcherHtml() . parent::getGridHtml(); } -} \ No newline at end of file +} 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 index 1b0ff6ec12..e9c242b9e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php index b14fd3ca32..59a5b034cb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() parent::__construct(); $this->_removeButton('add'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php index ff5721dc4e..fffbe89924 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -75,4 +75,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php index 10f02d5f63..4e86ff85ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php index 5c3815e025..a2a9ffea93 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php index ce84e28bc2..8fdc5569a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() parent::__construct(); $this->_removeButton('add'); } -} \ No newline at end of file +} 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 index ca47c42c40..0e73c5679d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -76,4 +76,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php index 6f0833cb6d..718330abb1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php index e4fd38758a..6ce55b9228 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php index d019aa139e..b86332be29 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function __construct() $this->_addBackButton(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php index 76463afd3f..5447261622 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php index 8770cd44f1..06187dfbc6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php index 54ddd1d0e5..229fafb464 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -116,4 +116,4 @@ public function getRowUrl($row) { return $this->getUrl('*/catalog_product_review/', array('productId' => $row->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php index 8e8b6e9fbf..1cc1f21a49 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} 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 index 66f630b883..6debba9e3b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -99,4 +99,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php index 720a871f3e..3c6d13be35 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} 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 index 4ef769df19..e0bac931fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -96,4 +96,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php index 1d5ebe4b95..30949849c7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} 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 index d2cf9e0b42..ad67911e88 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -89,4 +89,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php index 08f9de8765..8b8065e642 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} 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 index 5d3812c45b..7c32f47269 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -142,4 +142,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php index 6bed03ccb9..d09f43989c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} 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 index 7d5a8655d2..3ae6d7d572 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -74,4 +74,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php index 277f18c9d2..28c29f658b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} 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 index 3196fc56eb..2f18df2bed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -84,4 +84,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search.php b/app/code/core/Mage/Adminhtml/Block/Report/Search.php index 253c693cf5..552488d5d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,4 +45,4 @@ public function __construct() parent::__construct(); $this->_removeButton('add'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php index 4c31e3eab7..19aad58753 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php index 01447e6189..c58ffcba8f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -67,4 +67,4 @@ public function getGridHtml() return $this->getStoreSwitcherHtml() . parent::getGridHtml(); } -} \ No newline at end of file +} 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 index 085dad8f81..296c2c0265 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php index 248d80a430..f210b5d4a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() parent::__construct(); $this->_removeButton('add'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php index 20abaea3ba..7100f64d12 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php index 1dabe2b260..d2ff23fa84 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function __construct() $this->_removeButton('add'); } -} \ No newline at end of file +} 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 index 835a1c2028..6af7d6d1cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php index c46516f5f9..dec716c18d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php index 6802aca05f..5c7249b648 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function __construct() $this->_addBackButton(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php index ca1b7a8397..1f88d35b44 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -105,4 +105,4 @@ protected function _prepareColumns() return parent::_prepareColumns(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php index bbd94280e8..e3400d7d27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php index b1272f2b0d..3ee01b940d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php index 0a652098ba..4799a86689 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function __construct() $this->_addBackButton(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php index a3549a0f06..30e1209635 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php index 9595770dbe..66735975f4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php index b40ba2783f..9ab490de10 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php index 1a1d7709c8..9c9dc5f6f1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function __construct() $this->_addBackButton(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php index a80a41adb1..6bf00a6de6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php index 4d151812ef..1134f06ebc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php index 8a2f48ca23..58945efcea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php index 5c793294af..06c67950cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add.php b/app/code/core/Mage/Adminhtml/Block/Review/Add.php index e6185f1558..da4b643345 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -107,9 +107,9 @@ public function __construct() }(); Event.observe(window, \'load\', function(){ - if ($("select_stores")) { - Event.observe($("select_stores"), \'change\', review.updateRating); - } + if ($("select_stores")) { + Event.observe($("select_stores"), \'change\', review.updateRating); + } }); '; } @@ -118,4 +118,4 @@ public function getHeaderText() { return Mage::helper('review')->__('Add New Review'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php index 36d233491c..55145b2d79 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -115,4 +115,4 @@ protected function _prepareForm() $this->setForm($form); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php index 5371a4b422..41dc475b1d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php index e4c7cd8860..c96f9abb08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -138,4 +138,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php index 1f3349bd21..d817004da2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php index 37b37ca97c..6e691b28b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,24 +34,24 @@ class Mage_Adminhtml_Block_Review_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - protected function _getOptions() - { - return array( - array('label'=>'', 'value'=>''), - array('label'=>Mage::helper('review')->__('Administrator'), 'value'=>1), - array('label'=>Mage::helper('review')->__('Customer'), 'value'=>2), - array('label'=>Mage::helper('review')->__('Guest'), 'value'=>3) - ); - } + protected function _getOptions() + { + return array( + array('label'=>'', 'value'=>''), + array('label'=>Mage::helper('review')->__('Administrator'), 'value'=>1), + array('label'=>Mage::helper('review')->__('Customer'), 'value'=>2), + array('label'=>Mage::helper('review')->__('Guest'), 'value'=>3) + ); + } - public function getCondition() - { + public function getCondition() + { if ($this->getValue() == 1) { - return 1; + return 1; } elseif ($this->getValue() == 2) { - return 2; + return 2; } else { - return 3; + return 3; } - } -}// Class Mage_Adminhtml_Block_Review_Grid_Filter_Type END \ No newline at end of file + } +}// Class Mage_Adminhtml_Block_Review_Grid_Filter_Type END diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php index 47061a6e2d..e9eedfafd3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,15 +34,15 @@ class Mage_Adminhtml_Block_Review_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - public function render(Varien_Object $row) - { - if (is_null($row->getCustomerId())) { - return Mage::helper('review')->__('Guest'); - } elseif ($row->getCustomerId() == 0) { - return Mage::helper('review')->__('Administrator'); - } elseif ($row->getCustomerId() > 0) { - return Mage::helper('review')->__('Customer'); - } + public function render(Varien_Object $row) + { + if (is_null($row->getCustomerId())) { + return Mage::helper('review')->__('Guest'); + } elseif ($row->getCustomerId() == 0) { + return Mage::helper('review')->__('Administrator'); + } elseif ($row->getCustomerId() > 0) { + return Mage::helper('review')->__('Customer'); + } // return ($row->getCustomerId() ? Mage::helper('review')->__('Customer') : Mage::helper('review')->__('Guest')); - } -}// Class Mage_Adminhtml_Block_Review_Grid_Renderer_Type END \ No newline at end of file + } +}// Class Mage_Adminhtml_Block_Review_Grid_Renderer_Type END diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Main.php b/app/code/core/Mage/Adminhtml/Block/Review/Main.php index d6124ae954..b1890b0ef6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function __construct() } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php index d514574802..66d5b6743a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -118,4 +118,4 @@ protected function _prepareMassaction() { return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php index 9e551397ba..9cc20f1b08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -119,4 +119,4 @@ public function isSelected($option, $rating) return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php index c9848c69b5..f09f19b9bb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -61,4 +61,4 @@ public function getRatingSummary() return $this->getRatingSummaryCache(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales.php b/app/code/core/Mage/Adminhtml/Block/Sales.php index 2fc7b12299..4882ba27ca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php index afc09ca770..04417d37d7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php index aac5a232fc..84ea910195 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -159,4 +159,4 @@ public function getGridUrl() -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php index 9c1242f296..4b04f96b19 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php index c34106c0f5..73b7208ff7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php index 6a9485e924..c71b0f8ded 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -468,7 +468,7 @@ public function getInvoice() /** * CREDITMEMO */ - + public function canReturnToStock() { $canReturnToStock = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT); if (Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT)) { @@ -477,44 +477,44 @@ public function canReturnToStock() { return false; } } - + /** * Whether to show 'Return to stock' checkbox for item * @param Mage_Sales_Model_Order_Creditmemo_Item $item * @return bool */ public function canReturnItemToStock($item=null) { - $canReturnToStock = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT); - if (!is_null($item)) { - if (!$item->hasCanReturnToStock()) { - $product = Mage::getModel('catalog/product')->load($item->getOrderItem()->getProductId()); - if ( $product->getId() && $product->getStockItem()->getManageStock() ) { - $item->setCanReturnToStock(true); - } - else { - $item->setCanReturnToStock(false); - } - } - $canReturnToStock = $item->getCanReturnToStock(); - } - return $canReturnToStock; + $canReturnToStock = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT); + if (!is_null($item)) { + if (!$item->hasCanReturnToStock()) { + $product = Mage::getModel('catalog/product')->load($item->getOrderItem()->getProductId()); + if ( $product->getId() && $product->getStockItem()->getManageStock() ) { + $item->setCanReturnToStock(true); + } + else { + $item->setCanReturnToStock(false); + } + } + $canReturnToStock = $item->getCanReturnToStock(); + } + return $canReturnToStock; } /** - * Whether to show 'Return to stock' column for item parent + * Whether to show 'Return to stock' column for item parent * @param Mage_Sales_Model_Order_Creditmemo_Item $item * @return bool */ - public function canParentReturnToStock($item = null) + public function canParentReturnToStock($item = null) { - $canReturnToStock = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT); - if (!is_null($item)) { - if ( $item->getCreditmemo()->getOrder()->hasCanReturnToStock() ) { - $canReturnToStock = $item->getCreditmemo()->getOrder()->getCanReturnToStock(); - } - } elseif ( $this->getOrder()->hasCanReturnToStock() ) { - $canReturnToStock = $this->getOrder()->getCanReturnToStock(); - } - return $canReturnToStock; + $canReturnToStock = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT); + if (!is_null($item)) { + if ( $item->getCreditmemo()->getOrder()->hasCanReturnToStock() ) { + $canReturnToStock = $item->getCreditmemo()->getOrder()->getCanReturnToStock(); + } + } elseif ( $this->getOrder()->hasCanReturnToStock() ) { + $canReturnToStock = $this->getOrder()->getCanReturnToStock(); + } + return $canReturnToStock; } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php index 78db1bf46a..64385f7599 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,4 +89,4 @@ public function getSku() return $this->getItem()->getSku(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php index 356eb07fc1..cfc65c6cf9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Adminhtml_Block_Sales_Items_Column_Name extends Mage_Adminhtml_Block_Sales_Items_Column_Default { } -?> \ No newline at end of file +?> diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php index a887b4adcf..766b8105c7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,4 +55,4 @@ protected function _toHtml() return parent::_toHtml(); } } -?> \ No newline at end of file +?> diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php index 0c0cf65064..76a2472342 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ */ class Mage_Adminhtml_Block_Sales_Items_Column_Qty extends Mage_Adminhtml_Block_Sales_Items_Column_Default {} -?> \ No newline at end of file +?> diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php index 00812bc081..96ebf94e17 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function getItem() { return $this->_getData('item');//->getOrderItem(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php index be8a8f9f50..50f92e0386 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ public function getItem() { return $this->_getData('item');//->getOrderItem(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order.php index 623867d06e..a3f76415e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php index 4e9460d1d8..da42107479 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -110,4 +110,4 @@ public function displayShippingPriceInclTax($order) ' ' ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php index 667c32921e..40714d30f6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php index e2ff92942c..03a7102baa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php index db7e9dd82a..a515686d7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php index 8b70bfb69c..38f5fb7e66 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,7 +47,7 @@ public function getHeaderCssClass() protected function _prepareForm() { if (!$this->_form) { - parent::_prepareForm(); + parent::_prepareForm(); $this->_form->addFieldNameSuffix('order[billing_address]'); $this->_form->setHtmlNamePrefix('order[billing_address]'); $this->_form->setHtmlIdPrefix('order-billing_address_'); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php index 87d16186f5..2fa603ff52 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php index 94291582ed..76ee78d2b7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php index d08f88ac00..d4590e83c5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php @@ -18,10 +18,10 @@ * 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 Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,4 +56,4 @@ public function getNoteNotify() } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php index 721e17ef87..53cc406657 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,4 +55,4 @@ public function getHeaderCssClass() { return 'head-promo-quote'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php index fc2c6387cb..6ec8dbf41d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** 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 index fac6a91052..d86496a96c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php index 65dd8622f3..6bcebb2966 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php index 23021a7218..18e00b3067 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php index 626e27d033..fbf69c4bad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php index 4fc786e3c2..006bfc16db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -148,9 +148,9 @@ public function getCustomerData() { $data = $this->getCustomer()->getData(); foreach ($this->getQuote()->getData() as $key=>$value) { - if (strstr($key, 'customer_')) { - $data[str_replace('customer_', '', $key)] = $value; - } + if (strstr($key, 'customer_')) { + $data[str_replace('customer_', '', $key)] = $value; + } } $data['group_id'] = $this->getCreateOrderModel()->getCustomerGroupId(); $data['email'] = ($this->getQuote()->getCustomerEmail() ? $this->getQuote()->getCustomerEmail() :$this->getCustomer()->getData('email')); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php index c68f22d4b6..3ff93f4a6c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php @@ -18,10 +18,10 @@ * 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 Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -121,4 +121,4 @@ public function getAddressAsString($address) { return $address->format('oneline'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php index 66a7fef205..5c867f8cff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php index 3aa93b2917..9929200ac8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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 index cac7d1bfbd..999cc935da 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,7 +47,7 @@ protected function _toHtml() $out.= Mage::helper('sales')->__('Create New Order for New Customer in %s', $this->getStore()->getName()); } elseif ($customerId) { - $out.= Mage::helper('sales')->__('Create New Order for %s', $this->getCustomer()->getName()); + $out.= Mage::helper('sales')->__('Create New Order for %s', $this->getCustomer()->getName()); } elseif (!is_null($customerId)){ $out.= Mage::helper('sales')->__('Create New Order for New Customer'); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php index a612869bda..1120cc6986 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php index a55a2c66e4..efb239906a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php index 35f9b7e401..5ed16447f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php index cdf51575af..eadeb06aa5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php index 9918fc7c89..f8e0eed241 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php index a1a015613e..96d853bcb0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php @@ -1,44 +1,44 @@ - - */ - -class Mage_Adminhtml_Block_Sales_Order_Create_Newsletter_Form extends Mage_Adminhtml_Block_Widget -{ - - public function __construct() - { - parent::__construct(); - $this->setId('sales_order_create_newsletter_form'); - } - -} + + */ + +class Mage_Adminhtml_Block_Sales_Order_Create_Newsletter_Form extends Mage_Adminhtml_Block_Widget +{ + + public function __construct() + { + parent::__construct(); + $this->setId('sales_order_create_newsletter_form'); + } + +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php index 4558348465..75904613ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php index ccc402d4f8..354c67406e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -75,11 +75,11 @@ protected function _addColumnFilterToCollection($column) $productIds = 0; } if ($column->getFilter()->getValue()) { - $this->getCollection()->addFieldToFilter('entity_id', array('in'=>$productIds)); + $this->getCollection()->addFieldToFilter('entity_id', array('in'=>$productIds)); } else { if($productIds) { - $this->getCollection()->addFieldToFilter('entity_id', array('nin'=>$productIds)); - } + $this->getCollection()->addFieldToFilter('entity_id', array('nin'=>$productIds)); + } } } else { parent::_addColumnFilterToCollection($column); @@ -91,7 +91,7 @@ protected function _prepareCollection() { $collection = Mage::getModel('catalog/product')->getCollection() ->setStore($this->getStore()) - ->addAttributeToSelect('name') + ->addAttributeToSelect('name') ->addAttributeToSelect('sku') ->addAttributeToSelect('price') ->addAttributeToFilter('type_id', array_keys( @@ -164,7 +164,7 @@ protected function _prepareColumns() 'align' => 'center', 'index' => 'entity_id', 'values' => $this->_getGiftmessageSaveModel()->getAllowQuoteItemsProducts(), - 'width' => '1', + 'width' => '1', )); } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php index dab7dd56c3..33ac68fcb3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function render(Varien_Object $row) } } - // Class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Giftmessage End \ No newline at end of file + // Class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Giftmessage End diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php index 268e411bb4..5d75fe4934 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -85,4 +85,4 @@ public function getIsDisabled() { return $this->getQuote()->isVirtual(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php index f36f45d15a..96c710de25 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php index 5c5148f404..cb80292815 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -67,7 +67,7 @@ public function getShippingRates() $ratesFilter->addFilter($this->getStore()->getPriceFilter(), 'price'); foreach ($groups as $code => $groupItems) { - $groups[$code] = $ratesFilter->filter($groupItems); + $groups[$code] = $ratesFilter->filter($groupItems); } } */ @@ -121,11 +121,11 @@ public function getActiveMethodRate() $rates = $this->getShippingRates(); if (is_array($rates)) { foreach ($rates as $group) { - foreach ($group as $code => $rate) { - if ($rate->getCode() == $this->getShippingMethod()) { - return $rate; - } - } + foreach ($group as $code => $rate) { + if ($rate->getCode() == $this->getShippingMethod()) { + return $rate; + } + } } } return false; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php index 1734a895e9..07db49c21d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php index 55870e8c5c..b8dcddcbac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php index ee29756841..49c3095366 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -77,4 +77,4 @@ public function getIdentifierId($item) { return $item->getId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php index 2a0dffe6ff..c2712d5ff5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php index 9c0ec3cd5f..03d1f3a0dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -115,4 +115,4 @@ public function getIdentifierId($item) public function getProductId($item) { return $item->getId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php index 7e160b4e33..733c61290e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -107,4 +107,4 @@ public function getIdentifierId($item) { return $item->getId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php index 72428b1b73..3c93c5f515 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -114,4 +114,4 @@ public function getIdentifierId($item) { return $item->getId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php index d777add422..cba8482125 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php index 3f2775db78..42f6459a69 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php index e9f5953d6c..2266324ff0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php index d42b4e9f0c..867381253c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php index de13b7e5ac..cd801669cb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php index 4941a4dfce..b5e1c28342 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,4 +63,4 @@ public function formatPrice($value) { return $this->getStore()->formatPrice($value); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php index 6d69b22104..4f711a9224 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php index be9b17f5fb..2270896301 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Tax extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default { protected $_template = 'sales/order/create/totals/tax.phtml'; -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php index 695df02bd8..a582bd744a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -88,4 +88,4 @@ public function getBackUrl() { return $this->getUrl('*/sales_order/view', array('order_id'=>$this->getCreditmemo()->getOrderId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php index 4de27cd78f..2b495a5eac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -68,4 +68,4 @@ public function getSaveUrl() { return $this->getUrl('*/*/save', array('_current' => true)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php index 2a98e9b77c..bfdefc53c6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,7 +34,7 @@ class Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items extends Mage_Adminhtml_Block_Sales_Items_Abstract { - protected $_canReturnToStock; + protected $_canReturnToStock; /** * Prepare child blocks * @@ -169,7 +169,7 @@ public function getUpdateUrl() )); } - public function canReturnToStock() + public function canReturnToStock() { $canReturnToStock = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT); if (Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT)) { @@ -178,28 +178,28 @@ public function canReturnToStock() return false; } } - + /** * Whether to show 'Return to stock' column in creaditmemo grid - * @return bool + * @return bool */ - public function canReturnItemsToStock() + public function canReturnItemsToStock() { - if (is_null($this->_canReturnToStock)) { - if ($this->_canReturnToStock = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT)) { - $canReturnToStock = false; - foreach ($this->getCreditmemo()->getAllItems() as $item) { - $product = Mage::getModel('catalog/product')->load($item->getOrderItem()->getProductId()); - if ( $product->getId() && $product->getStockItem()->getManageStock() ) { - $item->setCanReturnToStock($canReturnToStock = true); - } else { - $item->setCanReturnToStock(false); - } - } - $this->getCreditmemo()->getOrder()->setCanReturnToStock($this->_canReturnToStock = $canReturnToStock); - } - } - return $this->_canReturnToStock; + if (is_null($this->_canReturnToStock)) { + if ($this->_canReturnToStock = Mage::getStoreConfig(Mage_CatalogInventory_Model_Stock_Item::XML_PATH_CAN_SUBTRACT)) { + $canReturnToStock = false; + foreach ($this->getCreditmemo()->getAllItems() as $item) { + $product = Mage::getModel('catalog/product')->load($item->getOrderItem()->getProductId()); + if ( $product->getId() && $product->getStockItem()->getManageStock() ) { + $item->setCanReturnToStock($canReturnToStock = true); + } else { + $item->setCanReturnToStock(false); + } + } + $this->getCreditmemo()->getOrder()->setCanReturnToStock($this->_canReturnToStock = $canReturnToStock); + } + } + return $this->_canReturnToStock; } public function canSendCreditmemoEmail() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php index 840222ad05..fbec57d7db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php index b27cf19bb4..1a43479583 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,4 +63,4 @@ public function getSource() { return $this->getCreditmemo(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php index 84b337a42f..7d2d14024c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -79,4 +79,4 @@ public function getOrderUrl() { return $this->getUrl('*/sales_order/view', array('order_id' => $this->getCreditmemo()->getOrderId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php index e184898d0f..934d4bf0d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,4 +80,4 @@ public function getOrderUrl() { return $this->getUrl('*/sales_order/view', array('order_id' => $this->getCreditmemo()->getOrderId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php index 341c6ceb7d..cd0cf6d0e5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -170,20 +170,26 @@ protected function _prepareMassaction() $this->setMassactionIdField('entity_id'); $this->getMassactionBlock()->setFormFieldName('order_ids'); - $this->getMassactionBlock()->addItem('cancel_order', array( - 'label'=> Mage::helper('sales')->__('Cancel'), - 'url' => $this->getUrl('*/*/massCancel'), - )); + if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/cancel')) { + $this->getMassactionBlock()->addItem('cancel_order', array( + 'label'=> Mage::helper('sales')->__('Cancel'), + 'url' => $this->getUrl('*/*/massCancel'), + )); + } - $this->getMassactionBlock()->addItem('hold_order', array( - 'label'=> Mage::helper('sales')->__('Hold'), - 'url' => $this->getUrl('*/*/massHold'), - )); + if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/hold')) { + $this->getMassactionBlock()->addItem('hold_order', array( + 'label'=> Mage::helper('sales')->__('Hold'), + 'url' => $this->getUrl('*/*/massHold'), + )); + } - $this->getMassactionBlock()->addItem('unhold_order', array( - 'label'=> Mage::helper('sales')->__('Unhold'), - 'url' => $this->getUrl('*/*/massUnhold'), - )); + if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/unhold')) { + $this->getMassactionBlock()->addItem('unhold_order', array( + 'label'=> Mage::helper('sales')->__('Unhold'), + 'url' => $this->getUrl('*/*/massUnhold'), + )); + } $this->getMassactionBlock()->addItem('pdfinvoices_order', array( 'label'=> Mage::helper('sales')->__('Print Invoices'), diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php index 34b5d918a7..1ee2ed94c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -86,4 +86,4 @@ public function getBackUrl() { return $this->getUrl('*/sales_order/view', array('order_id'=>$this->getInvoice()->getOrderId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php index 60fc8658d8..2f7df5d036 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -129,4 +129,4 @@ public function getForcedShipmentCreate() { return (int) $this->getOrder()->getForcedDoShipmentWithInvoice(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php index 748fbe39c6..8c5353fb4c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -196,4 +196,4 @@ public function canSendInvoiceEmail() { return Mage::helper('sales')->canSendNewInvoiceEmail($this->getOrder()->getStore()->getId()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php index 2971ae71dd..779e80cce7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,18 +33,18 @@ */ class Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Tracking extends Mage_Adminhtml_Block_Template { - public function _construct() - { - $this->setTemplate('sales/order/invoice/create/tracking.phtml'); - } - + public function _construct() + { + $this->setTemplate('sales/order/invoice/create/tracking.phtml'); + } + /** * Prepares layout of block * * @return Mage_Adminhtml_Block_Sales_Order_View_Giftmessage */ protected function _prepareLayout() - { + { $this->setChild('add_button', $this->getLayout()->createBlock('adminhtml/widget_button') ->setData(array( @@ -95,4 +95,4 @@ public function getCarriers() } return $carriers; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php index 20a7e72084..1e288832fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -190,4 +190,4 @@ public function updateBackButtonUrl($flag) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php index c984c12695..95c72c673c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,4 +63,4 @@ public function getInvoice() { return Mage::registry('current_invoice'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php index 1248a5f41c..e106f53803 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -81,4 +81,4 @@ public function formatPrice($price) { return $this->getInvoice()->getOrder()->formatPrice($price); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php index de38d59451..7f1c602e4c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -82,4 +82,4 @@ public function formatPrice($price) { return $this->getInvoice()->getOrder()->formatPrice($price); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Void.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Void.php index e69de29bb2..8b13789179 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Void.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Void.php @@ -0,0 +1 @@ + diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Void/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Void/Form.php index e69de29bb2..8b13789179 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Void/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Void/Form.php @@ -0,0 +1 @@ + diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php index dcfbf709d4..be9c7c8f0c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php index f1916d7dc6..0d97ec1f4b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -67,4 +67,4 @@ public function getBackUrl() { return $this->getUrl('*/sales_order/view', array('order_id'=>$this->getShipment()->getOrderId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php index a354351892..8acbfc5f9f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -99,4 +99,4 @@ public function getSaveUrl() { return $this->getUrl('*/*/save', array('order_id' => $this->getShipment()->getOrderId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php index 033c647545..6036a9b9b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -100,4 +100,4 @@ public function canSendShipmentEmail() { return Mage::helper('sales')->canSendNewShipmentEmail($this->getOrder()->getStore()->getId()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php index a887eb1798..d3470d025c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -81,4 +81,4 @@ public function getCarriers() } return $carriers; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php index 5c699fd14b..18a98ad22d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ protected function _construct() parent::_construct(); $this->setTemplate('sales/order/shipment/tracking/info.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php index 9cb7f3ad1b..75ae83cee6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -110,4 +110,4 @@ public function updateBackButtonUrl($flag) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php index 1ef754c514..af99615eb6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,4 +63,4 @@ public function getSource() { return $this->getShipment(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php index 99a497458a..49629e346e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,4 +62,4 @@ public function getSource() { return $this->getShipment(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php index d567068761..f0bb3cbabf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,4 +63,4 @@ public function getSource() { return $this->getShipment(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php index 321f3d401f..2c186a4071 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -138,4 +138,4 @@ public function getCarrierTitle($code) } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php index f4a6006a6b..5aca2d17bd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,4 +69,4 @@ public function addTotal($label, $value, $grand = false) ); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php index 8bb7eede42..7f48e438ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php index a7b155db78..e2326862e5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php index def155b4fb..e939e38117 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php index 2c2ee5924e..d483660541 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php index a1980d9606..de8e6a27c7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,4 +47,4 @@ protected function _prepareLayout() parent::_prepareLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php index 5912e1c697..89010e33a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php index f25ee20f51..d48e7468e8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php index b57442a6e6..3f2f3f4370 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php index a9c7086d49..053e8cf855 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function getItemsCollection() { return $this->getOrder()->getItemsCollection(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php index 29725ce27d..222c28a96e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -206,4 +206,4 @@ public function canDisplayGiftmessage() 'order_item', $this->getItem(), $this->getItem()->getOrder()->getStoreId() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php index 8480fada29..baf9d463c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php index 2829961133..ac582f6cac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php index c9ac8a48f7..2359c32954 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -160,4 +160,4 @@ public function isHidden() { return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php index 6e4a6646a7..956b42329a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -131,4 +131,4 @@ public function isHidden() { return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php index f2743ccf22..10c852b4b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php index 8341a820c3..6d2f538fb6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -137,4 +137,4 @@ public function isHidden() { return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php index 0468fb47f3..9b8f848839 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -102,4 +102,4 @@ protected function _beforeToHtml() // )); return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php index 9aff0c4619..44867711a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php index 741b6a2701..0cfd2386b4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php index 6607c4d35a..e27591f8fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -146,4 +146,4 @@ public function getGridUrl() return $this->getUrl('*/*/*', array('_current' => true)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap.php b/app/code/core/Mage/Adminhtml/Block/Sitemap.php index a836b12997..34a1dc6639 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php index 022d3eb09c..0c34116c80 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php index e8797caa35..281dddc665 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +59,7 @@ protected function _prepareForm() $fieldset = $form->addFieldset('add_sitemap_form', array('legend' => Mage::helper('sitemap')->__('Sitemap'))); if ($model->getId()) { - $fieldset->addField('sitemap_id', 'hidden', array( + $fieldset->addField('sitemap_id', 'hidden', array( 'name' => 'sitemap_id', )); } diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php index 352539687a..37af607f72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php index ce4d99e990..85783ef5c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php index 1f7ff7effe..0769263fef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php index ab73d0dd0b..555bac3b0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php index 7d4d1d1692..5db520c9d6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php index c9adcd00f3..2402b7b596 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function getHeaderText() { return Mage::helper('adminhtml')->__('My Account'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php index ebc844aa8e..0f897828ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php index be2e1cf7f9..73903fb39c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -182,4 +182,4 @@ public function getCatalogData() ), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php index 0ba5906ceb..b7121e3a63 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php index da3c77ec80..895407e7cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php index fe4ff462ab..0a09181cd4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -94,4 +94,4 @@ public function initForm() } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php index 3551567ca3..43eccb62f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,6 +81,13 @@ class Mage_Adminhtml_Block_System_Config_Form extends Mage_Adminhtml_Block_Widge */ protected $_fieldsets = array(); + /** + * Translated scope labels + * + * @var array + */ + protected $_scopeLabels = array(); + /** * Enter description here... * @@ -88,6 +95,11 @@ class Mage_Adminhtml_Block_System_Config_Form extends Mage_Adminhtml_Block_Widge public function __construct() { parent::__construct(); + $this->_scopeLabels = array( + self::SCOPE_DEFAULT => Mage::helper('adminhtml')->__('[GLOBAL]'), + self::SCOPE_WEBSITES => Mage::helper('adminhtml')->__('[WEBSITE]'), + self::SCOPE_STORES => Mage::helper('adminhtml')->__('[STORE VIEW]'), + ); } /** @@ -243,6 +255,7 @@ public function initFields($fieldset, $group, $section, $fieldPrefix='', $labelP $name = 'groups['.$group->getName().'][fields]['.$fieldPrefix.$e->getName().'][value]'; $label = Mage::helper($helperName)->__($labelPrefix).' '.Mage::helper($helperName)->__((string)$e->label); $comment = (string)$e->comment ? Mage::helper($helperName)->__((string)$e->comment) : ''; + $hint = (string)$e->hint ? Mage::helper($helperName)->__((string)$e->hint) : ''; if ($e->backend_model) { $model = Mage::getModel((string)$e->backend_model); @@ -256,12 +269,14 @@ public function initFields($fieldset, $group, $section, $fieldPrefix='', $labelP 'name' => $name, 'label' => $label, 'comment' => $comment, + 'hint' => $hint, 'value' => $data, 'inherit' => $inherit, 'class' => $e->frontend_class, 'field_config' => $e, 'scope' => $this->getScope(), 'scope_id' => $this->getScopeId(), + 'scope_label' => $this->getScopeLabel($e), 'can_use_default_value' => $this->canUseDefaultValue((int)$e->show_in_default), 'can_use_website_value' => $this->canUseWebsiteValue((int)$e->show_in_website), )); @@ -377,6 +392,22 @@ public function getScope() return $scope; } + /** + * Retrieve label for scope + * + * @param Mage_Core_Model_Config_Element $element + * @return string + */ + public function getScopeLabel($element) + { + if ($element->show_in_store == 1) { + return $this->_scopeLabels[self::SCOPE_STORES]; + } elseif ($element->show_in_website == 1) { + return $this->_scopeLabels[self::SCOPE_WEBSITES]; + } + return $this->_scopeLabels[self::SCOPE_DEFAULT]; + } + /** * Get current scope code * diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php index cdde7f5989..d433c90e2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,6 +91,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) $html.= '

'.$element->getComment().'

'; } $html.= ''; + if ($addInheritCheckbox) { $defText = $element->getDefaultValue(); @@ -117,6 +118,20 @@ public function render(Varien_Data_Form_Element_Abstract $element) $html.= ''; } + $html.= ''; + if ($element->getScope()) { + $html .= $element->getScopeLabel(); + } + $html.= ''; + + $html.= ''; + if ($element->getHint()) { + $html.= '
'; + $html.= '
' . $element->getHint() . '
'; + $html.= '
'; + } + $html.= ''; + $html.= ''; return $html; } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php index cc54754254..f6bf680307 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -160,4 +160,4 @@ protected function _renderCellTemplate($columnName) (isset($column['class']) ? $column['class'] : 'input-text') . '"'. (isset($column['style']) ? ' style="'.$column['style'] . '"' : '') . '/>'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php index ab07cedf0e..b1e8c8380c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) $format = Mage::app()->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM); return Mage::app()->getLocale()->date(intval($element->getValue()))->toString($format); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php index 2463ad8746..faa319f2ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php index 194b799cc2..c873e33199 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php index 65737cf812..8166906496 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php index b36e50ce74..094f456aff 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php @@ -1,43 +1,43 @@ - - */ -class Mage_Adminhtml_Block_System_Config_Form_Field_Notification extends Mage_Adminhtml_Block_System_Config_Form_Field -{ - protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) - { - $element->setValue(Mage::app()->loadCache('admin_notifications_lastcheck')); - $format = Mage::app()->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM); - return Mage::app()->getLocale()->date(intval($element->getValue()))->toString($format); - } -} \ No newline at end of file + + */ +class Mage_Adminhtml_Block_System_Config_Form_Field_Notification extends Mage_Adminhtml_Block_System_Config_Form_Field +{ + protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) + { + $element->setValue(Mage::app()->loadCache('admin_notifications_lastcheck')); + $format = Mage::app()->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM); + return Mage::app()->getLocale()->date(intval($element->getValue()))->toString($format); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php index a9e43832ea..541dbab779 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('adminhtml')->__('Add Exception'); parent::__construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php index 8cd3cc1d73..37592ac562 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php index c91c4d5abf..3de66025ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php index 37a4f09fcd..58381b74a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php index d95bfc3e63..d0c814fca9 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +79,7 @@ protected function _getHeaderHtml($element) if (!$default) { $html.= ''; } - $html.= ''; + $html.= ''; return $html; } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php index ad739ac8b5..ddc3e1b0a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php @@ -18,33 +18,33 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_System_Config_Form_Fieldset_Modules_DisableOutput - extends Mage_Adminhtml_Block_System_Config_Form_Fieldset + extends Mage_Adminhtml_Block_System_Config_Form_Fieldset { - protected $_dummyElement; - protected $_fieldRenderer; - protected $_values; + protected $_dummyElement; + protected $_fieldRenderer; + protected $_values; public function render(Varien_Data_Form_Element_Abstract $element) { - $html = $this->_getHeaderHtml($element); + $html = $this->_getHeaderHtml($element); - $modules = array_keys((array)Mage::getConfig()->getNode('modules')->children()); + $modules = array_keys((array)Mage::getConfig()->getNode('modules')->children()); - sort($modules); + sort($modules); foreach ($modules as $moduleName) { - if ($moduleName==='Mage_Adminhtml') { - continue; - } - $html.= $this->_getFieldHtml($element, $moduleName); + if ($moduleName==='Mage_Adminhtml') { + continue; + } + $html.= $this->_getFieldHtml($element, $moduleName); } $html .= $this->_getFooterHtml($element); @@ -53,38 +53,38 @@ public function render(Varien_Data_Form_Element_Abstract $element) protected function _getDummyElement() { - if (empty($this->_dummyElement)) { - $this->_dummyElement = new Varien_Object(array('show_in_default'=>1, 'show_in_website'=>1)); - } - return $this->_dummyElement; + if (empty($this->_dummyElement)) { + $this->_dummyElement = new Varien_Object(array('show_in_default'=>1, 'show_in_website'=>1)); + } + return $this->_dummyElement; } protected function _getFieldRenderer() { - if (empty($this->_fieldRenderer)) { - $this->_fieldRenderer = Mage::getBlockSingleton('adminhtml/system_config_form_field'); - } - return $this->_fieldRenderer; + if (empty($this->_fieldRenderer)) { + $this->_fieldRenderer = Mage::getBlockSingleton('adminhtml/system_config_form_field'); + } + return $this->_fieldRenderer; } protected function _getValues() { - if (empty($this->_values)) { - $this->_values = array( - array('label'=>Mage::helper('adminhtml')->__('Enable'), 'value'=>0), - array('label'=>Mage::helper('adminhtml')->__('Disable'), 'value'=>1), - ); - } - return $this->_values; + if (empty($this->_values)) { + $this->_values = array( + array('label'=>Mage::helper('adminhtml')->__('Enable'), 'value'=>0), + array('label'=>Mage::helper('adminhtml')->__('Disable'), 'value'=>1), + ); + } + return $this->_values; } protected function _getFieldHtml($fieldset, $moduleName) { - $configData = $this->getConfigData(); - $path = 'advanced/modules_disable_output/'.$moduleName; //TODO: move as property of form - $data = isset($configData[$path]) ? $configData[$path] : array(); + $configData = $this->getConfigData(); + $path = 'advanced/modules_disable_output/'.$moduleName; //TODO: move as property of form + $data = isset($configData[$path]) ? $configData[$path] : array(); - $e = $this->_getDummyElement(); + $e = $this->_getDummyElement(); $field = $fieldset->addField($moduleName, 'select', array( @@ -97,6 +97,6 @@ protected function _getFieldHtml($fieldset, $moduleName) 'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e), ))->setRenderer($this->_getFieldRenderer()); - return $field->toHtml(); + return $field->toHtml(); } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php index 006f7f7597..779d8bb995 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php @@ -18,28 +18,28 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_System_Config_Form_Fieldset_Order_Statuses - extends Mage_Adminhtml_Block_System_Config_Form_Fieldset + extends Mage_Adminhtml_Block_System_Config_Form_Fieldset { - protected $_dummyElement; - protected $_fieldRenderer; - protected $_values; + protected $_dummyElement; + protected $_fieldRenderer; + protected $_values; public function render(Varien_Data_Form_Element_Abstract $element) { - $html = ''; //$this->_getHeaderHtml($element); + $html = ''; //$this->_getHeaderHtml($element); - $statuses = Mage::getResourceModel('sales/order_status_collection')->load()->toOptionHash(); + $statuses = Mage::getResourceModel('sales/order_status_collection')->load()->toOptionHash(); foreach ($statuses as $id => $status) { - $html.= $this->_getFieldHtml($element, $id, $status); + $html.= $this->_getFieldHtml($element, $id, $status); } #$html .= $this->_getFooterHtml($element); @@ -48,27 +48,27 @@ public function render(Varien_Data_Form_Element_Abstract $element) protected function _getDummyElement() { - if (empty($this->_dummyElement)) { - $this->_dummyElement = new Varien_Object(array('show_in_default'=>1, 'show_in_website'=>1)); - } - return $this->_dummyElement; + if (empty($this->_dummyElement)) { + $this->_dummyElement = new Varien_Object(array('show_in_default'=>1, 'show_in_website'=>1)); + } + return $this->_dummyElement; } protected function _getFieldRenderer() { - if (empty($this->_fieldRenderer)) { - $this->_fieldRenderer = Mage::getBlockSingleton('adminhtml/system_config_form_field'); - } - return $this->_fieldRenderer; + if (empty($this->_fieldRenderer)) { + $this->_fieldRenderer = Mage::getBlockSingleton('adminhtml/system_config_form_field'); + } + return $this->_fieldRenderer; } protected function _getFieldHtml($fieldset, $id, $status) { - $configData = $this->getConfigData(); - $path = 'sales/order_statuses/status_'.$id; //TODO: move as property of form - $data = isset($configData[$path]) ? $configData[$path] : array(); + $configData = $this->getConfigData(); + $path = 'sales/order_statuses/status_'.$id; //TODO: move as property of form + $data = isset($configData[$path]) ? $configData[$path] : array(); - $e = $this->_getDummyElement(); + $e = $this->_getDummyElement(); $field = $fieldset->addField($id, 'text', array( @@ -82,7 +82,7 @@ protected function _getFieldHtml($fieldset, $id, $status) 'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e), ))->setRenderer($this->_getFieldRenderer()); - return $field->toHtml(); + return $field->toHtml(); } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php index dd09e14949..602eb25b69 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -106,4 +106,4 @@ public function getStoreSelectOptions() return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php index 9ae68221ec..a02245c4ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Xml.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Xml.php index e69de29bb2..8b13789179 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Xml.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Xml.php @@ -0,0 +1 @@ + diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php index c3edc74a88..d0d64cddb8 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php index 52e117e442..93c242d818 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php index ce2518c55f..b5f97d4eb0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php index 5c96ee7766..822db7875f 100755 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php index 116d3e8d9f..8b5dd6f4dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,7 +42,7 @@ public function initForm() $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('adminhtml')->__('View Actions XML'))); - $fieldset->addField('actions_xml', 'textarea', array( + $fieldset->addField('actions_xml', 'textarea', array( 'name' => 'actions_xml_view', 'label' => Mage::helper('adminhtml')->__('Actions XML'), 'title' => Mage::helper('adminhtml')->__('Actions XML'), diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php index 3441854db5..4ff21e2aca 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -140,7 +140,7 @@ public function getProductAttributeSetFilterOptions() $opt = array(); $opt = array(''=>$this->__('Any Attribute Set')); if ($options) foreach($options as $index => $value) { - $opt[$index] = $value; + $opt[$index] = $value; } //array_slice($options, 0, 0, array(''=>$this->__('Any Attribute Set'))); return $opt; diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php index ce4f4f838f..c97be4125a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php index 390f8c8fe8..902b1932d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php index d21455b1b4..d9661381cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php index 9ea39c356c..b953744965 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php index 9e721df3e1..1d63e3ee57 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,4 +52,4 @@ public function getHtml() $html .= ''; return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php index 359a9eafcb..29f4d0b920 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php index c9b281bea7..b293b7cb5e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function render(Varien_Object $row) $value = $row->getData($this->getColumn()->getIndex()); return $values[$value]; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php index 73fe4baeb0..bf89dbf0ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,14 +42,14 @@ public function initForm() $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('adminhtml')->__('General Information'))); - $fieldset->addField('name', 'text', array( + $fieldset->addField('name', 'text', array( 'name' => 'name', 'label' => Mage::helper('adminhtml')->__('Profile Name'), 'title' => Mage::helper('adminhtml')->__('Profile Name'), 'required' => true, )); - $fieldset->addField('actions_xml', 'textarea', array( + $fieldset->addField('actions_xml', 'textarea', array( 'name' => 'actions_xml', 'label' => Mage::helper('adminhtml')->__('Actions XML'), 'title' => Mage::helper('adminhtml')->__('Actions XML'), diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php index c7573f4352..a554fb3b02 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php index 35bd9475ba..28f9cff3c1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -94,6 +94,6 @@ public function getParseType() { $data = Mage::registry('current_convert_profile')->getGuiData(); if ($data) - return ($data['parse']['type'] == 'excel_xml') ? 'xml': $data['parse']['type']; + return ($data['parse']['type'] == 'excel_xml') ? 'xml': $data['parse']['type']; } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php index 78ba85c0a3..90d7b4acf1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php index d874fd123d..46b377d6ed 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php index 57087425e8..df7a785532 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php index e94c831fc9..210584b631 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -70,6 +70,10 @@ protected function _prepareLayout() $this->getLayout()->createBlock('adminhtml/system_currency_rate_matrix') ); + $this->setChild('import_services', + $this->getLayout()->createBlock('adminhtml/system_currency_rate_services') + ); + return parent::_prepareLayout(); } @@ -95,14 +99,7 @@ protected function getImportButtonHtml() protected function getServicesHtml() { - return $this->getLayout()->createBlock('adminhtml/html_select') - ->setOptions(Mage::getModel('adminhtml/system_config_source_currency_service')->toOptionArray(0)) - ->setId('rate_services') - ->setName('rate_services') - ->setValue(Mage::getSingleton('adminhtml/session')->getCurrencyRateService(true)) - ->setTitle(Mage::helper('adminhtml')->__('Import Service')) - ->toHtml(); - + return $this->getChildHtml('import_services'); } protected function getRatesMatrixHtml() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php index c68dbb4fc3..58d2b33794 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php index 14a05d45f4..de868984c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,4 +34,4 @@ class Mage_Adminhtml_Block_System_Currency_Edit_Tab_Main extends Mage_Adminhtml_Block_Widget_Form { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php index 35b9bf29be..183c95b17a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php index f8804c9edc..20680abb34 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,4 +56,4 @@ protected function _beforeToHtml() return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php index 1224cf90e4..d2bd3779ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -82,18 +82,18 @@ protected function _prepareRates($array) } foreach ($array as $key => $rate) { - foreach ($rate as $code => $value) { - $parts = explode('.', $value); - if( sizeof($parts) == 2 ) { - $parts[1] = str_pad(rtrim($parts[1], 0), 4, '0', STR_PAD_RIGHT); - $array[$key][$code] = join('.', $parts); - } elseif( $value > 0 ) { + foreach ($rate as $code => $value) { + $parts = explode('.', $value); + if( sizeof($parts) == 2 ) { + $parts[1] = str_pad(rtrim($parts[1], 0), 4, '0', STR_PAD_RIGHT); + $array[$key][$code] = join('.', $parts); + } elseif( $value > 0 ) { $array[$key][$code] = number_format($value, 4); - } else { - $array[$key][$code] = null; - } - } + } else { + $array[$key][$code] = null; + } + } } return $array; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php index ed8ab9e826..d5365b4d7d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,4 +43,4 @@ protected function _prepareLayout() $this->setChild('grid', $this->getLayout()->createBlock('adminhtml/system_design_grid', 'design.grid')); return parent::_prepareLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php index 05307f1823..3370daa17c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_System_Design_Edit extends Mage_Adminhtml_Block_Widget @@ -94,4 +94,4 @@ public function getHeader() } return $header; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php index 33b039abda..50d8154e07 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_System_Design_Edit_Tab_General extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php index 9a21098f77..4547dbd6ed 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_System_Design_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php index 6ca67b6dc2..5fdc99dd42 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php index faffb1068d..ef4a7a1795 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,25 +34,61 @@ class Mage_Adminhtml_Block_System_Email_Template extends Mage_Adminhtml_Block_Template { - public function __construct() + /** + * Set transactional emails grid template + * + */ + protected function _construct() { - parent::__construct(); + parent::_construct(); $this->setTemplate('system/email/template/list.phtml'); } + /** + * Create add button and grid blocks + * + * @return Mage_Core_Block_Abstract + */ protected function _prepareLayout() { + $this->setChild('add_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('adminhtml')->__('Add New Template'), + 'onclick' => "window.location='" . $this->getCreateUrl() . "'", + 'class' => 'add' + ))); $this->setChild('grid', $this->getLayout()->createBlock('adminhtml/system_email_template_grid', 'email.template.grid')); return parent::_prepareLayout(); } + /** + * Get URL for create new email template + * + * @return string + */ public function getCreateUrl() { return $this->getUrl('*/*/new'); } + /** + * Get transactional emails page header text + * + * @return string + */ public function getHeaderText() { return Mage::helper('adminhtml')->__('Transactional Emails'); } + + /** + * Get Add New Template button html + * + * @return string + */ + protected function getAddButtonHtml() + { + return $this->getChildHtml('add_button'); + } } 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 index 13cc76d3c4..922662390b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** 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 index 36ce88cc1f..43bfeaa2c1 100644 --- 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 @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,12 +58,12 @@ protected function _prepareForm() $fieldset->addField('template_text', 'editor', array( 'name'=>'template_text', - 'wysiwyg' => !Mage::registry('email_template')->isPlain(), + 'wysiwyg' => false, //!Mage::registry('email_template')->isPlain(), 'label' => Mage::helper('adminhtml')->__('Template Content'), 'required' => true, 'theme' => 'advanced', 'state' => 'html', - 'style' => 'height:24em;', + 'style' => 'height:24em;', )); if (Mage::registry('email_template')->getId()) { @@ -71,7 +71,7 @@ protected function _prepareForm() } if ($values = Mage::getSingleton('adminhtml/session')->getData('email_template_form_data', true)) { - $form->setValues($values); + $form->setValues($values); } $this->setForm($form); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php index 8596d76e4e..f4d2441394 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,8 +52,8 @@ protected function _prepareColumns() { $this->addColumn('template_id', array( - 'header'=>Mage::helper('adminhtml')->__('ID'), - 'index'=>'template_id' + 'header'=>Mage::helper('adminhtml')->__('ID'), + 'index'=>'template_id' ) ); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php index 0647c3e803..d80c2b3432 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,31 +34,31 @@ class Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - protected static $_types = array( - null => null, - Mage_Newsletter_Model_Template::TYPE_HTML => 'HTML', - Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text', - ); + protected static $_types = array( + null => null, + Mage_Newsletter_Model_Template::TYPE_HTML => 'HTML', + Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text', + ); - protected function _getOptions() - { - $result = array(); - foreach (self::$_types as $code=>$label) { - $result[] = array('value'=>$code, 'label'=>Mage::helper('adminhtml')->__($label)); - } + protected function _getOptions() + { + $result = array(); + foreach (self::$_types as $code=>$label) { + $result[] = array('value'=>$code, 'label'=>Mage::helper('adminhtml')->__($label)); + } - return $result; - } + return $result; + } - public function getCondition() - { - if(is_null($this->getValue())) { - return null; - } + public function getCondition() + { + if(is_null($this->getValue())) { + return null; + } - return array('eq'=>$this->getValue()); - } + return array('eq'=>$this->getValue()); + } }// Class Mage_Adminhtml_Block_Newsletter_Queue_Grid_Filter_Status END diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php index ab43cb28c9..37a692159f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,32 +36,32 @@ class Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Action extends Ma { public function render(Varien_Object $row) { - $actions = array(); + $actions = array(); - $actions[] = array( - 'url' => $this->getUrl('*/*/preview', array('id'=>$row->getId())), - 'popup' => true, - 'caption' => $this->__('Preview') - ); + $actions[] = array( + 'url' => $this->getUrl('*/*/preview', array('id'=>$row->getId())), + 'popup' => true, + 'caption' => $this->__('Preview') + ); $this->getColumn()->setActions($actions); - return parent::render($row); + return parent::render($row); } protected function _getEscapedValue($value) { - return addcslashes(htmlspecialchars($value),'\\\''); + return addcslashes(htmlspecialchars($value),'\\\''); } protected function _actionsToHtml(array $actions) { - $html = array(); - $attributesObject = new Varien_Object(); - foreach ($actions as $action) { - $attributesObject->setData($action['@']); - $html[] = 'serialize() . '>' . $action['#'] . ''; - } - return implode('  |  ', $html); + $html = array(); + $attributesObject = new Varien_Object(); + foreach ($actions as $action) { + $attributesObject->setData($action['@']); + $html[] = 'serialize() . '>' . $action['#'] . ''; + } + return implode('  |  ', $html); } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php index cc1b785c69..9dfa63c3f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,4 +52,4 @@ public function render(Varien_Object $row) return $str; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php index ad97878056..19fd969f80 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,10 +34,10 @@ class Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - protected static $_types = array( - Mage_Newsletter_Model_Template::TYPE_HTML => 'HTML', - Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text', - ); + protected static $_types = array( + Mage_Newsletter_Model_Template::TYPE_HTML => 'HTML', + Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text', + ); public function render(Varien_Object $row) { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php index 28c8e795ab..9c1ba01468 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php index 7d263966b2..82ffa0c558 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php @@ -1,100 +1,100 @@ - - */ -class Mage_Adminhtml_Block_System_Store_Delete extends Mage_Adminhtml_Block_Widget_Form_Container -{ - - /** - * Class constructor - * - */ - public function __construct() - { - $this->_objectId = 'item_id'; - $this->_mode = 'delete'; - $this->_controller = 'system_store'; - - parent::__construct(); - - $this->_removeButton('save'); - $this->_removeButton('reset'); - - $this->_updateButton('delete', 'area', 'footer'); - $this->_updateButton('delete', 'onclick', 'editForm.submit();'); - - $this->_addButton('cancel', array( - 'label' => Mage::helper('adminhtml')->__('Cancel'), - 'onclick' => 'setLocation(\'' . $this->getBackUrl() . '\')', - ), 2, 100, 'footer'); - - } - - /** - * Get edit form container header text - * - * @return string - */ - public function getHeaderText() - { - return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(), - $this->htmlEscape($this->getChild('form')->getDataObject()->getName())); - } - - /** - * Set store type title - * - * @param string $title - * @return Mage_Adminhtml_Block_System_Store_Delete - */ - public function setStoreTypeTitle($title) - { - $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete %s', $title)); - return $this->setData('store_type_title', $title); - } - - /** - * Set back URL for "Cancel" and "Back" buttons - * - * @param string $url - * @return Mage_Adminhtml_Block_System_Store_Delete - */ - public function setBackUrl($url) - { - $this->setData('back_url', $url); - $this->_updateButton('cancel', 'onclick', "setLocation('" . $url . "')"); - $this->_updateButton('back', 'onclick', "setLocation('" . $url . "')"); - return $this; - } - -} + + */ +class Mage_Adminhtml_Block_System_Store_Delete extends Mage_Adminhtml_Block_Widget_Form_Container +{ + + /** + * Class constructor + * + */ + public function __construct() + { + $this->_objectId = 'item_id'; + $this->_mode = 'delete'; + $this->_controller = 'system_store'; + + parent::__construct(); + + $this->_removeButton('save'); + $this->_removeButton('reset'); + + $this->_updateButton('delete', 'area', 'footer'); + $this->_updateButton('delete', 'onclick', 'editForm.submit();'); + + $this->_addButton('cancel', array( + 'label' => Mage::helper('adminhtml')->__('Cancel'), + 'onclick' => 'setLocation(\'' . $this->getBackUrl() . '\')', + ), 2, 100, 'footer'); + + } + + /** + * Get edit form container header text + * + * @return string + */ + public function getHeaderText() + { + return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(), + $this->htmlEscape($this->getChild('form')->getDataObject()->getName())); + } + + /** + * Set store type title + * + * @param string $title + * @return Mage_Adminhtml_Block_System_Store_Delete + */ + public function setStoreTypeTitle($title) + { + $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete %s', $title)); + return $this->setData('store_type_title', $title); + } + + /** + * Set back URL for "Cancel" and "Back" buttons + * + * @param string $url + * @return Mage_Adminhtml_Block_System_Store_Delete + */ + public function setBackUrl($url) + { + $this->setData('back_url', $url); + $this->_updateButton('cancel', 'onclick', "setLocation('" . $url . "')"); + $this->_updateButton('back', 'onclick', "setLocation('" . $url . "')"); + return $this; + } + +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php index 8aeda2f40d..8c79bdd864 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php @@ -1,80 +1,80 @@ - - */ -class Mage_Adminhtml_Block_System_Store_Delete_Form extends Mage_Adminhtml_Block_Widget_Form -{ - - /** - * Init form - */ - public function __construct() - { - parent::__construct(); - $this->setId('store_delete_form'); - $this->setTitle(Mage::helper('cms')->__('Block Information')); - } - - protected function _prepareForm() - { - $dataObject = $this->getDataObject(); - - $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post')); - - $form->setHtmlIdPrefix('store_'); - - $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('core')->__('Backup options'), 'class' => 'fieldset-wide')); - - $fieldset->addField('item_id', 'hidden', array( - 'name' => 'item_id', - 'value' => $dataObject->getId(), - )); - - $fieldset->addField('create_backup', 'select', array( - 'label' => Mage::helper('adminhtml')->__('Create DB Backup'), - 'title' => Mage::helper('adminhtml')->__('Create DB Backup'), - 'name' => 'create_backup', - 'options' => array( - '1' => Mage::helper('adminhtml')->__('Yes'), - '0' => Mage::helper('adminhtml')->__('No'), - ), - 'value' => '1', - )); - - $form->setUseContainer(true); - $this->setForm($form); - - return parent::_prepareForm(); - } - -} + + */ +class Mage_Adminhtml_Block_System_Store_Delete_Form extends Mage_Adminhtml_Block_Widget_Form +{ + + /** + * Init form + */ + public function __construct() + { + parent::__construct(); + $this->setId('store_delete_form'); + $this->setTitle(Mage::helper('cms')->__('Block Information')); + } + + protected function _prepareForm() + { + $dataObject = $this->getDataObject(); + + $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post')); + + $form->setHtmlIdPrefix('store_'); + + $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('core')->__('Backup options'), 'class' => 'fieldset-wide')); + + $fieldset->addField('item_id', 'hidden', array( + 'name' => 'item_id', + 'value' => $dataObject->getId(), + )); + + $fieldset->addField('create_backup', 'select', array( + 'label' => Mage::helper('adminhtml')->__('Create DB Backup'), + 'title' => Mage::helper('adminhtml')->__('Create DB Backup'), + 'name' => 'create_backup', + 'options' => array( + '1' => Mage::helper('adminhtml')->__('Yes'), + '0' => Mage::helper('adminhtml')->__('No'), + ), + 'value' => '1', + )); + + $form->setUseContainer(true); + $this->setForm($form); + + return parent::_prepareForm(); + } + +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php index aeddce6a8e..d3593e6b96 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -67,4 +67,4 @@ protected function _prepareLayout() ); return parent::_prepareLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php index 4bd0d38f1c..0ccf656749 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php index 9a93fa9670..158d391d2d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php @@ -1,103 +1,103 @@ - - */ - -class Mage_Adminhtml_Block_System_Store_Edit extends Mage_Adminhtml_Block_Widget_Form_Container -{ - /** - * Init class - * - */ - public function __construct() - { - switch (Mage::registry('store_type')) { - case 'website': - $this->_objectId = 'website_id'; - $saveLabel = Mage::helper('core')->__('Save Website'); - $deleteLabel = Mage::helper('core')->__('Delete Website'); - $deleteUrl = $this->getUrl('*/*/deleteWebsite', array('item_id' => Mage::registry('store_data')->getId())); - break; - case 'group': - $this->_objectId = 'group_id'; - $saveLabel = Mage::helper('core')->__('Save Store'); - $deleteLabel = Mage::helper('core')->__('Delete Store'); - $deleteUrl = $this->getUrl('*/*/deleteGroup', array('item_id' => Mage::registry('store_data')->getId())); - break; - case 'store': - $this->_objectId = 'store_id'; - $saveLabel = Mage::helper('core')->__('Save Store View'); - $deleteLabel = Mage::helper('core')->__('Delete Store View'); - $deleteUrl = $this->getUrl('*/*/deleteStore', array('item_id' => Mage::registry('store_data')->getId())); - break; - } - $this->_controller = 'system_store'; - - parent::__construct(); - - $this->_updateButton('save', 'label', $saveLabel); - $this->_updateButton('delete', 'label', $deleteLabel); - $this->_updateButton('delete', 'onclick', 'setLocation(\''.$deleteUrl.'\');'); - - if (!Mage::registry('store_data')->isCanDelete()) { - $this->_removeButton('delete'); - } - if (Mage::registry('store_data')->isReadOnly()) { - $this->_removeButton('save')->_removeButton('reset'); - } - } - - /** - * Get Header text - * - * @return string - */ - public function getHeaderText() - { - switch (Mage::registry('store_type')) { - case 'website': - $editLabel = Mage::helper('core')->__('Edit Website'); - $addLabel = Mage::helper('core')->__('New Website'); - break; - case 'group': - $editLabel = Mage::helper('core')->__('Edit Store'); - $addLabel = Mage::helper('core')->__('New Store'); - break; - case 'store': - $editLabel = Mage::helper('core')->__('Edit Store View'); - $addLabel = Mage::helper('core')->__('New Store View'); - break; - } - - return Mage::registry('store_action') == 'add' ? $addLabel : $editLabel; - } -} + + */ + +class Mage_Adminhtml_Block_System_Store_Edit extends Mage_Adminhtml_Block_Widget_Form_Container +{ + /** + * Init class + * + */ + public function __construct() + { + switch (Mage::registry('store_type')) { + case 'website': + $this->_objectId = 'website_id'; + $saveLabel = Mage::helper('core')->__('Save Website'); + $deleteLabel = Mage::helper('core')->__('Delete Website'); + $deleteUrl = $this->getUrl('*/*/deleteWebsite', array('item_id' => Mage::registry('store_data')->getId())); + break; + case 'group': + $this->_objectId = 'group_id'; + $saveLabel = Mage::helper('core')->__('Save Store'); + $deleteLabel = Mage::helper('core')->__('Delete Store'); + $deleteUrl = $this->getUrl('*/*/deleteGroup', array('item_id' => Mage::registry('store_data')->getId())); + break; + case 'store': + $this->_objectId = 'store_id'; + $saveLabel = Mage::helper('core')->__('Save Store View'); + $deleteLabel = Mage::helper('core')->__('Delete Store View'); + $deleteUrl = $this->getUrl('*/*/deleteStore', array('item_id' => Mage::registry('store_data')->getId())); + break; + } + $this->_controller = 'system_store'; + + parent::__construct(); + + $this->_updateButton('save', 'label', $saveLabel); + $this->_updateButton('delete', 'label', $deleteLabel); + $this->_updateButton('delete', 'onclick', 'setLocation(\''.$deleteUrl.'\');'); + + if (!Mage::registry('store_data')->isCanDelete()) { + $this->_removeButton('delete'); + } + if (Mage::registry('store_data')->isReadOnly()) { + $this->_removeButton('save')->_removeButton('reset'); + } + } + + /** + * Get Header text + * + * @return string + */ + public function getHeaderText() + { + switch (Mage::registry('store_type')) { + case 'website': + $editLabel = Mage::helper('core')->__('Edit Website'); + $addLabel = Mage::helper('core')->__('New Website'); + break; + case 'group': + $editLabel = Mage::helper('core')->__('Edit Store'); + $addLabel = Mage::helper('core')->__('New Store'); + break; + case 'store': + $editLabel = Mage::helper('core')->__('Edit Store View'); + $addLabel = Mage::helper('core')->__('New Store View'); + break; + } + + return Mage::registry('store_action') == 'add' ? $addLabel : $editLabel; + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php index 1d590f9d09..59d1551053 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php @@ -1,340 +1,340 @@ - - */ -class Mage_Adminhtml_Block_System_Store_Edit_Form extends Mage_Adminhtml_Block_Widget_Form -{ - - /** - * Class constructor - * - */ - public function __construct() - { - parent::__construct(); - $this->setId('coreStoreForm'); - } - - /** - * Prepare form data - * - * return Mage_Adminhtml_Block_Widget_Form - */ - protected function _prepareForm() - { - if (Mage::registry('store_type') == 'website') { - $websiteModel = Mage::registry('store_data'); - $showWebsiteFieldset = true; - $showGroupFieldset = $showStoreFieldset = false; - } elseif (Mage::registry('store_type') == 'group') { - $groupModel = Mage::registry('store_data'); - $showGroupFieldset = true; - $showWebsiteFieldset = $showStoreFieldset = false; - } elseif (Mage::registry('store_type') == 'store') { - $storeModel = Mage::registry('store_data'); - $showWebsiteFieldset = $showGroupFieldset = false; - $showStoreFieldset = true; - } - - /* @var $websiteModel Mage_Core_Model_Website */ - /* @var $groupModel Mage_Core_Model_Store_Group */ - /* @var $storeModel Mage_Core_Model_Store */ - - $form = new Varien_Data_Form(array( - 'id' => 'edit_form', - 'action' => $this->getData('action'), - 'method' => 'post' - )); - - if ($showWebsiteFieldset) { - if ($postData = Mage::registry('store_post_data')) { - $websiteModel->setData($postData['website']); - } - $fieldset = $form->addFieldset('website_fieldset', array( - 'legend' => Mage::helper('core')->__('Website Information') - )); - /* @var $fieldset Varien_Data_Form */ - - $fieldset->addField('website_name', 'text', array( - 'name' => 'website[name]', - 'label' => Mage::helper('core')->__('Name'), - 'value' => $websiteModel->getName(), - 'required' => true, - 'disabled' => $websiteModel->isReadOnly(), - )); - - $fieldset->addField('website_code', 'text', array( - 'name' => 'website[code]', - 'label' => Mage::helper('core')->__('Code'), - 'value' => $websiteModel->getCode(), - 'required' => true, - 'disabled' => $websiteModel->isReadOnly(), - )); - - $fieldset->addField('website_sort_order', 'text', array( - 'name' => 'website[sort_order]', - 'label' => Mage::helper('core')->__('Sort order'), - 'value' => $websiteModel->getSortOrder(), - 'required' => false, - 'disabled' => $websiteModel->isReadOnly(), - )); - - if (Mage::registry('store_action') == 'edit') { - $groups = Mage::getModel('core/store_group')->getCollection()->addWebsiteFilter($websiteModel->getId())->toOptionArray(); - //array_unshift($groups, array('label'=>'', 'value'=>0)); - $fieldset->addField('website_default_group_id', 'select', array( - 'name' => 'website[default_group_id]', - 'label' => Mage::helper('core')->__('Default Store'), - 'value' => $websiteModel->getDefaultGroupId(), - 'values' => $groups, - 'required' => false, - 'disabled' => $websiteModel->isReadOnly(), - )); - } - - if (!$websiteModel->getIsDefault() && $websiteModel->getStoresCount()) { - $fieldset->addField('is_default', 'checkbox', array( - 'name' => 'website[is_default]', - 'label' => Mage::helper('core')->__('Set as default'), - 'value' => 1, - 'disabled' => $websiteModel->isReadOnly(), - )); - } - else { - $fieldset->addField('is_default', 'hidden', array( - 'name' => 'website[is_default]', - 'value' => $websiteModel->getIsDefault() - )); - } - - $fieldset->addField('website_website_id', 'hidden', array( - 'name' => 'website[website_id]', - 'value' => $websiteModel->getId() - )); - } - - if ($showGroupFieldset) { - if ($postData = Mage::registry('store_post_data')) { - $groupModel->setData($postData['group']); - } - $fieldset = $form->addFieldset('group_fieldset', array( - 'legend' => Mage::helper('core')->__('Store Information') - )); - - if (Mage::registry('store_action') == 'edit' - || (Mage::registry('store_action') == 'add' && Mage::registry('store_type') == 'group')) { - $websites = Mage::getModel('core/website')->getCollection()->toOptionArray(); - $fieldset->addField('group_website_id', 'select', array( - 'name' => 'group[website_id]', - 'label' => Mage::helper('core')->__('Website'), - 'value' => $groupModel->getWebsiteId(), - 'values' => $websites, - 'required' => true, - 'disabled' => $groupModel->isReadOnly(), - )); - - if ($groupModel->getId() && $groupModel->getWebsite()->getDefaultGroupId() == $groupModel->getId()) { - if ($groupModel->getWebsite()->getIsDefault() || $groupModel->getWebsite()->getGroupsCount() == 1) { - $form->getElement('group_website_id')->setDisabled(true); - - $fieldset->addField('group_hidden_website_id', 'hidden', array( - 'name' => 'group[website_id]', - 'no_span' => true, - 'value' => $groupModel->getWebsiteId() - )); - } - else { - $fieldset->addField('group_original_website_id', 'hidden', array( - 'name' => 'group[original_website_id]', - 'no_span' => true, - 'value' => $groupModel->getWebsiteId() - )); - } - } - } - - $fieldset->addField('group_name', 'text', array( - 'name' => 'group[name]', - 'label' => Mage::helper('core')->__('Name'), - 'value' => $groupModel->getName(), - 'required' => true, - 'disabled' => $groupModel->isReadOnly(), - )); - - $categories = Mage::getModel('adminhtml/system_config_source_category')->toOptionArray(); - - $fieldset->addField('group_root_category_id', 'select', array( - 'name' => 'group[root_category_id]', - 'label' => Mage::helper('core')->__('Root Category'), - 'value' => $groupModel->getRootCategoryId(), - 'values' => $categories, - 'required' => true, - 'disabled' => $groupModel->isReadOnly(), - )); - - if (Mage::registry('store_action') == 'edit') { - $stores = Mage::getModel('core/store')->getCollection()->addGroupFilter($groupModel->getId())->toOptionArray(); - //array_unshift($stores, array('label'=>'', 'value'=>0)); - $fieldset->addField('group_default_store_id', 'select', array( - 'name' => 'group[default_store_id]', - 'label' => Mage::helper('core')->__('Default Store View'), - 'value' => $groupModel->getDefaultStoreId(), - 'values' => $stores, - 'required' => false, - 'disabled' => $groupModel->isReadOnly(), - )); - } - - $fieldset->addField('group_group_id', 'hidden', array( - 'name' => 'group[group_id]', - 'no_span' => true, - 'value' => $groupModel->getId() - )); - } - - if ($showStoreFieldset) { - if ($postData = Mage::registry('store_post_data')) { - $storeModel->setData($postData['store']); - } - $fieldset = $form->addFieldset('store_fieldset', array( - 'legend' => Mage::helper('core')->__('Store View Information') - )); - - if (Mage::registry('store_action') == 'edit' - || Mage::registry('store_action') == 'add' && Mage::registry('store_type') == 'store') { - $websites = Mage::getModel('core/website')->getCollection(); - $allgroups = Mage::getModel('core/store_group')->getCollection(); - $groups = array(); - foreach ($websites as $website) { - $values = array(); - foreach ($allgroups as $group) { - if ($group->getWebsiteId() == $website->getId()) { - $values[] = array('label'=>$group->getName(),'value'=>$group->getId()); - } - } - $groups[] = array('label'=>$website->getName(),'value'=>$values); - } - $fieldset->addField('store_group_id', 'select', array( - 'name' => 'store[group_id]', - 'label' => Mage::helper('core')->__('Store'), - 'value' => $storeModel->getGroupId(), - 'values' => $groups, - 'required' => true, - 'disabled' => $storeModel->isReadOnly(), - )); - if ($storeModel->getId() && $storeModel->getGroup()->getDefaultStoreId() == $storeModel->getId()) { - if ($storeModel->getGroup() && $storeModel->getGroup()->getStoresCount() > 1) { - $form->getElement('store_group_id')->setDisabled(true); - - $fieldset->addField('store_hidden_group_id', 'hidden', array( - 'name' => 'store[group_id]', - 'no_span' => true, - 'value' => $storeModel->getGroupId() - )); - } - else { - $fieldset->addField('store_original_group_id', 'hidden', array( - 'name' => 'store[original_group_id]', - 'no_span' => true, - 'value' => $storeModel->getGroupId() - )); - } - } - } - - $fieldset->addField('store_name', 'text', array( - 'name' => 'store[name]', - 'label' => Mage::helper('core')->__('Name'), - 'value' => $storeModel->getName(), - 'required' => true, - 'disabled' => $storeModel->isReadOnly(), - )); - $fieldset->addField('store_code', 'text', array( - 'name' => 'store[code]', - 'label' => Mage::helper('core')->__('Code'), - 'value' => $storeModel->getCode(), - 'required' => true, - 'disabled' => $storeModel->isReadOnly(), - )); - - $fieldset->addField('store_is_active', 'select', array( - 'name' => 'store[is_active]', - 'label' => Mage::helper('core')->__('Status'), - 'value' => $storeModel->getIsActive(), - 'options' => array( - 0 => Mage::helper('adminhtml')->__('Disabled'), - 1 => Mage::helper('adminhtml')->__('Enabled')), - 'required' => true, - 'disabled' => $storeModel->isReadOnly(), - )); - - $fieldset->addField('store_sort_order', 'text', array( - 'name' => 'store[sort_order]', - 'label' => Mage::helper('core')->__('Sort order'), - 'value' => $storeModel->getSortOrder(), - 'required' => false, - 'disabled' => $storeModel->isReadOnly(), - )); - - $fieldset->addField('store_is_default', 'hidden', array( - 'name' => 'store[is_default]', - 'no_span' => true, - 'value' => $storeModel->getIsDefault(), - )); - - $fieldset->addField('store_store_id', 'hidden', array( - 'name' => 'store[store_id]', - 'no_span' => true, - 'value' => $storeModel->getId(), - 'disabled' => $storeModel->isReadOnly(), - )); - } - - $form->addField('store_type', 'hidden', array( - 'name' => 'store_type', - 'no_span' => true, - 'value' => Mage::registry('store_type') - )); - - $form->addField('store_action', 'hidden', array( - 'name' => 'store_action', - 'no_span' => true, - 'value' => Mage::registry('store_action') - )); - - $form->setAction($this->getUrl('*/*/save')); - $form->setUseContainer(true); - $this->setForm($form); - - return parent::_prepareForm(); - } -} + + */ +class Mage_Adminhtml_Block_System_Store_Edit_Form extends Mage_Adminhtml_Block_Widget_Form +{ + + /** + * Class constructor + * + */ + public function __construct() + { + parent::__construct(); + $this->setId('coreStoreForm'); + } + + /** + * Prepare form data + * + * return Mage_Adminhtml_Block_Widget_Form + */ + protected function _prepareForm() + { + if (Mage::registry('store_type') == 'website') { + $websiteModel = Mage::registry('store_data'); + $showWebsiteFieldset = true; + $showGroupFieldset = $showStoreFieldset = false; + } elseif (Mage::registry('store_type') == 'group') { + $groupModel = Mage::registry('store_data'); + $showGroupFieldset = true; + $showWebsiteFieldset = $showStoreFieldset = false; + } elseif (Mage::registry('store_type') == 'store') { + $storeModel = Mage::registry('store_data'); + $showWebsiteFieldset = $showGroupFieldset = false; + $showStoreFieldset = true; + } + + /* @var $websiteModel Mage_Core_Model_Website */ + /* @var $groupModel Mage_Core_Model_Store_Group */ + /* @var $storeModel Mage_Core_Model_Store */ + + $form = new Varien_Data_Form(array( + 'id' => 'edit_form', + 'action' => $this->getData('action'), + 'method' => 'post' + )); + + if ($showWebsiteFieldset) { + if ($postData = Mage::registry('store_post_data')) { + $websiteModel->setData($postData['website']); + } + $fieldset = $form->addFieldset('website_fieldset', array( + 'legend' => Mage::helper('core')->__('Website Information') + )); + /* @var $fieldset Varien_Data_Form */ + + $fieldset->addField('website_name', 'text', array( + 'name' => 'website[name]', + 'label' => Mage::helper('core')->__('Name'), + 'value' => $websiteModel->getName(), + 'required' => true, + 'disabled' => $websiteModel->isReadOnly(), + )); + + $fieldset->addField('website_code', 'text', array( + 'name' => 'website[code]', + 'label' => Mage::helper('core')->__('Code'), + 'value' => $websiteModel->getCode(), + 'required' => true, + 'disabled' => $websiteModel->isReadOnly(), + )); + + $fieldset->addField('website_sort_order', 'text', array( + 'name' => 'website[sort_order]', + 'label' => Mage::helper('core')->__('Sort order'), + 'value' => $websiteModel->getSortOrder(), + 'required' => false, + 'disabled' => $websiteModel->isReadOnly(), + )); + + if (Mage::registry('store_action') == 'edit') { + $groups = Mage::getModel('core/store_group')->getCollection()->addWebsiteFilter($websiteModel->getId())->toOptionArray(); + //array_unshift($groups, array('label'=>'', 'value'=>0)); + $fieldset->addField('website_default_group_id', 'select', array( + 'name' => 'website[default_group_id]', + 'label' => Mage::helper('core')->__('Default Store'), + 'value' => $websiteModel->getDefaultGroupId(), + 'values' => $groups, + 'required' => false, + 'disabled' => $websiteModel->isReadOnly(), + )); + } + + if (!$websiteModel->getIsDefault() && $websiteModel->getStoresCount()) { + $fieldset->addField('is_default', 'checkbox', array( + 'name' => 'website[is_default]', + 'label' => Mage::helper('core')->__('Set as default'), + 'value' => 1, + 'disabled' => $websiteModel->isReadOnly(), + )); + } + else { + $fieldset->addField('is_default', 'hidden', array( + 'name' => 'website[is_default]', + 'value' => $websiteModel->getIsDefault() + )); + } + + $fieldset->addField('website_website_id', 'hidden', array( + 'name' => 'website[website_id]', + 'value' => $websiteModel->getId() + )); + } + + if ($showGroupFieldset) { + if ($postData = Mage::registry('store_post_data')) { + $groupModel->setData($postData['group']); + } + $fieldset = $form->addFieldset('group_fieldset', array( + 'legend' => Mage::helper('core')->__('Store Information') + )); + + if (Mage::registry('store_action') == 'edit' + || (Mage::registry('store_action') == 'add' && Mage::registry('store_type') == 'group')) { + $websites = Mage::getModel('core/website')->getCollection()->toOptionArray(); + $fieldset->addField('group_website_id', 'select', array( + 'name' => 'group[website_id]', + 'label' => Mage::helper('core')->__('Website'), + 'value' => $groupModel->getWebsiteId(), + 'values' => $websites, + 'required' => true, + 'disabled' => $groupModel->isReadOnly(), + )); + + if ($groupModel->getId() && $groupModel->getWebsite()->getDefaultGroupId() == $groupModel->getId()) { + if ($groupModel->getWebsite()->getIsDefault() || $groupModel->getWebsite()->getGroupsCount() == 1) { + $form->getElement('group_website_id')->setDisabled(true); + + $fieldset->addField('group_hidden_website_id', 'hidden', array( + 'name' => 'group[website_id]', + 'no_span' => true, + 'value' => $groupModel->getWebsiteId() + )); + } + else { + $fieldset->addField('group_original_website_id', 'hidden', array( + 'name' => 'group[original_website_id]', + 'no_span' => true, + 'value' => $groupModel->getWebsiteId() + )); + } + } + } + + $fieldset->addField('group_name', 'text', array( + 'name' => 'group[name]', + 'label' => Mage::helper('core')->__('Name'), + 'value' => $groupModel->getName(), + 'required' => true, + 'disabled' => $groupModel->isReadOnly(), + )); + + $categories = Mage::getModel('adminhtml/system_config_source_category')->toOptionArray(); + + $fieldset->addField('group_root_category_id', 'select', array( + 'name' => 'group[root_category_id]', + 'label' => Mage::helper('core')->__('Root Category'), + 'value' => $groupModel->getRootCategoryId(), + 'values' => $categories, + 'required' => true, + 'disabled' => $groupModel->isReadOnly(), + )); + + if (Mage::registry('store_action') == 'edit') { + $stores = Mage::getModel('core/store')->getCollection()->addGroupFilter($groupModel->getId())->toOptionArray(); + //array_unshift($stores, array('label'=>'', 'value'=>0)); + $fieldset->addField('group_default_store_id', 'select', array( + 'name' => 'group[default_store_id]', + 'label' => Mage::helper('core')->__('Default Store View'), + 'value' => $groupModel->getDefaultStoreId(), + 'values' => $stores, + 'required' => false, + 'disabled' => $groupModel->isReadOnly(), + )); + } + + $fieldset->addField('group_group_id', 'hidden', array( + 'name' => 'group[group_id]', + 'no_span' => true, + 'value' => $groupModel->getId() + )); + } + + if ($showStoreFieldset) { + if ($postData = Mage::registry('store_post_data')) { + $storeModel->setData($postData['store']); + } + $fieldset = $form->addFieldset('store_fieldset', array( + 'legend' => Mage::helper('core')->__('Store View Information') + )); + + if (Mage::registry('store_action') == 'edit' + || Mage::registry('store_action') == 'add' && Mage::registry('store_type') == 'store') { + $websites = Mage::getModel('core/website')->getCollection(); + $allgroups = Mage::getModel('core/store_group')->getCollection(); + $groups = array(); + foreach ($websites as $website) { + $values = array(); + foreach ($allgroups as $group) { + if ($group->getWebsiteId() == $website->getId()) { + $values[] = array('label'=>$group->getName(),'value'=>$group->getId()); + } + } + $groups[] = array('label'=>$website->getName(),'value'=>$values); + } + $fieldset->addField('store_group_id', 'select', array( + 'name' => 'store[group_id]', + 'label' => Mage::helper('core')->__('Store'), + 'value' => $storeModel->getGroupId(), + 'values' => $groups, + 'required' => true, + 'disabled' => $storeModel->isReadOnly(), + )); + if ($storeModel->getId() && $storeModel->getGroup()->getDefaultStoreId() == $storeModel->getId()) { + if ($storeModel->getGroup() && $storeModel->getGroup()->getStoresCount() > 1) { + $form->getElement('store_group_id')->setDisabled(true); + + $fieldset->addField('store_hidden_group_id', 'hidden', array( + 'name' => 'store[group_id]', + 'no_span' => true, + 'value' => $storeModel->getGroupId() + )); + } + else { + $fieldset->addField('store_original_group_id', 'hidden', array( + 'name' => 'store[original_group_id]', + 'no_span' => true, + 'value' => $storeModel->getGroupId() + )); + } + } + } + + $fieldset->addField('store_name', 'text', array( + 'name' => 'store[name]', + 'label' => Mage::helper('core')->__('Name'), + 'value' => $storeModel->getName(), + 'required' => true, + 'disabled' => $storeModel->isReadOnly(), + )); + $fieldset->addField('store_code', 'text', array( + 'name' => 'store[code]', + 'label' => Mage::helper('core')->__('Code'), + 'value' => $storeModel->getCode(), + 'required' => true, + 'disabled' => $storeModel->isReadOnly(), + )); + + $fieldset->addField('store_is_active', 'select', array( + 'name' => 'store[is_active]', + 'label' => Mage::helper('core')->__('Status'), + 'value' => $storeModel->getIsActive(), + 'options' => array( + 0 => Mage::helper('adminhtml')->__('Disabled'), + 1 => Mage::helper('adminhtml')->__('Enabled')), + 'required' => true, + 'disabled' => $storeModel->isReadOnly(), + )); + + $fieldset->addField('store_sort_order', 'text', array( + 'name' => 'store[sort_order]', + 'label' => Mage::helper('core')->__('Sort order'), + 'value' => $storeModel->getSortOrder(), + 'required' => false, + 'disabled' => $storeModel->isReadOnly(), + )); + + $fieldset->addField('store_is_default', 'hidden', array( + 'name' => 'store[is_default]', + 'no_span' => true, + 'value' => $storeModel->getIsDefault(), + )); + + $fieldset->addField('store_store_id', 'hidden', array( + 'name' => 'store[store_id]', + 'no_span' => true, + 'value' => $storeModel->getId(), + 'disabled' => $storeModel->isReadOnly(), + )); + } + + $form->addField('store_type', 'hidden', array( + 'name' => 'store_type', + 'no_span' => true, + 'value' => Mage::registry('store_type') + )); + + $form->addField('store_action', 'hidden', array( + 'name' => 'store_action', + 'no_span' => true, + 'value' => Mage::registry('store_action') + )); + + $form->setAction($this->getUrl('*/*/save')); + $form->setUseContainer(true); + $this->setForm($form); + + return parent::_prepareForm(); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php index 019bcca40c..8469e03473 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php index 4ddad90963..1714733a35 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function render(Varien_Object $row) } return '' . $row->getData($this->getColumn()->getIndex()) . ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php index 79843eec9c..b172cd4a08 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function render(Varien_Object $row) } return '' . $row->getData($this->getColumn()->getIndex()) . ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php index fe9b36fc3a..1e5f4ada25 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php index 0915938349..e80c13e931 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -72,4 +72,4 @@ public function getAddNewButtonHtml() $this->getChildHtml('add_new_store') )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag.php index b07a8bacfa..138f253dd3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php index 751f885a61..780df52b91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php index 43a022f1c0..a848b32afe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php index 1a8c691e2e..2a30ac6937 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -144,6 +144,6 @@ public function getSaveUrl() */ public function getSaveAndContinueUrl() { - return $this->getUrl('*/*/save', array('_current' => true, 'ret' => 'edit')); + return $this->getUrl('*/*/save', array('_current' => true, 'ret' => 'edit', 'store' => Mage::registry('current_tag')->getStoreId())); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php index fe436354d9..58ee290c2c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php index 648af97b23..cd965f273f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -102,4 +102,4 @@ public function getRowUrl($row) return $this->getUrl('*/*/products', array('tag_id' => $row->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php index ccc303e9cb..9be138d905 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php index f15a6dd7bb..f569b86257 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php index 969de55d5b..d2c82209f6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php index 18015b3913..254a67be66 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php index c5c47a4219..5d25688020 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php index 03dffcf868..36bbbe525f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php index 5b27f715af..35a1d9f87c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php index 4a246e5645..87dd1a1b65 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php index e8b7508c10..500dfc1491 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php index 66f7ac9274..565bf9d1a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class.php index cb2677f3b0..1aa160c0c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,4 +56,4 @@ public function setClassType($classType) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php index 9490c9fb73..a66713d435 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ public function setClassType($classType) $this->getChild('form')->setClassType($classType); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php index 142d34f78e..96f6e090a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -97,4 +97,4 @@ protected function _prepareForm() return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php index 8dfd32297d..154d7bdf71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php index dc4585f351..74a1915160 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,9 +55,14 @@ protected function _prepareForm() ->toOptionArray(); unset($countries[0]); + $countryId = $rateObject->getTaxCountryId(); + if (!$countryId) { + $countryId = Mage::getStoreConfig('general/country/default'); + } + $regionCollection = Mage::getModel('directory/region') ->getCollection() - ->addCountryFilter($rateModel->getTaxCountryId()); + ->addCountryFilter($countryId); $regions = $regionCollection->toOptionArray(); @@ -78,11 +83,6 @@ protected function _prepareForm() ); } - $countryId = $rateObject->getTaxCountryId(); - if (!$countryId) { - $countryId = Mage::getStoreConfig('general/country/default'); - } - $fieldset->addField('code', 'text', array( 'name' => 'code', diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php index 8ba1e92fe2..6c9ba05960 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Tax_Rate_Grid extends Mage_Adminhtml_Block_Widget_Grid { diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php index 0e70abce9a..519aa8e96a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php @@ -1,46 +1,46 @@ - - */ -class Mage_Adminhtml_Block_Tax_Rate_Grid_Renderer_Country extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country -{ -/** - * Render column for export - * - * @param Varien_Object $row - * @return string - */ - public function renderExport(Varien_Object $row) - { - return $row->getData($this->getColumn()->getIndex()); - } -} + + */ +class Mage_Adminhtml_Block_Tax_Rate_Grid_Renderer_Country extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country +{ +/** + * Render column for export + * + * @param Varien_Object $row + * @return string + */ + public function renderExport(Varien_Object $row) + { + return $row->getData($this->getColumn()->getIndex()); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php index 9ce217e6bc..84f0e7c3c3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,10 +38,10 @@ protected function _getValue (Varien_Object $row) { $data = parent::_getValue($row); if (intval($data) == $data) { - return (string) number_format($data, 2); + return (string) number_format($data, 2); } if (!is_null($data)) { - return $data * 1; + return $data * 1; } return $this->getColumn()->getDefault(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php index 611cc53bf2..8e67675a5e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ public function __construct() $this->setTemplate('tax/importExport.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php index 18753c7e4b..fba526bc67 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,4 +68,4 @@ public function getStores() } return $stores; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php index 60b50f5f02..d9eb4b6920 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function getChildrenHtml() { return Mage::getBlockSingleton('adminhtml/tax_rate_title')->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php index 5ec762db01..9ff2b95b0e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function __construct() parent::__construct(); $this->setTemplate('tax/toolbar/rate/add.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php index 87b7de8bda..a37c0ec7f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -102,4 +102,4 @@ public function getDeleteButtonHtml() } return $this->getChildHtml('deleteButton'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php index a7e41c60ad..bab9ebfc8d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('tax')->__('Add New Tax Rule'); parent::__construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php index fe98fa3c67..8e6bb3a31a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,7 +48,7 @@ public function __construct() $this->_updateButton('save', 'label', Mage::helper('tax')->__('Save Rule')); $this->_updateButton('delete', 'label', Mage::helper('tax')->__('Delete Rule')); - $this->_addButton('save_and_continue', array( + $this->_addButton('save_and_continue', array( 'label' => Mage::helper('tax')->__('Save And Continue Edit'), 'onclick' => 'saveAndContinueEdit()', 'class' => 'save' @@ -71,4 +71,4 @@ public function getHeaderText() return Mage::helper('tax')->__('New Rule'); } } -} \ No newline at end of file +} 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 index d29ca5787f..eb42064167 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -155,4 +155,4 @@ protected function _prepareForm() return parent::_prepareForm(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php index c10efb02a5..f5849169f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Grid { diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php index ddf6835b81..0bf0f4a4f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Template.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Text/List.php b/app/code/core/Mage/Adminhtml/Block/Text/List.php index 7ccdc98fac..74005920b7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Text/List.php +++ b/app/code/core/Mage/Adminhtml/Block/Text/List.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php index eeaf3cb50a..7cd3a2f5bd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php index 163b2955fa..5a03819460 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php index a76a9ca295..dbc7f34048 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php index eabf76556c..2178f38b98 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php index 9abf72ba0c..fd499904af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php index 90e637b12f..953210b428 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php index 72d527dfeb..f20c952cf9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php index c328c1266a..a4c9552322 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget.php b/app/code/core/Mage/Adminhtml/Block/Widget.php index f855325f4d..52eee3bd98 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,7 +36,7 @@ class Mage_Adminhtml_Block_Widget extends Mage_Adminhtml_Block_Template public function getId() { if ($this->getData('id')===null) { - $this->setData('id', 'id_'.md5(microtime())); + $this->setData('id', Mage::helper('core')->uniqHash('id_')); } return $this->getData('id'); } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php index 62167e5cf4..b719843a90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php index 7303132520..c95033952f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php index 0a990538cc..bfed144b1f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -65,4 +65,4 @@ protected function _beforeToHtml() // $this->assign('links', $this->_links); return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php index 7e314c7227..ef325dc2fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php index ddd2c39f31..15b5182160 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php index 2be2848ca3..4b1e0ed3ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php index a77e2a7c9c..e9fe613865 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php index dda2522e02..d07c60b272 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php index 4f93300156..6483af8418 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php index 1e45dd0630..ab688b1e41 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php index efa1d37017..7fa3b1a0a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function render(Varien_Data_Form_Element_Abstract $element) $this->_element = $element; return $this->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php index 6ff8b3c149..557f0799e4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index 6ca71743b7..e0fd5ca03f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php index f3213ad48a..dbaab3c1d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function render(Varien_Object $row) $block->setPageObject($row); echo $block->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php index db1856b361..cfde8c377f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php index 3989a8463f..774f9d748c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php index 6b9af54258..bb717d1c49 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,4 +69,4 @@ public function getCondition() } //return array('like'=>'%'.$this->getValue().'%'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php index 40c6ebe1d7..54c4fda2fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php index e1df560788..139d09a8ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -172,4 +172,4 @@ protected function _convertDate($date, $locale) return null; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php index c955fb2ff6..64beceb08d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -158,4 +158,4 @@ public function getEscapedValue($index=null) return parent::getEscapedValue($index); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php index db8758a3ee..683d775032 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php index 85ecfbf7dc..71bfe8c115 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function getCondition() return array('nin'=> ( $this->getColumn()->getSelected() ? $this->getColumn()->getSelected() : array(0) )); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php index 236c4d3d37..409f8150b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -147,4 +147,4 @@ public function prepareRates($displayCurrency) $this->getColumn()->setCurrencyCode($displayCurrency); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php index a22e71772a..98041a0fa3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -63,4 +63,4 @@ public function getCondition() ); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php index feb249dab3..4fac9eae36 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -59,4 +59,4 @@ public function getCondition() return $value; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php index d2824893cb..e82455fef2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,19 +51,19 @@ public function getHtml() $html = ''; return $html; } - public function getCondition() - { - if (is_null($this->getValue())) { - return null; - } - return array('eq' => $this->getValue()); - } + public function getCondition() + { + if (is_null($this->getValue())) { + return null; + } + return array('eq' => $this->getValue()); + } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php index 59ae3e348e..3064b60715 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php index 347088b96a..68426d4a4f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php index ca8288ab4b..dd716a5724 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,9 +58,8 @@ public function render(Varien_Object $row) { if ($this->getColumn()->getEditable()) { $value = $this->_getValue($row); - $value = $value!=''?$value:' '; - return $value . ( ($this->getColumn()->getEditOnly() && trim($this->_getValue($row)!='')) ? '' : '' ) . $this->_getInputValueElement($row); - + return $value . ($this->getColumn()->getEditOnly() ? '' : ($value != '' ? $value : ' ') . '') + . $this->_getInputValueElement($row); } return $this->_getValue($row); } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php index 1865727c36..599e2c645c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,30 +42,30 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Action extends Mage_Admin */ public function render(Varien_Object $row) { - $actions = $this->getColumn()->getActions(); - if ( empty($actions) || !is_array($actions) ) { - return ' '; - } + $actions = $this->getColumn()->getActions(); + if ( empty($actions) || !is_array($actions) ) { + return ' '; + } - if(sizeof($actions)==1 && !$this->getColumn()->getNoLink()) { - foreach ($actions as $action){ + if(sizeof($actions)==1 && !$this->getColumn()->getNoLink()) { + foreach ($actions as $action){ if ( is_array($action) ) { return $this->_toLinkHtml($action, $row); - } + } } - } + } - $out = '' + . ''; + $i = 0; foreach ($actions as $action){ $i++; - if ( is_array($action) ) { + if ( is_array($action) ) { $out .= $this->_toOptionHtml($action, $row); - } + } } - $out .= ''; - return $out; + $out .= ''; + return $out; } /** @@ -130,32 +130,32 @@ protected function _transformActionData(&$action, &$actionCaption, Varien_Object $this->getColumn()->setFormat(null); } - switch ($attibute) { - case 'caption': - $actionCaption = $action['caption']; - unset($action['caption']); - break; + switch ($attibute) { + case 'caption': + $actionCaption = $action['caption']; + unset($action['caption']); + break; - case 'url': - if(is_array($action['url'])) { - $params = array($action['field']=>$this->_getValue($row)); - if(isset($action['url']['params'])) { + case 'url': + if(is_array($action['url'])) { + $params = array($action['field']=>$this->_getValue($row)); + if(isset($action['url']['params'])) { $params = array_merge($action['url']['params'], $params); - } - $action['href'] = $this->getUrl($action['url']['base'], $params); - unset($action['field']); - } else { - $action['href'] = $action['url']; - } - unset($action['url']); - break; - - case 'popup': - $action['onclick'] = 'popWin(this.href, \'windth=800,height=700,resizable=1,scrollbars=1\');return false;'; - break; + } + $action['href'] = $this->getUrl($action['url']['base'], $params); + unset($action['field']); + } else { + $action['href'] = $action['url']; + } + unset($action['url']); + break; + + case 'popup': + $action['onclick'] = 'popWin(this.href, \'windth=800,height=700,resizable=1,scrollbars=1\');return false;'; + break; } } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php index bceadb0f60..ef44f0935d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php index 1093cb5e1b..870938aca9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php @@ -1,57 +1,57 @@ - - */ - -class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Concat extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract -{ - - /** - * Renders grid column - * - * @param Varien_Object $row - * @return string - */ - public function render(Varien_Object $row) - { - $dataArr = array(); - foreach ($this->getColumn()->getIndex() as $index) { - if ($data = $row->getData($index)) { - $dataArr[] = $data; - } - } - $data = join($this->getColumn()->getSeparator(), $dataArr); - // TODO run column type renderer - return $data; - } - -} \ No newline at end of file + + */ + +class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Concat extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract +{ + + /** + * Renders grid column + * + * @param Varien_Object $row + * @return string + */ + public function render(Varien_Object $row) + { + $dataArr = array(); + foreach ($this->getColumn()->getIndex() as $index) { + if ($data = $row->getData($index)) { + $dataArr[] = $data; + } + } + $data = join($this->getColumn()->getSeparator(), $dataArr); + // TODO run column type renderer + return $data; + } + +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php index 36fe481ac7..9968cbd729 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php index 414d3f2231..45285d0c4d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -90,4 +90,4 @@ public function renderCss() { return parent::renderCss() . ' a-right'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php index 3bbe7f1439..d5fb134015 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php index eb370e5af9..a6e11b8f10 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,20 +34,20 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Datetime extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - /** - * Date format string - */ - protected static $_format = null; + /** + * Date format string + */ + protected static $_format = null; - /** - * Retrieve datetime format - * - * @return unknown - */ - protected function _getFormat() - { - $format = $this->getColumn()->getFormat(); - if (!$format) { + /** + * Retrieve datetime format + * + * @return unknown + */ + protected function _getFormat() + { + $format = $this->getColumn()->getFormat(); + if (!$format) { if (is_null(self::$_format)) { try { self::$_format = Mage::app()->getLocale()->getDateTimeFormat( @@ -57,11 +57,11 @@ protected function _getFormat() catch (Exception $e) { } - } - $format = self::$_format; - } - return $format; - } + } + $format = self::$_format; + } + return $format; + } /** * Renders grid column @@ -72,8 +72,8 @@ protected function _getFormat() public function render(Varien_Object $row) { if ($data = $row->getData($this->getColumn()->getIndex())) { - $format = $this->_getFormat(); - try { + $format = $this->_getFormat(); + try { $data = Mage::app()->getLocale()->date($data, Varien_Date::DATETIME_INTERNAL_FORMAT)->toString($format); } catch (Exception $e) @@ -85,4 +85,4 @@ public function render(Varien_Object $row) } return $this->getColumn()->getDefault(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php index 4908b3db7b..7f892a89c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php index c5b2d6c023..85cdbf2b84 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php @@ -1,47 +1,47 @@ - - */ - -interface Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Interface -{ - public function setColumn($column); - - public function getColumn(); - - /** - * Renders grid column - * - * @param Varien_Object $row - */ - public function render(Varien_Object $row); -} \ No newline at end of file + + */ + +interface Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Interface +{ + public function setColumn($column); + + public function getColumn(); + + /** + * Renders grid column + * + * @param Varien_Object $row + */ + public function render(Varien_Object $row); +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php index 6667da446a..0b369e3f0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php @@ -1,43 +1,43 @@ -getData($this->getColumn()->getIndex())); - } -} +getData($this->getColumn()->getIndex())); + } +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php index 4c033a4ed7..16fc88f3a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,7 +54,7 @@ public function render(Varien_Object $row) } $text = Mage::helper('core/string')->truncate(parent::_getValue($row), $truncateLength); if ($this->getColumn()->getEscape()) { - $text = $this->htmlEscape($text); + $text = $this->htmlEscape($text); } if ($this->getColumn()->getNl2br()) { $text = nl2br($text); diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php index d406d5dbad..82be78aee8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,8 +52,8 @@ public function renderProperty() public function render(Varien_Object $row) { if ($this->getColumn()->getGrid()->getMassactionIdFieldOnlyIndexValue()){ - $this->setNoObjectId(true); - } + $this->setNoObjectId(true); + } return parent::render($row); } // diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php index 79cb752cc3..9addf0d8c6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,7 +41,7 @@ protected function _getValue(Varien_Object $row) $data = parent::_getValue($row); if (!is_null($data)) { $value = $data * 1; - return $value ? $value: '0'; // fixed for showing zero in grid + return $value ? $value: '0'; // fixed for showing zero in grid } return $this->getColumn()->getDefault(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php index 381963cc74..99f01d33f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php index 529194a18c..3da38e5b62 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,10 +35,10 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Price extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { protected $_defaultWidth = 100; - /** - * Currency objects cache - */ - protected static $_currencies = array(); + /** + * Currency objects cache + */ + protected static $_currencies = array(); /** * Renders grid column @@ -49,16 +49,16 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Price extends Mage_Adminh public function render(Varien_Object $row) { if ($data = $row->getData($this->getColumn()->getIndex())) { - $currency_code = $this->_getCurrencyCode($row); + $currency_code = $this->_getCurrencyCode($row); - if (!$currency_code) { - return $data; - } + if (!$currency_code) { + return $data; + } - $data = floatval($data) * $this->_getRate($row); - $data = sprintf("%f", $data); - $data = Mage::app()->getLocale()->currency($currency_code)->toCurrency($data); - return $data; + $data = floatval($data) * $this->_getRate($row); + $data = sprintf("%f", $data); + $data = Mage::app()->getLocale()->currency($currency_code)->toCurrency($data); + return $data; } return $this->getColumn()->getDefault(); } @@ -89,4 +89,4 @@ public function renderCss() { return parent::renderCss() . ' a-right'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php index 5bfb7d5fdb..460859c485 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php index e69078f2fa..a6d8aeafb2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,7 +46,7 @@ public function render(Varien_Object $row) $html = ''; diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php index 505b908849..85ed87a356 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php index 40ba7610f2..4dba178894 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,4 +69,4 @@ public function _getValue(Varien_Object $row) return htmlspecialchars($format); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php index e3aea97fc2..6aea650b02 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,4 +56,4 @@ public function render(Varien_Object $row) } return $wrappedLine; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php index 05381dc54f..c6466c0ae3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php index da2283d699..29eb48ad15 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php index d7edc283d7..31159a230c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php index 69ea1f174c..296c596aaf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php index 4c2ed063b6..b15176f1a9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php index 132c9f444c..9ecf29e06d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php index 52a39ddd07..35b4e224bf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php @@ -1,41 +1,41 @@ - - */ -interface Mage_Adminhtml_Block_Widget_Tab_Interface -{ - public function getTabLabel(); - public function getTabTitle(); - public function canShowTab(); - public function isHidden(); -} + + */ +interface Mage_Adminhtml_Block_Widget_Tab_Interface +{ + public function getTabLabel(); + public function getTabTitle(); + public function canShowTab(); + public function isHidden(); +} diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php index 0eecc61065..ed7e007481 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php index c9af014ca5..b78445fc9e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php index 2cb4ef58a6..a092f3b1d8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php index 7994a9346b..420c8e0664 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Action.php +++ b/app/code/core/Mage/Adminhtml/Controller/Action.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php index a6913063b4..19ca059191 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -132,4 +132,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('sales/creditmemo'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php index f7bbfd08a9..a864f7e553 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php index 96c6a13fcd..4fa6728bf9 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -117,4 +117,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('sales/shipment'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Exception.php b/app/code/core/Mage/Adminhtml/Exception.php index f3378b1a14..c076a528e5 100644 --- a/app/code/core/Mage/Adminhtml/Exception.php +++ b/app/code/core/Mage/Adminhtml/Exception.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog.php b/app/code/core/Mage/Adminhtml/Helper/Catalog.php index 5043b98839..e41e9de032 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php index 5285272b1f..ff0329d97d 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php index 19f54978f2..73e39f9774 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php index 56fb1cc505..a8869c6683 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,9 +56,9 @@ public function getDatePeriods() return array( '24h'=>$this->__('Last 24 hours'), '7d'=>$this->__('Last 7 days'), - '1m'=>$this->__('Current Month'), - '1y'=>$this->__('YTD'), - '2y'=>$this->__('2YTD') + '1m'=>$this->__('Current Month'), + '1y'=>$this->__('YTD'), + '2y'=>$this->__('2YTD') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php index b2f85f81fa..ae3ce97318 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Helper/Data.php b/app/code/core/Mage/Adminhtml/Helper/Data.php index b4f350c8ea..9dec87048f 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Data.php +++ b/app/code/core/Mage/Adminhtml/Helper/Data.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Helper/Js.php b/app/code/core/Mage/Adminhtml/Helper/Js.php index 8ad3cde085..cd87ba6c46 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Js.php +++ b/app/code/core/Mage/Adminhtml/Helper/Js.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,24 +35,37 @@ class Mage_Adminhtml_Helper_Js extends Mage_Core_Helper_Js { /** * Decode serialized grid data - * - * If string is in next format: 1&2&3&4, - * than this method convert it to enumerated array + * + * Ignores non-numeric array keys + * + * '1&2&3&4' will be decoded into: + * array(1, 2, 3, 4); + * + * otherwise the following format is anticipated: + * 1=&2=: + * array ( + * 1 => array(...), + * 2 => array(...), + * ) * * @param string $encoded * @return array */ - public function decodeInput($encoded) + public function decodeGridSerializedInput($encoded) { - $_data = array(); - parse_str($encoded, $data); - foreach($data as $key=>$value) { - if (empty($value)) { - $_data[] = $key; + $isSimplified = (false === strpos($encoded, '=')); + $result = array(); + parse_str($encoded, $decoded); + foreach($decoded as $key => $value) { + if (is_numeric($key)) { + if ($isSimplified) { + $result[] = $key; + } else { + $result[$key] = null; + parse_str(base64_decode($value), $result[$key]); + } } - parse_str(base64_decode($value), $data[$key]); } - $data = !empty($_data) ? $_data : $data; - return $data; + return $result; } } diff --git a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php index f0164c4e22..e79cbb01c7 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php +++ b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Rss.php b/app/code/core/Mage/Adminhtml/Helper/Rss.php index c2be23ce74..f0ff523fa5 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Rss.php +++ b/app/code/core/Mage/Adminhtml/Helper/Rss.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ public function authAdmin($path) Mage::helper('core/http')->authFailed(); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/Config.php b/app/code/core/Mage/Adminhtml/Model/Config.php index 37047aae53..55622e32e4 100644 --- a/app/code/core/Mage/Adminhtml/Model/Config.php +++ b/app/code/core/Mage/Adminhtml/Model/Config.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php index cf70a78498..bfb2c0e617 100644 --- a/app/code/core/Mage/Adminhtml/Model/Config/Data.php +++ b/app/code/core/Mage/Adminhtml/Model/Config/Data.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php index 8f502eaa69..f1e8cff19e 100644 --- a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -80,7 +80,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) .$element->serialize($htmlAttributes).'>'."\n"; foreach ($regionCollection as $region) { $selected = ($regionId==$region->getId()) ? ' selected="selected"' : ''; - $html.= ''; + $html.= ''; } $html.= ''; $element->setClass($elementClass); diff --git a/app/code/core/Mage/Adminhtml/Model/Extension.php b/app/code/core/Mage/Adminhtml/Model/Extension.php index ce663c42a5..2457479281 100644 --- a/app/code/core/Mage/Adminhtml/Model/Extension.php +++ b/app/code/core/Mage/Adminhtml/Model/Extension.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Varien/Pear/Package.php'; @@ -76,7 +76,7 @@ protected function _setPackage($pfm) $pfm->setPackageType('php'); $pfm->setChannel($this->getData('channel')); - $pfm->setLicense($this->getData('license'), $this->getData('license_uri')); + $pfm->setLicense($this->getData('license'), $this->getData('license_uri')); $pfm->setPackage($this->getData('name')); $pfm->setSummary($this->getData('summary')); @@ -314,10 +314,10 @@ public function createPackage() if (!Mage::getConfig()->createDirIfNotExists($dir)) { return false; } - $curDir = getcwd(); - chdir($dir); + $curDir = getcwd(); + chdir($dir); $result = $pear->run('mage-package', array(), array('package.xml')); - chdir($curDir); + chdir($curDir); if ($result instanceof PEAR_Error) { return $result; } diff --git a/app/code/core/Mage/Adminhtml/Model/Extension/Collection.php b/app/code/core/Mage/Adminhtml/Model/Extension/Collection.php index af592f03f4..f55d03698b 100644 --- a/app/code/core/Mage/Adminhtml/Model/Extension/Collection.php +++ b/app/code/core/Mage/Adminhtml/Model/Extension/Collection.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/Extension/Local/Collection.php b/app/code/core/Mage/Adminhtml/Model/Extension/Local/Collection.php index f78732fb42..5f50f895d3 100644 --- a/app/code/core/Mage/Adminhtml/Model/Extension/Local/Collection.php +++ b/app/code/core/Mage/Adminhtml/Model/Extension/Local/Collection.php @@ -1,5 +1,28 @@ getAllItems() as $item) { - $productIds[] = $item->getProductId(); + $productIds[] = $item->getProductId(); } $productCollection = Mage::getModel('catalog/product')->getCollection() @@ -69,14 +69,14 @@ public function checkRelation(Mage_Sales_Model_Order $order) $hasBadItems = false; foreach ($order->getAllItems() as $item) { - if (!$productCollection->getItemById($item->getProductId())) { - $this->_getSession()->addError( - Mage::helper('adminhtml')->__('The item %s (SKU %s) doesn\'t exist in the catalog anymore', - $item->getName(), - $item->getSku() + if (!$productCollection->getItemById($item->getProductId())) { + $this->_getSession()->addError( + Mage::helper('adminhtml')->__('The item %s (SKU %s) doesn\'t exist in the catalog anymore', + $item->getName(), + $item->getSku() )); $hasBadItems = true; - } + } } if ($hasBadItems) { $this->_getSession()->addError( diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php index 11026468ed..4f77ab4b51 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -1222,13 +1222,13 @@ protected function _putCustomerIntoQuote() ->setDefaultShipping($shippingAddress->getId()); } elseif (($customer = $this->getSession()->getCustomer()) && $customer->getId() - && !$this->getSession()->getCustomer(true,true)->getId()) - { - $customer = clone $customer; - $customer->setStore($this->getSession()->getStore()) - ->save(); - $this->getSession()->setCustomer($customer); - $customer->addData($this->getData('account')); + && !$this->getSession()->getCustomer(true,true)->getId()) + { + $customer = clone $customer; + $customer->setStore($this->getSession()->getStore()) + ->save(); + $this->getSession()->setCustomer($customer); + $customer->addData($this->getData('account')); } else { $customer = $this->getSession()->getCustomer(); $customer->addData($this->getData('account')); @@ -1369,4 +1369,4 @@ protected function _getNewCustomerEmail($customer) } return $email; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php index a2af9edc12..a0123e2645 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php @@ -18,10 +18,10 @@ * 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 Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -170,4 +170,4 @@ public function save() $this->_quote->save(); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php index 6070efa804..53f2de8e25 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,4 +58,4 @@ public function load() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php index b07f766214..3b407c38c9 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Order.php b/app/code/core/Mage/Adminhtml/Model/Search/Order.php index 2ba1cb5b9a..efa838dd60 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Order.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Order.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_Search_Order extends Varien_Object { diff --git a/app/code/core/Mage/Adminhtml/Model/Session.php b/app/code/core/Mage/Adminhtml/Model/Session.php index 12c82aa429..b2c39bbf10 100644 --- a/app/code/core/Mage/Adminhtml/Model/Session.php +++ b/app/code/core/Mage/Adminhtml/Model/Session.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php index be7fa44394..6d86975c96 100644 --- a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php +++ b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -100,7 +100,7 @@ public function getQuote() /** * Set customer model object - * To enable quick switch of preconfigured customer + * To enable quick switch of preconfigured customer * @param Mage_Customer_Model_Customer $customer * @return Mage_Adminhtml_Model_Session_Quote */ @@ -109,11 +109,11 @@ public function setCustomer(Mage_Customer_Model_Customer $customer) $this->_customer = $customer; return $this; } - + /** * Retrieve customer model object * @param bool $forceReload - * @param bool $useSetStore + * @param bool $useSetStore * @return Mage_Customer_Model_Customer */ public function getCustomer($forceReload=false, $useSetStore=false) @@ -121,7 +121,7 @@ public function getCustomer($forceReload=false, $useSetStore=false) if (is_null($this->_customer) || $forceReload) { $this->_customer = Mage::getModel('customer/customer'); if ($useSetStore && $this->getStore()->getId()) { - $this->_customer->setStore($this->getStore()); + $this->_customer->setStore($this->getStore()); } if ($customerId = $this->getCustomerId()) { $this->_customer->load($customerId); diff --git a/app/code/core/Mage/Adminhtml/Model/Sitemap/Sitemap.php b/app/code/core/Mage/Adminhtml/Model/Sitemap/Sitemap.php index e69de29bb2..8b13789179 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sitemap/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Model/Sitemap/Sitemap.php @@ -0,0 +1 @@ + diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php index 9930298bc2..9c82ff85fb 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,4 +72,4 @@ public function _afterSave() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php index f584079461..095d7f2722 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,4 +47,4 @@ protected function _beforeSave() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php index e1b7c6e4fa..b926c149b5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ protected function _afterSave() Mage::getSingleton('adminhtml/url')->renewSecretUrls(); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php index f96949b3a9..360d65ff97 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,9 +43,9 @@ protected function _beforeSave() * If value is special ({{}}) we don't need add slash */ if (!preg_match('#}}$#', $value)) { - $value.= '/'; + $value.= '/'; } - + $this->setValue($value); return $this; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php index 4f2962ed45..5ef31c65b3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php @@ -1,50 +1,50 @@ -isValueChanged()) { - Mage::app()->cleanCache($this->_cacheTags); - } - } -} +isValueChanged()) { + Mage::app()->cleanCache($this->_cacheTags); + } + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php index 7a5170fc62..914dc42afd 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php @@ -1,57 +1,57 @@ - - */ -class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock - extends Mage_Core_Model_Config_Data -{ -/** - * After change Catalog Inventory Manage value process - * - * @return Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock - */ - protected function _afterSave() - { - $newValue = $this->getValue(); - $oldValue = Mage::getConfig()->getNode( - Mage_CatalogSearch_Model_Fulltext::XML_PATH_CATALOG_SEARCH_TYPE, - $this->getScope(), - $this->getScopeId() - ); - if ($newValue != $oldValue) { - Mage::getSingleton('cataloginventory/stock_status')->rebuild(); - } - - return $this; - } -} + + */ +class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock + extends Mage_Core_Model_Config_Data +{ +/** + * After change Catalog Inventory Manage value process + * + * @return Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock + */ + protected function _afterSave() + { + $newValue = $this->getValue(); + $oldValue = Mage::getConfig()->getNode( + Mage_CatalogSearch_Model_Fulltext::XML_PATH_CATALOG_SEARCH_TYPE, + $this->getScope(), + $this->getScopeId() + ); + if ($newValue != $oldValue) { + Mage::getSingleton('cataloginventory/stock_status')->rebuild(); + } + + return $this; + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php index 749959f176..d797e58480 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php index d6f1c9f434..5baac0a1c7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,13 +48,13 @@ protected function _afterSave() // Save root $category->setStoreId(0) - ->load($root->getId()); + ->load($root->getId()); $category->setStoreId($storeId) ->save(); foreach ($root->getAllChildNodes() as $node) { - $category->setStoreId(0) - ->load($node->getId()); + $category->setStoreId(0) + ->load($node->getId()); $category->setStoreId($storeId) ->save(); } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php index 75415d4c19..62d6c1a456 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php @@ -1,95 +1,95 @@ - - */ -abstract class Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract extends Mage_Core_Model_Config_Data -{ - /** - * Retrieve allowed currencies for current scope - * - * @return array - */ - protected function _getAllowedCurrencies() - { - if ($this->getData('groups/options/fields/allow/inherit')) { - return explode(',', Mage::getConfig()->getNode('currency/options/allow', $this->getScope(), $this->getScopeId())); - } - return $this->getData('groups/options/fields/allow/value'); - } - - /** - * Retrieve Installed Currencies - * - * @return array - */ - protected function _getInstalledCurrencies() - { - return explode(',', Mage::getStoreConfig('system/currency/installed')); - } - - /** - * Retrieve Base Currency value for current scope - * - * @return string - */ - protected function _getCurrencyBase() - { - if (!$value = $this->getData('groups/options/fields/base/value')) { - $value = Mage::getConfig()->getNode( - Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE, - $this->getScope(), - $this->getScopeId() - ); - } - return strval($value); - } - - /** - * Retrieve Default desplay Currency value for current scope - * - * @return string - */ - protected function _getCurrencyDefault() - { - if (!$value = $this->getData('groups/options/fields/default/value')) { - $value = Mage::getConfig()->getNode( - Mage_Directory_Model_Currency::XML_PATH_CURRENCY_DEFAULT, - $this->getScope(), - $this->getScopeId() - ); - } - return strval($value); - } -} + + */ +abstract class Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract extends Mage_Core_Model_Config_Data +{ + /** + * Retrieve allowed currencies for current scope + * + * @return array + */ + protected function _getAllowedCurrencies() + { + if ($this->getData('groups/options/fields/allow/inherit')) { + return explode(',', Mage::getConfig()->getNode('currency/options/allow', $this->getScope(), $this->getScopeId())); + } + return $this->getData('groups/options/fields/allow/value'); + } + + /** + * Retrieve Installed Currencies + * + * @return array + */ + protected function _getInstalledCurrencies() + { + return explode(',', Mage::getStoreConfig('system/currency/installed')); + } + + /** + * Retrieve Base Currency value for current scope + * + * @return string + */ + protected function _getCurrencyBase() + { + if (!$value = $this->getData('groups/options/fields/base/value')) { + $value = Mage::getConfig()->getNode( + Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE, + $this->getScope(), + $this->getScopeId() + ); + } + return strval($value); + } + + /** + * Retrieve Default desplay Currency value for current scope + * + * @return string + */ + protected function _getCurrencyDefault() + { + if (!$value = $this->getData('groups/options/fields/default/value')) { + $value = Mage::getConfig()->getNode( + Mage_Directory_Model_Currency::XML_PATH_CURRENCY_DEFAULT, + $this->getScope(), + $this->getScopeId() + ); + } + return strval($value); + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php index 2640168749..70418b95ac 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php @@ -1,64 +1,64 @@ - - */ -class Mage_Adminhtml_Model_System_Config_Backend_Currency_Allow extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract -{ - /** - * Check is isset default display currency in allowed currencies - * Check allowed currencies is available in installed currencies - * - * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Allow - */ - protected function _afterSave() - { - $exceptions = array(); - foreach ($this->_getAllowedCurrencies() as $currencyCode) { - if (!in_array($currencyCode, $this->_getInstalledCurrencies())) { - $exceptions[] = Mage::helper('adminhtml')->__('Selected allow currency "%s" is not available in installed currencies', Mage::app()->getLocale()->currency($currencyCode)->getName()); - } - } - - if (!in_array($this->_getCurrencyDefault(), $this->_getAllowedCurrencies())) { - $exceptions[] = Mage::helper('adminhtml')->__('Default display currency "%s" is not available in allowed currencies', Mage::app()->getLocale()->currency($this->_getCurrencyDefault())->getName()); - } - - if ($exceptions) { - Mage::throwException(join("\n", $exceptions)); - } - - return $this; - } -} + + */ +class Mage_Adminhtml_Model_System_Config_Backend_Currency_Allow extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract +{ + /** + * Check is isset default display currency in allowed currencies + * Check allowed currencies is available in installed currencies + * + * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Allow + */ + protected function _afterSave() + { + $exceptions = array(); + foreach ($this->_getAllowedCurrencies() as $currencyCode) { + if (!in_array($currencyCode, $this->_getInstalledCurrencies())) { + $exceptions[] = Mage::helper('adminhtml')->__('Selected allow currency "%s" is not available in installed currencies', Mage::app()->getLocale()->currency($currencyCode)->getName()); + } + } + + if (!in_array($this->_getCurrencyDefault(), $this->_getAllowedCurrencies())) { + $exceptions[] = Mage::helper('adminhtml')->__('Default display currency "%s" is not available in allowed currencies', Mage::app()->getLocale()->currency($this->_getCurrencyDefault())->getName()); + } + + if ($exceptions) { + Mage::throwException(join("\n", $exceptions)); + } + + return $this; + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php index 162dfe197c..bfd2aa4d10 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php @@ -1,53 +1,53 @@ - - */ -class Mage_Adminhtml_Model_System_Config_Backend_Currency_Base extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract -{ - /** - * Check base currency is available in installed currencies - * - * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Base - */ - protected function _afterSave() - { - if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) { - Mage::throwException(Mage::helper('adminhtml')->__('Selected base currency is not available in installed currencies')); - } - - return $this; - } -} - + + */ +class Mage_Adminhtml_Model_System_Config_Backend_Currency_Base extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract +{ + /** + * Check base currency is available in installed currencies + * + * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Base + */ + protected function _afterSave() + { + if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) { + Mage::throwException(Mage::helper('adminhtml')->__('Selected base currency is not available in installed currencies')); + } + + return $this; + } +} + diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php index 9358402af3..372dbcbc80 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php index 33789f1f8e..c6bc405b17 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php @@ -1,57 +1,57 @@ - - */ -class Mage_Adminhtml_Model_System_Config_Backend_Currency_Default extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract -{ - /** - * Check default currency is available in installed currencies - * Check default currency is available in allowed currencies - * - * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Default - */ - protected function _afterSave() - { - if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) { - Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in installed currencies')); - } - - if (!in_array($this->getValue(), $this->_getAllowedCurrencies())) { - Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in allowed currencies')); - } - - return $this; - } -} + + */ +class Mage_Adminhtml_Model_System_Config_Backend_Currency_Default extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract +{ + /** + * Check default currency is available in installed currencies + * Check default currency is available in allowed currencies + * + * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Default + */ + protected function _afterSave() + { + if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) { + Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in installed currencies')); + } + + if (!in_array($this->getValue(), $this->_getAllowedCurrencies())) { + Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in allowed currencies')); + } + + return $this; + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php index 474bbd9662..0da4e28e4f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ protected function _afterSave() { #echo "
".print_r($configData,1)."
"; die; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php index 6409624934..eec106c178 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Backend_Design_Package extends Mage_Core_Model_Config_Data @@ -36,4 +36,4 @@ protected function _beforeSave() throw new Exception('package with this name does not exist and cannot be set.'); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php index a6971421d6..2695e1c793 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,8 +38,8 @@ protected function _beforeSave() { $value = $this->getValue(); if (!Zend_Validate::is($value, 'EmailAddress')) { - Mage::throwException(Mage::helper('adminhtml')->__('Invalid email address "%s"', $value)); + Mage::throwException(Mage::helper('adminhtml')->__('Invalid email address "%s"', $value)); } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php index eb129ad66f..1c4f1360ae 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,4 +42,4 @@ protected function _beforeSave() } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php index 9381443f7a..9e9255eec9 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php index 800126d377..0a9b4ccead 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php index 1895248207..4e27c0b1a2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ protected function _getAllowedExtensions() { return array('tif', 'tiff', 'png', 'jpg', 'jpe', 'jpeg'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php index c357f930e5..5995cd2325 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php index 3cc42063e3..44cfd5f2ce 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php index bb3586cdf2..e82e0fc628 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,4 +85,4 @@ protected function _afterSave() Mage::throwException(Mage::helper('adminhtml')->__('Unable to save Cron expression')); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php index c8f3e10767..de5087d852 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ class Mage_Adminhtml_Model_System_Config_Backend_Price_Scope extends Mage_Core_M { // protected $_eventPrefix = 'system_config_price_scope'; // protected $_eventObject = 'option'; -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php index 758534d971..ffd4ff7cf3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,4 +78,4 @@ protected function _afterSave() throw new Exception(Mage::helper('cron')->__('Unable to save Cron expression')); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php index 4884db8a9b..d8641626f5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php index 8d930ac874..b570a4c2e7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Backend_Serialized extends Mage_Core_Model_Config_Data @@ -39,4 +39,4 @@ protected function _beforeSave() $this->setValue(serialize($this->getValue())); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php index 69719ed196..7e68bbd000 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php index df41fd4745..dc2d3cace2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php index a192362e85..e32a31d217 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,11 +31,11 @@ class Mage_Adminhtml_Model_System_Config_Backend_Sitemap extends Mage_Core_Model protected function _beforeSave() { $value = $this->getValue(); - if ($value < 0 || $value > 1) { - throw new Exception(Mage::helper('sitemap')->__('Priority must be between 0 and 1')); - } elseif (($value == 0) && !($value === '0' || $value === '0.0')) { - throw new Exception(Mage::helper('sitemap')->__('Priority must be between 0 and 1')); - } + if ($value < 0 || $value > 1) { + throw new Exception(Mage::helper('sitemap')->__('Priority must be between 0 and 1')); + } elseif (($value == 0) && !($value === '0' || $value === '0.0')) { + throw new Exception(Mage::helper('sitemap')->__('Priority must be between 0 and 1')); + } return $this; } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php index 70b2114ee7..b114ce12ea 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php index 368fae109d..f623fd4f9b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ protected function _afterSave() Mage::app()->getStore()->setConfig(Mage_Core_Model_Store::XML_PATH_STORE_IN_URL, $this->getValue()); Mage::app()->cleanCache(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php index 40e77bd526..122b4dfdaf 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php index 33ea6d5bec..ec3f5046c3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -160,4 +160,4 @@ protected function _getHelperValue(Varien_Simplexml_Element $child) return Mage::helper($helperName)->__((string)$child->$titleNodeName); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php index 9c5a1720aa..f6454d2977 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,4 +68,4 @@ public function sortRegionCountries($a, $b) { return strcmp($this->_countries[$a], $this->_countries[$b]); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php index f6ad93c224..5ca80b7c3f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function toOptionArray() //$result[] = array('value' => 'all', 'label' => Mage::helper('catalog')->__('All')); return $result; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php index 799f340099..b59a2e9a83 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function toOptionArray() array('value'=>'list-grid', 'label'=>Mage::helper('adminhtml')->__('List (default) / Grid')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php index c829c6b569..3657eab4bb 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php index f554199c14..1ac3e16f1c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php @@ -1,66 +1,66 @@ - - */ -class Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort -{ - /** - * Retrieve option values array - * - * @return array - */ - public function toOptionArray() - { - $options = array(); - $options[] = array( - 'label' => Mage::helper('catalog')->__('Best Value'), - 'value' => 'position' - ); - foreach ($this->_getCatalogConfig()->getAttributesUsedForSortBy() as $attribute) { - $options[] = array( - 'label' => Mage::helper('catalog')->__($attribute['frontend_label']), - 'value' => $attribute['attribute_code'] - ); - } - return $options; - } - - /** - * Retrieve Catalog Config Singleton - * - * @return Mage_Catalog_Model_Config - */ - protected function _getCatalogConfig() { - return Mage::getSingleton('catalog/config'); - } -} + + */ +class Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort +{ + /** + * Retrieve option values array + * + * @return array + */ + public function toOptionArray() + { + $options = array(); + $options[] = array( + 'label' => Mage::helper('catalog')->__('Best Value'), + 'value' => 'position' + ); + foreach ($this->_getCatalogConfig()->getAttributesUsedForSortBy() as $attribute) { + $options[] = array( + 'label' => Mage::helper('catalog')->__($attribute['frontend_label']), + 'value' => $attribute['attribute_code'] + ); + } + return $options; + } + + /** + * Retrieve Catalog Config Singleton + * + * @return Mage_Catalog_Model_Config + */ + protected function _getCatalogConfig() { + return Mage::getSingleton('catalog/config'); + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php index 21084f27ef..a88190fd31 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php index 2b2c41bf82..e8ef8beb21 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat @@ -33,4 +33,4 @@ public function toOptionArray() array('value' => '24h', 'label' => Mage::helper('adminhtml')->__('24h')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php index a2c5fdf92c..9e2f97e291 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php index 91b6727601..ab3ed94788 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Cms_Page { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php index a78699848a..efab44a6cf 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,4 +42,4 @@ public function toOptionArray($isMultiselect=false) return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php index 9d91a2d4a5..bb50873720 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,4 +30,4 @@ class Mage_Adminhtml_Model_System_Config_Source_Country_Full extends Mage_Adminh public function toOptionArray($isMultiselect=false) { return parent::toOptionArray(true); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php index 01ef6b1d54..33d617514f 100755 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php index b528f0efa4..e7bae47de9 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function toOptionArray($isMultiselect) $options = $this->_options; return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php index 53af818aa3..36f13392e4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function toOptionArray($isMultiselect) return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php index 29938d3844..07cec88d21 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function toOptionArray() } return $this->_options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php index 498e372b95..9d504357b8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function toOptionArray() $arr[] = array('label'=>strftime('DD/MM/YYYY (%d/%m/%Y)'), 'value'=>'%d/%m/%Y'); return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php index da37e8d56b..afe89991bf 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Package { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php index 7a94e20bb8..e6a2c9be8e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php @@ -18,22 +18,22 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Design_Robots { - public function toOptionArray() - { - return array( - array('value'=>'INDEX,FOLLOW', 'label'=>'INDEX, FOLLOW'), - array('value'=>'NOINDEX,FOLLOW', 'label'=>'NOINDEX, FOLLOW'), - array('value'=>'INDEX,NOFOLLOW', 'label'=>'INDEX, NOFOLLOW'), - array('value'=>'NOINDEX,NOFOLLOW', 'label'=>'NOINDEX, NOFOLLOW'), - ); - } -} \ No newline at end of file + public function toOptionArray() + { + return array( + array('value'=>'INDEX,FOLLOW', 'label'=>'INDEX, FOLLOW'), + array('value'=>'NOINDEX,FOLLOW', 'label'=>'NOINDEX, FOLLOW'), + array('value'=>'INDEX,NOFOLLOW', 'label'=>'INDEX, NOFOLLOW'), + array('value'=>'NOINDEX,NOFOLLOW', 'label'=>'NOINDEX, NOFOLLOW'), + ); + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php index 0c8d7b635f..4797b927e9 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Dev_Dbautoup { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php index b74bf69cd1..8c0d0ca563 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,4 +47,4 @@ public function toOptionArray() return $this->_options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php index fb0049e911..0f48834cbe 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,4 +48,4 @@ public function toOptionArray() ); return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php index dee352b884..7131870e33 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function toOptionArray() array('value'=>'CRAM-MD5', 'label'=>'CRAM-MD5'), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php index 6a0b23965f..3761329bec 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php index 7a16896192..21529186e5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function toOptionArray() array('value'=>0, 'label'=>Mage::helper('adminhtml')->__('Disable')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php index f6239a9e38..f27abd6c86 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function toOptionArray() array('value'=>'never', 'label'=>Mage::helper('sitemap')->__('Never')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php index 4fd2c72d1a..c11d7ba28d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php index 8756bf645c..eb52cd9006 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php @@ -18,10 +18,10 @@ * 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 Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php index 5d8763d6a3..a12a1d45a1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php @@ -18,10 +18,10 @@ * 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 Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php index ad4643dd16..2ef5fe321e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php @@ -18,10 +18,10 @@ * 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 Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php index d550ba1760..1036c855bf 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php @@ -1,43 +1,43 @@ -_options) { - $this->_options = Mage::app()->getLocale()->getOptionAllCurrencies(); - } - $options = $this->_options; - if(!$isMultiselect){ - array_unshift($options, array('value'=>'', 'label'=>'')); - } - - return $options; - } -} \ No newline at end of file +_options) { + $this->_options = Mage::app()->getLocale()->getOptionAllCurrencies(); + } + $options = $this->_options; + if(!$isMultiselect){ + array_unshift($options, array('value'=>'', 'label'=>'')); + } + + return $options; + } +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php index a8414aac35..f8233d41ca 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php @@ -18,10 +18,10 @@ * 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 Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php index 384ddb2f47..6aea7b139d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php @@ -18,10 +18,10 @@ * 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 Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php index 7428c15e01..e0c58381e1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Nooptreq { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php index 583c7df957..e6879bbbfc 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,4 +44,4 @@ public function toOptionArray() 24 => Mage::helper('adminhtml')->__('24 Hours') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php index 2e3a16b437..0847986144 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,14 +50,14 @@ public function toOptionArray() } $options = array(); $options[] = array( - 'value' => '', - 'label' => Mage::helper('adminhtml')->__('-- Please Select --') - ); + 'value' => '', + 'label' => Mage::helper('adminhtml')->__('-- Please Select --') + ); foreach ($statuses as $code=>$label) { - $options[] = array( - 'value' => $code, - 'label' => $label - ); + $options[] = array( + 'value' => $code, + 'label' => $label + ); } return $options; } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php index 5a5e7c101b..61d0d5ec37 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php index 26e4df9991..d182cc1636 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php index 347c98cc83..0e0e2a3582 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php index 51f0000001..a1ab5567f1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Payment_Allmethods @@ -44,4 +44,4 @@ public function toOptionArray() return $methods; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php index c90fe05970..53c85b1aa0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Payment_Allowedmethods @@ -46,4 +46,4 @@ protected function _getPaymentMethods() // // return $methods; // } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php index 554c23b5ef..5da8827a9c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function toOptionArray() array('value'=>1, 'label'=>Mage::helper('adminhtml')->__('Specific Countries')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php index 9df909e2dd..d7a10e1ed0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php @@ -18,25 +18,25 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - + class Mage_Adminhtml_Model_System_Config_Source_Payment_Cctype { public function toOptionArray() { $options = array(); - + foreach (Mage::getSingleton('payment/config')->getCcTypes() as $code => $name) { - $options[] = array( - 'value' => $code, - 'label' => $name - ); + $options[] = array( + 'value' => $code, + 'label' => $name + ); } - + return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Standardtypes.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Standardtypes.php index 7ffd0d11a6..202491fc0d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Standardtypes.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Standardtypes.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function toOptionArray() //array('value'=>'PDT', 'label'=>Mage::helper('adminhtml')->__('Payment Data Transfer (PDT)')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Transactiontype.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Transactiontype.php index e341e10930..e4ccc6dfee 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Transactiontype.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Transactiontype.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php index 845dd5d3d6..51a53b24c2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function toOptionArray() array('value'=>'1', 'label'=>Mage::helper('core')->__('Website')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php index de6e75b9b9..0178844202 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,4 +40,4 @@ public function toOptionArray() array('value' => 'percent', 'label' => Mage::helper('adminhtml')->__('Percent')) ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php index e181ede11f..5f495ed188 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,4 +62,4 @@ public function toOptionArray() return $groups; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php index 566dfffa65..4e4eb8eef4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,4 +40,4 @@ public function toOptionArray() array('value'=>'parent', 'label'=>Mage::helper('adminhtml')->__('Parent Product Thumbnail')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php index 416b3952e6..94bfdd2ea0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php @@ -1,48 +1,48 @@ - - */ -class Mage_Adminhtml_Model_System_Config_Source_Reports_Scope -{ - /** - * Scope filter - */ - public function toOptionArray() - { - return array( - array('value'=>'website', 'label'=>Mage::helper('adminhtml')->__('Website')), - array('value'=>'group', 'label'=>Mage::helper('adminhtml')->__('Store')), - array('value'=>'store', 'label'=>Mage::helper('adminhtml')->__('Store View')), - ); - } - -} \ No newline at end of file + + */ +class Mage_Adminhtml_Model_System_Config_Source_Reports_Scope +{ + /** + * Scope filter + */ + public function toOptionArray() + { + return array( + array('value'=>'website', 'label'=>Mage::helper('adminhtml')->__('Website')), + array('value'=>'group', 'label'=>Mage::helper('adminhtml')->__('Store')), + array('value'=>'store', 'label'=>Mage::helper('adminhtml')->__('Store View')), + ); + } + +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php index 9d05ec5dcb..4a8e03f8c5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Shipping_Allmethods @@ -60,4 +60,4 @@ public function toOptionArray($isActiveOnlyFlag=false) return $methods; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php index d74fa40481..f5e444fbe4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Shipping_Allowedmethods @@ -32,4 +32,4 @@ public function toOptionArray() return parent::toOptionArray(true); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php index af4c5ece87..9eadcff0fe 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function toOptionArray() array('value'=>1, 'label'=>Mage::helper('adminhtml')->__('Specific Countries')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php index 6fe29f2a0d..091c340cf0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php index c0de1a654c..42ee09eeb3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php index 34d5347981..a6d2834732 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Shipping_Taxclass { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php index bef38a7c74..723ba6588b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function toOptionArray() } return $this->_options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php index 36f0489fa7..adad3f4412 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php @@ -1,36 +1,36 @@ -0, 'label'=>Mage::helper('tax')->__('Custom price if available')), - array('value'=>1, 'label'=>Mage::helper('tax')->__('Original price only')), - ); - } - -} +0, 'label'=>Mage::helper('tax')->__('Custom price if available')), + array('value'=>1, 'label'=>Mage::helper('tax')->__('Original price only')), + ); + } + +} diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php index b19de5a1b5..dfe9fe6f4f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Tax_Basedon { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php index 0793f3246d..be2971c929 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Tax_Catalog { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php index 82e1d7c7f1..ae283373d2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php index 52cb9642fc..8acdd5fff2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Web_Protocol { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php index 7419f9bfb5..f9272ceda2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php index 7f0f6085a0..e3028f3bc6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_System_Config_Source_Yesno { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Store.php index f958984205..01fca3ad3a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Store.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -167,12 +167,19 @@ public function getStoreValuesForForm($empty = false, $all = false) return $options; } + /** + * Website label/value array getter, compatible with form dropdown options + * + * @param bool $empty + * @param bool $all + * @return array + */ public function getWebsiteValuesForForm($empty = false, $all = false) { $options = array(); if ($empty) { $options[] = array( - 'label' => '', + 'label' => Mage::helper('adminhtml')->__('-- Please Select --'), 'value' => '' ); } @@ -310,7 +317,7 @@ public function getStoreNameWithWebsite($storeId) if (is_array($storeId)) { $names = array(); foreach ($storeId as $id) { - $names[]= $this->getStoreNameWithWebsite($id); + $names[]= $this->getStoreNameWithWebsite($id); } $name = implode(', ', $names); } @@ -399,7 +406,7 @@ public function getStoreNamePath($storeId) if (is_array($storeId)) { $names = array(); foreach ($storeId as $id) { - $names[]= $this->getStoreNamePath($id); + $names[]= $this->getStoreNamePath($id); } $name = implode(', ', $names); } diff --git a/app/code/core/Mage/Adminhtml/Model/Url.php b/app/code/core/Mage/Adminhtml/Model/Url.php index 2915ee133f..3943a0417e 100644 --- a/app/code/core/Mage/Adminhtml/Model/Url.php +++ b/app/code/core/Mage/Adminhtml/Model/Url.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Model_Url extends Mage_Core_Model_Url { diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php index 2eaeb876c3..2016358fd4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -190,4 +190,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('api/roles'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php index 1391ec045a..d8f35af352 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Api_UserController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php index 89c7569c3b..890f7ee3f2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php index 63ab3d8fe2..3842ddfc97 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -191,4 +191,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('catalog/update_attributes'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php index 84f8413d08..3e40c8ce9c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -263,6 +263,6 @@ public function deleteAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('catalog/attributes/attributes'); + return Mage::getSingleton('admin/session')->isAllowed('catalog/attributes/attributes'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php index 045b86fbd7..b06d472097 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ public function indexAction() { } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php index 21525943af..6f274b6393 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -65,4 +65,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('catalog/products'); } -} // Class Mage_Adminhtml_Catalog_Product_GalleryController End \ No newline at end of file +} // Class Mage_Adminhtml_Catalog_Product_GalleryController End diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php index ab0efb14d1..bf7e4bead2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php @@ -18,20 +18,15 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * - * @category Mage - * @package Mage_Adminhtml - * @author Magento Core Team + * @deprecated after 1.4.0.0-alpha2 */ - class Mage_Adminhtml_Catalog_Product_GroupController extends Mage_Adminhtml_Controller_Action { public function saveAction() @@ -51,7 +46,7 @@ public function saveAction() } } } - + protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('catalog/products'); diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php index 5ab193b39b..c6f64fc15e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,7 +34,7 @@ class Mage_Adminhtml_Catalog_Product_ReviewController extends Mage_Adminhtml_Controller_Action { - public function indexAction() + public function indexAction() { if ($this->getRequest()->getParam('ajax')) { return $this->_forward('reviewGrid'); @@ -290,10 +290,10 @@ public function postAction() $arrRatingId = $this->getRequest()->getParam('ratings', array()); foreach ($arrRatingId as $ratingId=>$optionId) { - Mage::getModel('rating/rating') - ->setRatingId($ratingId) - ->setReviewId($review->getId()) - ->addOptionVote($optionId, $productId); + Mage::getModel('rating/rating') + ->setRatingId($ratingId) + ->setReviewId($review->getId()) + ->addOptionVote($optionId, $productId); } $review->aggregate(); @@ -322,13 +322,13 @@ public function ratingItemsAction() protected function _isAllowed() { - switch ($this->getRequest()->getActionName()) { + switch ($this->getRequest()->getActionName()) { case 'pending': return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/reviews/pending'); break; default: return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/reviews/all'); break; - } + } } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php index 92d264b331..ff1fc16ed8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -170,4 +170,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('catalog/attributes/sets'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php index a60852c36e..96ae179e7b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -509,16 +509,16 @@ protected function _initProductSave() */ $links = $this->getRequest()->getPost('links'); if (isset($links['related']) && !$product->getRelatedReadonly()) { - $product->setRelatedLinkData($this->_decodeInput($links['related'])); + $product->setRelatedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['related'])); } - if (isset($links['upsell']) && !$product->getUpsellReadonly()) { - $product->setUpSellLinkData($this->_decodeInput($links['upsell'])); + if (isset($links['upsell']) && !$product->getUpsellReadonly()) { + $product->setUpSellLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['upsell'])); } - if (isset($links['crosssell']) && !$product->getCrosssellReadonly()) { - $product->setCrossSellLinkData($this->_decodeInput($links['crosssell'])); + if (isset($links['crosssell']) && !$product->getCrosssellReadonly()) { + $product->setCrossSellLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['crosssell'])); } - if (isset($links['grouped']) && !$product->getGroupedReadonly()) { - $product->setGroupedLinkData($this->_decodeInput($links['grouped'])); + if (isset($links['grouped']) && !$product->getGroupedReadonly()) { + $product->setGroupedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['grouped'])); } /** @@ -653,10 +653,7 @@ public function duplicateAction() } /** - * Decode strings for linked products - * - * @param string $encoded - * @return array + * @deprecated since 1.4.0.0-alpha2 */ protected function _decodeInput($encoded) { @@ -664,7 +661,6 @@ protected function _decodeInput($encoded) foreach($data as $key=>$value) { parse_str(base64_decode($value), $data[$key]); } - return $data; } diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php index 654ba75889..2381095f84 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -165,6 +165,6 @@ public function massDeleteAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('catalog/search'); + return Mage::getSingleton('admin/session')->isAllowed('catalog/search'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php index b72fc2ca77..b5a067cc5b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,6 +45,6 @@ public function indexAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('catalog'); + return Mage::getSingleton('admin/session')->isAllowed('catalog'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php index b2376e958b..313a20a58d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -145,6 +145,6 @@ protected function _initAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('sales/checkoutagreement'); + return Mage::getSingleton('admin/session')->isAllowed('sales/checkoutagreement'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php index 939c97adef..a672951918 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php index e219d32846..fcfc251ecb 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php index ac4ab03354..5aaa846c45 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,6 +50,6 @@ public function indexAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('customer/config'); + return Mage::getSingleton('admin/session')->isAllowed('customer/config'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php index ce37e2ac2d..383342ce8f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -145,6 +145,6 @@ public function deleteAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('customer/group'); + return Mage::getSingleton('admin/session')->isAllowed('customer/group'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php index c77cd87971..37e8277608 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php @@ -18,20 +18,20 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Customer_OnlineController extends Mage_Adminhtml_Controller_Action { public function indexAction() { - if($this->getRequest()->getParam('ajax')) { - $this->_forward('grid'); - return; - } + if($this->getRequest()->getParam('ajax')) { + $this->_forward('grid'); + return; + } $this->loadLayout(); @@ -47,6 +47,6 @@ public function indexAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('customer/online'); + return Mage::getSingleton('admin/session')->isAllowed('customer/online'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php index 5debd35331..a4f723cb57 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -151,7 +151,7 @@ public function deleteAction() public function saveAction() { if ($data = $this->getRequest()->getPost()) { - $redirectBack = $this->getRequest()->getParam('back', false); + $redirectBack = $this->getRequest()->getParam('back', false); $this->_initCustomer('customer_id'); $customer = Mage::registry('current_customer'); @@ -233,11 +233,11 @@ public function saveAction() Mage::dispatchEvent('adminhtml_customer_save_after', array('customer' => $customer)); if ($redirectBack) { - $this->_redirect('*/*/edit', array( - 'id' => $customer->getId(), - '_current'=>true - )); - return; + $this->_redirect('*/*/edit', array( + 'id' => $customer->getId(), + '_current'=>true + )); + return; } } catch (Exception $e){ diff --git a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php index 16354e89ea..0fe18fb2be 100644 --- a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php +++ b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -91,4 +91,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('dashboard'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php index 68f21c9e4a..ec9443c3be 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php @@ -1,5 +1,4 @@ isAllowed('system/extensions/config'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php index 3f145694bf..ecfb94d086 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php @@ -1,5 +1,4 @@ isAllowed('system/extensions'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php index 28aefc008d..6116bdb608 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php @@ -1,5 +1,4 @@ - */ -class Mage_Adminhtml_Extensions_FileController extends Mage_Adminhtml_Controller_Action -{ - public function indexAction() - { - $this->loadLayout(); - - $this->_setActiveMenu('system/extensions'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_file_form')->initForm()); - - $this->renderLayout(); - } - - public function installAction() - { - $params = array('comment'=>Mage::helper('adminhtml')->__("Pending installation...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - switch ($this->getRequest()->getParam('file_type')) { - case 'local': - if (empty($_FILES['local']['tmp_name'])) { - $params['comment'] = Mage::helper('adminhtml')->__("Error uploading the file")."\r\n\r\n"; - break; - } - $tmpDir = Mage::getBaseDir('var').DS.'pear'; - if (!is_dir($tmpDir)) { - mkdir($tmpDir, 0777, true); - } - $pkg = $tmpDir.DS.$_FILES['local']['name']; - move_uploaded_file($_FILES['local']['tmp_name'], $pkg); - - break; - - case 'remote': - $pkg = $this->getRequest()->getParam('remote'); - if (empty($pkg)) { - $params['comment'] = Mage::helper('adminhtml')->__("Invalid URL")."\r\n\r\n"; - } - break; - } - if (!empty($pkg)) { - $params['comment'] = Mage::helper('adminhtml')->__("Installing $pkg, please wait...")."\r\n\r\n"; - $params['command'] = 'install'; - $params['options'] = array(); - $params['params'] = array($pkg); - } - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::getModel('adminhtml/extension')->clearAllCache(); - } - } - - public function upgradeAllAction() - { - $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading all packages, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'upgrade'; - $params['options'] = array(); - $params['params'] = array($pkg); - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - } - } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/extensions'); - } -} \ No newline at end of file + + */ +class Mage_Adminhtml_Extensions_FileController extends Mage_Adminhtml_Controller_Action +{ + public function indexAction() + { + $this->loadLayout(); + + $this->_setActiveMenu('system/extensions'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_file_form')->initForm()); + + $this->renderLayout(); + } + + public function installAction() + { + $params = array('comment'=>Mage::helper('adminhtml')->__("Pending installation...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + switch ($this->getRequest()->getParam('file_type')) { + case 'local': + if (empty($_FILES['local']['tmp_name'])) { + $params['comment'] = Mage::helper('adminhtml')->__("Error uploading the file")."\r\n\r\n"; + break; + } + $tmpDir = Mage::getBaseDir('var').DS.'pear'; + if (!is_dir($tmpDir)) { + mkdir($tmpDir, 0777, true); + } + $pkg = $tmpDir.DS.$_FILES['local']['name']; + move_uploaded_file($_FILES['local']['tmp_name'], $pkg); + + break; + + case 'remote': + $pkg = $this->getRequest()->getParam('remote'); + if (empty($pkg)) { + $params['comment'] = Mage::helper('adminhtml')->__("Invalid URL")."\r\n\r\n"; + } + break; + } + if (!empty($pkg)) { + $params['comment'] = Mage::helper('adminhtml')->__("Installing $pkg, please wait...")."\r\n\r\n"; + $params['command'] = 'install'; + $params['options'] = array(); + $params['params'] = array($pkg); + } + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::getModel('adminhtml/extension')->clearAllCache(); + } + } + + public function upgradeAllAction() + { + $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading all packages, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'upgrade'; + $params['options'] = array(); + $params['params'] = array($pkg); + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + } + } + + protected function _isAllowed() + { + return Mage::getSingleton('admin/session')->isAllowed('system/extensions'); + } +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php index 7fa3f16274..a643ce9d64 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php @@ -1,207 +1,206 @@ - - */ -class Mage_Adminhtml_Extensions_LocalController extends Mage_Adminhtml_Controller_Action -{ - public function indexAction() - { - $url = Mage::getBaseUrl('web').'downloader/?return='.urlencode(Mage::getUrl('adminhtml')); - $this->getResponse()->setRedirect($url); - return; - - $this->loadLayout(); - - $this->_setActiveMenu('system/extensions/local'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local')); - - $this->renderLayout(); - } - - public function gridAction() - { - $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/extensions_local_grid')->toHtml()); - } - - public function editAction() - { - $this->loadLayout(); - - $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); - $ext = Mage::getModel('adminhtml/extension')->loadLocal($pkg); - Mage::register('local_extension', $ext); -#echo "
".print_r($ext->getData(),1)."
"; - $this->_setActiveMenu('system/extensions/local'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local_edit')); - $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_local_edit_tabs')); - - $this->renderLayout(); - } - - public function prepareAction() - { - $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); - $params = array('comment'=>Mage::helper('adminhtml')->__("Preparing to change $pkg, please wait...")."\r\n\r\n"); - Varien_Pear::getInstance()->runHtmlConsole($params); - } - - public function upgradeAction() - { - $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); - $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading $pkg, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'upgrade'; - $params['options'] = array(); - $params['params'] = array($pkg); - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - } - Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); - } - - public function uninstallAction() - { - $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); - $params = array('comment'=>Mage::helper('adminhtml')->__("Uninstalling $pkg, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'uninstall'; - $params['options'] = array(); - $params['params'] = array($pkg); - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - } - Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); - } - - public function upgradeAllAction() - { - $this->loadLayout(); - - $this->_setActiveMenu('system/extensions'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local_upgrade')->initForm()); - - $this->renderLayout(); - } - - public function upgradeAllRunAction() - { - $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading all available packages, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'upgrade-all'; - $params['options'] = array(); - $params['params'] = array(); - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - echo "ALL UPGRADES ARE DONE.\n"; - } else { - echo "ERROR DURING UPGRADES.\n"; - } - Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); - } - - public function massUninstallAction() - { - $this->loadLayout(); - - $this->_setActiveMenu('system/extensions'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_uninstall')->initForm()); - - $this->renderLayout(); - } - - public function massUninstallRunAction() - { - $params = array('comment'=>Mage::helper('adminhtml')->__("Uninstalling selected packages, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'uninstall'; - $params['options'] = array(); - $packages = array(); - foreach ($this->getRequest()->getPost('package') as $package) { - $packages[] = str_replace('|', '/', $package); - } - $params['params'] = $packages; - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - } - Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); - } - - public function massUpgradeAction() - { - $this->loadLayout(); - - $this->_setActiveMenu('system/extensions'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_upgrade')->initForm()); - - $this->renderLayout(); - } - - public function massUpgradeRunAction() - { - $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading selected packages, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'upgrade'; - $params['options'] = array(); - $packages = array(); - foreach ($this->getRequest()->getPost('package') as $package) { - $packages[] = str_replace('|', '/', $package); - } - $params['params'] = $packages; - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - } - Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); - } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/extensions/local'); - } -} \ No newline at end of file + + */ +class Mage_Adminhtml_Extensions_LocalController extends Mage_Adminhtml_Controller_Action +{ + public function indexAction() + { + $url = Mage::getBaseUrl('web').'downloader/?return='.urlencode(Mage::getUrl('adminhtml')); + $this->getResponse()->setRedirect($url); + return; + + $this->loadLayout(); + + $this->_setActiveMenu('system/extensions/local'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local')); + + $this->renderLayout(); + } + + public function gridAction() + { + $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/extensions_local_grid')->toHtml()); + } + + public function editAction() + { + $this->loadLayout(); + + $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); + $ext = Mage::getModel('adminhtml/extension')->loadLocal($pkg); + Mage::register('local_extension', $ext); +#echo "
".print_r($ext->getData(),1)."
"; + $this->_setActiveMenu('system/extensions/local'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local_edit')); + $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_local_edit_tabs')); + + $this->renderLayout(); + } + + public function prepareAction() + { + $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); + $params = array('comment'=>Mage::helper('adminhtml')->__("Preparing to change $pkg, please wait...")."\r\n\r\n"); + Varien_Pear::getInstance()->runHtmlConsole($params); + } + + public function upgradeAction() + { + $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); + $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading $pkg, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'upgrade'; + $params['options'] = array(); + $params['params'] = array($pkg); + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + } + Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); + } + + public function uninstallAction() + { + $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); + $params = array('comment'=>Mage::helper('adminhtml')->__("Uninstalling $pkg, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'uninstall'; + $params['options'] = array(); + $params['params'] = array($pkg); + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + } + Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); + } + + public function upgradeAllAction() + { + $this->loadLayout(); + + $this->_setActiveMenu('system/extensions'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local_upgrade')->initForm()); + + $this->renderLayout(); + } + + public function upgradeAllRunAction() + { + $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading all available packages, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'upgrade-all'; + $params['options'] = array(); + $params['params'] = array(); + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + echo "ALL UPGRADES ARE DONE.\n"; + } else { + echo "ERROR DURING UPGRADES.\n"; + } + Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); + } + + public function massUninstallAction() + { + $this->loadLayout(); + + $this->_setActiveMenu('system/extensions'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_uninstall')->initForm()); + + $this->renderLayout(); + } + + public function massUninstallRunAction() + { + $params = array('comment'=>Mage::helper('adminhtml')->__("Uninstalling selected packages, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'uninstall'; + $params['options'] = array(); + $packages = array(); + foreach ($this->getRequest()->getPost('package') as $package) { + $packages[] = str_replace('|', '/', $package); + } + $params['params'] = $packages; + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + } + Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); + } + + public function massUpgradeAction() + { + $this->loadLayout(); + + $this->_setActiveMenu('system/extensions'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_upgrade')->initForm()); + + $this->renderLayout(); + } + + public function massUpgradeRunAction() + { + $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading selected packages, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'upgrade'; + $params['options'] = array(); + $packages = array(); + foreach ($this->getRequest()->getPost('package') as $package) { + $packages[] = str_replace('|', '/', $package); + } + $params['params'] = $packages; + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + } + Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); + } + + protected function _isAllowed() + { + return Mage::getSingleton('admin/session')->isAllowed('system/extensions/local'); + } +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php index b04b66a095..4114f8310a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php @@ -1,137 +1,136 @@ - - */ -class Mage_Adminhtml_Extensions_RemoteController extends Mage_Adminhtml_Controller_Action -{ - public function indexAction() - { - $this->loadLayout(); - - $this->_setActiveMenu('system/extensions/remote'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_remote')); - - $this->renderLayout(); - } - - public function gridAction() - { - $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/extensions_remote_grid')->toHtml()); - } - - public function editAction() - { - $this->loadLayout(); - - $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); - $ext = Mage::getModel('adminhtml/extension')->loadRemote($pkg); -#echo "
".print_r($ext->getData(),1)."
"; - Mage::register('remote_extension', $ext); - $this->_setActiveMenu('system/extensions/remote'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_remote_edit')); - $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_remote_edit_tabs')); - - $this->renderLayout(); - } - - public function installAction() - { - $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); - $params = array('comment'=>Mage::helper('adminhtml')->__("Downloading and installing $pkg, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'install'; - $params['options'] = array('onlyreqdeps'=>1); - $params['params'] = array($pkg); - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - } - Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); - } - - public function upgradeAction() - { - $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); - $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading $pkg, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'upgrade'; - $params['options'] = array(); - $params['params'] = array($pkg); - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - } - Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); - } - - public function massInstallAction() - { - $this->loadLayout(); - - $this->_setActiveMenu('system/extensions'); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_install')->initForm()); - - $this->renderLayout(); - } - - public function massInstallRunAction() - { - $params = array('comment'=>Mage::helper('adminhtml')->__("Installing selected packages, please wait...")."\r\n\r\n"); - if ($this->getRequest()->getParam('do')) { - $params['command'] = 'install'; - $params['options'] = array(); - $packages = array(); - foreach ($this->getRequest()->getPost('package') as $package) { - $packages[] = str_replace('|', '/', $package); - } - $params['params'] = $packages; - } - $result = Varien_Pear::getInstance()->runHtmlConsole($params); - if (!$result instanceof PEAR_Error) { - Mage::app()->cleanCache(); - } - Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); - } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/extensions/remote'); - } -} + + */ +class Mage_Adminhtml_Extensions_RemoteController extends Mage_Adminhtml_Controller_Action +{ + public function indexAction() + { + $this->loadLayout(); + + $this->_setActiveMenu('system/extensions/remote'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_remote')); + + $this->renderLayout(); + } + + public function gridAction() + { + $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/extensions_remote_grid')->toHtml()); + } + + public function editAction() + { + $this->loadLayout(); + + $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); + $ext = Mage::getModel('adminhtml/extension')->loadRemote($pkg); +#echo "
".print_r($ext->getData(),1)."
"; + Mage::register('remote_extension', $ext); + $this->_setActiveMenu('system/extensions/remote'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_remote_edit')); + $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_remote_edit_tabs')); + + $this->renderLayout(); + } + + public function installAction() + { + $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); + $params = array('comment'=>Mage::helper('adminhtml')->__("Downloading and installing $pkg, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'install'; + $params['options'] = array('onlyreqdeps'=>1); + $params['params'] = array($pkg); + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + } + Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); + } + + public function upgradeAction() + { + $pkg = str_replace('|', '/', $this->getRequest()->getParam('id')); + $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading $pkg, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'upgrade'; + $params['options'] = array(); + $params['params'] = array($pkg); + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + } + Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); + } + + public function massInstallAction() + { + $this->loadLayout(); + + $this->_setActiveMenu('system/extensions'); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_install')->initForm()); + + $this->renderLayout(); + } + + public function massInstallRunAction() + { + $params = array('comment'=>Mage::helper('adminhtml')->__("Installing selected packages, please wait...")."\r\n\r\n"); + if ($this->getRequest()->getParam('do')) { + $params['command'] = 'install'; + $params['options'] = array(); + $packages = array(); + foreach ($this->getRequest()->getPost('package') as $package) { + $packages[] = str_replace('|', '/', $package); + } + $params['params'] = $packages; + } + $result = Varien_Pear::getInstance()->runHtmlConsole($params); + if (!$result instanceof PEAR_Error) { + Mage::app()->cleanCache(); + } + Mage::app()->getFrontController()->getResponse()->clearAllHeaders(); + } + + protected function _isAllowed() + { + return Mage::getSingleton('admin/session')->isAllowed('system/extensions/remote'); + } +} diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php index e455fbec04..9648fc0332 100644 --- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php +++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/JsonController.php b/app/code/core/Mage/Adminhtml/controllers/JsonController.php index dcc5882875..b9c363d38c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/JsonController.php +++ b/app/code/core/Mage/Adminhtml/controllers/JsonController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,4 +49,4 @@ public function countryRegionAction() $this->getResponse()->setBody(Mage::helper('core')->jsonEncode($arrRes)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php index ca20c99602..e3cd342d8d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php index c00ea66383..88913bb48d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,4 +52,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('media'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php index 7624ce4e03..138f1be4f8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -99,4 +99,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('newsletter/problem'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php index 5886a23667..576e908772 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php index f92b55bca0..8bc10089dd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php index 4fde237585..4da03ee951 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Manage Newsletter Template Controller diff --git a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php index 6c4cf8cb71..d9b8907400 100644 --- a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php +++ b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php @@ -10,12 +10,18 @@ * http://opensource.org/licenses/osl-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. + * to license@magentocommerce.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -183,4 +189,4 @@ protected function _isAllowed() } return Mage::getSingleton('admin/session')->isAllowed($acl); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php index e07b2c5df5..e80dfa9c5c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php @@ -1,198 +1,198 @@ - - */ -class Mage_Adminhtml_Permissions_RoleController extends Mage_Adminhtml_Controller_Action -{ - - protected function _initAction() - { - $this->loadLayout(); - $this->_setActiveMenu('system/acl'); - $this->_addBreadcrumb($this->__('System'), $this->__('System')); - $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')); - $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles')); - return $this; - } - - protected function _initRole($requestVariable = 'rid') - { - Mage::register('current_role', Mage::getModel('admin/roles')->load($this->getRequest()->getParam($requestVariable))); - return Mage::registry('current_role'); - } - - public function indexAction() - { - $this->_initAction(); - - $this->renderLayout(); - } - - public function roleGridAction() - { - $this->loadLayout(); - $this->getResponse()->setBody($this->getLayout()->getBlock('adminhtml.permission.role.grid')->toHtml()); - } - - public function editRoleAction() - { - $role = $this->_initRole(); - $this->_initAction(); - - if ($role->getId()) { - $breadCrumb = $this->__('Edit Role'); - $breadCrumbTitle = $this->__('Edit Role'); - } else { - $breadCrumb = $this->__('Add new Role'); - $breadCrumbTitle = $this->__('Add new Role'); - } - $this->_addBreadcrumb($breadCrumb, $breadCrumbTitle); - - $this->getLayout()->getBlock('head')->setCanLoadExtJs(true); - - $this->_addContent( - $this->getLayout()->createBlock('adminhtml/permissions_buttons') - ->setRoleId($role->getId()) - ->setRoleInfo($role) - ->setTemplate('permissions/roleinfo.phtml') - ); - $this->_addJs($this->getLayout()->createBlock('adminhtml/template')->setTemplate('permissions/role_users_grid_js.phtml')); - $this->renderLayout(); - } - - public function deleteAction() - { - $rid = $this->getRequest()->getParam('rid', false); - $currentUser = Mage::getModel('admin/user')->setId(Mage::getSingleton('admin/session')->getUser()->getId()); - if ( in_array($rid, $currentUser->getRoles()) ) { - Mage::getSingleton('adminhtml/session')->addError($this->__('You can not delete self assigned roles.')); - $this->_redirect('*/*/editrole', array('rid' => $rid)); - return; - } - - try { - Mage::getModel("admin/roles")->setId($rid)->delete(); - Mage::getSingleton('adminhtml/session')->addSuccess($this->__('Role successfully deleted.')); - } catch (Exception $e) { - Mage::getSingleton('adminhtml/session')->addError($this->__('Error while deleting this role. Please try again later.')); - } - - $this->_redirect("*/*/"); - } - - public function saveRoleAction() - { - $rid = $this->getRequest()->getParam('role_id', false); - $resource = explode(',', $this->getRequest()->getParam('resource', false)); - $roleUsers = $this->getRequest()->getParam('in_role_user', null); - parse_str($roleUsers, $roleUsers); - $roleUsers = array_keys($roleUsers); - - $isAll = $this->getRequest()->getParam('all'); - if ($isAll) - $resource = array("all"); - - try { - $role = Mage::getModel("admin/roles") - ->setId($rid) - ->setName($this->getRequest()->getParam('rolename', false)) - ->setPid($this->getRequest()->getParam('parent_id', false)) - ->setRoleType('G'); - Mage::dispatchEvent('admin_permissions_role_prepare_save', array('object' => $role, 'request' => $this->getRequest())); - $role->save(); - - Mage::getModel("admin/rules") - ->setRoleId($role->getId()) - ->setResources($resource) - ->saveRel(); - - $oldRoleUsers = Mage::getModel("admin/roles")->setId($role->getId())->getRoleUsers($role); - if ( sizeof($oldRoleUsers) > 0 ) { - foreach($oldRoleUsers as $oUid) { - $this->_deleteUserFromRole($oUid, $role->getId()); - } - } - if ( $roleUsers ) { - foreach ($roleUsers as $nRuid) { - $this->_addUserToRole($nRuid, $role->getId()); - } - } - $rid = $role->getId(); - Mage::getSingleton('adminhtml/session')->addSuccess($this->__('Role successfully saved.')); - } catch (Mage_Core_Exception $e) { - Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); - } catch (Exception $e) { - Mage::getSingleton('adminhtml/session')->addError($this->__('Error while saving this role. Please try again later.')); - } - - //$this->getResponse()->setRedirect($this->getUrl("*/*/editrole/rid/$rid")); - $this->_redirect('*/*/editrole', array('rid' => $rid)); - return; - } - - public function editrolegridAction() - { - $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/permissions_role_grid_user')->toHtml()); - } - - protected function _deleteUserFromRole($userId, $roleId) - { - try { - Mage::getModel("admin/user") - ->setRoleId($roleId) - ->setUserId($userId) - ->deleteFromRole(); - } catch (Exception $e) { - throw $e; - return false; - } - return true; - } - - protected function _addUserToRole($userId, $roleId) - { - $user = Mage::getModel("admin/user")->load($userId); - $user->setRoleId($roleId)->setUserId($userId); - - if( $user->roleUserExists() === true ) { - return false; - } else { - $user->add(); - return true; - } - } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/acl/roles'); - } -} \ No newline at end of file + + */ +class Mage_Adminhtml_Permissions_RoleController extends Mage_Adminhtml_Controller_Action +{ + + protected function _initAction() + { + $this->loadLayout(); + $this->_setActiveMenu('system/acl'); + $this->_addBreadcrumb($this->__('System'), $this->__('System')); + $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions')); + $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles')); + return $this; + } + + protected function _initRole($requestVariable = 'rid') + { + Mage::register('current_role', Mage::getModel('admin/roles')->load($this->getRequest()->getParam($requestVariable))); + return Mage::registry('current_role'); + } + + public function indexAction() + { + $this->_initAction(); + + $this->renderLayout(); + } + + public function roleGridAction() + { + $this->loadLayout(); + $this->getResponse()->setBody($this->getLayout()->getBlock('adminhtml.permission.role.grid')->toHtml()); + } + + public function editRoleAction() + { + $role = $this->_initRole(); + $this->_initAction(); + + if ($role->getId()) { + $breadCrumb = $this->__('Edit Role'); + $breadCrumbTitle = $this->__('Edit Role'); + } else { + $breadCrumb = $this->__('Add new Role'); + $breadCrumbTitle = $this->__('Add new Role'); + } + $this->_addBreadcrumb($breadCrumb, $breadCrumbTitle); + + $this->getLayout()->getBlock('head')->setCanLoadExtJs(true); + + $this->_addContent( + $this->getLayout()->createBlock('adminhtml/permissions_buttons') + ->setRoleId($role->getId()) + ->setRoleInfo($role) + ->setTemplate('permissions/roleinfo.phtml') + ); + $this->_addJs($this->getLayout()->createBlock('adminhtml/template')->setTemplate('permissions/role_users_grid_js.phtml')); + $this->renderLayout(); + } + + public function deleteAction() + { + $rid = $this->getRequest()->getParam('rid', false); + $currentUser = Mage::getModel('admin/user')->setId(Mage::getSingleton('admin/session')->getUser()->getId()); + if ( in_array($rid, $currentUser->getRoles()) ) { + Mage::getSingleton('adminhtml/session')->addError($this->__('You can not delete self assigned roles.')); + $this->_redirect('*/*/editrole', array('rid' => $rid)); + return; + } + + try { + Mage::getModel("admin/roles")->setId($rid)->delete(); + Mage::getSingleton('adminhtml/session')->addSuccess($this->__('Role successfully deleted.')); + } catch (Exception $e) { + Mage::getSingleton('adminhtml/session')->addError($this->__('Error while deleting this role. Please try again later.')); + } + + $this->_redirect("*/*/"); + } + + public function saveRoleAction() + { + $rid = $this->getRequest()->getParam('role_id', false); + $resource = explode(',', $this->getRequest()->getParam('resource', false)); + $roleUsers = $this->getRequest()->getParam('in_role_user', null); + parse_str($roleUsers, $roleUsers); + $roleUsers = array_keys($roleUsers); + + $isAll = $this->getRequest()->getParam('all'); + if ($isAll) + $resource = array("all"); + + try { + $role = Mage::getModel("admin/roles") + ->setId($rid) + ->setName($this->getRequest()->getParam('rolename', false)) + ->setPid($this->getRequest()->getParam('parent_id', false)) + ->setRoleType('G'); + Mage::dispatchEvent('admin_permissions_role_prepare_save', array('object' => $role, 'request' => $this->getRequest())); + $role->save(); + + Mage::getModel("admin/rules") + ->setRoleId($role->getId()) + ->setResources($resource) + ->saveRel(); + + $oldRoleUsers = Mage::getModel("admin/roles")->setId($role->getId())->getRoleUsers($role); + if ( sizeof($oldRoleUsers) > 0 ) { + foreach($oldRoleUsers as $oUid) { + $this->_deleteUserFromRole($oUid, $role->getId()); + } + } + if ( $roleUsers ) { + foreach ($roleUsers as $nRuid) { + $this->_addUserToRole($nRuid, $role->getId()); + } + } + $rid = $role->getId(); + Mage::getSingleton('adminhtml/session')->addSuccess($this->__('Role successfully saved.')); + } catch (Mage_Core_Exception $e) { + Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); + } catch (Exception $e) { + Mage::getSingleton('adminhtml/session')->addError($this->__('Error while saving this role. Please try again later.')); + } + + //$this->getResponse()->setRedirect($this->getUrl("*/*/editrole/rid/$rid")); + $this->_redirect('*/*/editrole', array('rid' => $rid)); + return; + } + + public function editrolegridAction() + { + $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/permissions_role_grid_user')->toHtml()); + } + + protected function _deleteUserFromRole($userId, $roleId) + { + try { + Mage::getModel("admin/user") + ->setRoleId($roleId) + ->setUserId($userId) + ->deleteFromRole(); + } catch (Exception $e) { + throw $e; + return false; + } + return true; + } + + protected function _addUserToRole($userId, $roleId) + { + $user = Mage::getModel("admin/user")->load($userId); + $user->setRoleId($roleId)->setUserId($userId); + + if( $user->roleUserExists() === true ) { + return false; + } else { + $user->add(); + return true; + } + } + + protected function _isAllowed() + { + return Mage::getSingleton('admin/session')->isAllowed('system/acl/roles'); + } +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index 35bc4c7bb4..8254551b21 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Adminhtml_Permissions_UserController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php index b0c3a38631..e85a444efa 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -119,7 +119,7 @@ public function jsonDeleteAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('cms/poll'); + return Mage::getSingleton('admin/session')->isAllowed('cms/poll'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/PollController.php b/app/code/core/Mage/Adminhtml/controllers/PollController.php index 3e6811e676..ca65d02e27 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PollController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PollController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -195,4 +195,4 @@ protected function _isAllowed() return Mage::getSingleton('admin/session')->isAllowed('cms/poll'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php index 3b0a700e3c..f9659383c6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php index 87b7fe4d36..ca73c354fe 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php index 944d34116e..5f176c681e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,7 +54,7 @@ public function chooserAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('promo/catalog'); + return Mage::getSingleton('admin/session')->isAllowed('promo/catalog'); } /** diff --git a/app/code/core/Mage/Adminhtml/controllers/PromoController.php b/app/code/core/Mage/Adminhtml/controllers/PromoController.php index 3d252a3cdf..83de3cef08 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PromoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PromoController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/RatingController.php b/app/code/core/Mage/Adminhtml/controllers/RatingController.php index 0691f07d14..550df66f08 100644 --- a/app/code/core/Mage/Adminhtml/controllers/RatingController.php +++ b/app/code/core/Mage/Adminhtml/controllers/RatingController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -140,7 +140,7 @@ protected function _initEnityId() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/ratings'); + return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/ratings'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php index 87bc1d693b..086bac51e9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -164,4 +164,4 @@ protected function _isAllowed() break; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php index 80444be061..d2fcc40b6b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php @@ -18,10 +18,10 @@ * 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) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -276,4 +276,4 @@ protected function _isAllowed() break; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php index 1c3c807e7a..7e2aac77ff 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -147,7 +147,7 @@ public function exportProductDetailExcelAction() protected function _isAllowed() { - switch ($this->getRequest()->getActionName()) { + switch ($this->getRequest()->getActionName()) { case 'customer': return Mage::getSingleton('admin/session')->isAllowed('report/review/customer'); break; @@ -159,4 +159,4 @@ protected function _isAllowed() break; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php index 7f9a49863c..b7718e6097 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php index d8757cc610..34ff22b36c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -158,4 +158,4 @@ protected function _isAllowed() break; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php index bbbf1036ab..a54640290e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/ReportController.php b/app/code/core/Mage/Adminhtml/controllers/ReportController.php index 3a2264f545..0ff014dbda 100644 --- a/app/code/core/Mage/Adminhtml/controllers/ReportController.php +++ b/app/code/core/Mage/Adminhtml/controllers/ReportController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -129,7 +129,7 @@ public function totalsAction() protected function _isAllowed() { - switch ($this->getRequest()->getActionName()) { + switch ($this->getRequest()->getActionName()) { case 'search': return Mage::getSingleton('admin/session')->isAllowed('report/search'); break; @@ -143,4 +143,4 @@ protected function _isAllowed() break; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php index 627e725d21..22849a136d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ public function reviewAction() $this->loadLayout(false); $this->renderLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php index 74f58b5205..421b2adecd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function newAction() $this->loadLayout(false); $this->renderLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php index a380c7ce98..e52acc6625 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,4 +32,4 @@ class Mage_Adminhtml_Sales_CreditmemoController extends Mage_Adminhtml_Controller_Sales_Creditmemo { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php index c676b84d11..439bd1bc54 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,4 +32,4 @@ class Mage_Adminhtml_Sales_InvoiceController extends Mage_Adminhtml_Controller_Sales_Invoice { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php index 0c6f31d22f..c32e208631 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -419,4 +419,4 @@ protected function _isAllowed() } return Mage::getSingleton('admin/session')->isAllowed('sales/order'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php index 605c6130e5..e781e16842 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php index 20a606d30d..94bab48589 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once('CreateController.php'); @@ -61,4 +61,4 @@ public function startAction() $this->_redirect('*/sales_order/'); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php index e699c31544..0357d411e7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -73,7 +73,7 @@ protected function _initInvoice($update = false) * Check invoice create availability */ if (!$order->canInvoice()) { - $this->_getSession()->addError($this->__('Can not do invoice for order')); + $this->_getSession()->addError($this->__('Order does not allow to create an invoice.')); return false; } @@ -290,6 +290,7 @@ public function updateQtyAction() public function saveAction() { $data = $this->getRequest()->getPost('invoice'); + $orderId = $this->getRequest()->getParam('order_id'); try { if ($invoice = $this->_initInvoice()) { @@ -322,41 +323,47 @@ public function saveAction() } $transactionSave->save(); - /** - * Sending emails - */ + if (!empty($data['do_shipment'])) { + $this->_getSession()->addSuccess($this->__('Invoice and shipment have been successfully created.')); + } + else { + $this->_getSession()->addSuccess($this->__('Invoice has been successfully created.')); + } + + // send invoice/shipment emails $comment = ''; if (isset($data['comment_customer_notify'])) { $comment = $data['comment_text']; } - $invoice->sendEmail(!empty($data['send_email']), $comment); - if ($shipment) { - $shipment->sendEmail(!empty($data['send_email'])); - } - - if (!empty($data['do_shipment'])) { - $this->_getSession()->addSuccess($this->__('Invoice and shipment was successfully created.')); + try { + $invoice->sendEmail(!empty($data['send_email']), $comment); + } catch (Exception $e) { + Mage::logException($e); + $this->_getSession()->addError($this->__('Unable to send invoice email.')); } - else { - $this->_getSession()->addSuccess($this->__('Invoice was successfully created.')); + if ($shipment) { + try { + $shipment->sendEmail(!empty($data['send_email'])); + } catch (Exception $e) { + Mage::logException($e); + $this->_getSession()->addError($this->__('Unable to send shipment email.')); + } } - - $this->_redirect('*/sales_order/view', array('order_id' => $invoice->getOrderId())); - return; + $this->_redirect('*/sales_order/view', array('order_id' => $orderId)); } else { $this->_forward('noRoute'); - return; } + return; } catch (Mage_Core_Exception $e) { $this->_getSession()->addError($e->getMessage()); } catch (Exception $e) { - $this->_getSession()->addError($this->__('Can not save invoice')); + $this->_getSession()->addError($this->__('Failed to save invoice.')); + Mage::logException($e); } - - $this->_redirect('*/*/new', array('order_id' => $this->getRequest()->getParam('order_id'))); + $this->_redirect('*/*/new', array('order_id' => $orderId)); } @@ -524,4 +531,4 @@ protected function _needToAddDummyForShipment($item, $qtys) { } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php index efdb56b9a6..c8de91a759 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php index ea4a424142..fb92971e03 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php index 035aa1ac3c..31e49d85a5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -122,10 +122,17 @@ public function viewAction() public function emailAction() { if ($order = $this->_initOrder()) { - $order->sendNewOrderEmail(); - $this->_getSession()->addSuccess(Mage::helper('sales')->__('Message was successfully sent')); - $this->_redirect('*/sales_order/view', array('order_id' => $order->getId())); + try { + $order->sendNewOrderEmail(); + $this->_getSession()->addSuccess($this->__('Order email has been successfully sent.')); + } catch (Mage_Core_Exception $e) { + $this->_getSession()->addError($e->getMessage()); + } catch (Exception $e) { + $this->_getSession()->addError($this->__('Failed to send order email.')); + Mage::logException($e); + } } + $this->_redirect('*/sales_order/view', array('order_id' => $order->getId())); } /** * Cancel order @@ -527,4 +534,4 @@ protected function _isAllowed() } return Mage::getSingleton('admin/session')->isAllowed('sales/order'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php index 60c4005efb..818fcad9f6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,4 +32,4 @@ class Mage_Adminhtml_Sales_ShipmentController extends Mage_Adminhtml_Controller_Sales_Shipment { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/SalesController.php index 0878263645..c2fde89164 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SalesController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -57,6 +57,6 @@ public function indexAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('sales'); + return Mage::getSingleton('admin/session')->isAllowed('sales'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php index e2f5e98f35..dfbfbd4348 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -242,4 +242,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('catalog/sitemap'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php index 43ec1f6313..a5ac47ba2c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php index 21af1e1089..7a5eb2411d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php @@ -1,147 +1,147 @@ - - */ -class Mage_Adminhtml_System_BackupController extends Mage_Adminhtml_Controller_Action -{ - /** - * Backup list action - */ - public function indexAction() - { - if($this->getRequest()->getParam('ajax')) { - $this->_forward('grid'); - return; - } - - $this->loadLayout(); - $this->_setActiveMenu('system'); - $this->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System')); - $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Tools'), Mage::helper('adminhtml')->__('Tools')); - $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Backups'), Mage::helper('adminhtml')->__('Backup')); - - $this->_addContent($this->getLayout()->createBlock('adminhtml/backup', 'backup')); - - $this->renderLayout(); - } - - /** - * Backup list action - */ - public function gridAction() - { - $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/backup_grid')->toHtml()); - } - - /** - * Create backup action - */ - public function createAction() - { - try { - $backupDb = Mage::getModel('backup/db'); - $backup = Mage::getModel('backup/backup') - ->setTime(time()) - ->setType('db') - ->setPath(Mage::getBaseDir("var") . DS . "backups"); - - $backupDb->createBackup($backup); - $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Backup successfully created')); - } - catch (Exception $e) { - $this->_getSession()->addException($e, Mage::helper('adminhtml')->__('Error while create backup. Please try again later')); - } - $this->_redirect('*/*'); - } - - /** - * Download backup action - */ - public function downloadAction() - { - $backup = Mage::getModel('backup/backup') - ->setTime((int)$this->getRequest()->getParam('time')) - ->setType($this->getRequest()->getParam('type')) - ->setPath(Mage::getBaseDir("var") . DS . "backups"); - /* @var $backup Mage_Backup_Model_Backup */ - - if (!$backup->exists()) { - $this->_redirect('*/*'); - } - - $fileName = 'backup-' . date('YmdHis', $backup->getTime()) . '.sql.gz'; - - $this->_prepareDownloadResponse($fileName, null, 'application/octet-stream', $backup->getSize()); - - $this->getResponse()->sendHeaders(); - - $backup->output(); - exit(); - } - - /** - * Delete backup action - */ - public function deleteAction() - { - try { - $backup = Mage::getModel('backup/backup') - ->setTime((int)$this->getRequest()->getParam('time')) - ->setType($this->getRequest()->getParam('type')) - ->setPath(Mage::getBaseDir("var") . DS . "backups") - ->deleteFile(); - - $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Backup record was deleted')); - } - catch (Exception $e) { - // Nothing - } - - $this->_redirect('*/*/'); - - } - - protected function _isAllowed() - { - return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup'); - } - - /** - * Retrive adminhtml session model - * - * @return Mage_Adminhtml_Model_Session - */ - protected function _getSession() - { - return Mage::getSingleton('adminhtml/session'); - } -} + + */ +class Mage_Adminhtml_System_BackupController extends Mage_Adminhtml_Controller_Action +{ + /** + * Backup list action + */ + public function indexAction() + { + if($this->getRequest()->getParam('ajax')) { + $this->_forward('grid'); + return; + } + + $this->loadLayout(); + $this->_setActiveMenu('system'); + $this->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System')); + $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Tools'), Mage::helper('adminhtml')->__('Tools')); + $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Backups'), Mage::helper('adminhtml')->__('Backup')); + + $this->_addContent($this->getLayout()->createBlock('adminhtml/backup', 'backup')); + + $this->renderLayout(); + } + + /** + * Backup list action + */ + public function gridAction() + { + $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/backup_grid')->toHtml()); + } + + /** + * Create backup action + */ + public function createAction() + { + try { + $backupDb = Mage::getModel('backup/db'); + $backup = Mage::getModel('backup/backup') + ->setTime(time()) + ->setType('db') + ->setPath(Mage::getBaseDir("var") . DS . "backups"); + + $backupDb->createBackup($backup); + $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Backup successfully created')); + } + catch (Exception $e) { + $this->_getSession()->addException($e, Mage::helper('adminhtml')->__('Error while create backup. Please try again later')); + } + $this->_redirect('*/*'); + } + + /** + * Download backup action + */ + public function downloadAction() + { + $backup = Mage::getModel('backup/backup') + ->setTime((int)$this->getRequest()->getParam('time')) + ->setType($this->getRequest()->getParam('type')) + ->setPath(Mage::getBaseDir("var") . DS . "backups"); + /* @var $backup Mage_Backup_Model_Backup */ + + if (!$backup->exists()) { + $this->_redirect('*/*'); + } + + $fileName = 'backup-' . date('YmdHis', $backup->getTime()) . '.sql.gz'; + + $this->_prepareDownloadResponse($fileName, null, 'application/octet-stream', $backup->getSize()); + + $this->getResponse()->sendHeaders(); + + $backup->output(); + exit(); + } + + /** + * Delete backup action + */ + public function deleteAction() + { + try { + $backup = Mage::getModel('backup/backup') + ->setTime((int)$this->getRequest()->getParam('time')) + ->setType($this->getRequest()->getParam('type')) + ->setPath(Mage::getBaseDir("var") . DS . "backups") + ->deleteFile(); + + $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Backup record was deleted')); + } + catch (Exception $e) { + // Nothing + } + + $this->_redirect('*/*/'); + + } + + protected function _isAllowed() + { + return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup'); + } + + /** + * Retrive adminhtml session model + * + * @return Mage_Adminhtml_Model_Session + */ + protected function _getSession() + { + return Mage::getSingleton('adminhtml/session'); + } +} diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php index 0a7bca9032..99e88ce793 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -323,6 +323,6 @@ public function refreshLayeredNavigationAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('system/cache'); + return Mage::getSingleton('admin/session')->isAllowed('system/cache'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php index 348e98a94d..c1e2991972 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php index eae1cc2267..1332bebd01 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ include_once "ProfileController.php"; @@ -146,4 +146,4 @@ protected function _isAllowed() return Mage::getSingleton('admin/session')->isAllowed('admin/system/convert/gui'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php index bfcbe3bc73..f36fde5f1c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php index b2b568d062..dbfed97941 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -76,7 +76,7 @@ public function fetchRatesAction() $errors = $importModel->getMessages(); if( sizeof($errors) > 0 ) { foreach ($errors as $error) { - Mage::getSingleton('adminhtml/session')->addWarning($error); + Mage::getSingleton('adminhtml/session')->addWarning($error); } Mage::getSingleton('adminhtml/session')->addWarning(Mage::helper('adminhtml')->__('All possible rates were fetched, click on "Save" to apply')); } else { @@ -118,6 +118,6 @@ public function saveRatesAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('system/currency'); + return Mage::getSingleton('admin/session')->isAllowed('system/currency'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php index 1d94649a76..72f78e150a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,17 +69,17 @@ public function editAction() public function saveAction() { if ($data = $this->getRequest()->getPost()) { - $id = (int) $this->getRequest()->getParam('id'); + $id = (int) $this->getRequest()->getParam('id'); - $design = Mage::getModel('core/design'); - if ($id) { - $design->load($id); - } + $design = Mage::getModel('core/design'); + if ($id) { + $design->load($id); + } $design->setData($data['design']); - if ($id) { - $design->setId($id); - } + if ($id) { + $design->setId($id); + } try { $design->save(); @@ -122,4 +122,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('system/design'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php index e1a82ca4bb..7fd6df459b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,7 +40,7 @@ public function indexAction() return; } - $this->loadLayout(); + $this->loadLayout(); $this->_setActiveMenu('system/email_template'); $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Transactional Emails'), Mage::helper('adminhtml')->__('Transactional Emails')); @@ -92,7 +92,7 @@ public function saveAction() ->setTemplateSenderName($request->getParam('sender_name')) */ ->setTemplateText($request->getParam('template_text')) - ->setModifiedAt(Mage::getSingleton('core/date')->gmtDate()); + ->setModifiedAt(Mage::getSingleton('core/date')->gmtDate()); if (!$template->getId()) { //$type = constant(Mage::getConfig()->getModelClassName('core/email_template') . "::TYPE_HTML"); @@ -108,9 +108,9 @@ public function saveAction() $this->_redirect('*/*'); } catch (Exception $e) { - Mage::getSingleton('adminhtml/session')->setData('email_template_form_data', $this->getRequest()->getParams()); - Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); - $this->_forward('new'); + Mage::getSingleton('adminhtml/session')->setData('email_template_form_data', $this->getRequest()->getParams()); + Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); + $this->_forward('new'); } } @@ -148,6 +148,6 @@ public function defaultTemplateAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('system/email_template'); + return Mage::getSingleton('admin/session')->isAllowed('system/email_template'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php index 0e07843d74..53332d3a5e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/SystemController.php b/app/code/core/Mage/Adminhtml/controllers/SystemController.php index 931c5427ff..f9bf5ffb5c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SystemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SystemController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('system'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php index 5805cd6725..fbf03d2049 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,7 +47,7 @@ protected function _initAction() /** * Prepare tag model for manipulation * - * @return Mage_Tag_Model_Tag + * @return Mage_Tag_Model_Tag | false */ protected function _initTag() { @@ -56,8 +56,12 @@ protected function _initTag() $model = Mage::getModel('tag/tag'); if ($id) { $model->load($id); + if (!$model->getId()) { + return false; + } $model->setStoreId($storeId); } + Mage::register('current_tag', $model); return $model; @@ -119,7 +123,15 @@ public function editAction() return; } - $model = $this->_initTag(); + if (!$model = $this->_initTag()) { + Mage::getSingleton('adminhtml/session')->addError( + Mage::helper('adminhtml')->__('Wrong Tag specified') + ); + $this->_redirect('*/*/index', array( + 'store' => $this->getRequest()->getParam('store') + )); + return; + } $model->addSummary($this->getRequest()->getParam('store')); @@ -148,13 +160,21 @@ public function saveAction() $data['name'] = trim($postData['tag_name']); $data['status'] = $postData['tag_status']; $data['base_popularity'] = (isset($postData['base_popularity'])) ? $postData['base_popularity'] : 0; - $data['store_id'] = $postData['store_id']; + $data['store'] = $postData['store_id']; - $model = $this->_initTag(); + if (!$model = $this->_initTag()) { + Mage::getSingleton('adminhtml/session')->addError( + Mage::helper('adminhtml')->__('Wrong Tag specified') + ); + $this->_redirect('*/*/index', array( + 'store' => $data['store'] + )); + return; + } $model->addData($data); if (isset($postData['tag_assigned_products'])) { - $productIds = Mage::helper('adminhtml/js')->decodeInput($postData['tag_assigned_products']); + $productIds = Mage::helper('adminhtml/js')->decodeGridSerializedInput($postData['tag_assigned_products']); $tagRelationModel = Mage::getModel('tag/tag_relation'); $tagRelationModel->addRelations($model, $productIds); } @@ -189,7 +209,8 @@ public function saveAction() if ($this->getRequest()->getParam('ret') == 'edit') { $url = $this->getUrl('*/tag/edit', array( - 'tag_id' => $model->getId() + 'tag_id' => $model->getId(), + 'store' => $model->getStoreId() )); } @@ -198,7 +219,10 @@ public function saveAction() } catch (Exception $e) { Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); Mage::getSingleton('adminhtml/session')->setTagData($data); - $this->_redirect('*/*/edit', array('tag_id' => $this->getRequest()->getParam('tag_id'))); + $this->_redirect('*/*/edit', array( + 'tag_id' => $model->getId(), + 'store' => $model->getStoreId() + )); return; } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php index f5944818ed..29e8aea8a3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -161,6 +161,6 @@ protected function _initAction() */ protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_customer'); + return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_customer'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php index f73e82276b..3129c0fc05 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -163,4 +163,4 @@ protected function _isAllowed() return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_product'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php index 8ec767ae1e..fc1d450340 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -87,4 +87,4 @@ protected function _initAction() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php index 44d978e1bb..32ad1ff25d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php index 425ea9da77..236c7790d8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -151,6 +151,6 @@ protected function _initAction() protected function _isAllowed() { - return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rules'); + return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rules'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php index 90e17e0b51..0c51f26a1c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Adminhtml + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index f85aef09b0..b7083916b8 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -21,8 +21,8 @@ * * @category Mage * @package Mage_Adminhtml - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -184,4 +184,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/AmazonPayments/Block/Adminhtml/Shipping/Methods.php b/app/code/core/Mage/AmazonPayments/Block/Adminhtml/Shipping/Methods.php index 2a05f6f502..ed4e07e994 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Adminhtml/Shipping/Methods.php +++ b/app/code/core/Mage/AmazonPayments/Block/Adminhtml/Shipping/Methods.php @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_AmazonPayments_Block_Adminhtml_Shipping_Methods @@ -100,4 +100,4 @@ protected function _getSelected($value) { return $this->getElement()->getData('value/method') == $value ? 'selected="selected"' : ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Block/Asp/Form.php b/app/code/core/Mage/AmazonPayments/Block/Asp/Form.php index c616c5b0ad..fa002f365c 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Asp/Form.php +++ b/app/code/core/Mage/AmazonPayments/Block/Asp/Form.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Block/Asp/Redirect.php b/app/code/core/Mage/AmazonPayments/Block/Asp/Redirect.php index c6109f714c..5569b37011 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Asp/Redirect.php +++ b/app/code/core/Mage/AmazonPayments/Block/Asp/Redirect.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Block/Asp/Shortcut.php b/app/code/core/Mage/AmazonPayments/Block/Asp/Shortcut.php index 43fb8bbbec..4383a3b138 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Asp/Shortcut.php +++ b/app/code/core/Mage/AmazonPayments/Block/Asp/Shortcut.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,7 +40,7 @@ public function getCheckoutUrl() public function getButtonImageUrl() { - return Mage::getStoreConfig('payment/amazonpayments_asp/pay_now_button_image_url'); + return Mage::getStoreConfig('payment/amazonpayments_asp/pay_now_button_image_url'); } public function _toHtml() @@ -52,4 +52,4 @@ public function _toHtml() return ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Block/Cba/Form.php b/app/code/core/Mage/AmazonPayments/Block/Cba/Form.php index 9d890244fb..b91b59c262 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Cba/Form.php +++ b/app/code/core/Mage/AmazonPayments/Block/Cba/Form.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Block/Cba/Redirect.php b/app/code/core/Mage/AmazonPayments/Block/Cba/Redirect.php index ef9da0b73d..4f4e1ca4b9 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Cba/Redirect.php +++ b/app/code/core/Mage/AmazonPayments/Block/Cba/Redirect.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -66,4 +66,4 @@ protected function _toHtml() return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Block/Cba/Success.php b/app/code/core/Mage/AmazonPayments/Block/Cba/Success.php index f6e181f32a..2554fb618d 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Cba/Success.php +++ b/app/code/core/Mage/AmazonPayments/Block/Cba/Success.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ protected function _toHtml() return ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Block/Form.php b/app/code/core/Mage/AmazonPayments/Block/Form.php index 24bd2be700..f09711c64f 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Form.php +++ b/app/code/core/Mage/AmazonPayments/Block/Form.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Block/Link/Shortcut.php b/app/code/core/Mage/AmazonPayments/Block/Link/Shortcut.php index 9d01cf72f0..49f3244a5d 100644 --- a/app/code/core/Mage/AmazonPayments/Block/Link/Shortcut.php +++ b/app/code/core/Mage/AmazonPayments/Block/Link/Shortcut.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Helper/Data.php b/app/code/core/Mage/AmazonPayments/Helper/Data.php index c5a46ef205..4a9417826e 100644 --- a/app/code/core/Mage/AmazonPayments/Helper/Data.php +++ b/app/code/core/Mage/AmazonPayments/Helper/Data.php @@ -18,11 +18,10 @@ * 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_AmazonPayments - * @*package Mage_AmazonBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,4 +43,4 @@ public function formatAmount($amount) { return round($amount, 2); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Api/Abstract.php index 4bb052d152..ec0ae3bcd9 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Abstract.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Abstract.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp.php index 3de6ae302e..610b138160 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Abstract.php index d9ce3fcfe7..538b9d518c 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Abstract.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Abstract.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Amount.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Amount.php index 54abce4ffd..c75973857e 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Amount.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Amount.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps.php index 22aaf170df..3e67d10a1e 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Abstract.php index 4b11f00438..c15a596686 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Abstract.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Abstract.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Cancel.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Cancel.php index 17773aa3ac..95e2107e7c 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Cancel.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Cancel.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Refund.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Refund.php index 0e4013ad32..1dafbd5bb3 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Refund.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Refund.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Settle.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Settle.php index a58825fdcd..1031c32045 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Settle.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Settle.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Abstract.php index 83db36eae7..4dc7a2e7e9 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Abstract.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Abstract.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Cancel.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Cancel.php index fcdbb4190e..6b8f1c15a7 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Cancel.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Cancel.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Error.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Error.php index 3bf5895f86..df77e46fff 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Error.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Error.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Refund.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Refund.php index e6fc48ae72..96cb6807c4 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Refund.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Refund.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Settle.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Settle.php index 25b9085ebc..37ab8772fc 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Settle.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Settle.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Ipn/Request.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Ipn/Request.php index 880846ca65..8899d96cf0 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Ipn/Request.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Ipn/Request.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Cba.php b/app/code/core/Mage/AmazonPayments/Model/Api/Cba.php index 682051630f..73deced0a9 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Cba.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Cba.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Cba/Document.php b/app/code/core/Mage/AmazonPayments/Model/Api/Cba/Document.php index 9cf3f03ee8..d43eabc10f 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Cba/Document.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Cba/Document.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Debug.php b/app/code/core/Mage/AmazonPayments/Model/Api/Debug.php index d33e4fb194..5835c511a8 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Api/Debug.php +++ b/app/code/core/Mage/AmazonPayments/Model/Api/Debug.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ protected function _construct() { $this->_init('amazonpayments/api_debug'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug.php index 3bdb339c40..2ac7a9d44c 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug.php +++ b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ protected function _construct() { $this->_init('amazonpayments/api_debug', 'transaction_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug/Collection.php index 3238fe6529..8052e0dc56 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug/Collection.php +++ b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug/Collection.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ protected function _construct() { $this->_init('amazonpayments/api_debug'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Setup.php b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Setup.php index 50bdc92471..cf2ded6fb8 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Setup.php @@ -18,14 +18,14 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_AmazonPayments_Model_Mysql4_Setup extends Mage_Sales_Model_Mysql4_Setup { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Model/Observer.php b/app/code/core/Mage/AmazonPayments/Model/Observer.php index da44977a3f..b7851d2057 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Observer.php +++ b/app/code/core/Mage/AmazonPayments/Model/Observer.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp.php index bb0b365aeb..2ddf21574c 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp.php +++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -324,7 +324,7 @@ public function capture(Varien_Object $payment, $amount) */ public function processInvoice($invoice, $payment) { - if (!is_null($payment->getCcTransId()) && + if (!is_null($payment->getCcTransId()) && is_null($payment->getLastTransId()) && is_null($invoice->getTransactionId())) { diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Abstract.php index 808e397b69..2bc0cbdf1b 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Abstract.php +++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Abstract.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_AmazonPayments_Model_Payment_Asp_Abstract extends Mage_Payment_Model_Method_Abstract diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Fps.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Fps.php index 367546af4c..3a875d89b1 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Fps.php +++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Fps.php @@ -18,18 +18,18 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_AmazonPayments_Model_Payment_Asp_Fps extends Mage_AmazonPayments_Model_Payment_Asp_Abstract { - + public function refund($reserveTransactionId, $callerReference) { - $this->getApi()->getFps()->refund($reserveTransactionId, $callerReference); + $this->getApi()->getFps()->refund($reserveTransactionId, $callerReference); } } diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Notification.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Notification.php index 2956e793b7..ea72ebc3ad 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Notification.php +++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Notification.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Source/PaymentAction.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Source/PaymentAction.php index f30fff4267..96104926e3 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Source/PaymentAction.php +++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Source/PaymentAction.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ public function toOptionArray() ), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Cba.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Cba.php index 0ec1ab6da9..fc60f1021c 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Payment/Cba.php +++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Cba.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_AmazonPayments_Model_Payment_Cba extends Mage_Payment_Model_Method_Abstract @@ -595,4 +595,4 @@ public function getDebug() { return Mage::getStoreConfig('payment/' . $this->getCode() . '/debug_flag'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/Model/Session.php b/app/code/core/Mage/AmazonPayments/Model/Session.php index 90c8cd1967..852930cb83 100644 --- a/app/code/core/Mage/AmazonPayments/Model/Session.php +++ b/app/code/core/Mage/AmazonPayments/Model/Session.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,4 +36,4 @@ public function __construct() { $this->init('amazonpayments'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/controllers/AspController.php b/app/code/core/Mage/AmazonPayments/controllers/AspController.php index 8ac1cf1bcd..e29e35219f 100644 --- a/app/code/core/Mage/AmazonPayments/controllers/AspController.php +++ b/app/code/core/Mage/AmazonPayments/controllers/AspController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AmazonPayments/controllers/CbaController.php b/app/code/core/Mage/AmazonPayments/controllers/CbaController.php index 8103f9c2b1..a3e94833b9 100644 --- a/app/code/core/Mage/AmazonPayments/controllers/CbaController.php +++ b/app/code/core/Mage/AmazonPayments/controllers/CbaController.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_AmazonPayments_CbaController extends Mage_Core_Controller_Front_Action @@ -164,4 +164,4 @@ public function cancelAction() $this->_redirect('checkout/cart/'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/AmazonPayments/etc/system.xml b/app/code/core/Mage/AmazonPayments/etc/system.xml index 1155b35a54..64c5daec42 100644 --- a/app/code/core/Mage/AmazonPayments/etc/system.xml +++ b/app/code/core/Mage/AmazonPayments/etc/system.xml @@ -19,10 +19,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -335,7 +335,7 @@ - + text 30 1 @@ -343,7 +343,7 @@ 0 - + text 31 1 diff --git a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-install-0.1.2.php b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-install-0.1.2.php index b6bbf16309..49ac50490a 100644 --- a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-install-0.1.2.php +++ b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-install-0.1.2.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.0-0.1.1.php index b6bbf16309..49ac50490a 100644 --- a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.1-0.1.2.php index 4a933b57aa..5852a8d0ff 100644 --- a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -18,10 +18,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Controller/Action.php b/app/code/core/Mage/Api/Controller/Action.php index 49e4765858..15f5a0c36f 100644 --- a/app/code/core/Mage/Api/Controller/Action.php +++ b/app/code/core/Mage/Api/Controller/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ protected function _getServer() { return Mage::getSingleton('api/server'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Exception.php b/app/code/core/Mage/Api/Exception.php index 0e6d306e5b..c248f3144e 100644 --- a/app/code/core/Mage/Api/Exception.php +++ b/app/code/core/Mage/Api/Exception.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function getCustomMessage() { return $this->_customMessage; } -} // Class Mage_Api_Model_Resource_Exception End \ No newline at end of file +} // Class Mage_Api_Model_Resource_Exception End diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php index f1db5add47..b19c09db57 100644 --- a/app/code/core/Mage/Api/Helper/Data.php +++ b/app/code/core/Mage/Api/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Api_Helper_Data extends Mage_Core_Helper_Abstract { -} // Class Mage_Api_Helper_Data End \ No newline at end of file +} // Class Mage_Api_Helper_Data End diff --git a/app/code/core/Mage/Api/Model/Acl.php b/app/code/core/Mage/Api/Model/Acl.php index a0bb4b701b..27b2f62444 100644 --- a/app/code/core/Mage/Api/Model/Acl.php +++ b/app/code/core/Mage/Api/Model/Acl.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,4 +89,4 @@ public function addRoleParent($role, $parent) $this->_getRoleRegistry()->addParent($role, $parent); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php index de5e6fafe8..27a74a9660 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,4 +53,4 @@ protected function _isCleanIP($ip) { // ... } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php index 6f76640482..e8b5479f63 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,4 +53,4 @@ protected function _isCleanTime($time) { // ... } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Acl/Resource.php b/app/code/core/Mage/Api/Model/Acl/Resource.php index 434ad186be..9583b7d6c4 100644 --- a/app/code/core/Mage/Api/Model/Acl/Resource.php +++ b/app/code/core/Mage/Api/Model/Acl/Resource.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Api_Model_Acl_Resource extends Zend_Acl_Resource { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Acl/Role.php b/app/code/core/Mage/Api/Model/Acl/Role.php index 11466e9341..802c259622 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Acl/Role.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ protected function _construct() { $this->_init('api/role'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php index 2907c20617..7e42cf4521 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Api_Model_Acl_Role_Generic extends Zend_Acl_Role { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Group.php b/app/code/core/Mage/Api/Model/Acl/Role/Group.php index fdc066c43d..4e309a011b 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Group.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Api_Model_Acl_Role_Group extends Mage_Api_Model_Acl_Role_Generic { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php index 9db6eab80b..114ea6cbcc 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Role/User.php b/app/code/core/Mage/Api/Model/Acl/Role/User.php index e590e04961..389024c311 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/User.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Api_Model_Acl_Role_User extends Mage_Api_Model_Acl_Role_Generic { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Config.php b/app/code/core/Mage/Api/Model/Config.php index 50492199bb..7951060491 100644 --- a/app/code/core/Mage/Api/Model/Config.php +++ b/app/code/core/Mage/Api/Model/Config.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -270,4 +270,4 @@ protected function _removeCache($id) { return Mage::app()->removeCache($id); } -} // Class Mage_Api_Model_Config End \ No newline at end of file +} // Class Mage_Api_Model_Config End diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl.php b/app/code/core/Mage/Api/Model/Mysql4/Acl.php index 1f1cc33d18..479442e93b 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -116,7 +116,7 @@ function loadRoles(Mage_Api_Model_Acl $acl, array $rolesArr) */ function loadRules(Mage_Api_Model_Acl $acl, array $rulesArr) { - foreach ($rulesArr as $rule) { + foreach ($rulesArr as $rule) { $role = $rule['role_type'].$rule['role_id']; $resource = $rule['resource_id']; $privileges = !empty($rule['privileges']) ? explode(',', $rule['privileges']) : null; @@ -128,9 +128,9 @@ function loadRules(Mage_Api_Model_Acl $acl, array $rulesArr) } try { if ( $rule['permission'] == 'allow' ) { - $acl->allow($role, $resource, $privileges, $assert); + $acl->allow($role, $resource, $privileges, $assert); } else if ( $rule['permission'] == 'deny' ) { - $acl->deny($role, $resource, $privileges, $assert); + $acl->deny($role, $resource, $privileges, $assert); } } catch (Exception $e) { //$m = $e->getMessage(); diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php index 82eaec6c1c..dacf5965b8 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,4 +45,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php index 8918292481..3424955fe2 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('api/role'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php index 81efb60705..b0f4e8ecb0 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_Permissions_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Role.php index 1085f328a0..3b7cd7895f 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Role.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Role.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_Role extends Mage_Core_Model_Mysql4_Abstract diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php index d76d585ed1..5ab7ca8293 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_Role_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles.php b/app/code/core/Mage/Api/Model/Mysql4/Roles.php index bf9ebcf79e..77e38ca527 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_Roles extends Mage_Core_Model_Mysql4_Abstract diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php index 43567f52c6..d3cdc7e0f7 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_Roles_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php index 61a30281cf..dfb4c60fc7 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_Roles_User_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules.php b/app/code/core/Mage/Api/Model/Mysql4/Rules.php index 709989588e..c02c7ada73 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Rules.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_Rules extends Mage_Core_Model_Mysql4_Abstract diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php index 1dffb7adee..161fcd86ae 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_Rules_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php index 53a6dcf480..1165141cb8 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php index c580f55a96..f919a0561f 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Mysql4_User_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Api/Model/Resource/Abstract.php b/app/code/core/Mage/Api/Model/Resource/Abstract.php index 900fcebb6d..4e7a82bdbf 100644 --- a/app/code/core/Mage/Api/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Api/Model/Resource/Abstract.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -102,4 +102,4 @@ protected function _fault($code, $customMessage=null) { throw new Mage_Api_Exception($code, $customMessage); } -} // Class Mage_Api_Model_Resource_Abstract End \ No newline at end of file +} // Class Mage_Api_Model_Resource_Abstract End diff --git a/app/code/core/Mage/Api/Model/Role.php b/app/code/core/Mage/Api/Model/Role.php index c9bce6c86d..6f2ea47692 100644 --- a/app/code/core/Mage/Api/Model/Role.php +++ b/app/code/core/Mage/Api/Model/Role.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Role extends Mage_Core_Model_Abstract diff --git a/app/code/core/Mage/Api/Model/Roles.php b/app/code/core/Mage/Api/Model/Roles.php index f92a7d39e1..739c8585e0 100644 --- a/app/code/core/Mage/Api/Model/Roles.php +++ b/app/code/core/Mage/Api/Model/Roles.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Roles extends Mage_Core_Model_Abstract @@ -113,4 +113,4 @@ protected function _buildResourcesArray(Varien_Simplexml_Element $resource=null, } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Rules.php b/app/code/core/Mage/Api/Model/Rules.php index 8c8a50c516..cef0068751 100644 --- a/app/code/core/Mage/Api/Model/Rules.php +++ b/app/code/core/Mage/Api/Model/Rules.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_Rules extends Mage_Core_Model_Abstract diff --git a/app/code/core/Mage/Api/Model/Server.php b/app/code/core/Mage/Api/Model/Server.php index d4cbc1e15f..05bb348670 100644 --- a/app/code/core/Mage/Api/Model/Server.php +++ b/app/code/core/Mage/Api/Model/Server.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -87,4 +87,4 @@ public function getAdapter() } -} // Class Mage_Api_Model_Server_Abstract End \ No newline at end of file +} // Class Mage_Api_Model_Server_Abstract End diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php index ba3834a354..19a46202c8 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -78,4 +78,4 @@ function run(); */ function fault($code, $message); -} // Class Mage_Api_Model_Server_Adapter_Interface End \ No newline at end of file +} // Class Mage_Api_Model_Server_Adapter_Interface End diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index 1e15c5f821..a513e84987 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php index 5bae6c959d..3b861add80 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -112,4 +112,4 @@ public function fault($code, $message) { throw new Zend_XmlRpc_Server_Exception($message, $code); } -} // Class Mage_Api_Model_Server_Adapter_Xmlrpc End \ No newline at end of file +} // Class Mage_Api_Model_Server_Adapter_Xmlrpc End diff --git a/app/code/core/Mage/Api/Model/Server/Handler.php b/app/code/core/Mage/Api/Model/Server/Handler.php index c7702c2760..6aea0fb39e 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/Handler.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,4 +34,4 @@ class Mage_Api_Model_Server_Handler extends Mage_Api_Model_Server_Handler_Abstract { -} // Class Mage_Api_Model_Server_Handler End \ No newline at end of file +} // Class Mage_Api_Model_Server_Handler End diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php index 8d260b0648..3af45be2b6 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -529,4 +529,4 @@ public function globalFaults($sessionId) $this->_startSession($sessionId); return array_values($this->_getConfig()->getFaults()); } -} // Class Mage_Api_Model_Server_Handler_Abstract End \ No newline at end of file +} // Class Mage_Api_Model_Server_Handler_Abstract End diff --git a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php index 8b5ef96361..0073d80bd1 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Server/V2/Handler.php b/app/code/core/Mage/Api/Model/Server/V2/Handler.php index ed9adff0ee..ce97dc09b4 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Handler.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,4 +56,4 @@ public function __call( $function, $args ) } return $this->call($sessionId, $apiKey, $args); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Session.php b/app/code/core/Mage/Api/Model/Session.php index 705cdf5b59..4dbc818473 100644 --- a/app/code/core/Mage/Api/Model/Session.php +++ b/app/code/core/Mage/Api/Model/Session.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -139,17 +139,17 @@ public function isAllowed($resource, $privilege=null) $acl = $this->getAcl(); if ($user && $acl) { - try { - if ($acl->isAllowed($user->getAclRole(), 'all', null)){ - return true; - } - } catch (Exception $e) {} + try { + if ($acl->isAllowed($user->getAclRole(), 'all', null)){ + return true; + } + } catch (Exception $e) {} - try { + try { return $acl->isAllowed($user->getAclRole(), $resource, $privilege); - } catch (Exception $e) { - return false; - } + } catch (Exception $e) { + return false; + } } return false; } @@ -208,4 +208,4 @@ protected function _renewBySessId ($sessId) return false; } -} // Class Mage_Api_Model_Session End \ No newline at end of file +} // Class Mage_Api_Model_Session End diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php index 2ada3a1a8b..f82bb2d5d0 100644 --- a/app/code/core/Mage/Api/Model/User.php +++ b/app/code/core/Mage/Api/Model/User.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Api_Model_User extends Mage_Core_Model_Abstract @@ -212,4 +212,4 @@ protected function _getEncodedApiKey($apiKey) return Mage::helper('core')->getHash($apiKey, 2); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config.php b/app/code/core/Mage/Api/Model/Wsdl/Config.php index 62137dad3b..f0153dd5e8 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php index 903fdb59df..3623d76720 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php index a390e571c9..f3365d9b01 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/controllers/IndexController.php b/app/code/core/Mage/Api/controllers/IndexController.php index 55a52450c9..4d5bb530da 100644 --- a/app/code/core/Mage/Api/controllers/IndexController.php +++ b/app/code/core/Mage/Api/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function indexAction() $this->_getServer()->init($this, 'soap') ->run(); } -} // Class Mage_Api_IndexController End \ No newline at end of file +} // Class Mage_Api_IndexController End diff --git a/app/code/core/Mage/Api/controllers/SoapController.php b/app/code/core/Mage/Api/controllers/SoapController.php index cc6e18568c..60b7330646 100644 --- a/app/code/core/Mage/Api/controllers/SoapController.php +++ b/app/code/core/Mage/Api/controllers/SoapController.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function indexAction() $this->_getServer()->init($this) ->run(); } -} // Class Mage_Api_IndexController End \ No newline at end of file +} // Class Mage_Api_IndexController End diff --git a/app/code/core/Mage/Api/controllers/V2/SoapController.php b/app/code/core/Mage/Api/controllers/V2/SoapController.php index d76f22c062..76db40213b 100644 --- a/app/code/core/Mage/Api/controllers/V2/SoapController.php +++ b/app/code/core/Mage/Api/controllers/V2/SoapController.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function indexAction() $this->_getServer()->init($this, 'soap_v2', 'soap_v2') ->run(); } -} // Class Mage_Api_IndexController End \ No newline at end of file +} // Class Mage_Api_IndexController End diff --git a/app/code/core/Mage/Api/controllers/XmlrpcController.php b/app/code/core/Mage/Api/controllers/XmlrpcController.php index 191c2e52c7..97551f0d77 100644 --- a/app/code/core/Mage/Api/controllers/XmlrpcController.php +++ b/app/code/core/Mage/Api/controllers/XmlrpcController.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ public function indexAction() $this->_getServer()->init($this, 'xmlrpc') ->run(); } -} // Class Mage_Api_XmlrpcController End \ No newline at end of file +} // Class Mage_Api_XmlrpcController End diff --git a/app/code/core/Mage/Api/etc/api.xml b/app/code/core/Mage/Api/etc/api.xml index 11e0ddfe68..687e63cc71 100644 --- a/app/code/core/Mage/Api/etc/api.xml +++ b/app/code/core/Mage/Api/etc/api.xml @@ -21,8 +21,8 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -123,4 +123,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml index cae2702d7e..5f671bc205 100644 --- a/app/code/core/Mage/Api/etc/config.xml +++ b/app/code/core/Mage/Api/etc/config.xml @@ -21,8 +21,8 @@ * * @category Mage * @package Mage_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -121,4 +121,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Api/etc/system.xml b/app/code/core/Mage/Api/etc/system.xml index 64d0f40c20..743a8f4f79 100644 --- a/app/code/core/Mage/Api/etc/system.xml +++ b/app/code/core/Mage/Api/etc/system.xml @@ -19,10 +19,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php index 247502afd7..f0b61029b9 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -87,4 +87,4 @@ "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php index 0e474860c8..f87bb66f78 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ $installer->startSetup(); $installer->run("ALTER TABLE {$this->getTable('api_user')} ADD `sessid` VARCHAR(40) NOT NULL AFTER `lognum`;"); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php index 69f8c24cd8..f57a0ff7c7 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -18,10 +18,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,4 +53,4 @@ $installer->getConnection()->dropColumn($installer->getTable('api/user'), 'logdate'); $installer->getConnection()->dropColumn($installer->getTable('api/user'), 'sessid'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Backup/Exception.php b/app/code/core/Mage/Backup/Exception.php index ceb4dc5c42..98cf7384bb 100644 --- a/app/code/core/Mage/Backup/Exception.php +++ b/app/code/core/Mage/Backup/Exception.php @@ -18,10 +18,10 @@ * 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_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Helper/Data.php b/app/code/core/Mage/Backup/Helper/Data.php index 3de538ce15..e6517716d2 100644 --- a/app/code/core/Mage/Backup/Helper/Data.php +++ b/app/code/core/Mage/Backup/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Backup/Model/Backup.php b/app/code/core/Mage/Backup/Model/Backup.php index c70fa2feed..0df96a54c0 100644 --- a/app/code/core/Mage/Backup/Model/Backup.php +++ b/app/code/core/Mage/Backup/Model/Backup.php @@ -18,10 +18,10 @@ * 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_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -351,4 +351,4 @@ public function getSize() return 0; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php index 526599cf83..7f340a8f15 100644 --- a/app/code/core/Mage/Backup/Model/Db.php +++ b/app/code/core/Mage/Backup/Model/Db.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -84,8 +84,8 @@ public function renderSql() $tables = $this->getTables(); foreach ($tables as $tableName) { - $sql.= $this->getTableCreateScript($tableName, true); - $sql.= $this->getTableDataDump($tableName); + $sql.= $this->getTableCreateScript($tableName, true); + $sql.= $this->getTableDataDump($tableName); } $sql.= $this->getFooter(); diff --git a/app/code/core/Mage/Backup/Model/Fs/Collection.php b/app/code/core/Mage/Backup/Model/Fs/Collection.php index b7d72785dd..d26f9a3e85 100644 --- a/app/code/core/Mage/Backup/Model/Fs/Collection.php +++ b/app/code/core/Mage/Backup/Model/Fs/Collection.php @@ -18,10 +18,10 @@ * 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_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -82,4 +82,4 @@ protected function _generateRow($filename) $row['size'] = filesize($filename); return $row; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Backup/Model/Media.php b/app/code/core/Mage/Backup/Model/Media.php index aebe3c3e66..18acb3a7ba 100644 --- a/app/code/core/Mage/Backup/Model/Media.php +++ b/app/code/core/Mage/Backup/Model/Media.php @@ -18,8 +18,8 @@ * 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_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php index 6c76f15c98..6e9bf70ecc 100644 --- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php +++ b/app/code/core/Mage/Backup/Model/Mysql4/Db.php @@ -18,10 +18,10 @@ * 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_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -101,7 +101,7 @@ public function getTableCreateSql($tableName, $withForeignKeys = false) $sql = 'SHOW CREATE TABLE ' . $quotedTableName; $row = $this->_read->fetchRow($sql); - if (!$row) { + if (!$row || !isset($row['Table']) || !isset($row['Create Table'])) { return false; } @@ -301,7 +301,7 @@ public function getTableDataDump($tableName, $step=100) while ($data = $this->_read->fetchAll($select)) { $dataSql = array(); foreach ($data as $row) { - $dataSql[] = $this->_read->quoteInto('(?)', $row); + $dataSql[] = $this->_read->quoteInto('(?)', $row); } $arrSql[] = $sql.implode(', ', $dataSql).';'; $startRow += $step; @@ -404,4 +404,4 @@ public function rollBackTransaction() { $this->_read->rollBack(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Backup/Model/View.php b/app/code/core/Mage/Backup/Model/View.php index aebe3c3e66..18acb3a7ba 100644 --- a/app/code/core/Mage/Backup/Model/View.php +++ b/app/code/core/Mage/Backup/Model/View.php @@ -18,8 +18,8 @@ * 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_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml index 78b4cdd369..b644a092d7 100644 --- a/app/code/core/Mage/Backup/etc/config.xml +++ b/app/code/core/Mage/Backup/etc/config.xml @@ -19,10 +19,10 @@ * 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_Backup - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php index fe60d7f626..f371f93f9c 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php index ff184cc650..cfa209e94e 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php index 0d70d32061..6e1a8de907 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,4 +40,4 @@ public function getElementHtml() .'[%]';; return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php index 4ca7a09df6..35b278eca0 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php index 24612d37fb..99ed97751c 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php @@ -1,209 +1,209 @@ - - */ -class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option extends Mage_Adminhtml_Block_Widget -{ - protected $_element = null; - protected $_customerGroups = null; - protected $_websites = null; - - protected $_oprions = null; - - public function __construct() - { - $this->setTemplate('bundle/product/edit/bundle/option.phtml'); - } - - public function getFieldId() - { - return 'bundle_option'; - } - - public function getFieldName() - { - return 'bundle_options'; - } - - /** - * Retrieve Product object - * - * @return Mage_Catalog_Model_Product - */ - public function getProduct() - { - if (!$this->getData('product')) { - $this->setData('product', Mage::registry('product')); - } - return $this->getData('product'); - } - - public function render(Varien_Data_Form_Element_Abstract $element) - { - $this->setElement($element); - return $this->toHtml(); - } - - public function setElement(Varien_Data_Form_Element_Abstract $element) - { - $this->_element = $element; - return $this; - } - - public function getElement() - { - return $this->_element; - } - - public function isMultiWebsites() - { - return !Mage::app()->isSingleStoreMode(); - } - - protected function _prepareLayout() - { - $this->setChild('add_selection_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'id' => $this->getFieldId().'_{{index}}_add_button', - 'label' => Mage::helper('bundle')->__('Add Selection'), - 'on_click' => 'bSelection.showSearch(event)', - 'class' => 'add' - ))); - - $this->setChild('close_search_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'id' => $this->getFieldId().'_{{index}}_close_button', - 'label' => Mage::helper('bundle')->__('Close'), - 'on_click' => 'bSelection.closeSearch(event)', - 'class' => 'back no-display' - ))); - - $this->setChild('option_delete_button', - $this->getLayout()->createBlock('adminhtml/widget_button') - ->setData(array( - 'label' => Mage::helper('catalog')->__('Delete Option'), - 'class' => 'delete delete-product-option', - 'on_click' => 'bOption.remove(event)' - )) - ); - - $this->setChild('selection_template', - $this->getLayout()->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle_option_selection') - ); - - return parent::_prepareLayout(); - } - - public function getAddButtonHtml() - { - return $this->getChildHtml('add_button'); - } - - public function getCloseSearchButtonHtml() - { - return $this->getChildHtml('close_search_button'); - } - - public function getAddSelectionButtonHtml() - { - return $this->getChildHtml('add_selection_button'); - } - - public function getOptions() - { - if (!$this->_options) { - $this->getProduct()->getTypeInstance(true)->setStoreFilter($this->getProduct()->getStoreId(), $this->getProduct()); - - $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct()); - - $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection( - $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()), - $this->getProduct() - ); - - $this->_options = $optionCollection->appendSelections($selectionCollection); - } - return $this->_options; - } - - public function getAddButtonId() - { - $buttonId = $this->getLayout() - ->getBlock('admin.product.bundle.items') - ->getChild('add_button')->getId(); - return $buttonId; - } - - public function getOptionDeleteButtonHtml() - { - return $this->getChildHtml('option_delete_button'); - } - - public function getSelectionHtml() - { - return $this->getChildHtml('selection_template'); - } - - public function getTypeSelectHtml() - { - $select = $this->getLayout()->createBlock('adminhtml/html_select') - ->setData(array( - 'id' => $this->getFieldId().'_{{index}}_type', - 'class' => 'select select-product-option-type required-option-select', - 'extra_params' => 'onchange="bOption.changeType(event)"' - )) - ->setName($this->getFieldName().'[{{index}}][type]') - ->setOptions(Mage::getSingleton('bundle/source_option_type')->toOptionArray()); - - return $select->getHtml(); - } - - public function getRequireSelectHtml() - { - $select = $this->getLayout()->createBlock('adminhtml/html_select') - ->setData(array( - 'id' => $this->getFieldId().'_{{index}}_required', - 'class' => 'select' - )) - ->setName($this->getFieldName().'[{{index}}][required]') - ->setOptions(Mage::getSingleton('adminhtml/system_config_source_yesno')->toOptionArray()); - - return $select->getHtml(); - } - - public function isDefaultStore() - { - return ($this->getProduct()->getStoreId() == '0'); - } -} \ No newline at end of file + + */ +class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option extends Mage_Adminhtml_Block_Widget +{ + protected $_element = null; + protected $_customerGroups = null; + protected $_websites = null; + + protected $_oprions = null; + + public function __construct() + { + $this->setTemplate('bundle/product/edit/bundle/option.phtml'); + } + + public function getFieldId() + { + return 'bundle_option'; + } + + public function getFieldName() + { + return 'bundle_options'; + } + + /** + * Retrieve Product object + * + * @return Mage_Catalog_Model_Product + */ + public function getProduct() + { + if (!$this->getData('product')) { + $this->setData('product', Mage::registry('product')); + } + return $this->getData('product'); + } + + public function render(Varien_Data_Form_Element_Abstract $element) + { + $this->setElement($element); + return $this->toHtml(); + } + + public function setElement(Varien_Data_Form_Element_Abstract $element) + { + $this->_element = $element; + return $this; + } + + public function getElement() + { + return $this->_element; + } + + public function isMultiWebsites() + { + return !Mage::app()->isSingleStoreMode(); + } + + protected function _prepareLayout() + { + $this->setChild('add_selection_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'id' => $this->getFieldId().'_{{index}}_add_button', + 'label' => Mage::helper('bundle')->__('Add Selection'), + 'on_click' => 'bSelection.showSearch(event)', + 'class' => 'add' + ))); + + $this->setChild('close_search_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'id' => $this->getFieldId().'_{{index}}_close_button', + 'label' => Mage::helper('bundle')->__('Close'), + 'on_click' => 'bSelection.closeSearch(event)', + 'class' => 'back no-display' + ))); + + $this->setChild('option_delete_button', + $this->getLayout()->createBlock('adminhtml/widget_button') + ->setData(array( + 'label' => Mage::helper('catalog')->__('Delete Option'), + 'class' => 'delete delete-product-option', + 'on_click' => 'bOption.remove(event)' + )) + ); + + $this->setChild('selection_template', + $this->getLayout()->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle_option_selection') + ); + + return parent::_prepareLayout(); + } + + public function getAddButtonHtml() + { + return $this->getChildHtml('add_button'); + } + + public function getCloseSearchButtonHtml() + { + return $this->getChildHtml('close_search_button'); + } + + public function getAddSelectionButtonHtml() + { + return $this->getChildHtml('add_selection_button'); + } + + public function getOptions() + { + if (!$this->_options) { + $this->getProduct()->getTypeInstance(true)->setStoreFilter($this->getProduct()->getStoreId(), $this->getProduct()); + + $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct()); + + $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection( + $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()), + $this->getProduct() + ); + + $this->_options = $optionCollection->appendSelections($selectionCollection); + } + return $this->_options; + } + + public function getAddButtonId() + { + $buttonId = $this->getLayout() + ->getBlock('admin.product.bundle.items') + ->getChild('add_button')->getId(); + return $buttonId; + } + + public function getOptionDeleteButtonHtml() + { + return $this->getChildHtml('option_delete_button'); + } + + public function getSelectionHtml() + { + return $this->getChildHtml('selection_template'); + } + + public function getTypeSelectHtml() + { + $select = $this->getLayout()->createBlock('adminhtml/html_select') + ->setData(array( + 'id' => $this->getFieldId().'_{{index}}_type', + 'class' => 'select select-product-option-type required-option-select', + 'extra_params' => 'onchange="bOption.changeType(event)"' + )) + ->setName($this->getFieldName().'[{{index}}][type]') + ->setOptions(Mage::getSingleton('bundle/source_option_type')->toOptionArray()); + + return $select->getHtml(); + } + + public function getRequireSelectHtml() + { + $select = $this->getLayout()->createBlock('adminhtml/html_select') + ->setData(array( + 'id' => $this->getFieldId().'_{{index}}_required', + 'class' => 'select' + )) + ->setName($this->getFieldName().'[{{index}}][required]') + ->setOptions(Mage::getSingleton('adminhtml/system_config_source_yesno')->toOptionArray()); + + return $select->getHtml(); + } + + public function isDefaultStore() + { + return ($this->getProduct()->getStoreId() == '0'); + } +} diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php index ee6f8b01fb..d902637c15 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php index ced3a492c3..b2cd554642 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php index 9df4f12bf2..2138182cbf 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -97,4 +97,4 @@ public function getSelectionSearchUrl() { return $this->getUrl('bundle/selection/search'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php index d90a97d05b..9097df40e7 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ protected function _prepareLayout() )); $this->bindShadowTabs('bundle_items', 'customer_options'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php index 5c824621b7..be1dcac470 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php index f50cbd3bd2..1c68c5563f 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php index 832408117f..4930fa748d 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -127,4 +127,4 @@ public function getProduct() } return $this->_product; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php index b3a81433c7..1e62bca567 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php index 621a5ef0cc..400854fda9 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php index e4914cd01a..b70d86a730 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php @@ -1,143 +1,143 @@ - - */ -class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Block_Product_View_Abstract -{ - protected $_optionRenderers = array(); - protected $_options = null; - - public function getOptions() - { - if (!$this->_options) { - $this->getProduct()->getTypeInstance(true)->setStoreFilter($this->getProduct()->getStoreId(), $this->getProduct()); - - $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct()); - - $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection( - $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()), - $this->getProduct() - ); - - $this->_options = $optionCollection->appendSelections($selectionCollection, false, false); - } - return $this->_options; - } - - public function hasOptions() - { - $this->getOptions(); - if (empty($this->_options) || !$this->getProduct()->isSalable()) { - return false; - } - return true; - } - - public function getJsonConfig() - { - Mage::app()->getLocale()->getJsPriceFormat(); - $store = Mage::app()->getStore(); - $optionsArray = $this->getOptions(); - $options = array(); - $selected = array(); - - foreach ($optionsArray as $_option) { - if (!$_option->getSelections()) { - continue; - } - $option = array ( - 'selections' => array(), - 'title' => $_option->getTitle(), - 'isMulti' => ($_option->getType() == 'multi' || $_option->getType() == 'checkbox') - ); - - $selectionCount = count($_option->getSelections()); - - foreach ($_option->getSelections() as $_selection) { - $_qty = !($_selection->getSelectionQty()*1)?'1':$_selection->getSelectionQty()*1; - $selection = array ( - 'qty' => $_qty, - 'customQty' => $_selection->getSelectionCanChangeQty(), - 'price' => Mage::helper('core')->currency($_selection->getFinalPrice(), false, false), - 'priceValue' => Mage::helper('core')->currency($_selection->getSelectionPriceValue(), false, false), - 'priceType' => $_selection->getSelectionPriceType(), - 'tierPrice' => $_selection->getTierPrice(), - 'name' => $_selection->getName(), - 'plusDisposition' => 0, - 'minusDisposition' => 0, - ); - $responseObject = new Varien_Object(); - $args = array('response_object'=>$responseObject, 'selection'=>$_selection); - Mage::dispatchEvent('bundle_product_view_config', $args); - if (is_array($responseObject->getAdditionalOptions())) { - foreach ($responseObject->getAdditionalOptions() as $o=>$v) { - $selection[$o] = $v; - } - } - $option['selections'][$_selection->getSelectionId()] = $selection; - - if (($_selection->getIsDefault() || ($selectionCount == 1 && $_option->getRequired())) && $_selection->isSalable()) { - $selected[$_option->getId()][] = $_selection->getSelectionId(); - } - } - $options[$_option->getId()] = $option; - } - - $config = array( - 'options' => $options, - 'selected' => $selected, - 'bundleId' => $this->getProduct()->getId(), - 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(), - 'basePrice' => Mage::helper('core')->currency($this->getProduct()->getPrice(), false, false), - 'priceType' => $this->getProduct()->getPriceType(), - 'specialPrice' => $this->getProduct()->getSpecialPrice() - ); - - return Mage::helper('core')->jsonEncode($config); - } - - public function addRenderer($type, $block) - { - $this->_optionRenderers[$type] = $block; - } - - public function getOptionHtml($option) - { - if (!isset($this->_optionRenderers[$option->getType()])) { - return $this->__('There is no defined renderer for "%s" option type', $option->getType()); - } - return $this->getLayout()->createBlock($this->_optionRenderers[$option->getType()]) - ->setOption($option)->toHtml(); - } - -} \ No newline at end of file + + */ +class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Block_Product_View_Abstract +{ + protected $_optionRenderers = array(); + protected $_options = null; + + public function getOptions() + { + if (!$this->_options) { + $this->getProduct()->getTypeInstance(true)->setStoreFilter($this->getProduct()->getStoreId(), $this->getProduct()); + + $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct()); + + $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection( + $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()), + $this->getProduct() + ); + + $this->_options = $optionCollection->appendSelections($selectionCollection, false, false); + } + return $this->_options; + } + + public function hasOptions() + { + $this->getOptions(); + if (empty($this->_options) || !$this->getProduct()->isSalable()) { + return false; + } + return true; + } + + public function getJsonConfig() + { + Mage::app()->getLocale()->getJsPriceFormat(); + $store = Mage::app()->getStore(); + $optionsArray = $this->getOptions(); + $options = array(); + $selected = array(); + + foreach ($optionsArray as $_option) { + if (!$_option->getSelections()) { + continue; + } + $option = array ( + 'selections' => array(), + 'title' => $_option->getTitle(), + 'isMulti' => ($_option->getType() == 'multi' || $_option->getType() == 'checkbox') + ); + + $selectionCount = count($_option->getSelections()); + + foreach ($_option->getSelections() as $_selection) { + $_qty = !($_selection->getSelectionQty()*1)?'1':$_selection->getSelectionQty()*1; + $selection = array ( + 'qty' => $_qty, + 'customQty' => $_selection->getSelectionCanChangeQty(), + 'price' => Mage::helper('core')->currency($_selection->getFinalPrice(), false, false), + 'priceValue' => Mage::helper('core')->currency($_selection->getSelectionPriceValue(), false, false), + 'priceType' => $_selection->getSelectionPriceType(), + 'tierPrice' => $_selection->getTierPrice(), + 'name' => $_selection->getName(), + 'plusDisposition' => 0, + 'minusDisposition' => 0, + ); + $responseObject = new Varien_Object(); + $args = array('response_object'=>$responseObject, 'selection'=>$_selection); + Mage::dispatchEvent('bundle_product_view_config', $args); + if (is_array($responseObject->getAdditionalOptions())) { + foreach ($responseObject->getAdditionalOptions() as $o=>$v) { + $selection[$o] = $v; + } + } + $option['selections'][$_selection->getSelectionId()] = $selection; + + if (($_selection->getIsDefault() || ($selectionCount == 1 && $_option->getRequired())) && $_selection->isSalable()) { + $selected[$_option->getId()][] = $_selection->getSelectionId(); + } + } + $options[$_option->getId()] = $option; + } + + $config = array( + 'options' => $options, + 'selected' => $selected, + 'bundleId' => $this->getProduct()->getId(), + 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(), + 'basePrice' => Mage::helper('core')->currency($this->getProduct()->getPrice(), false, false), + 'priceType' => $this->getProduct()->getPriceType(), + 'specialPrice' => $this->getProduct()->getSpecialPrice() + ); + + return Mage::helper('core')->jsonEncode($config); + } + + public function addRenderer($type, $block) + { + $this->_optionRenderers[$type] = $block; + } + + public function getOptionHtml($option) + { + if (!isset($this->_optionRenderers[$option->getType()])) { + return $this->__('There is no defined renderer for "%s" option type', $option->getType()); + } + return $this->getLayout()->createBlock($this->_optionRenderers[$option->getType()]) + ->setOption($option)->toHtml(); + } + +} diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php index 99740b57e3..ba5d3cdc30 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php index 8228a832e6..4745317bfa 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function _construct() { $this->setTemplate('bundle/catalog/product/view/type/bundle/option/checkbox.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php index d9dad59ab8..e74f794225 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function _construct() { $this->setTemplate('bundle/catalog/product/view/type/bundle/option/multi.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php index 2b6616949a..549804a437 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function _construct() { $this->setTemplate('bundle/catalog/product/view/type/bundle/option/radio.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php index fde3a75df0..7aa1a1e13a 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function _construct() { $this->setTemplate('bundle/catalog/product/view/type/bundle/option/select.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php index 415c1987d0..8d7b4b8cb8 100644 --- a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php @@ -1,121 +1,121 @@ - - */ -class Mage_Bundle_Block_Checkout_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer -{ - /** - * Get bundled selections (slections-products collection) - * - * Returns array of options objects. - * Each option object will contain array of selections objects - * - * @return array - */ - protected function _getBundleOptions($useCache = true) - { - $options = array(); - - /** - * @var Mage_Bundle_Model_Product_Type - */ - $typeInstance = $this->getProduct()->getTypeInstance(true); - - // get bundle options - $optionsQuoteItemOption = $this->getItem()->getOptionByCode('bundle_option_ids'); - $bundleOptionsIds = unserialize($optionsQuoteItemOption->getValue()); - if ($bundleOptionsIds) { - /** - * @var Mage_Bundle_Model_Mysql4_Option_Collection - */ - $optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $this->getProduct()); - - // get and add bundle selections collection - $selectionsQuoteItemOption = $this->getItem()->getOptionByCode('bundle_selection_ids'); - - $selectionsCollection = $typeInstance->getSelectionsByIds( - unserialize($selectionsQuoteItemOption->getValue()), - $this->getProduct() - ); - - $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true); - foreach ($bundleOptions as $bundleOption) { - if ($bundleOption->getSelections()) { - $option = array('label' => $bundleOption->getTitle(), "value" => array()); - $bundleSelections = $bundleOption->getSelections(); - - foreach ($bundleSelections as $bundleSelection) { - $option['value'][] = $this->_getSelectionQty($bundleSelection->getSelectionId()).' x '. $this->htmlEscape($bundleSelection->getName()). ' ' .Mage::helper('core')->currency($this->_getSelectionFinalPrice($bundleSelection)); - } - - $options[] = $option; - } - } - } - return $options; - } - - /** - * Obtain final price of selection in a bundle product - * - * @param Mage_Catalog_Model_Product $selectionProduct - * @return decimal - */ - protected function _getSelectionFinalPrice($selectionProduct) - { - $bundleProduct = $this->getProduct(); - return $bundleProduct->getPriceModel()->getSelectionFinalPrice( - $bundleProduct, $selectionProduct, - $this->getQty(), - $this->_getSelectionQty($selectionProduct->getSelectionId()) - ); - } - - /** - * Get selection quantity - * - * @param int $selectionId - * @return decimal - */ - protected function _getSelectionQty($selectionId) - { - if ($selectionQty = $this->getProduct()->getCustomOption('selection_qty_' . $selectionId)) { - return $selectionQty->getValue(); - } - return 0; - } - - public function getOptionList() - { - return array_merge($this->_getBundleOptions(), parent::getOptionList()); - } -} + + */ +class Mage_Bundle_Block_Checkout_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer +{ + /** + * Get bundled selections (slections-products collection) + * + * Returns array of options objects. + * Each option object will contain array of selections objects + * + * @return array + */ + protected function _getBundleOptions($useCache = true) + { + $options = array(); + + /** + * @var Mage_Bundle_Model_Product_Type + */ + $typeInstance = $this->getProduct()->getTypeInstance(true); + + // get bundle options + $optionsQuoteItemOption = $this->getItem()->getOptionByCode('bundle_option_ids'); + $bundleOptionsIds = unserialize($optionsQuoteItemOption->getValue()); + if ($bundleOptionsIds) { + /** + * @var Mage_Bundle_Model_Mysql4_Option_Collection + */ + $optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $this->getProduct()); + + // get and add bundle selections collection + $selectionsQuoteItemOption = $this->getItem()->getOptionByCode('bundle_selection_ids'); + + $selectionsCollection = $typeInstance->getSelectionsByIds( + unserialize($selectionsQuoteItemOption->getValue()), + $this->getProduct() + ); + + $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true); + foreach ($bundleOptions as $bundleOption) { + if ($bundleOption->getSelections()) { + $option = array('label' => $bundleOption->getTitle(), "value" => array()); + $bundleSelections = $bundleOption->getSelections(); + + foreach ($bundleSelections as $bundleSelection) { + $option['value'][] = $this->_getSelectionQty($bundleSelection->getSelectionId()).' x '. $this->htmlEscape($bundleSelection->getName()). ' ' .Mage::helper('core')->currency($this->_getSelectionFinalPrice($bundleSelection)); + } + + $options[] = $option; + } + } + } + return $options; + } + + /** + * Obtain final price of selection in a bundle product + * + * @param Mage_Catalog_Model_Product $selectionProduct + * @return decimal + */ + protected function _getSelectionFinalPrice($selectionProduct) + { + $bundleProduct = $this->getProduct(); + return $bundleProduct->getPriceModel()->getSelectionFinalPrice( + $bundleProduct, $selectionProduct, + $this->getQty(), + $this->_getSelectionQty($selectionProduct->getSelectionId()) + ); + } + + /** + * Get selection quantity + * + * @param int $selectionId + * @return decimal + */ + protected function _getSelectionQty($selectionId) + { + if ($selectionQty = $this->getProduct()->getCustomOption('selection_qty_' . $selectionId)) { + return $selectionQty->getValue(); + } + return 0; + } + + public function getOptionList() + { + return array_merge($this->_getBundleOptions(), parent::getOptionList()); + } +} diff --git a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php index 7d3290fb27..e63cea6cdd 100644 --- a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php @@ -1,169 +1,169 @@ - - */ -class Mage_Bundle_Block_Sales_Order_Items_Renderer extends Mage_Sales_Block_Order_Item_Renderer_Default -{ - public function isShipmentSeparately($item = null) - { - if ($item) { - if ($item->getOrderItem()) { - $item = $item->getOrderItem(); - } - if ($parentItem = $item->getParentItem()) { - if ($options = $parentItem->getProductOptions()) { - if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) { - return true; - } else { - return false; - } - } - } else { - if ($options = $item->getProductOptions()) { - if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) { - return false; - } else { - return true; - } - } - } - } - - if ($options = $this->getOrderItem()->getProductOptions()) { - if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) { - return true; - } - } - return false; - } - - public function isChildCalculated($item = null) - { - if ($item) { - if ($item->getOrderItem()) { - $item = $item->getOrderItem(); - } - if ($parentItem = $item->getParentItem()) { - if ($options = $parentItem->getProductOptions()) { - if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) { - return true; - } else { - return false; - } - } - } else { - if ($options = $item->getProductOptions()) { - if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) { - return false; - } else { - return true; - } - } - } - } - - if ($options = $this->getOrderItem()->getProductOptions()) { - if (isset($options['product_calculations']) - && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) { - return true; - } - } - return false; - } - - public function getSelectionAttributes($item) { - if ($item instanceof Mage_Sales_Model_Order_Item) { - $options = $item->getProductOptions(); - } else { - $options = $item->getOrderItem()->getProductOptions(); - } - if (isset($options['bundle_selection_attributes'])) { - return unserialize($options['bundle_selection_attributes']); - } - return null; - } - - public function getValueHtml($item) - { - if ($attributes = $this->getSelectionAttributes($item)) { - return sprintf('%d', $attributes['qty']) . ' x ' . - $this->htmlEscape($item->getName()) . - " " . $this->getOrder()->formatPrice($attributes['price']); - } else { - return $this->htmlEscape($item->getName()); - } - } - - /** - * Getting all available childs for Invoice, Shipmen or Creditmemo item - * - * @param Varien_Object $item - * @return array - */ - public function getChilds($item) - { - $_itemsArray = array(); - - if ($item instanceof Mage_Sales_Model_Order_Invoice_Item) { - $_items = $item->getInvoice()->getAllItems(); - } else if ($item instanceof Mage_Sales_Model_Order_Shipment_Item) { - $_items = $item->getShipment()->getAllItems(); - } else if ($item instanceof Mage_Sales_Model_Order_Creditmemo_Item) { - $_items = $item->getCreditmemo()->getAllItems(); - } - - if ($_items) { - foreach ($_items as $_item) { - if ($parentItem = $_item->getOrderItem()->getParentItem()) { - $_itemsArray[$parentItem->getId()][$_item->getOrderItemId()] = $_item; - } else { - $_itemsArray[$_item->getOrderItem()->getId()][$_item->getOrderItemId()] = $_item; - } - } - } - - if (isset($_itemsArray[$item->getOrderItem()->getId()])) { - return $_itemsArray[$item->getOrderItem()->getId()]; - } else { - return null; - } - } - - public function canShowPriceInfo($item) - { - if (($item->getOrderItem()->getParentItem() && $this->isChildCalculated()) - || (!$item->getOrderItem()->getParentItem() && !$this->isChildCalculated())) { - return true; - } - return false; - } -} \ No newline at end of file + + */ +class Mage_Bundle_Block_Sales_Order_Items_Renderer extends Mage_Sales_Block_Order_Item_Renderer_Default +{ + public function isShipmentSeparately($item = null) + { + if ($item) { + if ($item->getOrderItem()) { + $item = $item->getOrderItem(); + } + if ($parentItem = $item->getParentItem()) { + if ($options = $parentItem->getProductOptions()) { + if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) { + return true; + } else { + return false; + } + } + } else { + if ($options = $item->getProductOptions()) { + if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) { + return false; + } else { + return true; + } + } + } + } + + if ($options = $this->getOrderItem()->getProductOptions()) { + if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) { + return true; + } + } + return false; + } + + public function isChildCalculated($item = null) + { + if ($item) { + if ($item->getOrderItem()) { + $item = $item->getOrderItem(); + } + if ($parentItem = $item->getParentItem()) { + if ($options = $parentItem->getProductOptions()) { + if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) { + return true; + } else { + return false; + } + } + } else { + if ($options = $item->getProductOptions()) { + if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) { + return false; + } else { + return true; + } + } + } + } + + if ($options = $this->getOrderItem()->getProductOptions()) { + if (isset($options['product_calculations']) + && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) { + return true; + } + } + return false; + } + + public function getSelectionAttributes($item) { + if ($item instanceof Mage_Sales_Model_Order_Item) { + $options = $item->getProductOptions(); + } else { + $options = $item->getOrderItem()->getProductOptions(); + } + if (isset($options['bundle_selection_attributes'])) { + return unserialize($options['bundle_selection_attributes']); + } + return null; + } + + public function getValueHtml($item) + { + if ($attributes = $this->getSelectionAttributes($item)) { + return sprintf('%d', $attributes['qty']) . ' x ' . + $this->htmlEscape($item->getName()) . + " " . $this->getOrder()->formatPrice($attributes['price']); + } else { + return $this->htmlEscape($item->getName()); + } + } + + /** + * Getting all available childs for Invoice, Shipmen or Creditmemo item + * + * @param Varien_Object $item + * @return array + */ + public function getChilds($item) + { + $_itemsArray = array(); + + if ($item instanceof Mage_Sales_Model_Order_Invoice_Item) { + $_items = $item->getInvoice()->getAllItems(); + } else if ($item instanceof Mage_Sales_Model_Order_Shipment_Item) { + $_items = $item->getShipment()->getAllItems(); + } else if ($item instanceof Mage_Sales_Model_Order_Creditmemo_Item) { + $_items = $item->getCreditmemo()->getAllItems(); + } + + if ($_items) { + foreach ($_items as $_item) { + if ($parentItem = $_item->getOrderItem()->getParentItem()) { + $_itemsArray[$parentItem->getId()][$_item->getOrderItemId()] = $_item; + } else { + $_itemsArray[$_item->getOrderItem()->getId()][$_item->getOrderItemId()] = $_item; + } + } + } + + if (isset($_itemsArray[$item->getOrderItem()->getId()])) { + return $_itemsArray[$item->getOrderItem()->getId()]; + } else { + return null; + } + } + + public function canShowPriceInfo($item) + { + if (($item->getOrderItem()->getParentItem() && $this->isChildCalculated()) + || (!$item->getOrderItem()->getParentItem() && !$this->isChildCalculated())) { + return true; + } + return false; + } +} diff --git a/app/code/core/Mage/Bundle/Helper/Data.php b/app/code/core/Mage/Bundle/Helper/Data.php index b7df61265c..fc889d2fc4 100644 --- a/app/code/core/Mage/Bundle/Helper/Data.php +++ b/app/code/core/Mage/Bundle/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php index d1acf51217..ae8c2b1e45 100644 --- a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -83,4 +83,4 @@ protected function _prepareLinkFetchSelect($store, $table, $idField, $whereField { $this->_addAttributeFilter($this->_getLinkSelect(), 'required_options', 'l', $idField, $store, 0); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php index 4ceef686ef..2d2343b205 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php index 7ee7df72d7..a879b61498 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php index ee0c4906f8..abc01b2379 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -126,4 +126,4 @@ public function setIdFilter($ids) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php index 06b22da5b9..5a67ec1c1c 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -761,7 +761,7 @@ public function _calculateSpecialPrice($finalPrice, array $priceData, Mage_Core_ $specialPrice = $priceData['special_price']; if (!is_null($specialPrice) && $specialPrice != false) { - if (Mage::app()->getLocale()->IsStoreDateInInterval($store, $priceData['special_from_date'], $priceData['special_to_date'])) { + if (Mage::app()->getLocale()->isStoreDateInInterval($store, $priceData['special_from_date'], $priceData['special_to_date'])) { $specialPrice = ($finalPrice * $specialPrice) / 100; $finalPrice = min($finalPrice, $specialPrice); } diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php index bca5a09ef6..035b9b4a8e 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -185,4 +185,4 @@ public function getParentIdsByChild($childId) return $parentIds; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php index d26cfb3ffc..7548258ded 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php index 3385a8367e..816018ff8a 100644 --- a/app/code/core/Mage/Bundle/Model/Observer.php +++ b/app/code/core/Mage/Bundle/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Option.php b/app/code/core/Mage/Bundle/Model/Option.php index 748c3481ab..c9d1d5b362 100644 --- a/app/code/core/Mage/Bundle/Model/Option.php +++ b/app/code/core/Mage/Bundle/Model/Option.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Price/Index.php b/app/code/core/Mage/Bundle/Model/Price/Index.php index 7cf2f82d90..413b3eabd3 100644 --- a/app/code/core/Mage/Bundle/Model/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Price/Index.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php index 300b9103a4..202a48649f 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php +++ b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -97,4 +97,4 @@ public function getFlatUpdateSelect($store) return Mage::getResourceModel('eav/entity_attribute_option') ->getFlatUpdateSelect($this->getAttribute(), $store, false); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php index af393313e2..a23072c48a 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Price.php +++ b/app/code/core/Mage/Bundle/Model/Product/Price.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -557,7 +557,7 @@ public static function calculatePrice($basePrice, $specialPrice, $specialPriceFr public static function calculateSpecialPrice($finalPrice, $specialPrice, $specialPriceFrom, $specialPriceTo, $store = null) { if (!is_null($specialPrice) && $specialPrice != false) { - if (Mage::app()->getLocale()->IsStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) { + if (Mage::app()->getLocale()->isStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) { $specialPrice = ($finalPrice * $specialPrice) / 100; $finalPrice = min($finalPrice, $specialPrice); } diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index 51a72b4dab..328f2c5174 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php index e00070b470..6f7c63d740 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php index 980f1dbb82..5101decb93 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php index 2881f1d68d..ba051a4a8a 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php index 1b24b04f5c..719f5521bd 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Selection.php b/app/code/core/Mage/Bundle/Model/Selection.php index 5437b2441e..5da46e258c 100644 --- a/app/code/core/Mage/Bundle/Model/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Selection.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php index 81c3a4709b..157dadffd4 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,4 +40,4 @@ public function toOptionArray() array('value' => '1', 'label' => Mage::helper('bundle')->__('Percent')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php index 71716bd646..81a2cc69bb 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,4 +49,4 @@ public function toOptionArray() return $types; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/controllers/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Product/EditController.php index f5856c49bb..081b0fd619 100644 --- a/app/code/core/Mage/Bundle/controllers/Product/EditController.php +++ b/app/code/core/Mage/Bundle/controllers/Product/EditController.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Mage/Adminhtml/controllers/Catalog/ProductController.php'; diff --git a/app/code/core/Mage/Bundle/controllers/SelectionController.php b/app/code/core/Mage/Bundle/controllers/SelectionController.php index 39bccfc101..b1e1d5a5dd 100644 --- a/app/code/core/Mage/Bundle/controllers/SelectionController.php +++ b/app/code/core/Mage/Bundle/controllers/SelectionController.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -59,4 +59,4 @@ public function gridAction() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml index 91bc0279e3..547278fc81 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.xml @@ -19,10 +19,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php index 8e39db93f3..ec42bb3499 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -166,4 +166,4 @@ } } -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php index 365b00e198..1af54b1b3b 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php index 3f72fb97ad..5d59040571 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php index 5039e35920..082ff33e3b 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php index 86593e4851..378503f1e5 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php index 423812b589..4069ea5cce 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php index b9ad19e8d4..835734aad3 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php index 2ebecd05ba..258d4fd664 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php @@ -18,10 +18,10 @@ * 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_Bundle - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php index 9e7bfbc1d2..dd174be465 100644 --- a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php +++ b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog breadcrumbs diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php index 6e4e757a03..f12ac57b14 100644 --- a/app/code/core/Mage/Catalog/Block/Category/View.php +++ b/app/code/core/Mage/Catalog/Block/Category/View.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php index 3decccc25c..806a96d180 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php index a97886f9e8..bf6981b515 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php index 468cbadb9a..22e706d99b 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php index cdc8d6e29a..6c76b8b368 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Layer/State.php b/app/code/core/Mage/Catalog/Block/Layer/State.php index 7cc72dcc82..cbc79bd1ea 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/State.php +++ b/app/code/core/Mage/Catalog/Block/Layer/State.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Navigation.php b/app/code/core/Mage/Catalog/Block/Navigation.php index 81a5a718b9..6b54fdb488 100644 --- a/app/code/core/Mage/Catalog/Block/Navigation.php +++ b/app/code/core/Mage/Catalog/Block/Navigation.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product.php b/app/code/core/Mage/Catalog/Block/Product.php index cfffbc7ee3..8b939f3099 100644 --- a/app/code/core/Mage/Catalog/Block/Product.php +++ b/app/code/core/Mage/Catalog/Block/Product.php @@ -18,50 +18,50 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Block_Product extends Mage_Core_Block_Template { - protected $_finalPrice = array(); + protected $_finalPrice = array(); - public function getProduct() - { - if (!$this->getData('product') instanceof Mage_Catalog_Model_Product) { - if ($this->getData('product')->getProductId()) { - $productId = $this->getData('product')->getProductId(); - } - if ($productId) { - $product = Mage::getModel('catalog/product')->load($productId); - if ($product) { - $this->setProduct($product); - } - } - } - return $this->getData('product'); - } + public function getProduct() + { + if (!$this->getData('product') instanceof Mage_Catalog_Model_Product) { + if ($this->getData('product')->getProductId()) { + $productId = $this->getData('product')->getProductId(); + } + if ($productId) { + $product = Mage::getModel('catalog/product')->load($productId); + if ($product) { + $this->setProduct($product); + } + } + } + return $this->getData('product'); + } - public function getPrice() - { - return $this->getProduct()->getPrice(); - } + public function getPrice() + { + return $this->getProduct()->getPrice(); + } - public function getFinalPrice() - { - if (!isset($this->_finalPrice[$this->getProduct()->getId()])) { - $this->_finalPrice[$this->getProduct()->getId()] = $this->getProduct()->getFinalPrice(); - } - return $this->_finalPrice[$this->getProduct()->getId()]; - } + public function getFinalPrice() + { + if (!isset($this->_finalPrice[$this->getProduct()->getId()])) { + $this->_finalPrice[$this->getProduct()->getId()] = $this->getProduct()->getFinalPrice(); + } + return $this->_finalPrice[$this->getProduct()->getId()]; + } - public function getPriceHtml($product) - { - $this->setTemplate('catalog/product/price.phtml'); - $this->setProduct($product); - return $this->toHtml(); - } -} \ No newline at end of file + public function getPriceHtml($product) + { + $this->setTemplate('catalog/product/price.phtml'); + $this->setProduct($product); + return $this->toHtml(); + } +} diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php index 46f2ed9f38..5d833b41f9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,9 +38,29 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ protected $_priceBlockDefaultTemplate = 'catalog/product/price.phtml'; protected $_tierPriceDefaultTemplate = 'catalog/product/view/tierprices.phtml'; protected $_priceBlockTypes = array(); + /** + * Flag which allow/disallow to use link for as low as price + * + * @var bool + */ + protected $_useLinkForAsLowAs = true; protected $_reviewsHelperBlock; + /** + * Default product amount per row + * + * @var int + */ + protected $_defaultColumnCount = 3; + + /** + * Product amount per row depending on custom page layout of category + * + * @var array + */ + protected $_columnCountLayoutDepend = array(); + /** * Retrieve url for add product to cart * Will return product view page URL if product has required options @@ -132,6 +152,7 @@ public function getPriceHtml($product, $displayMinimalPrice = false, $idSuffix=' ->setProduct($product) ->setDisplayMinimalPrice($displayMinimalPrice) ->setIdSuffix($idSuffix) + ->setUseLinkForAsLowAs($this->_useLinkForAsLowAs) ->toHtml(); } @@ -343,4 +364,79 @@ public function hasProductUrl($product) return false; } + + /** + * Retrieve product amount per row + * + * @return int + */ + public function getColumnCount() + { + if (!$this->_getData('column_count')) { + $pageLayout = $this->getPageLayout(); + if ($pageLayout && $this->getColumnCountLayoutDepend($pageLayout->getCode())) { + $this->setData( + 'column_count', + $this->getColumnCountLayoutDepend($pageLayout->getCode()) + ); + } else { + $this->setData('column_count', $this->_defaultColumnCount); + } + } + + return (int) $this->_getData('column_count'); + } + + /** + * Add row size depends on page layout + * + * @param string $pageLayout + * @param int $rowSize + * @return Mage_Catalog_Block_Product_List + */ + public function addColumnCountLayoutDepend($pageLayout, $columnCount) + { + $this->_columnCountLayoutDepend[$pageLayout] = $columnCount; + return $this; + } + + /** + * Remove row size depends on page layout + * + * @param string $pageLayout + * @return Mage_Catalog_Block_Product_List + */ + public function removeColumnCountLayoutDepend($pageLayout) + { + if (isset($this->_columnCountLayoutDepend[$pageLayout])) { + unset($this->_columnCountLayoutDepend[$pageLayout]); + } + + return $this; + } + + /** + * Retrieve row size depends on page layout + * + * @param string $pageLayout + * @return int|boolean + */ + public function getColumnCountLayoutDepend($pageLayout) + { + if (isset($this->_columnCountLayoutDepend[$pageLayout])) { + return $this->_columnCountLayoutDepend[$pageLayout]; + } + + return false; + } + + /** + * Retrieve current page layout + * + * @return Varien_Object + */ + public function getPageLayout() + { + return $this->helper('page/layout')->getCurrentPageLayout(); + } } diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php index 8cbe9b64b6..55b2bf226d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,6 +48,13 @@ class Mage_Catalog_Block_Product_Compare_List extends Mage_Catalog_Block_Product */ protected $_attributes; + /** + * Flag which allow/disallow to use link for as low as price + * + * @var bool + */ + protected $_useLinkForAsLowAs = false; + /** * Retrieve url for adding product to wishlist with params * diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php index 8f21ad1802..1adf6c7368 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Gallery.php b/app/code/core/Mage/Catalog/Block/Product/Gallery.php index 1982c1ff3f..02bf81eb72 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Gallery.php +++ b/app/code/core/Mage/Catalog/Block/Product/Gallery.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php index 0e2a9fe2b2..3617e82cf5 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/List.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,22 +48,6 @@ class Mage_Catalog_Block_Product_List extends Mage_Catalog_Block_Product_Abstrac */ protected $_productCollection; - /** - * Default product amount per row in grid display mode - * - * @var int - */ - protected $_defaultColumnCount = 3; - - /** - * Product amount per row in grid display mode depending - * on custom page layout of category - * - * @var array - */ - protected $_columnCountLayoutDepend = array(); - - /** * Retrieve loaded category collection * @@ -247,79 +231,4 @@ public function prepareSortableFieldsByCategory($category) { return $this; } - - /** - * Retrieve product amount per row in grid display mode - * - * @return int - */ - public function getColumnCount() - { - if (!$this->_getData('column_count')) { - $pageLayout = $this->getPageLayout(); - if ($pageLayout && $this->getColumnCountLayoutDepend($pageLayout->getCode())) { - $this->setData( - 'column_count', - $this->getColumnCountLayoutDepend($pageLayout->getCode()) - ); - } else { - $this->setData('column_count', $this->_defaultColumnCount); - } - } - - return (int) $this->_getData('column_count'); - } - - /** - * Add row size depends on page layout - * - * @param string $pageLayout - * @param int $rowSize - * @return Mage_Catalog_Block_Product_List - */ - public function addColumnCountLayoutDepend($pageLayout, $columnCount) - { - $this->_columnCountLayoutDepend[$pageLayout] = $columnCount; - return $this; - } - - /** - * Remove row size depends on page layout - * - * @param string $pageLayout - * @return Mage_Catalog_Block_Product_List - */ - public function removeColumnCountLayoutDepend($pageLayout) - { - if (isset($this->_columnCountLayoutDepend[$pageLayout])) { - unset($this->_columnCountLayoutDepend[$pageLayout]); - } - - return $this; - } - - /** - * Retrieve row size depends on page layout - * - * @param string $pageLayout - * @return int|boolean - */ - public function getColumnCountLayoutDepend($pageLayout) - { - if (isset($this->_columnCountLayoutDepend[$pageLayout])) { - return $this->_columnCountLayoutDepend[$pageLayout]; - } - - return false; - } - - /** - * Retrieve current page layout - * - * @return Varien_Object - */ - public function getPageLayout() - { - return $this->helper('page/layout')->getCurrentPageLayout(); - } } diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php index 5c1a39eb6c..16ba4d4bf3 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php b/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php index f6499c8655..499865129f 100755 --- a/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php @@ -1,5 +1,28 @@ _productCollection; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Random.php b/app/code/core/Mage/Catalog/Block/Product/List/Random.php index a2b15a9999..0901c77d1f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Random.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Random.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ protected function _getProductCollection() } return $this->_productCollection; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Related.php b/app/code/core/Mage/Catalog/Block/Product/List/Related.php index 7aaf41aa3a..e66961880e 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Related.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Related.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -73,4 +73,4 @@ public function getItems() { return $this->_itemCollection; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php index 2ac4c24f9f..057fb9a3c4 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php index bd4b0b73e1..443349e989 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -158,4 +158,4 @@ public function getItemLimit($type = '') return 0; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/New.php b/app/code/core/Mage/Catalog/Block/Product/New.php index fcd7231618..27d94b0f19 100644 --- a/app/code/core/Mage/Catalog/Block/Product/New.php +++ b/app/code/core/Mage/Catalog/Block/Product/New.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,7 +60,8 @@ public function getCacheKey() . '_' . Mage::getDesign()->getPackageName() . '_' . Mage::getDesign()->getTheme('template') . '_' . Mage::getSingleton('customer/session')->getCustomerGroupId() - . '_' . md5($this->getTemplate()); + . '_' . md5($this->getTemplate()) + . '_' . $this->getProductsCount(); } /** diff --git a/app/code/core/Mage/Catalog/Block/Product/Price.php b/app/code/core/Mage/Catalog/Block/Product/Price.php index b19d43b01d..bd8f322ad8 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Price.php +++ b/app/code/core/Mage/Catalog/Block/Product/Price.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/Send.php b/app/code/core/Mage/Catalog/Block/Product/Send.php index da1ac25fe7..92f030dbeb 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Send.php +++ b/app/code/core/Mage/Catalog/Block/Product/Send.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,11 +34,11 @@ */ class Mage_Catalog_Block_Product_Send extends Mage_Catalog_Block_Product_Abstract { - public function __construct(){ - parent::__construct(); - } + public function __construct(){ + parent::__construct(); + } - /** + /** * Retrieve username for form field * * @return string @@ -46,12 +46,12 @@ public function __construct(){ public function getUserName() { - return Mage::getSingleton('customer/session')->getCustomer()->getName(); + return Mage::getSingleton('customer/session')->getCustomer()->getName(); } public function getEmail() { - return (string)Mage::getSingleton('customer/session')->getCustomer()->getEmail(); + return (string)Mage::getSingleton('customer/session')->getCustomer()->getEmail(); } public function getProductId() @@ -59,9 +59,9 @@ public function getProductId() return $this->getRequest()->getParam('id'); } - public function getMaxRecipients() - { - $sendToFriendModel = Mage::registry('send_to_friend_model'); - return $sendToFriendModel->getMaxRecipients(); - } -} \ No newline at end of file + public function getMaxRecipients() + { + $sendToFriendModel = Mage::registry('send_to_friend_model'); + return $sendToFriendModel->getMaxRecipients(); + } +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php index 049621f430..230bc7613d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View.php +++ b/app/code/core/Mage/Catalog/Block/Product/View.php @@ -1,187 +1,187 @@ -getLayout()->createBlock('catalog/breadcrumbs'); - $headBlock = $this->getLayout()->getBlock('head'); - if ($headBlock) { - $title = $this->getProduct()->getMetaTitle(); - if ($title) { - $headBlock->setTitle($title); - } - $keyword = $this->getProduct()->getMetaKeyword(); - $currentCategory = Mage::registry('current_category'); - if ($keyword) { - $headBlock->setKeywords($keyword); - } elseif($currentCategory) { - $headBlock->setKeywords($this->getProduct()->getName()); - } - $description = $this->getProduct()->getMetaDescription(); - if ($description) { - $headBlock->setDescription( ($description) ); - } else { - $headBlock->setDescription( $this->getProduct()->getDescription() ); - } - } - - return parent::_prepareLayout(); - } - - /** - * Retrieve current product model - * - * @return Mage_Catalog_Model_Product - */ - public function getProduct() - { - if (!Mage::registry('product') && $this->getProductId()) { - $product = Mage::getModel('catalog/product')->load($this->getProductId()); - Mage::register('product', $product); - } - return Mage::registry('product'); - } - - /** - * Check if product can be emailed to friend - * - * @return bool - */ - public function canEmailToFriend() - { - $sendToFriendModel = Mage::registry('send_to_friend_model'); - return $sendToFriendModel && $sendToFriendModel->canEmailToFriend(); - } - - /** - * Retrieve url for direct adding product to cart - * - * @param Mage_Catalog_Model_Product $product - * @param array $additional - * @return string - */ - public function getAddToCartUrl($product, $additional = array()) - { - if ($this->getRequest()->getParam('wishlist_next')){ - $additional['wishlist_next'] = 1; - } - - return $this->helper('checkout/cart')->getAddUrl($product, $additional); - } - - /** - * Get JSON encripted configuration array which can be used for JS dynamic - * price calculation depending on product options - * - * @return string - */ - public function getJsonConfig() - { - $config = array(); - if (!$this->hasOptions()) { - return Mage::helper('core')->jsonEncode($config); - } - - $_request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false); - $_request->setProductClassId($this->getProduct()->getTaxClassId()); - $defaultTax = Mage::getSingleton('tax/calculation')->getRate($_request); - - $_request = Mage::getSingleton('tax/calculation')->getRateRequest(); - $_request->setProductClassId($this->getProduct()->getTaxClassId()); - $currentTax = Mage::getSingleton('tax/calculation')->getRate($_request); - - $_regularPrice = $this->getProduct()->getPrice(); - $_finalPrice = $this->getProduct()->getFinalPrice(); - $_priceInclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice, true); - $_priceExclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice); - - $config = array( - 'productId' => $this->getProduct()->getId(), - 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(), - 'includeTax' => Mage::helper('tax')->priceIncludesTax() ? 'true' : 'false', - 'showIncludeTax' => Mage::helper('tax')->displayPriceIncludingTax(), - 'showBothPrices' => Mage::helper('tax')->displayBothPrices(), - 'productPrice' => Mage::helper('core')->currency($_finalPrice, false, false), - 'productOldPrice' => Mage::helper('core')->currency($_regularPrice, false, false), - 'skipCalculate' => ($_priceExclTax != $_priceInclTax ? 0 : 1), - 'defaultTax' => $defaultTax, - 'currentTax' => $currentTax, - 'idSuffix' => '_clone', - 'oldPlusDisposition' => 0, - 'plusDisposition' => 0, - 'oldMinusDisposition' => 0, - 'minusDisposition' => 0, - ); - - $responseObject = new Varien_Object(); - Mage::dispatchEvent('catalog_product_view_config', array('response_object'=>$responseObject)); - if (is_array($responseObject->getAdditionalOptions())) { - foreach ($responseObject->getAdditionalOptions() as $option=>$value) { - $config[$option] = $value; - } - } - - return Mage::helper('core')->jsonEncode($config); - } - - /** - * Return true if product has options - * - * @return bool - */ - public function hasOptions() - { - if ($this->getProduct()->getTypeInstance(true)->hasOptions($this->getProduct())) { - return true; - } - return false; - } - - /** - * Check if product has required options - * - * @return bool - */ - public function hasRequiredOptions() - { - return $this->getProduct()->getTypeInstance(true)->hasRequiredOptions($this->getProduct()); - } -} +getLayout()->createBlock('catalog/breadcrumbs'); + $headBlock = $this->getLayout()->getBlock('head'); + if ($headBlock) { + $title = $this->getProduct()->getMetaTitle(); + if ($title) { + $headBlock->setTitle($title); + } + $keyword = $this->getProduct()->getMetaKeyword(); + $currentCategory = Mage::registry('current_category'); + if ($keyword) { + $headBlock->setKeywords($keyword); + } elseif($currentCategory) { + $headBlock->setKeywords($this->getProduct()->getName()); + } + $description = $this->getProduct()->getMetaDescription(); + if ($description) { + $headBlock->setDescription( ($description) ); + } else { + $headBlock->setDescription( $this->getProduct()->getDescription() ); + } + } + + return parent::_prepareLayout(); + } + + /** + * Retrieve current product model + * + * @return Mage_Catalog_Model_Product + */ + public function getProduct() + { + if (!Mage::registry('product') && $this->getProductId()) { + $product = Mage::getModel('catalog/product')->load($this->getProductId()); + Mage::register('product', $product); + } + return Mage::registry('product'); + } + + /** + * Check if product can be emailed to friend + * + * @return bool + */ + public function canEmailToFriend() + { + $sendToFriendModel = Mage::registry('send_to_friend_model'); + return $sendToFriendModel && $sendToFriendModel->canEmailToFriend(); + } + + /** + * Retrieve url for direct adding product to cart + * + * @param Mage_Catalog_Model_Product $product + * @param array $additional + * @return string + */ + public function getAddToCartUrl($product, $additional = array()) + { + if ($this->getRequest()->getParam('wishlist_next')){ + $additional['wishlist_next'] = 1; + } + + return $this->helper('checkout/cart')->getAddUrl($product, $additional); + } + + /** + * Get JSON encripted configuration array which can be used for JS dynamic + * price calculation depending on product options + * + * @return string + */ + public function getJsonConfig() + { + $config = array(); + if (!$this->hasOptions()) { + return Mage::helper('core')->jsonEncode($config); + } + + $_request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false); + $_request->setProductClassId($this->getProduct()->getTaxClassId()); + $defaultTax = Mage::getSingleton('tax/calculation')->getRate($_request); + + $_request = Mage::getSingleton('tax/calculation')->getRateRequest(); + $_request->setProductClassId($this->getProduct()->getTaxClassId()); + $currentTax = Mage::getSingleton('tax/calculation')->getRate($_request); + + $_regularPrice = $this->getProduct()->getPrice(); + $_finalPrice = $this->getProduct()->getFinalPrice(); + $_priceInclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice, true); + $_priceExclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice); + + $config = array( + 'productId' => $this->getProduct()->getId(), + 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(), + 'includeTax' => Mage::helper('tax')->priceIncludesTax() ? 'true' : 'false', + 'showIncludeTax' => Mage::helper('tax')->displayPriceIncludingTax(), + 'showBothPrices' => Mage::helper('tax')->displayBothPrices(), + 'productPrice' => Mage::helper('core')->currency($_finalPrice, false, false), + 'productOldPrice' => Mage::helper('core')->currency($_regularPrice, false, false), + 'skipCalculate' => ($_priceExclTax != $_priceInclTax ? 0 : 1), + 'defaultTax' => $defaultTax, + 'currentTax' => $currentTax, + 'idSuffix' => '_clone', + 'oldPlusDisposition' => 0, + 'plusDisposition' => 0, + 'oldMinusDisposition' => 0, + 'minusDisposition' => 0, + ); + + $responseObject = new Varien_Object(); + Mage::dispatchEvent('catalog_product_view_config', array('response_object'=>$responseObject)); + if (is_array($responseObject->getAdditionalOptions())) { + foreach ($responseObject->getAdditionalOptions() as $option=>$value) { + $config[$option] = $value; + } + } + + return Mage::helper('core')->jsonEncode($config); + } + + /** + * Return true if product has options + * + * @return bool + */ + public function hasOptions() + { + if ($this->getProduct()->getTypeInstance(true)->hasOptions($this->getProduct())) { + return true; + } + return false; + } + + /** + * Check if product has required options + * + * @return bool + */ + public function hasRequiredOptions() + { + return $this->getProduct()->getTypeInstance(true)->hasRequiredOptions($this->getProduct()); + } +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php index 7162f272ac..a7341999a0 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php @@ -1,51 +1,51 @@ - - */ -abstract class Mage_Catalog_Block_Product_View_Abstract extends Mage_Catalog_Block_Product_Abstract -{ - /** - * Retrive product - * - * @return Mage_Catalog_Model_Product - */ - public function getProduct() - { - $product = parent::getProduct(); - if (is_null($product->getTypeInstance(true)->getStoreFilter($product))) { - $product->getTypeInstance(true)->setStoreFilter(Mage::app()->getStore(), $product); - } - - return $product; - } - -} + + */ +abstract class Mage_Catalog_Block_Product_View_Abstract extends Mage_Catalog_Block_Product_Abstract +{ + /** + * Retrive product + * + * @return Mage_Catalog_Model_Product + */ + public function getProduct() + { + $product = parent::getProduct(); + if (is_null($product->getTypeInstance(true)->getStoreFilter($product))) { + $product->getTypeInstance(true)->setStoreFilter(Mage::app()->getStore(), $product); + } + + return $product; + } + +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php index 40ebf63d28..7265802644 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php index 7af29b7012..3ea502b58e 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,4 +81,4 @@ public function getAdditionalData(array $excludeAttr = array()) } return $data; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Description.php b/app/code/core/Mage/Catalog/Block/Product/View/Description.php index 4ba7c0c520..5c1a76ac8f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Description.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Description.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,4 +43,4 @@ function getProduct() } return $this->_product; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Media.php b/app/code/core/Mage/Catalog/Block/Product/View/Media.php index 14e3b9b3be..707894f344 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Media.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Media.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,4 +58,4 @@ public function disableGallery() { $this->_isGalleryDisabled = true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options.php b/app/code/core/Mage/Catalog/Block/Product/View/Options.php index 318e843ef9..c1af9e408f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options.php @@ -1,180 +1,180 @@ - - */ -class Mage_Catalog_Block_Product_View_Options extends Mage_Core_Block_Template -{ - protected $_product; - - protected $_optionRenders = array(); - - public function __construct() - { - parent::__construct(); - $this->addOptionRenderer( - 'default', - 'catalog/product_view_options_type_default', - 'catalog/product/view/options/type/default.phtml' - ); - } - - /** - * Retrieve product object - * - * @return Mage_Catalog_Model_Product - */ - public function getProduct() - { - if (!$this->_product) { - if (Mage::registry('product')) { - $this->_product = Mage::registry('current_product'); - } else { - $this->_product = Mage::getSingleton('catalog/product'); - } - } - return $this->_product; - } - - /** - * Set product object - * - * @param Mage_Catalog_Model_Product $product - * @return Mage_Catalog_Block_Product_View_Options - */ - public function setProduct(Mage_Catalog_Model_Product $product = null) - { - $this->_product = $product; - return $this; - } - - /** - * Add option renderer to renderers array - * - * @param string $type - * @param string $block - * @param string $template - * @return Mage_Catalog_Block_Product_View_Options - */ - public function addOptionRenderer($type, $block, $template) - { - $this->_optionRenders[$type] = array( - 'block' => $block, - 'template' => $template, - 'renderer' => null - ); - return $this; - } - - /** - * Get option render by given type - * - * @param string $type - * @return array - */ - public function getOptionRender($type) - { - if (isset($this->_optionRenders[$type])) { - return $this->_optionRenders[$type]; - } - - return $this->_optionRenders['default']; - } - - public function getGroupOfOption($type) - { - $group = Mage::getSingleton('catalog/product_option')->getGroupByType($type); - - return $group == '' ? 'default' : $group; - } - - /** - * Get product options - * - * @return array - */ - public function getOptions() - { - return $this->getProduct()->getOptions(); - } - - public function hasOptions() - { - if ($this->getOptions()) { - return true; - } - return false; - } - - public function getJsonConfig() - { - $config = array(); - - foreach ($this->getOptions() as $option) { - /* @var $option Mage_Catalog_Model_Product_Option */ - $priceValue = 0; - if ($option->getGroupByType() == Mage_Catalog_Model_Product_Option::OPTION_GROUP_SELECT) { - $_tmpPriceValues = array(); - foreach ($option->getValues() as $value) { - /* @var $value Mage_Catalog_Model_Product_Option_Value */ - $_tmpPriceValues[$value->getId()] = Mage::helper('core')->currency($value->getPrice(true), false, false); - } - $priceValue = $_tmpPriceValues; - } else { - $priceValue = Mage::helper('core')->currency($option->getPrice(), false, false); - } - $config[$option->getId()] = $priceValue; - } - - return Mage::helper('core')->jsonEncode($config); - } - - /** - * Get option html block - * - * @param Mage_Catalog_Model_Product_Option $option - */ - public function getOptionHtml(Mage_Catalog_Model_Product_Option $option) - { - $renderer = $this->getOptionRender( - $this->getGroupOfOption($option->getType()) - ); - if (is_null($renderer['renderer'])) { - $renderer['renderer'] = $this->getLayout()->createBlock($renderer['block']) - ->setTemplate($renderer['template']); - } - return $renderer['renderer'] - ->setProduct($this->getProduct()) - ->setOption($option) - ->toHtml(); - } -} \ No newline at end of file + + */ +class Mage_Catalog_Block_Product_View_Options extends Mage_Core_Block_Template +{ + protected $_product; + + protected $_optionRenders = array(); + + public function __construct() + { + parent::__construct(); + $this->addOptionRenderer( + 'default', + 'catalog/product_view_options_type_default', + 'catalog/product/view/options/type/default.phtml' + ); + } + + /** + * Retrieve product object + * + * @return Mage_Catalog_Model_Product + */ + public function getProduct() + { + if (!$this->_product) { + if (Mage::registry('product')) { + $this->_product = Mage::registry('current_product'); + } else { + $this->_product = Mage::getSingleton('catalog/product'); + } + } + return $this->_product; + } + + /** + * Set product object + * + * @param Mage_Catalog_Model_Product $product + * @return Mage_Catalog_Block_Product_View_Options + */ + public function setProduct(Mage_Catalog_Model_Product $product = null) + { + $this->_product = $product; + return $this; + } + + /** + * Add option renderer to renderers array + * + * @param string $type + * @param string $block + * @param string $template + * @return Mage_Catalog_Block_Product_View_Options + */ + public function addOptionRenderer($type, $block, $template) + { + $this->_optionRenders[$type] = array( + 'block' => $block, + 'template' => $template, + 'renderer' => null + ); + return $this; + } + + /** + * Get option render by given type + * + * @param string $type + * @return array + */ + public function getOptionRender($type) + { + if (isset($this->_optionRenders[$type])) { + return $this->_optionRenders[$type]; + } + + return $this->_optionRenders['default']; + } + + public function getGroupOfOption($type) + { + $group = Mage::getSingleton('catalog/product_option')->getGroupByType($type); + + return $group == '' ? 'default' : $group; + } + + /** + * Get product options + * + * @return array + */ + public function getOptions() + { + return $this->getProduct()->getOptions(); + } + + public function hasOptions() + { + if ($this->getOptions()) { + return true; + } + return false; + } + + public function getJsonConfig() + { + $config = array(); + + foreach ($this->getOptions() as $option) { + /* @var $option Mage_Catalog_Model_Product_Option */ + $priceValue = 0; + if ($option->getGroupByType() == Mage_Catalog_Model_Product_Option::OPTION_GROUP_SELECT) { + $_tmpPriceValues = array(); + foreach ($option->getValues() as $value) { + /* @var $value Mage_Catalog_Model_Product_Option_Value */ + $_tmpPriceValues[$value->getId()] = Mage::helper('core')->currency($value->getPrice(true), false, false); + } + $priceValue = $_tmpPriceValues; + } else { + $priceValue = Mage::helper('core')->currency($option->getPrice(), false, false); + } + $config[$option->getId()] = $priceValue; + } + + return Mage::helper('core')->jsonEncode($config); + } + + /** + * Get option html block + * + * @param Mage_Catalog_Model_Product_Option $option + */ + public function getOptionHtml(Mage_Catalog_Model_Product_Option $option) + { + $renderer = $this->getOptionRender( + $this->getGroupOfOption($option->getType()) + ); + if (is_null($renderer['renderer'])) { + $renderer['renderer'] = $this->getLayout()->createBlock($renderer['block']) + ->setTemplate($renderer['template']); + } + return $renderer['renderer'] + ->setProduct($this->getProduct()) + ->setOption($option) + ->toHtml(); + } +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php index 13146c1050..08c6ae471a 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php @@ -1,160 +1,160 @@ - - */ -abstract class Mage_Catalog_Block_Product_View_Options_Abstract extends Mage_Core_Block_Template -{ - /** - * Product object - * - * @var Mage_Catalog_Model_Product - */ - protected $_product; - - /** - * Product option object - * - * @var Mage_Catalog_Model_Product_Option - */ - protected $_option; - - /** - * Set Product object - * - * @param Mage_Catalog_Model_Product $product - * @return Mage_Catalog_Block_Product_View_Options_Abstract - */ - public function setProduct(Mage_Catalog_Model_Product $product = null) - { - $this->_product = $product; - return $this; - } - - /** - * Retrieve Product object - * - * @return Mage_Catalog_Model_Product - */ - public function getProduct() - { - return $this->_product; - } - - /** - * Set option - * - * @param Mage_Catalog_Model_Product_Option $option - * @return Mage_Catalog_Block_Product_View_Options_Abstract - */ - public function setOption(Mage_Catalog_Model_Product_Option $option) - { - $this->_option = $option; - return $this; - } - - /** - * Get option - * - * @return Mage_Catalog_Model_Product_Option - */ - public function getOption() - { - return $this->_option; - } - - public function getFormatedPrice() - { - if ($option = $this->getOption()) { - return $this->_formatPrice(array( - 'is_percent' => ($option->getPriceType() == 'percent') ? true : false, - 'pricing_value' => $option->getPrice(true) - )); - } - return ''; - } - - /** - * Return formated price - * - * @param array $value - * @return string - */ - protected function _formatPrice($value, $flag=true) - { - if ($value['pricing_value'] == 0) { - return ''; - } - $sign = '+'; - if ($value['pricing_value'] < 0) { - $sign = '-'; - $value['pricing_value'] = 0 - $value['pricing_value']; - } - $priceStr = $sign; - $_priceInclTax = $this->getPrice($value['pricing_value'], true); - $_priceExclTax = $this->getPrice($value['pricing_value']); - if (Mage::helper('tax')->displayPriceIncludingTax()) { - $priceStr .= $this->helper('core')->currency($_priceInclTax, true, $flag); - } elseif (Mage::helper('tax')->displayPriceExcludingTax()) { - $priceStr .= $this->helper('core')->currency($_priceExclTax, true, $flag); - } elseif (Mage::helper('tax')->displayBothPrices()) { - $priceStr .= $this->helper('core')->currency($_priceExclTax, true, $flag); - if ($_priceInclTax != $_priceExclTax) { - $priceStr .= ' ('.$sign.$this->helper('core') - ->currency($_priceInclTax, true, $flag).' '.$this->__('Incl. Tax').')'; - } - } - - if ($flag) { - $priceStr = ''.$priceStr.''; - } - - return $priceStr; - } - - /** - * Get price with including/excluding tax - * - * @param decimal $price - * @param bool $includingTax - * @return decimal - */ - public function getPrice($price, $includingTax = null) - { - if (!is_null($includingTax)) { - $price = Mage::helper('tax')->getPrice($this->getProduct(), $price, true); - } else { - $price = Mage::helper('tax')->getPrice($this->getProduct(), $price); - } - return $price; - } -} \ No newline at end of file + + */ +abstract class Mage_Catalog_Block_Product_View_Options_Abstract extends Mage_Core_Block_Template +{ + /** + * Product object + * + * @var Mage_Catalog_Model_Product + */ + protected $_product; + + /** + * Product option object + * + * @var Mage_Catalog_Model_Product_Option + */ + protected $_option; + + /** + * Set Product object + * + * @param Mage_Catalog_Model_Product $product + * @return Mage_Catalog_Block_Product_View_Options_Abstract + */ + public function setProduct(Mage_Catalog_Model_Product $product = null) + { + $this->_product = $product; + return $this; + } + + /** + * Retrieve Product object + * + * @return Mage_Catalog_Model_Product + */ + public function getProduct() + { + return $this->_product; + } + + /** + * Set option + * + * @param Mage_Catalog_Model_Product_Option $option + * @return Mage_Catalog_Block_Product_View_Options_Abstract + */ + public function setOption(Mage_Catalog_Model_Product_Option $option) + { + $this->_option = $option; + return $this; + } + + /** + * Get option + * + * @return Mage_Catalog_Model_Product_Option + */ + public function getOption() + { + return $this->_option; + } + + public function getFormatedPrice() + { + if ($option = $this->getOption()) { + return $this->_formatPrice(array( + 'is_percent' => ($option->getPriceType() == 'percent') ? true : false, + 'pricing_value' => $option->getPrice(true) + )); + } + return ''; + } + + /** + * Return formated price + * + * @param array $value + * @return string + */ + protected function _formatPrice($value, $flag=true) + { + if ($value['pricing_value'] == 0) { + return ''; + } + $sign = '+'; + if ($value['pricing_value'] < 0) { + $sign = '-'; + $value['pricing_value'] = 0 - $value['pricing_value']; + } + $priceStr = $sign; + $_priceInclTax = $this->getPrice($value['pricing_value'], true); + $_priceExclTax = $this->getPrice($value['pricing_value']); + if (Mage::helper('tax')->displayPriceIncludingTax()) { + $priceStr .= $this->helper('core')->currency($_priceInclTax, true, $flag); + } elseif (Mage::helper('tax')->displayPriceExcludingTax()) { + $priceStr .= $this->helper('core')->currency($_priceExclTax, true, $flag); + } elseif (Mage::helper('tax')->displayBothPrices()) { + $priceStr .= $this->helper('core')->currency($_priceExclTax, true, $flag); + if ($_priceInclTax != $_priceExclTax) { + $priceStr .= ' ('.$sign.$this->helper('core') + ->currency($_priceInclTax, true, $flag).' '.$this->__('Incl. Tax').')'; + } + } + + if ($flag) { + $priceStr = ''.$priceStr.''; + } + + return $priceStr; + } + + /** + * Get price with including/excluding tax + * + * @param decimal $price + * @param bool $includingTax + * @return decimal + */ + public function getPrice($price, $includingTax = null) + { + if (!is_null($includingTax)) { + $price = Mage::helper('tax')->getPrice($this->getProduct(), $price, true); + } else { + $price = Mage::helper('tax')->getPrice($this->getProduct(), $price); + } + return $price; + } +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php index d6efa96166..f567819940 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -204,4 +204,4 @@ protected function _getValueWithLeadingZeros($value) } return $value < 10 ? '0'.$value : $value; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php index c67fbea8c9..5dd43cd01e 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ class Mage_Catalog_Block_Product_View_Options_Type_Default extends Mage_Catalog_Block_Product_View_Options_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php index bc96d0fa78..fd763d9b73 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ class Mage_Catalog_Block_Product_View_Options_Type_File extends Mage_Catalog_Block_Product_View_Options_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php index 9f44d8dd3e..ff0cabf56f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -117,4 +117,4 @@ public function getValuesHtml() } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php index c479fc8714..25a7f7498b 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ class Mage_Catalog_Block_Product_View_Options_Type_Text extends Mage_Catalog_Block_Product_View_Options_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Price.php b/app/code/core/Mage/Catalog/Block/Product/View/Price.php index 63ec5bd9d6..edd25b4b51 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Price.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Price.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php index 0cb43e8546..615d2f15d6 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,4 +65,4 @@ function getTabs() { return $this->_tabs; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php index 7e17934c08..8df8134306 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -263,4 +263,4 @@ protected function _convertPrice($price, $round=false) // } // return $this; // } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php index 7b21abd284..07b10fb11f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php @@ -1,42 +1,42 @@ - - */ -class Mage_Catalog_Block_Product_View_Type_Grouped extends Mage_Catalog_Block_Product_View_Abstract -{ - public function getAssociatedProducts() - { - return $this->getProduct()->getTypeInstance(true) - ->getAssociatedProducts($this->getProduct()); - } -} \ No newline at end of file + + */ +class Mage_Catalog_Block_Product_View_Type_Grouped extends Mage_Catalog_Block_Product_View_Abstract +{ + public function getAssociatedProducts() + { + return $this->getProduct()->getTypeInstance(true) + ->getAssociatedProducts($this->getProduct()); + } +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php index 2d5465deeb..7526e2b82d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Catalog_Block_Product_View_Type_Simple extends Mage_Catalog_Block_Product_View_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php index 679b666e88..faef25a0d4 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,4 +34,4 @@ class Mage_Catalog_Block_Product_View_Type_Virtual extends Mage_Catalog_Block_Product_View_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php index 204cfbad02..0bd423343c 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php index 6213a5242a..1fa8725b47 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php index f71029dce6..e3d0e723cb 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php index b5161e76f4..84acb72a21 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php index 137463f145..f803ee3da8 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php @@ -1,180 +1,180 @@ - - * - * @todo separate order, mode and pager - */ -class Mage_Catalog_Block_Seo_Sitemap_Tree_Pager extends Mage_Page_Block_Html_Pager -{ - protected $_showPerPage = false; - protected $lastPageNumber = 1; - protected $_totalNum = 0; - protected $_firstNum = 0; - protected $_lastNum = 1; - - public function getCurrentPage($displacement = 0) - { - if ($page = (int) $this->getRequest()->getParam($this->getPageVarName()) + $displacement) { - if ($page > $this->getLastPageNum()) { - return $this->getLastPageNum(); - } - return $page; - } - return 1; - } - - public function getLimit() - { - $limits = $this->getAvailableLimit(); -// if ($limit = $this->getRequest()->getParam($this->getLimitVarName())) { -// if (isset($limits[$limit])) { -// return $limit; -// } -// } - $limits = array_keys($limits); - return $limits[0]; - } - - public function setCollection($collection) - { - $this->_collection = $collection; -// ->setCurPage($this->getCurrentPage()); - // If not int - then not limit -// if ((int) $this->getLimit()) { -// $this->_collection->setPageSize($this->getLimit()); -// } - - return $this; - } - - /** - * @return Mage_Core_Model_Mysql4_Collection_Abstract - */ - public function getCollection() - { - return $this->_collection; - } - - public function getFirstNum() - { - return $this->_firstNum + 1; - } - - public function setFirstNum($firstNum) - { - $this->_firstNum = $firstNum; - return $this; - } - - public function getLastNum() - { - return $this->_lastNum; - } - - public function setLastNum($lastNum) - { - $this->_lastNum = $lastNum; - return $this; - } - - public function getTotalNum() - { - return $this->_totalNum; - } - - public function setTotalNum($totalNum) - { - $this->_totalNum = $totalNum; - return $this; - } - - public function isFirstPage() - { - return $this->getCurrentPage() == 1; - } - - public function getLastPageNum() - { - return $this->_lastPageNumber; - } - - public function setLastPageNum($lastPageNum) - { - $this->_lastPageNumber = $lastPageNum; - return $this; - } - - public function isLastPage() - { - return $this->getCurrentPage() >= $this->getLastPageNum(); - } - - public function getPages() - { - $pages = array(); - if ($this->getLastPageNum() <= $this->_displayPages) { - $pages = range(1, $this->getLastPageNum()); - } else { - $half = ceil($this->_displayPages / 2); - if ($this->getCurrentPage() >= $half && $this->getCurrentPage() <= $this->getLastPageNum() - $half) { - $start = ($this->getCurrentPage() - $half) + 1; - $finish = ($start + $this->_displayPages) - 1; - } elseif ($this->getCurrentPage() < $half) { - $start = 1; - $finish = $this->_displayPages; - } elseif ($this->getCurrentPage() > ($this->getLastPageNum() - $half)) { - $finish = $this->getLastPageNum(); - $start = $finish - $this->_displayPages + 1; - } - $pages = range($start, $finish); - } - - return $pages; - } - - public function getPreviousPageUrl() - { - return $this->getPageUrl($this->getCurrentPage(-1)); - } - - public function getNextPageUrl() - { - return $this->getPageUrl($this->getCurrentPage(+1)); - } - - public function getLastPageUrl() - { - return $this->getPageUrl($this->getLastPageNum()); - } - -} - + + * + * @todo separate order, mode and pager + */ +class Mage_Catalog_Block_Seo_Sitemap_Tree_Pager extends Mage_Page_Block_Html_Pager +{ + protected $_showPerPage = false; + protected $lastPageNumber = 1; + protected $_totalNum = 0; + protected $_firstNum = 0; + protected $_lastNum = 1; + + public function getCurrentPage($displacement = 0) + { + if ($page = (int) $this->getRequest()->getParam($this->getPageVarName()) + $displacement) { + if ($page > $this->getLastPageNum()) { + return $this->getLastPageNum(); + } + return $page; + } + return 1; + } + + public function getLimit() + { + $limits = $this->getAvailableLimit(); +// if ($limit = $this->getRequest()->getParam($this->getLimitVarName())) { +// if (isset($limits[$limit])) { +// return $limit; +// } +// } + $limits = array_keys($limits); + return $limits[0]; + } + + public function setCollection($collection) + { + $this->_collection = $collection; +// ->setCurPage($this->getCurrentPage()); + // If not int - then not limit +// if ((int) $this->getLimit()) { +// $this->_collection->setPageSize($this->getLimit()); +// } + + return $this; + } + + /** + * @return Mage_Core_Model_Mysql4_Collection_Abstract + */ + public function getCollection() + { + return $this->_collection; + } + + public function getFirstNum() + { + return $this->_firstNum + 1; + } + + public function setFirstNum($firstNum) + { + $this->_firstNum = $firstNum; + return $this; + } + + public function getLastNum() + { + return $this->_lastNum; + } + + public function setLastNum($lastNum) + { + $this->_lastNum = $lastNum; + return $this; + } + + public function getTotalNum() + { + return $this->_totalNum; + } + + public function setTotalNum($totalNum) + { + $this->_totalNum = $totalNum; + return $this; + } + + public function isFirstPage() + { + return $this->getCurrentPage() == 1; + } + + public function getLastPageNum() + { + return $this->_lastPageNumber; + } + + public function setLastPageNum($lastPageNum) + { + $this->_lastPageNumber = $lastPageNum; + return $this; + } + + public function isLastPage() + { + return $this->getCurrentPage() >= $this->getLastPageNum(); + } + + public function getPages() + { + $pages = array(); + if ($this->getLastPageNum() <= $this->_displayPages) { + $pages = range(1, $this->getLastPageNum()); + } else { + $half = ceil($this->_displayPages / 2); + if ($this->getCurrentPage() >= $half && $this->getCurrentPage() <= $this->getLastPageNum() - $half) { + $start = ($this->getCurrentPage() - $half) + 1; + $finish = ($start + $this->_displayPages) - 1; + } elseif ($this->getCurrentPage() < $half) { + $start = 1; + $finish = $this->_displayPages; + } elseif ($this->getCurrentPage() > ($this->getLastPageNum() - $half)) { + $finish = $this->getLastPageNum(); + $start = $finish - $this->_displayPages + 1; + } + $pages = range($start, $finish); + } + + return $pages; + } + + public function getPreviousPageUrl() + { + return $this->getPageUrl($this->getCurrentPage(-1)); + } + + public function getNextPageUrl() + { + return $this->getPageUrl($this->getCurrentPage(+1)); + } + + public function getLastPageUrl() + { + return $this->getPageUrl($this->getLastPageNum()); + } + +} + diff --git a/app/code/core/Mage/Catalog/Exception.php b/app/code/core/Mage/Catalog/Exception.php index 24a8e4675c..8870a9e8a8 100644 --- a/app/code/core/Mage/Catalog/Exception.php +++ b/app/code/core/Mage/Catalog/Exception.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,4 +30,4 @@ class Mage_Catalog_Exception extends Zend_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php index 28ac963dfb..2df19c9fdf 100644 --- a/app/code/core/Mage/Catalog/Helper/Category.php +++ b/app/code/core/Mage/Catalog/Helper/Category.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Helper/Category/Flat.php b/app/code/core/Mage/Catalog/Helper/Category/Flat.php index 9feea72b27..13850c6523 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Flat.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -71,4 +71,4 @@ public function isBuilt() { return $this->isEnabled(true); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Helper/Data.php b/app/code/core/Mage/Catalog/Helper/Data.php index e4ca699f79..e908766a43 100644 --- a/app/code/core/Mage/Catalog/Helper/Data.php +++ b/app/code/core/Mage/Catalog/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php index fb77b2e3ed..fc4e4ce3cc 100644 --- a/app/code/core/Mage/Catalog/Helper/Image.php +++ b/app/code/core/Mage/Catalog/Helper/Image.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -483,4 +483,4 @@ public function getOriginalSizeArray() $this->getOriginalHeight() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Helper/Map.php b/app/code/core/Mage/Catalog/Helper/Map.php index cf6dcb58e9..9953991a2c 100644 --- a/app/code/core/Mage/Catalog/Helper/Map.php +++ b/app/code/core/Mage/Catalog/Helper/Map.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Helper/Output.php b/app/code/core/Mage/Catalog/Helper/Output.php index 8731603b7a..a610481f2d 100644 --- a/app/code/core/Mage/Catalog/Helper/Output.php +++ b/app/code/core/Mage/Catalog/Helper/Output.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Helper_Output extends Mage_Core_Helper_Abstract @@ -83,9 +83,9 @@ public function getHandlers($method) public function process($method, $result, $params) { foreach ($this->getHandlers($method) as $handler) { - if (method_exists($handler, $method)) { + if (method_exists($handler, $method)) { $result = $handler->$method($this, $result, $params); - } + } } return $result; } @@ -123,4 +123,4 @@ public function categoryAttribute($category, $attributeHtml, $attributeName) )); return $attributeHtml; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php index 9937308bb5..eacb41e216 100644 --- a/app/code/core/Mage/Catalog/Helper/Product.php +++ b/app/code/core/Mage/Catalog/Helper/Product.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -187,4 +187,4 @@ public function getProductUrlSuffix($storeId = null) } return $this->_productUrlSuffix[$storeId]; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php index 1fc5dec88d..d07402d9e8 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Flat.php b/app/code/core/Mage/Catalog/Helper/Product/Flat.php index 24d7d3a8ed..85de26c6f5 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Flat.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Options.php b/app/code/core/Mage/Catalog/Helper/Product/Options.php index c5d0ec9151..f07100e0cd 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Options.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Options.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ */ class Mage_Catalog_Helper_Product_Options extends Mage_Core_Helper_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php index d5a02caca3..7bb20de1ea 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -128,4 +128,4 @@ public function format($string) { return strtr($string, $this->getConvertTable()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Abstract.php b/app/code/core/Mage/Catalog/Model/Abstract.php index c0d9ccf1cb..16568ada9f 100644 --- a/app/code/core/Mage/Catalog/Model/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Abstract.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Api/Resource.php b/app/code/core/Mage/Catalog/Model/Api/Resource.php index e7789d15e6..eb3a990e60 100644 --- a/app/code/core/Mage/Catalog/Model/Api/Resource.php +++ b/app/code/core/Mage/Catalog/Model/Api/Resource.php @@ -1,151 +1,151 @@ - - */ -class Mage_Catalog_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract -{ - /** - * Default ignored attribute codes - * - * @var array - */ - protected $_ignoredAttributeCodes = array('entity_id', 'attribute_set_id', 'entity_type_id'); - - /** - * Default ignored attribute types - * - * @var array - */ - protected $_ignoredAttributeTypes = array(); - - /** - * Field name in session for saving store id - * @var string - */ - protected $_storeIdSessionField = 'store_id'; - - /** - * Check is attribute allowed - * - * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute - * @param array $attributes - * @return boolean - */ - protected function _isAllowedAttribute($attribute, $attributes = null) - { - if (is_array($attributes) - && !( in_array($attribute->getAttributeCode(), $attributes) - || in_array($attribute->getAttributeId(), $attributes))) { - return false; - } - - return !in_array($attribute->getFrontendInput(), $this->_ignoredAttributeTypes) - && !in_array($attribute->getAttributeCode(), $this->_ignoredAttributeCodes); - } - - /** - * Retrives store id from store code, if no store id specified, - * it use seted session or admin store - * - * @param string|int $store - * @return int - */ - protected function _getStoreId($store = null) - { - if (is_null($store)) { - $store = ($this->_getSession()->hasData($this->_storeIdSessionField) - ? $this->_getSession()->getData($this->_storeIdSessionField) : 0); - } - - try { - $storeId = Mage::app()->getStore($store)->getId(); - } catch (Mage_Core_Model_Store_Exception $e) { - $this->_fault('store_not_exists'); - } - - return $storeId; - } - - /** - * Return loaded product instance - * - * @param int|string $productId (SKU or ID) - * @param int|string $store - * @return Mage_Catalog_Model_Product - */ - protected function _getProduct($productId, $store = null, $identifierType = null) - { - $loadByIdOnFalse = false; - if ($identifierType === null) { - $identifierType = 'sku'; - $loadByIdOnFalse = true; - } - $product = Mage::getModel('catalog/product'); - if ($store !== null) { - $product->setStoreId($this->_getStoreId($store)); - } - /* @var $product Mage_Catalog_Model_Product */ - if ($identifierType == 'sku') { - $idBySku = $product->getIdBySku($productId); - if ($idBySku) { - $productId = $idBySku; - } - if ($idBySku || $loadByIdOnFalse) { - $product->load($productId); - } - } elseif ($identifierType == 'id') { - $product->load($productId); - } - return $product; - } - - /** - * Set current store for catalog. - * - * @param string|int $store - * @return int - */ - public function currentStore($store=null) - { - if (!is_null($store)) { - try { - $storeId = Mage::app()->getStore($store)->getId(); - } catch (Mage_Core_Model_Store_Exception $e) { - $this->_fault('store_not_exists'); - } - - $this->_getSession()->setData($this->_storeIdSessionField, $storeId); - } - - return $this->_getStoreId(); - } -} // Class Mage_Catalog_Model_Api_Resource End \ No newline at end of file + + */ +class Mage_Catalog_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract +{ + /** + * Default ignored attribute codes + * + * @var array + */ + protected $_ignoredAttributeCodes = array('entity_id', 'attribute_set_id', 'entity_type_id'); + + /** + * Default ignored attribute types + * + * @var array + */ + protected $_ignoredAttributeTypes = array(); + + /** + * Field name in session for saving store id + * @var string + */ + protected $_storeIdSessionField = 'store_id'; + + /** + * Check is attribute allowed + * + * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute + * @param array $attributes + * @return boolean + */ + protected function _isAllowedAttribute($attribute, $attributes = null) + { + if (is_array($attributes) + && !( in_array($attribute->getAttributeCode(), $attributes) + || in_array($attribute->getAttributeId(), $attributes))) { + return false; + } + + return !in_array($attribute->getFrontendInput(), $this->_ignoredAttributeTypes) + && !in_array($attribute->getAttributeCode(), $this->_ignoredAttributeCodes); + } + + /** + * Retrives store id from store code, if no store id specified, + * it use seted session or admin store + * + * @param string|int $store + * @return int + */ + protected function _getStoreId($store = null) + { + if (is_null($store)) { + $store = ($this->_getSession()->hasData($this->_storeIdSessionField) + ? $this->_getSession()->getData($this->_storeIdSessionField) : 0); + } + + try { + $storeId = Mage::app()->getStore($store)->getId(); + } catch (Mage_Core_Model_Store_Exception $e) { + $this->_fault('store_not_exists'); + } + + return $storeId; + } + + /** + * Return loaded product instance + * + * @param int|string $productId (SKU or ID) + * @param int|string $store + * @return Mage_Catalog_Model_Product + */ + protected function _getProduct($productId, $store = null, $identifierType = null) + { + $loadByIdOnFalse = false; + if ($identifierType === null) { + $identifierType = 'sku'; + $loadByIdOnFalse = true; + } + $product = Mage::getModel('catalog/product'); + if ($store !== null) { + $product->setStoreId($this->_getStoreId($store)); + } + /* @var $product Mage_Catalog_Model_Product */ + if ($identifierType == 'sku') { + $idBySku = $product->getIdBySku($productId); + if ($idBySku) { + $productId = $idBySku; + } + if ($idBySku || $loadByIdOnFalse) { + $product->load($productId); + } + } elseif ($identifierType == 'id') { + $product->load($productId); + } + return $product; + } + + /** + * Set current store for catalog. + * + * @param string|int $store + * @return int + */ + public function currentStore($store=null) + { + if (!is_null($store)) { + try { + $storeId = Mage::app()->getStore($store)->getId(); + } catch (Mage_Core_Model_Store_Exception $e) { + $this->_fault('store_not_exists'); + } + + $this->_getSession()->setData($this->_storeIdSessionField, $storeId); + } + + return $this->_getStoreId(); + } +} // Class Mage_Catalog_Model_Api_Resource End diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index b89a0de229..fb751af6e6 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php index 99ffdff3ba..527fd73e8e 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -533,4 +533,4 @@ public function removeProduct($categoryId, $productId, $identifierType = null) return true; } -} // Class Mage_Catalog_Model_Category_Api End \ No newline at end of file +} // Class Mage_Catalog_Model_Category_Api End diff --git a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php index 7e301f6af1..d295337f5f 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php index 9a4875c73c..d2d5345549 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -106,4 +106,4 @@ public function options($attributeId, $store = null) return $result; } -} // Class Mage_Catalog_Model_Category_Attribute_Api End \ No newline at end of file +} // Class Mage_Catalog_Model_Category_Attribute_Api End diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php index fcbb12cf9b..3ed63b93c6 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Catalog_Model_Category_Attribute_Api_V2 extends Mage_Catalog_Model_Category_Attribute_Api { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php index 47caaa946c..2058a4c145 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php index f4bf32791c..3f9a5a9a99 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php index 6ec0e445e4..ac72ab27af 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php index 44f5ca9e3d..b90f062fd0 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php index 33a24d23c2..fb161f93ab 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php index 94d90800d8..820e9be776 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php index 58843033ea..549cfabd0c 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Config.php b/app/code/core/Mage/Catalog/Model/Config.php index bff44b6afb..357a8635e9 100644 --- a/app/code/core/Mage/Catalog/Model/Config.php +++ b/app/code/core/Mage/Catalog/Model/Config.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Convert.php b/app/code/core/Mage/Catalog/Model/Convert.php index 1f8561687a..19740a840c 100644 --- a/app/code/core/Mage/Catalog/Model/Convert.php +++ b/app/code/core/Mage/Catalog/Model/Convert.php @@ -1,31 +1,31 @@ -getLocale()->IsStoreDateInInterval(null, $date['from'], $date['to'])) { + if (Mage::app()->getLocale()->isStoreDateInInterval(null, $date['from'], $date['to'])) { $this->_apply($package, $theme); return true; } diff --git a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php index e030631984..286395bdab 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -59,4 +59,4 @@ protected function _afterSave() Mage::getSingleton('eav/config')->clear(); return parent::_afterSave(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php index e04600b01a..29a27b7ac1 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,4 +62,4 @@ public function getOptionText($value) return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php index 090ecefaf5..7b19ada3b1 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function getUrl($object, $size=null) }*/ return $url; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Index.php b/app/code/core/Mage/Catalog/Model/Index.php index 9af759c69e..df5435e50d 100644 --- a/app/code/core/Mage/Catalog/Model/Index.php +++ b/app/code/core/Mage/Catalog/Model/Index.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer.php b/app/code/core/Mage/Catalog/Model/Layer.php index 7c39b4bb1f..00d6764fe6 100644 --- a/app/code/core/Mage/Catalog/Model/Layer.php +++ b/app/code/core/Mage/Catalog/Model/Layer.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php index e877b1a1f8..76e5a095a0 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php index f692b6ffce..e89aaebcb0 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php index 97004fe078..9e70420b66 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php index 07a1cda11a..55e00c9458 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -101,4 +101,4 @@ public function getValueString() } return $value; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Layer/State.php b/app/code/core/Mage/Catalog/Model/Layer/State.php index 8d81141dff..0a53e5fa80 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/State.php +++ b/app/code/core/Mage/Catalog/Model/Layer/State.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -76,4 +76,4 @@ public function getFilters() } return $filters; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Observer.php b/app/code/core/Mage/Catalog/Model/Observer.php index e952e311e7..8fd71c34a1 100644 --- a/app/code/core/Mage/Catalog/Model/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 5c82d5f41f..a78d7c0552 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php index b6a6e1725c..2194a3d7dd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -310,4 +310,4 @@ public function delete($productId, $identifierType = null) return true; } -} // Class Mage_Catalog_Model_Product_Api End \ No newline at end of file +} // Class Mage_Catalog_Model_Product_Api End diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php index 5d11a8d6db..c5cc86476a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -339,4 +339,4 @@ public function getSpecialPrice($productId, $store = null) ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php index 2388462072..c9b315db04 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -115,4 +115,4 @@ public function options($attributeId, $store = null) } return $options; } -} // Class Mage_Catalog_Model_Product_Attribute_Api End \ No newline at end of file +} // Class Mage_Catalog_Model_Product_Attribute_Api End diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php index 97a1fbfa86..acbeaa447f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Catalog_Model_Product_Attribute_Api_V2 extends Mage_Catalog_Model_Product_Attribute_Api { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php index 170b49e178..3dafc124fd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php index 3a2457bb0c..40006117ee 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php index 2aa25a8051..1570391be5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php index 2bb2228281..44452212b8 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -240,7 +240,7 @@ public function afterSave($object) // prepare data for save foreach ($tierPrices as $data) { - if (empty($data['price_qty']) || !isset($data['price_qty']) || !empty($data['delete'])) { + if (empty($data['price_qty']) || !isset($data['cust_group']) || !empty($data['delete'])) { continue; } if ($this->getAttribute()->isScopeGlobal() && $data['website_id'] > 0) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php index 6f724cea98..9478ebca40 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php index da08480667..5593f74bef 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php index b44658f1af..6e7465ca51 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -382,4 +382,4 @@ protected function _initProduct($productId, $store = null, $identifierType = nul return $product; } -} // Class Mage_Catalog_Model_Product_Attribute_Media_Api End \ No newline at end of file +} // Class Mage_Catalog_Model_Product_Attribute_Media_Api End diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php index b3a0a7115e..ffa98e5258 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -181,4 +181,4 @@ public function update($productId, $file, $data, $store = null, $identifierType return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php index b6786c99c1..607eda3a08 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,4 +55,4 @@ public function items() return $result; } -} // Class Mage_Catalog_Model_Product_Attribute_Set_Api End \ No newline at end of file +} // Class Mage_Catalog_Model_Product_Attribute_Set_Api End diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php index 290dc3c03f..0ce2bfc685 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Catalog_Model_Product_Attribute_Set_Api_V2 extends Mage_Catalog_Model_Product_Attribute_Set_Api { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php index 5d88e8e4b3..59110a8277 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function getAllOptions() } return $this->_options; } -} +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php index 0cee46bf5b..109350fc71 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -119,7 +119,7 @@ public function update($productId, $tierPrices, $identifierType = null) } try { - $product->setData(self::ATTRIBUTE_CODE ,$updateValue); + $product->setData(self::ATTRIBUTE_CODE ,$updateValue); $product->validate(); $product->save(); } catch (Mage_Core_Exception $e) { @@ -166,4 +166,4 @@ protected function _initProduct($productId, $identifierType = null) return $product; } -} // Class Mage_Catalog_Model_Product_Attribute_Tierprice End \ No newline at end of file +} // Class Mage_Catalog_Model_Product_Attribute_Tierprice End diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php index e0352e4f33..13c065c225 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -96,7 +96,7 @@ public function update($productId, $tierPrices, $identifierType = null) } try { - $product->setData(self::ATTRIBUTE_CODE ,$updateValue); + $product->setData(self::ATTRIBUTE_CODE ,$updateValue); $product->validate(); $product->save(); } catch (Mage_Core_Exception $e) { @@ -105,4 +105,4 @@ public function update($productId, $tierPrices, $identifierType = null) return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php index 9be4bb2a3c..9ee06aa327 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php index 63c446b5bf..fb64710f11 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -128,4 +128,4 @@ public function hasItems($customerId, $visitorId) return Mage::getResourceSingleton('catalog/product_compare_item') ->getCount($customerId, $visitorId); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Condition.php b/app/code/core/Mage/Catalog/Model/Product/Condition.php index 2dea33bedf..5b01a140b5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Condition.php +++ b/app/code/core/Mage/Catalog/Model/Product/Condition.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Model_Product_Condition extends Varien_Object implements Mage_Catalog_Model_Product_Condition_Interface @@ -47,4 +47,4 @@ public function getIdsSelect($dbAdapter) } return ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php b/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php index eb26468b15..90ed1b646a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php @@ -18,14 +18,14 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ interface Mage_Catalog_Model_Product_Condition_Interface { public function applyToCollection($collection); public function getIdsSelect($dbAdapter); -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php index b426dffd4c..d88dddbbef 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php index dee437f7b3..7cf9a41a7c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php index c359fd32d5..aef0932153 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php index dd1def7443..9c85fb6308 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Image.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -255,7 +255,7 @@ private function _rgbToString($rgbArray) */ public function setBaseFile($file) { - if (($file) && (0 !== strpos($file, '/', 0))) { + if (($file) && (0 !== strpos($file, '/', 0))) { $file = '/' . $file; } $baseDir = Mage::getSingleton('catalog/product_media_config')->getBaseMediaPath(); @@ -413,7 +413,7 @@ public function setAngle($angle) /** * Add watermark to image - * size param in format 100x200 + * size param in format 100x200 * * @param string $fileName * @param string $position @@ -431,11 +431,11 @@ public function setWatermark($file, $position=null, $size=null, $width=null, $he return $this; } - if ($position) + if ($position) $this->setWatermarkPosition($position); - if ($size) + if ($size) $this->setWatermarkSize($size); - if ($width) + if ($width) $this->setWatermarkWidth($width); if ($heigth) $this->setWatermarkHeigth($heigth); @@ -443,7 +443,7 @@ public function setWatermark($file, $position=null, $size=null, $width=null, $he $this->setImageOpacity($imageOpacity); $filePath = $this->_getWatermarkFilePath(); - + if($filePath) { $this->getImageProcessor() ->setWatermarkPosition( $this->getWatermarkPosition() ) @@ -501,7 +501,7 @@ public function isCached() { return file_exists($this->_newFile); } - + /** * Set watermark file name * @@ -527,7 +527,7 @@ public function getWatermarkFile() /** * Get relative watermark file path * or false if file not found - * + * * @return string | bool */ protected function _getWatermarkFilePath() @@ -580,7 +580,7 @@ public function getWatermarkPosition() { return $this->_watermarkPosition; } - + /** * Set watermark image opacity * @@ -668,4 +668,4 @@ public function clearCache() $io = new Varien_Io_File(); $io->rmdir($directory, true); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Link.php b/app/code/core/Mage/Catalog/Model/Product/Link.php index 3730af5a0e..35246e36bf 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,4 +152,4 @@ public function saveGroupedLinks($product) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php index 928e632da8..49b29edffc 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -328,4 +328,4 @@ protected function _collectionToEditableArray($collection) return $result; } -} // Class Mage_Catalog_Model_Product_Link_Api End \ No newline at end of file +} // Class Mage_Catalog_Model_Product_Link_Api End diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php index eb8029fe84..260b75d8f9 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -116,4 +116,4 @@ public function update($type, $productId, $linkedProductId, $data = array(), $id return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php index c1de7ce732..8310676d96 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php +++ b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -107,4 +107,4 @@ protected function _prepareFileForPath($file) { return str_replace('/', DS, $file); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Option.php b/app/code/core/Mage/Catalog/Model/Product/Option.php index e403caccd9..5956142995 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php index 8e66c64aa1..d19513cd54 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php index 8950030fe3..72a24e94e0 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -324,4 +324,4 @@ protected function _timeExists() Mage_Catalog_Model_Product_Option::OPTION_TYPE_TIME )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php index 80e1907fc0..0e8ebfe0c6 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -349,4 +349,4 @@ protected function _getChargableOptionPrice($price, $isPercent, $basePrice) } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php index 588eb1f7bf..96ebdd21bc 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -576,4 +576,4 @@ protected function _bytesToMbytes($bytes) { return round($bytes / (1024 * 1024)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php index b3db5e73d9..bc459188bc 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -303,4 +303,4 @@ protected function _isSingleSelection() ); return in_array($this->getOption()->getType(), $_single); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php index af73aa0746..2a65fdc50d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -82,4 +82,4 @@ public function getFormattedOptionValue($value) { return Mage::helper('core')->htmlEscape($value); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php index dff61c9084..3771db8c57 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php @@ -1,209 +1,209 @@ - - */ -class Mage_Catalog_Model_Product_Option_Value extends Mage_Core_Model_Abstract -{ - protected $_values = array(); - - protected $_product; - - protected $_option; - - protected function _construct() - { - $this->_init('catalog/product_option_value'); - } - - public function addValue($value) - { - $this->_values[] = $value; - return $this; - } - - public function getValues() - { - return $this->_values; - } - - public function setValues($values) - { - $this->_values = $values; - return $this; - } - - public function unsetValues() - { - $this->_values = array(); - return $this; - } - - public function setOption(Mage_Catalog_Model_Product_Option $option) - { - $this->_option = $option; - return $this; - } - - public function unsetOption() - { - $this->_option = null; - return $this; - } - - /** - * Enter description here... - * - * @return Mage_Catalog_Model_Product_Option - */ - public function getOption() - { - return $this->_option; - } - - public function setProduct($product) - { - $this->_product = $product; - return $this; - } - - public function getProduct() - { - if (is_null($this->_product)) { - $this->_product = $this->getOption()->getProduct(); - } - return $this->_product; - } - - public function saveValues() - { - foreach ($this->getValues() as $value) { - $this->setData($value) - ->setData('option_id', $this->getOption()->getId()) - ->setData('store_id', $this->getOption()->getStoreId()); - - if ($this->getData('option_type_id') == '-1') {//change to 0 - $this->unsetData('option_type_id'); - } else { - $this->setId($this->getData('option_type_id')); - } - - if ($this->getData('is_delete') == '1') { - if ($this->getId()) { - $this->deleteValues($this->getId()); - $this->delete(); - } - } else { - $this->save(); - } - }//eof foreach() - return $this; - } - - /** - * Return price. If $flag is true and price is percent - * return converted percent to price - * - * @param bool $flag - * @return decimal - */ - public function getPrice($flag=false) - { - if ($flag && $this->getPriceType() == 'percent') { - $basePrice = $this->getOption()->getProduct()->getFinalPrice(); - $price = $basePrice*($this->_getData('price')/100); - return $price; - } - return $this->_getData('price'); - } - - /** - * Enter description here... - * - * @param Mage_Catalog_Model_Product_Option $option - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection - */ - public function getValuesCollection(Mage_Catalog_Model_Product_Option $option) - { - $collection = Mage::getResourceModel('catalog/product_option_value_collection') - ->addFieldToFilter('option_id', $option->getId()) - ->getValues($option->getStoreId()); - - return $collection; - } - - public function getValuesByOption($optionIds, $option_id, $store_id) - { - $collection = Mage::getResourceModel('catalog/product_option_value_collection') - ->addFieldToFilter('option_id', $option_id) - ->getValuesByOption($optionIds, $store_id); - - return $collection; - } - - public function deleteValue($option_id) - { - $this->getResource()->deleteValue($option_id); - return $this; - } - - public function deleteValues($option_type_id) - { - $this->getResource()->deleteValues($option_type_id); - return $this; - } - - /** - * Prepare array of option values for duplicate - * - * @return array - */ - public function prepareValueForDuplicate() - { - $this->setOptionId(null); - $this->setOptionTypeId(null); - - return $this->__toArray(); - } - - /** - * Duplicate product options value - * - * @param int $oldOptionId - * @param int $newOptionId - * @return Mage_Catalog_Model_Product_Option_Value - */ - public function duplicate($oldOptionId, $newOptionId) - { - $this->getResource()->duplicate($this, $oldOptionId, $newOptionId); - return $this; - } -} \ No newline at end of file + + */ +class Mage_Catalog_Model_Product_Option_Value extends Mage_Core_Model_Abstract +{ + protected $_values = array(); + + protected $_product; + + protected $_option; + + protected function _construct() + { + $this->_init('catalog/product_option_value'); + } + + public function addValue($value) + { + $this->_values[] = $value; + return $this; + } + + public function getValues() + { + return $this->_values; + } + + public function setValues($values) + { + $this->_values = $values; + return $this; + } + + public function unsetValues() + { + $this->_values = array(); + return $this; + } + + public function setOption(Mage_Catalog_Model_Product_Option $option) + { + $this->_option = $option; + return $this; + } + + public function unsetOption() + { + $this->_option = null; + return $this; + } + + /** + * Enter description here... + * + * @return Mage_Catalog_Model_Product_Option + */ + public function getOption() + { + return $this->_option; + } + + public function setProduct($product) + { + $this->_product = $product; + return $this; + } + + public function getProduct() + { + if (is_null($this->_product)) { + $this->_product = $this->getOption()->getProduct(); + } + return $this->_product; + } + + public function saveValues() + { + foreach ($this->getValues() as $value) { + $this->setData($value) + ->setData('option_id', $this->getOption()->getId()) + ->setData('store_id', $this->getOption()->getStoreId()); + + if ($this->getData('option_type_id') == '-1') {//change to 0 + $this->unsetData('option_type_id'); + } else { + $this->setId($this->getData('option_type_id')); + } + + if ($this->getData('is_delete') == '1') { + if ($this->getId()) { + $this->deleteValues($this->getId()); + $this->delete(); + } + } else { + $this->save(); + } + }//eof foreach() + return $this; + } + + /** + * Return price. If $flag is true and price is percent + * return converted percent to price + * + * @param bool $flag + * @return decimal + */ + public function getPrice($flag=false) + { + if ($flag && $this->getPriceType() == 'percent') { + $basePrice = $this->getOption()->getProduct()->getFinalPrice(); + $price = $basePrice*($this->_getData('price')/100); + return $price; + } + return $this->_getData('price'); + } + + /** + * Enter description here... + * + * @param Mage_Catalog_Model_Product_Option $option + * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection + */ + public function getValuesCollection(Mage_Catalog_Model_Product_Option $option) + { + $collection = Mage::getResourceModel('catalog/product_option_value_collection') + ->addFieldToFilter('option_id', $option->getId()) + ->getValues($option->getStoreId()); + + return $collection; + } + + public function getValuesByOption($optionIds, $option_id, $store_id) + { + $collection = Mage::getResourceModel('catalog/product_option_value_collection') + ->addFieldToFilter('option_id', $option_id) + ->getValuesByOption($optionIds, $store_id); + + return $collection; + } + + public function deleteValue($option_id) + { + $this->getResource()->deleteValue($option_id); + return $this; + } + + public function deleteValues($option_type_id) + { + $this->getResource()->deleteValues($option_type_id); + return $this; + } + + /** + * Prepare array of option values for duplicate + * + * @return array + */ + public function prepareValueForDuplicate() + { + $this->setOptionId(null); + $this->setOptionTypeId(null); + + return $this->__toArray(); + } + + /** + * Duplicate product options value + * + * @param int $oldOptionId + * @param int $newOptionId + * @return Mage_Catalog_Model_Product_Option_Value + */ + public function duplicate($oldOptionId, $newOptionId) + { + $this->getResource()->duplicate($this, $oldOptionId, $newOptionId); + return $this; + } +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php index c4ba27c582..3f16f8359a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Product/Status.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type.php b/app/code/core/Mage/Catalog/Model/Product/Type.php index 3209aa44e8..55959d032c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php index cb3ba2e7d7..469277f594 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php index 064e76403b..b6424ae7a1 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,4 +51,4 @@ public function items() return $result; } -} // Class Mage_Catalog_Model_Product_Type_Api End \ No newline at end of file +} // Class Mage_Catalog_Model_Product_Type_Api End diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php index 8fa4493970..b9d81b5c1d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Catalog_Model_Product_Type_Api_V2 extends Mage_Catalog_Model_Product_Type_Api { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php index b1840fabd5..3115c7ae22 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php index 15323ca7d9..d7f7d01a06 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php index 24940699ff..3cc6dc11c5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php @@ -1,103 +1,103 @@ - - */ -class Mage_Catalog_Model_Product_Type_Configurable_Price extends Mage_Catalog_Model_Product_Type_Price -{ - /** - * Get product final price - * - * @param double $qty - * @param Mage_Catalog_Model_Product $product - * @return double - */ - public function getFinalPrice($qty=null, $product) - { - if (is_null($qty) && !is_null($product->getCalculatedFinalPrice())) { - return $product->getCalculatedFinalPrice(); - } - - $finalPrice = parent::getFinalPrice($qty, $product); - $product->getTypeInstance(true) - ->setStoreFilter($product->getStore(), $product); - $attributes = $product->getTypeInstance(true) - ->getConfigurableAttributes($product); - - $selectedAttributes = array(); - if ($product->getCustomOption('attributes')) { - $selectedAttributes = unserialize($product->getCustomOption('attributes')->getValue()); - } - - $basePrice = $finalPrice; - foreach ($attributes as $attribute) { - $attributeId = $attribute->getProductAttribute()->getId(); - $value = $this->_getValueByIndex( - $attribute->getPrices() ? $attribute->getPrices() : array(), - isset($selectedAttributes[$attributeId]) ? $selectedAttributes[$attributeId] : null - ); - if($value) { - if($value['pricing_value'] != 0) { - $finalPrice += $this->_calcSelectionPrice($value, $basePrice); - } - } - } - $product->setFinalPrice($finalPrice); - return max(0, $product->getData('final_price')); - } - - /** - * Calculate configurable product selection price - * - * @param array $priceInfo - * @param decimal $productPrice - * @return decimal - */ - protected function _calcSelectionPrice($priceInfo, $productPrice) - { - if($priceInfo['is_percent']) { - $ratio = $priceInfo['pricing_value']/100; - $price = $productPrice * $ratio; - } else { - $price = $priceInfo['pricing_value']; - } - return $price; - } - - protected function _getValueByIndex($values, $index) { - foreach ($values as $value) { - if($value['value_index'] == $index) { - return $value; - } - } - return false; - } -} \ No newline at end of file + + */ +class Mage_Catalog_Model_Product_Type_Configurable_Price extends Mage_Catalog_Model_Product_Type_Price +{ + /** + * Get product final price + * + * @param double $qty + * @param Mage_Catalog_Model_Product $product + * @return double + */ + public function getFinalPrice($qty=null, $product) + { + if (is_null($qty) && !is_null($product->getCalculatedFinalPrice())) { + return $product->getCalculatedFinalPrice(); + } + + $finalPrice = parent::getFinalPrice($qty, $product); + $product->getTypeInstance(true) + ->setStoreFilter($product->getStore(), $product); + $attributes = $product->getTypeInstance(true) + ->getConfigurableAttributes($product); + + $selectedAttributes = array(); + if ($product->getCustomOption('attributes')) { + $selectedAttributes = unserialize($product->getCustomOption('attributes')->getValue()); + } + + $basePrice = $finalPrice; + foreach ($attributes as $attribute) { + $attributeId = $attribute->getProductAttribute()->getId(); + $value = $this->_getValueByIndex( + $attribute->getPrices() ? $attribute->getPrices() : array(), + isset($selectedAttributes[$attributeId]) ? $selectedAttributes[$attributeId] : null + ); + if($value) { + if($value['pricing_value'] != 0) { + $finalPrice += $this->_calcSelectionPrice($value, $basePrice); + } + } + } + $product->setFinalPrice($finalPrice); + return max(0, $product->getData('final_price')); + } + + /** + * Calculate configurable product selection price + * + * @param array $priceInfo + * @param decimal $productPrice + * @return decimal + */ + protected function _calcSelectionPrice($priceInfo, $productPrice) + { + if($priceInfo['is_percent']) { + $ratio = $priceInfo['pricing_value']/100; + $price = $productPrice * $ratio; + } else { + $price = $priceInfo['pricing_value']; + } + return $price; + } + + protected function _getValueByIndex($values, $index) { + foreach ($values as $value) { + if($value['value_index'] == $index) { + return $value; + } + } + return false; + } +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php index b69f759aa0..168aa1f433 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -308,4 +308,4 @@ public function prepareForCart(Varien_Object $buyRequest, $product = null) } return Mage::helper('catalog')->__('Please specify the product(s) quantity'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php index 5c9916ef57..3347e799f8 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -320,7 +320,7 @@ public static function calculatePrice($basePrice, $specialPrice, $specialPriceFr public static function calculateSpecialPrice($finalPrice, $specialPrice, $specialPriceFrom, $specialPriceTo, $store = null) { if (!is_null($specialPrice) && $specialPrice != false) { - if (Mage::app()->getLocale()->IsStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) { + if (Mage::app()->getLocale()->isStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) { $finalPrice = min($finalPrice, $specialPrice); } } diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php index 87464fad2f..2292b83774 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Catalog_Model_Product_Type_Simple extends Mage_Catalog_Model_Product_Type_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php index 9aa6261e02..a666f74862 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php @@ -1,46 +1,46 @@ - - */ -class Mage_Catalog_Model_Product_Type_Virtual extends Mage_Catalog_Model_Product_Type_Abstract -{ - /** - * Check is virtual product - * - * @param Mage_Catalog_Model_Product $product - * @return bool - */ - public function isVirtual($product = null) - { - return true; - } -} \ No newline at end of file + + */ +class Mage_Catalog_Model_Product_Type_Virtual extends Mage_Catalog_Model_Product_Type_Abstract +{ + /** + * Check is virtual product + * + * @param Mage_Catalog_Model_Product $product + * @return bool + */ + public function isVirtual($product = null) + { + return true; + } +} diff --git a/app/code/core/Mage/Catalog/Model/Product/Url.php b/app/code/core/Mage/Catalog/Model/Product/Url.php index aa655ed568..6cec32cb1f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Url.php +++ b/app/code/core/Mage/Catalog/Model/Product/Url.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Visibility.php b/app/code/core/Mage/Catalog/Model/Product/Visibility.php index 05e7e25e7f..d51e98ff1a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php +++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -136,7 +136,7 @@ public function getVisibleInSiteIds() static public function getOptionArray() { return array( - self::VISIBILITY_NOT_VISIBLE=> Mage::helper('catalog')->__('Nowhere'), + self::VISIBILITY_NOT_VISIBLE=> Mage::helper('catalog')->__('Not Visible Individually'), self::VISIBILITY_IN_CATALOG => Mage::helper('catalog')->__('Catalog'), self::VISIBILITY_IN_SEARCH => Mage::helper('catalog')->__('Search'), self::VISIBILITY_BOTH => Mage::helper('catalog')->__('Catalog, Search') diff --git a/app/code/core/Mage/Catalog/Model/Product/Website.php b/app/code/core/Mage/Catalog/Model/Product/Website.php index d37af7653e..16542df952 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Product/Website.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php index 9b5fdaae86..daf5c1c88a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php index eddff0a6cc..8d0d961363 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php index e72ad9fa0c..c14a0c576a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -340,7 +340,7 @@ protected function _saveCategoryProducts($category) */ if (!empty($update)) { foreach ($update as $productId => $position) { - $where = $adapter->quoteInto('category_id=?', (int)$id) + $where = $adapter->quoteInto('category_id=? AND ', (int)$id) . $adapter->quoteInto('product_id=?', (int)$productId); $bind = array('position' => (int)$position); $adapter->update($this->_categoryProductTable, $bind, $where); @@ -1149,4 +1149,4 @@ protected function _refreshRootCategoryProductIndex($productIds = array(), $stor return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php index 4a6ba10ab5..28da702035 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php index 0eafe68f62..7fcd3a281f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php index 10aa66e84d..07cf38c529 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php index 4064d4a345..8d44790905 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php index ae6976d6c7..68695b2f03 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php index 080a26487b..b2343f61b6 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -803,7 +803,6 @@ public function synchronize($category = null, $storeIds = array()) $select = $write->select() ->from($this->getTable('catalog/category')) ->where('entity_id=?', $category); - Mage::log($select->assemble()); $row = $write->fetchRow($select); if (!$row) { return $this; @@ -811,14 +810,12 @@ public function synchronize($category = null, $storeIds = array()) $stores = $this->getStoresRootCategories(); $path = explode('/', $row['path']); - Mage::log($path); foreach ($stores as $storeId => $rootCategoryId) { if (in_array($rootCategoryId, $path)) { $attributeValues = $this->_getAttributeValues($category, $storeId); $data = new Varien_Object($row); $data->addData($attributeValues[$category]) ->setStoreId($storeId); - Mage::log($data->debug()); $this->_synchronize($data); } else { $where = $write->quoteInto('entity_id=?', $category); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php index 8c512bd293..92e6e5932e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -340,4 +340,4 @@ public function setPage($pageNum, $pageSize) ->setPageSize($pageSize); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php index b86afebca8..8dad745eb8 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php index b8f9dc228b..c12a09013e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -74,7 +74,7 @@ public function getDefaultStoreId() protected function _getLoadAttributesSelect($table, $attributeIds = array()) { if (empty($attributeIds)) { - $attributeIds = $this->_selectAttributes; + $attributeIds = $this->_selectAttributes; } if ((int) $this->getStoreId()) { $entityIdField = $this->getEntity()->getEntityIdField(); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php index 8a1d75fa4d..4cf5421f94 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php index 49c65b3097..e57029829b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php index 9b13420cda..9b3241b28a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php index f2dbb4dfa8..758bbef51a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php index e17ce09999..3573765944 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -205,4 +205,4 @@ public function duplicate($object, $newFiles, $originalProductId, $newProductId) return $this; } -} // Class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media End \ No newline at end of file +} // Class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media End diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php index f84576bfe6..cb121fff57 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -92,10 +92,10 @@ public function deletePriceData($productId, $websiteId = null, $priceId = null) $adapter->quoteInto('entity_id=?', $productId) ); if (!is_null($websiteId)) { - $where[] = $adapter->quoteInto('website_id=?', $websiteId); + $conds[] = $adapter->quoteInto('website_id=?', $websiteId); } if (!is_null($priceId)) { - $where[] = $adapter->quoteInto($this->getIdFieldName() . '=?', $priceId); + $conds[] = $adapter->quoteInto($this->getIdFieldName() . '=?', $priceId); } $where = join(' AND ', $conds); @@ -111,9 +111,7 @@ public function deletePriceData($productId, $websiteId = null, $priceId = null) public function savePriceData(Varien_Object $priceObject) { $adapter = $this->_getWriteAdapter(); - Mage::log($priceObject->debug()); $data = $this->_prepareDataForTable($priceObject, $this->getMainTable()); - Mage::log($data); if (!empty($data[$this->getIdFieldName()])) { $where = $adapter->quoteInto($this->getIdFieldName() . '=?', $data[$this->getIdFieldName()]); unset($data[$this->getIdFieldName()]); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php index 72fd9b7edf..f5aeec6681 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php index 2327017246..c4ce7c425e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php index 90d4af60fa..eced6f0247 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php index 62a29e50d3..901a84c475 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -1415,10 +1415,13 @@ protected function _productLimitationJoinPrice() $fromPart = $this->getSelect()->getPart(Zend_Db_Select::FROM); if (!isset($fromPart['price_index'])) { + $minimalExpr = new Zend_Db_Expr( + 'IF(`price_index`.`tier_price`, LEAST(`price_index`.`min_price`, `price_index`.`tier_price`), `price_index`.`min_price`)' + ); $this->getSelect()->joinLeft( array('price_index' => $this->getTable('catalog/product_index_price')), $joinCond, - array('price', 'final_price', 'min_price', 'max_price', 'tier_price') + array('price', 'final_price', 'minimal_price'=>$minimalExpr , 'min_price', 'max_price', 'tier_price') ); } else { $fromPart['price_index']['joinCondition'] = $joinCond; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php index 396d5b74f5..55abf3d336 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php index 91157d278a..877bd0af04 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php index 6620eda4c2..2b56a35716 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php index 5915da7cf9..137ca52bfd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php index 0071da1e95..cc3b915374 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php index 623b1aa3d7..a17941f656 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php @@ -1,142 +1,142 @@ - - */ -class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection - extends Mage_Core_Model_Mysql4_Collection_Abstract -{ - protected $_product; - protected $_linkModel; - protected $_linkTypeId; - - protected function _construct() - { - $this->_init('catalog/product_link'); - } - - /** - * Declare link model and initialize type attributes join - * - * @param Mage_Catalog_Model_Product_Link $linkModel - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection - */ - public function setLinkModel($linkModel) - { - $this->_linkModel = $linkModel; - if ($linkModel->getLinkTypeId()) { - $this->_linkTypeId = $linkModel->getLinkTypeId(); - } - return $this; - } - - /** - * Retrieve collection link model - * - * @return Mage_Catalog_Model_Product_Link - */ - public function getLinkModel() - { - return $this->_linkModel; - } - - /** - * Initialize collection parent product and add limitation join - * - * @param Mage_Catalog_Model_Product $product - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection - */ - public function setProduct($product) - { - $this->_product = $product; - return $this; - } - - /** - * Retrieve collection base product object - * - * @return Mage_Catalog_Model_Product - */ - public function getProduct() - { - return $this->_product; - } - - /** - * Add link's type to filter - * - * @return Mage_Catalog_Model_Product - */ - public function addLinkTypeIdFilter() - { - if ($this->_linkTypeId) { - $this->addFieldToFilter("link_type_id", $this->_linkTypeId); - } - return $this; - } - - /** - * Add product to filter - * - * @return Mage_Catalog_Model_Product - */ - public function addProductIdFilter() - { - if ($this->getProduct() && $this->getProduct()->getId()) { - $this->addFieldToFilter("product_id", $this->getProduct()->getId()); - } - return $this; - } - - /** - * Join attributes - * - * @return Mage_Catalog_Model_Product - */ - public function joinAttributes() - { - if ($this->getLinkModel()) { - $attributes = $this->getLinkModel()->getAttributes(); - $attributesByType = array(); - foreach ($attributes as $attribute) { - $table = $this->getLinkModel()->getAttributeTypeTable($attribute['type']); - $alias = 'link_attribute_'.$attribute['code'].'_'.$attribute['type']; - $this->getSelect()->joinLeft( - array($alias => $table), - $alias.'.link_id=main_table.link_id AND '.$alias.'.product_link_attribute_id='.$attribute['id'], - array($attribute['code'] => 'value') - ); - } - } - return $this; - } -} \ No newline at end of file + + */ +class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection + extends Mage_Core_Model_Mysql4_Collection_Abstract +{ + protected $_product; + protected $_linkModel; + protected $_linkTypeId; + + protected function _construct() + { + $this->_init('catalog/product_link'); + } + + /** + * Declare link model and initialize type attributes join + * + * @param Mage_Catalog_Model_Product_Link $linkModel + * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection + */ + public function setLinkModel($linkModel) + { + $this->_linkModel = $linkModel; + if ($linkModel->getLinkTypeId()) { + $this->_linkTypeId = $linkModel->getLinkTypeId(); + } + return $this; + } + + /** + * Retrieve collection link model + * + * @return Mage_Catalog_Model_Product_Link + */ + public function getLinkModel() + { + return $this->_linkModel; + } + + /** + * Initialize collection parent product and add limitation join + * + * @param Mage_Catalog_Model_Product $product + * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection + */ + public function setProduct($product) + { + $this->_product = $product; + return $this; + } + + /** + * Retrieve collection base product object + * + * @return Mage_Catalog_Model_Product + */ + public function getProduct() + { + return $this->_product; + } + + /** + * Add link's type to filter + * + * @return Mage_Catalog_Model_Product + */ + public function addLinkTypeIdFilter() + { + if ($this->_linkTypeId) { + $this->addFieldToFilter("link_type_id", $this->_linkTypeId); + } + return $this; + } + + /** + * Add product to filter + * + * @return Mage_Catalog_Model_Product + */ + public function addProductIdFilter() + { + if ($this->getProduct() && $this->getProduct()->getId()) { + $this->addFieldToFilter("product_id", $this->getProduct()->getId()); + } + return $this; + } + + /** + * Join attributes + * + * @return Mage_Catalog_Model_Product + */ + public function joinAttributes() + { + if ($this->getLinkModel()) { + $attributes = $this->getLinkModel()->getAttributes(); + $attributesByType = array(); + foreach ($attributes as $attribute) { + $table = $this->getLinkModel()->getAttributeTypeTable($attribute['type']); + $alias = 'link_attribute_'.$attribute['code'].'_'.$attribute['type']; + $this->getSelect()->joinLeft( + array($alias => $table), + $alias.'.link_id=main_table.link_id AND '.$alias.'.product_link_attribute_id='.$attribute['id'], + array($attribute['code'] => 'value') + ); + } + } + return $this; + } +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php index f8ea1a4f16..e10e80704d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php index e3d409d132..1b27dc0918 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php index 5aa3794178..efa35eaa21 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -145,4 +145,4 @@ public function reset() { return $this->_reset(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php index 66ecca029a..f4e731deef 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -260,4 +260,4 @@ public function duplicate(Mage_Catalog_Model_Product_Option_Value $object, $oldO return $object; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php index 08ba205850..92ae9a8eeb 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -138,4 +138,4 @@ public function addOptionToFilter($option) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php index 992f39ab27..9b13f0c3ea 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php index cbdfe41114..56776f92d5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +81,7 @@ public function saveProducts($mainProduct, $productIds) if (!empty($insert)) { $data = array(); foreach ($insert as $childId) { - $data = array( + $data[] = array( 'product_id' => $childId, 'parent_id' => $mainProductId ); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php index bff820b869..1cd8782071 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php index 8dc84102b9..6a4986cde9 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php index 2492424577..09a4b7ecaf 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php index 1bbe4c9ad8..9cc201b584 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php index 3a8ba8348b..00bfe55047 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend extends Mage_Core_Model_Mysql4_Abstract @@ -50,4 +50,4 @@ public function deleteLogsBefore($time) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php index 7c6f443a96..72e37f7b85 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract @@ -30,4 +30,4 @@ protected function _construct() { $this->_init('catalog/sendfriend'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php index 019bd39ba9..d7c981d82d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -1263,7 +1263,7 @@ public function getDefaultEntities() 'input' => 'textarea', 'class' => '', 'source' => '', - 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL, + 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, 'visible' => true, 'required' => false, 'user_defined' => false, diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php index dbb66a7410..0abf7ef5a2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Sendfriend.php index 1421f83569..efb6870e9f 100644 --- a/app/code/core/Mage/Catalog/Model/Sendfriend.php +++ b/app/code/core/Mage/Catalog/Model/Sendfriend.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Model_Sendfriend extends Mage_Core_Model_Abstract @@ -264,4 +264,4 @@ private function _deleteLogsBefore($time) $this->_getResource()->deleteLogsBefore($time); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/Model/Session.php b/app/code/core/Mage/Catalog/Model/Session.php index bb3ffb481b..b07be2624d 100644 --- a/app/code/core/Mage/Catalog/Model/Session.php +++ b/app/code/core/Mage/Catalog/Model/Session.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php index dbe0184312..4e40b99690 100644 --- a/app/code/core/Mage/Catalog/Model/Url.php +++ b/app/code/core/Mage/Catalog/Model/Url.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -674,4 +674,4 @@ public function generatePath($type = 'target', $product = null, $category = null } return 'catalog/product/view/id/' . $product->getId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php index e1680e02f5..ceefe66926 100644 --- a/app/code/core/Mage/Catalog/controllers/CategoryController.php +++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/controllers/IndexController.php b/app/code/core/Mage/Catalog/controllers/IndexController.php index b9a318917a..ad98e1983f 100644 --- a/app/code/core/Mage/Catalog/controllers/IndexController.php +++ b/app/code/core/Mage/Catalog/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_IndexController extends Mage_Core_Controller_Front_Action diff --git a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php index 96c39a470f..1b6bf5710e 100644 --- a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php +++ b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -150,4 +150,4 @@ public function clearAction() $this->_redirectReferer(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Catalog/controllers/ProductController.php b/app/code/core/Mage/Catalog/controllers/ProductController.php index b33489b3c8..59ab5a6f8a 100644 --- a/app/code/core/Mage/Catalog/controllers/ProductController.php +++ b/app/code/core/Mage/Catalog/controllers/ProductController.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php index 84a78c9723..62dffcf495 100644 --- a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +++ b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/etc/api.xml b/app/code/core/Mage/Catalog/etc/api.xml index 2fa71d02c8..b9a12ab8ab 100644 --- a/app/code/core/Mage/Catalog/etc/api.xml +++ b/app/code/core/Mage/Catalog/etc/api.xml @@ -21,8 +21,8 @@ * * @category Mage * @package Mage_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -515,4 +515,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml index e9ed7ea01c..27eec4d731 100644 --- a/app/code/core/Mage/Catalog/etc/config.xml +++ b/app/code/core/Mage/Catalog/etc/config.xml @@ -19,16 +19,16 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 1.4.0.0.10 + 1.4.0.0.11 diff --git a/app/code/core/Mage/Catalog/etc/convert.xml b/app/code/core/Mage/Catalog/etc/convert.xml index 04040a6ce3..a19df36f1e 100644 --- a/app/code/core/Mage/Catalog/etc/convert.xml +++ b/app/code/core/Mage/Catalog/etc/convert.xml @@ -129,4 +129,4 @@ upload - \ No newline at end of file + diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml index 18b44818ca..97b01be3ff 100644 --- a/app/code/core/Mage/Catalog/etc/system.xml +++ b/app/code/core/Mage/Catalog/etc/system.xml @@ -19,10 +19,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/wsdl.xml b/app/code/core/Mage/Catalog/etc/wsdl.xml index f9b1f10599..5f292e36dd 100644 --- a/app/code/core/Mage/Catalog/etc/wsdl.xml +++ b/app/code/core/Mage/Catalog/etc/wsdl.xml @@ -364,6 +364,13 @@ + + + + + + + @@ -431,6 +438,13 @@ + + + + + + + @@ -475,6 +489,13 @@ + + + + + + + @@ -693,7 +714,7 @@ - + @@ -787,8 +808,8 @@ Set/Get current store view - - + + Retrieve products list by filters @@ -827,8 +848,8 @@ Set/Get current store view - - + + Retrieve attribute list @@ -862,8 +883,8 @@ Set/Get current store view - - + + Retrieve product image list diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php index e33a0b1e20..b16672a7a2 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php index cf6b0e4ea4..4a19087845 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php index d277f07a90..758128986f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup()->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php index 480aa3562a..c19c440e9e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->addAttributeGroup('catalog_product', 'Default', 'Design', 6); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php index e4a3de1e81..b79c4d7a90 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php index 6051721b09..ede799bb82 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php index 37475fca4e..868343a8ac 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php index d22e5f9f1d..8dbb3b4924 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup()->run(" delete link1.* diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php index 8163d84063..7ff45ad585 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -40,4 +40,4 @@ WHEN '5' THEN 'virtual' ELSE `type_id` END; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php index 6051721b09..ede799bb82 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php index 359dcea1b2..dac90ba144 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php index c2fd149405..ecc6a2c401 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php @@ -1,34 +1,34 @@ -getEntityTypeId('catalog_product'); -$installer->run(" - UPDATE `{$installer->getTable('eav_attribute')}` - SET `apply_to` = IF(`use_in_super_product`, 'simple,grouped,configurable', 'simple') - WHERE `entity_type_id` = $entityTypeId; -"); -$installer->getConnection()->dropColumn($installer->getTable('eav_attribute'), 'use_in_super_product'); \ No newline at end of file +getEntityTypeId('catalog_product'); +$installer->run(" + UPDATE `{$installer->getTable('eav_attribute')}` + SET `apply_to` = IF(`use_in_super_product`, 'simple,grouped,configurable', 'simple') + WHERE `entity_type_id` = $entityTypeId; +"); +$installer->getConnection()->dropColumn($installer->getTable('eav_attribute'), 'use_in_super_product'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php index e4a3de1e81..b79c4d7a90 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php index f0375db6b8..2d74d2310b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php index b452e0ebba..612ba2fe23 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php index 16ca9c38a6..a7af3c8878 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php @@ -1,41 +1,41 @@ -run(" -ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` MODIFY COLUMN `qty` DECIMAL(12,4) NOT NULL DEFAULT 1; -DELETE FROM `{$this->getTable('catalog_product_entity_tier_price')}` WHERE store_id>0; -ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` DROP COLUMN `store_id`, - ADD COLUMN `website_id` SMALLINT(5) UNSIGNED NOT NULL AFTER `value` -, DROP INDEX `FK_CATALOG_PRODUCT_ENTITY_TIER_PRICE_STORE`, - DROP FOREIGN KEY `FK_CATALOG_PRODUCT_ENTITY_TIER_PRICE_STORE`, - ADD CONSTRAINT `FK_CATALOG_PRODUCT_TIER_WEBSITE` FOREIGN KEY `FK_CATALOG_PRODUCT_TIER_WEBSITE` (`website_id`) - REFERENCES `{$this->getTable('core_website')}` (`website_id`) - ON DELETE CASCADE - ON UPDATE CASCADE; -"); \ No newline at end of file +run(" +ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` MODIFY COLUMN `qty` DECIMAL(12,4) NOT NULL DEFAULT 1; +DELETE FROM `{$this->getTable('catalog_product_entity_tier_price')}` WHERE store_id>0; +ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` DROP COLUMN `store_id`, + ADD COLUMN `website_id` SMALLINT(5) UNSIGNED NOT NULL AFTER `value` +, DROP INDEX `FK_CATALOG_PRODUCT_ENTITY_TIER_PRICE_STORE`, + DROP FOREIGN KEY `FK_CATALOG_PRODUCT_ENTITY_TIER_PRICE_STORE`, + ADD CONSTRAINT `FK_CATALOG_PRODUCT_TIER_WEBSITE` FOREIGN KEY `FK_CATALOG_PRODUCT_TIER_WEBSITE` (`website_id`) + REFERENCES `{$this->getTable('core_website')}` (`website_id`) + ON DELETE CASCADE + ON UPDATE CASCADE; +"); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php index caa2534333..9d2a0442c0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php @@ -1,27 +1,27 @@ -installEntities(); \ No newline at end of file +installEntities(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php index 594ec2f3ac..039e748029 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php @@ -1,30 +1,30 @@ -run("UPDATE `{$this->getTable('catalog_category_entity')}` SET `position` = `entity_id` WHERE `position` = 0;"); +run("UPDATE `{$this->getTable('catalog_category_entity')}` SET `position` = `entity_id` WHERE `position` = 0;"); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php index 569341770d..26da8027d5 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php index 569341770d..26da8027d5 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php index ae5b10de5f..59de5a6114 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -72,4 +72,4 @@ 'FK_CORE_URL_REWRITE_PRODUCT', $installer->getTable('core_url_rewrite'), 'product_id', $installer->getTable('catalog_product_entity'), 'entity_id' ); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php index f1d8c2cd84..7a64ee1236 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php index c67894ad34..2bb37305ad 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php index 4678ed7261..edf3cc1c92 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php @@ -1,39 +1,39 @@ -startSetup(); -$installer->updateAttribute('catalog_category', 'is_active', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); -$installer->updateAttribute('catalog_category', 'image', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); -$installer->updateAttribute('catalog_category', 'display_mode', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); -$installer->updateAttribute('catalog_category', 'landing_page', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); -$installer->updateAttribute('catalog_category', 'page_layout', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); -$installer->updateAttribute('catalog_category', 'custom_layout_update', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); - -$installer->updateAttribute('catalog_product', 'status', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_WEBSITE); -$installer->endSetup(); +startSetup(); +$installer->updateAttribute('catalog_category', 'is_active', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); +$installer->updateAttribute('catalog_category', 'image', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); +$installer->updateAttribute('catalog_category', 'display_mode', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); +$installer->updateAttribute('catalog_category', 'landing_page', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); +$installer->updateAttribute('catalog_category', 'page_layout', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); +$installer->updateAttribute('catalog_category', 'custom_layout_update', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); + +$installer->updateAttribute('catalog_product', 'status', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_WEBSITE); +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php index 8f291b78e5..2dfe654a73 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php @@ -1,35 +1,35 @@ -run(" -// -//update `{$installer->getTable('eav/attribute')}` set `is_required`=0 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}' -// -//"); -// \ No newline at end of file +run(" +// +//update `{$installer->getTable('eav/attribute')}` set `is_required`=0 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}' +// +//"); +// diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php index 65a2d2df57..aebd26022a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php @@ -1,34 +1,34 @@ -run(" - -update `{$installer->getTable('eav/attribute')}` set `is_required`=1 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}' - -"); +run(" + +update `{$installer->getTable('eav/attribute')}` set `is_required`=1 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}' + +"); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php index 5e50803690..2daf6cea98 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php index 9d2ebf7d4d..36644bbcbb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -59,4 +59,4 @@ ADD UNIQUE `UNQ_CATEGORY_PRODUCT` (`category_id`, `product_id`); "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php index 845debc2ef..665dcb2bac 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->run("ALTER TABLE `{$installer->getTable('catalog_category_entity')}` DROP `is_active`;"); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php index 4df2d15d62..663e86b3e1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -58,4 +58,4 @@ 'unique' => false, )); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php index e33085d7f0..d0081484b1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php @@ -1,47 +1,47 @@ -startSetup(); -try { - $installer->run(" - ALTER TABLE `{$installer->getTable('catalog_product_website')}` ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci; - - delete from `{$installer->getTable('catalog_product_website')}` where product_id not in (select entity_id from catalog_product_entity); - delete from `{$installer->getTable('catalog_product_website')}` where website_id not in (select website_id from core_website); - - ALTER TABLE `{$installer->getTable('catalog_product_website')}` DROP INDEX `FK_CATALOG_PRODUCT_WEBSITE_WEBSITE`, - ADD CONSTRAINT `FK_CATALOG_PRODUCT_WEBSITE_PRODUCT` FOREIGN KEY `FK_CATALOG_PRODUCT_WEBSITE_PRODUCT` (`product_id`) - REFERENCES `{$installer->getTable('catalog_product_entity')}` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - ADD CONSTRAINT `FK_CATAOLOG_PRODUCT_WEBSITE_WEBSITE` FOREIGN KEY `FK_CATAOLOG_PRODUCT_WEBSITE_WEBSITE` (`website_id`) - REFERENCES `{$installer->getTable('core_website')}` (`website_id`) ON DELETE CASCADE ON UPDATE CASCADE, - ROW_FORMAT = FIXED; - "); -} catch (Exception $e) { -} -$installer->endSetup(); +startSetup(); +try { + $installer->run(" + ALTER TABLE `{$installer->getTable('catalog_product_website')}` ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci; + + delete from `{$installer->getTable('catalog_product_website')}` where product_id not in (select entity_id from catalog_product_entity); + delete from `{$installer->getTable('catalog_product_website')}` where website_id not in (select website_id from core_website); + + ALTER TABLE `{$installer->getTable('catalog_product_website')}` DROP INDEX `FK_CATALOG_PRODUCT_WEBSITE_WEBSITE`, + ADD CONSTRAINT `FK_CATALOG_PRODUCT_WEBSITE_PRODUCT` FOREIGN KEY `FK_CATALOG_PRODUCT_WEBSITE_PRODUCT` (`product_id`) + REFERENCES `{$installer->getTable('catalog_product_entity')}` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE, + ADD CONSTRAINT `FK_CATAOLOG_PRODUCT_WEBSITE_WEBSITE` FOREIGN KEY `FK_CATAOLOG_PRODUCT_WEBSITE_WEBSITE` (`website_id`) + REFERENCES `{$installer->getTable('core_website')}` (`website_id`) ON DELETE CASCADE ON UPDATE CASCADE, + ROW_FORMAT = FIXED; + "); +} catch (Exception $e) { +} +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php index eb2a926a16..333b5ba300 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -110,4 +110,4 @@ )ENGINE=InnoDB default CHARSET=utf8; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php index 5872d2cb8f..b6eb518caf 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -34,4 +34,4 @@ "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php index 9c347e2441..8cda5ce85f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -39,4 +39,4 @@ } } -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php index 71d734643c..237e4bd5eb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -50,13 +50,13 @@ $installer->getConnection()->dropColumn($productTable, 'is_active'); try { - $installer->run(" - INSERT INTO {$this->getTable('catalog_product_website')} - SELECT DISTINCT ps.product_id, cs.website_id - FROM {$this->getTable('catalog_product_store')} ps, {$this->getTable('core_store')} cs - WHERE cs.store_id=ps.store_id AND ps.store_id>0; - DROP TABLE IF EXISTS {$this->getTable('catalog_product_store')}; - "); + $installer->run(" + INSERT INTO {$this->getTable('catalog_product_website')} + SELECT DISTINCT ps.product_id, cs.website_id + FROM {$this->getTable('catalog_product_store')} ps, {$this->getTable('core_store')} cs + WHERE cs.store_id=ps.store_id AND ps.store_id>0; + DROP TABLE IF EXISTS {$this->getTable('catalog_product_store')}; + "); } catch (Exception $e) { } @@ -68,7 +68,7 @@ } catch (Exception $e) { } try { - $this->run("DROP TABLE IF EXISTS `{$this->getTable('catalog/category_tree')}`;"); + $this->run("DROP TABLE IF EXISTS `{$this->getTable('catalog/category_tree')}`;"); } catch (Exception $e) { } diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php index baa9942d09..62e1f5710b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php index 645b13dca4..b8fa03aea5 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -35,4 +35,4 @@ $installer->getConnection()->addKey($installer->getTable('catalog_product_entity_text'), 'IDX_ATTRIBUTE_VALUE', array('entity_id', 'attribute_id', 'store_id')); $installer->getConnection()->addKey($installer->getTable('catalog_product_entity_varchar'), 'IDX_ATTRIBUTE_VALUE', array('entity_id', 'attribute_id', 'store_id')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php index 6d9e44c943..56e66c129f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php @@ -18,9 +18,9 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php index 735e8319b3..85fd42801d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -34,4 +34,4 @@ 'default' => false )); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php index c12c489e53..8f00ab7aa9 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->updateAttribute('catalog_product', 'tax_class_id', 'apply_to', 'simple,configurable,virtual'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php index c071b7253e..902aad3563 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->updateAttribute('catalog_product', 'tier_price', 'is_used_for_price_rules', '0'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php index 0957f3a617..488edb9911 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -107,9 +107,9 @@ "); foreach ($storeIds as $storeId) { if (!$storeId) { - continue; + continue; } - $installer->run(" + $installer->run(" INSERT INTO {$installer->getTable('catalog_product_enabled_index')} SELECT t_v_default.entity_id, {$storeId}, IFNULL(t_v.value, t_v_default.value) FROM {$installer->getTable('catalog_product_entity_int')} AS t_v_default @@ -123,7 +123,7 @@ WHERE t_v_default.attribute_id='{$visibilityAttributeId}' AND t_v_default.store_id=0 AND (IFNULL(t_s.value, t_s_default.value)=".Mage_Catalog_Model_Product_Status::STATUS_ENABLED.") - "); + "); } } diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php index c21b44b2d5..80a4ee1cff 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php index 6a9b4a4aaf..52e3874e57 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php index f76445e60c..513adfdccb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $this Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php index 98e27e1492..732984c803 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php index 7fff4855aa..85f9280b71 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $this Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */ @@ -41,4 +41,4 @@ WHERE `entity_id` = {$row['entity_id']}"); } -$this->endSetup(); \ No newline at end of file +$this->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php index 56888ac37d..4e543d590f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $this Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */ @@ -48,4 +48,4 @@ $this->run("DROP TABLE `{$tableTmp}`"); -$this->endSetup(); \ No newline at end of file +$this->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php index 3b9ee79334..a70f51c245 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->getConnection()->changeColumn($installer->getTable('catalog/product_option_title'), 'title', 'title', 'VARCHAR(255) NOT NULL default \'\''); $installer->getConnection()->changeColumn($installer->getTable('catalog/product_option_type_title'), 'title', 'title', 'VARCHAR(255) NOT NULL default \'\''); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php index 1ab88f0c68..f877dd312d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -59,4 +59,4 @@ 'is_configurable' => false, )); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php index f2406120d0..0be8ec53af 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -35,4 +35,4 @@ $installer->updateAttribute('catalog_product', 'thumbnail_label', 'is_searchable', '0'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php index 78a8a7b82a..0cb9714c9f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -69,31 +69,31 @@ "); foreach ($storesData as $storeData) { - $storeId = $storeData['store_id']; - $websiteId = $storeData['website_id']; - $path = $storeData['root_path']; - - $query = "INSERT INTO {$categoryIndexTable} - (`category_id`, `product_id`, `position`, `is_parent`, `store_id`, `visibility`) - SELECT - ci.category_id, - ci.product_id, - ci.position, - ci.is_parent, - {$storeId}, - ep.visibility - FROM - $categoryIndexTable AS ci - INNER JOIN {$installer->getTable('catalog/product_website')} AS pw - ON pw.product_id=ci.product_id AND pw.website_id={$websiteId} - INNER JOIN {$installer->getTable('catalog/category')} AS c - ON c.entity_id=ci.category_id AND c.path LIKE '{$path}%' - INNER JOIN {$installer->getTable('catalog/product_enabled_index')} AS ep - ON ep.product_id=ci.product_id AND ep.store_id={$storeId} + $storeId = $storeData['store_id']; + $websiteId = $storeData['website_id']; + $path = $storeData['root_path']; + + $query = "INSERT INTO {$categoryIndexTable} + (`category_id`, `product_id`, `position`, `is_parent`, `store_id`, `visibility`) + SELECT + ci.category_id, + ci.product_id, + ci.position, + ci.is_parent, + {$storeId}, + ep.visibility + FROM + $categoryIndexTable AS ci + INNER JOIN {$installer->getTable('catalog/product_website')} AS pw + ON pw.product_id=ci.product_id AND pw.website_id={$websiteId} + INNER JOIN {$installer->getTable('catalog/category')} AS c + ON c.entity_id=ci.category_id AND c.path LIKE '{$path}%' + INNER JOIN {$installer->getTable('catalog/product_enabled_index')} AS ep + ON ep.product_id=ci.product_id AND ep.store_id={$storeId} WHERE ci.store_id=0"; - $installer->run($query); + $installer->run($query); } $installer->getConnection()->delete($categoryIndexTable, 'store_id=0'); @@ -124,4 +124,4 @@ 'store_id' ); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php index f2d4f18774..12e8d11407 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php index 593df91119..ea280cd511 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php index 9e5c5ab60a..38d804b17b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php index f3384d237c..931642d3de 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php index e4a3de1e81..b79c4d7a90 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php index 7d74b9a490..19df73101c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php index a6f7c98f20..52a8f68fea 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php index babb259ecb..5e450ff84d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php index 123777c58b..57f8cad2fe 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php index e9a273671d..e1c0a74f32 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php @@ -1,30 +1,30 @@ getTable('core/config_data')}` SET `value`=0 WHERE `path` LIKE '".Mage_Catalog_Helper_Product_Flat::XML_PATH_USE_PRODUCT_FLAT."'; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php index 51e8eefc16..3152f8d242 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php index 04acbbf586..4fa0ae2a30 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php index 43733e4c70..ea814bacd4 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php index 8af7c61439..5867b46cac 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php index fb73cecf5e..183f2ba2aa 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogIndex/Model/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php index 4b04cc87d7..988f68ccb8 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -119,7 +119,7 @@ public function clearProductData($productIds) if (!empty($categoryPaths)) { $tags = array(); foreach ($categoryPaths as $path) { - $tags[] = Mage_Catalog_Model_Category::CACHE_TAG.':'.$path; + $tags[] = Mage_Catalog_Model_Category::CACHE_TAG.':'.$path; } $this->clearCacheData($tags); } @@ -163,4 +163,4 @@ protected function _processTags($tags) } return $newTags; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Attribute.php index 7ebad38387..f66924096c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Attribute.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,4 +58,4 @@ public function applyFilterToCollection($collection, $attribute, $value) $this->_getResource()->applyFilterToCollection($collection, $attribute, $value); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php index a825d921b8..7f9d6c54d8 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php +++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogIndex_Model_Catalog_Index_Flag extends Mage_Core_Model_Flag @@ -49,4 +49,4 @@ protected function _beforeSave() return parent::_beforeSave(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php index 26dc707bd6..628a643983 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php +++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * 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_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogIndex_Model_Catalog_Index_Kill_Flag extends Mage_Core_Model_Flag @@ -26,4 +32,4 @@ public function checkIsThisProcess() { return ($this->getFlagData() == getmypid()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php index 9a77088030..9e57b249fa 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php index 7a66d3b1bb..9031fedd99 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -77,4 +77,4 @@ protected function _getLinkSettings() 'child_field'=>'product_id', ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php index f52e29c45e..195d5403d2 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -80,4 +80,4 @@ protected function _getLinkSettings() 'additional'=>array('link_type_id'=>Mage_Catalog_Model_Product_Link::LINK_TYPE_GROUPED) ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php index 2007ef7fee..80d7d15fd0 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function getTypeCode() { return Mage_Catalog_Model_Product_Type::TYPE_SIMPLE; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php index f4a6730d25..b109df280a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function getTypeCode() return Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php index 89ebf29706..924a47643d 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -803,4 +803,4 @@ public function updateCatalogProductFlat($store, $products = null, $resourceTabl return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php index c48292301b..a6bb4c2276 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -149,4 +149,4 @@ public function isAttributeIdUsed() { return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php index 3d895fcbdb..3951576e94 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,4 +85,4 @@ protected function _getIndexableAttributeConditions() $conditions['or']['is_filterable'] = array(1, 2); $conditions['or']['is_visible_in_advanced_search'] = 1; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php index d9415babae..008d46ddf6 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ interface Mage_CatalogIndex_Model_Indexer_Interface { public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null); -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php index 18a116b46d..459b8479ac 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php @@ -1,122 +1,122 @@ - - */ -class Mage_CatalogIndex_Model_Indexer_Minimalprice extends Mage_CatalogIndex_Model_Indexer_Abstract -{ - protected $_customerGroups = array(); - protected $_runOnce = true; - protected $_processChildren = false; - - protected function _construct() - { - $this->_init('catalogindex/indexer_minimalprice'); - $this->_currencyModel = Mage::getModel('directory/currency'); - $this->_customerGroups = Mage::getModel('customer/group')->getCollection(); - - return parent::_construct(); - } - - public function getTierPriceAttribute() - { - $data = $this->getData('tier_price_attribute'); - if (is_null($data)) { - $data = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'tier_price'); - $this->setData('tier_price_attribute', $data); - } - return $data; - } - - public function getPriceAttribute() - { - $data = $this->getData('price_attribute'); - if (is_null($data)) { - $data = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'price'); - $this->setData('price_attribute', $data); - } - return $data; - } - - public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null) - { - $searchEntityId = $object->getId(); - $priceAttributeId = $this->getTierPriceAttribute()->getId(); - if ($object->isGrouped()) { - $priceAttributeId = $this->getPriceAttribute()->getId(); - $associated = $object->getTypeInstance(true)->getAssociatedProducts($object); - $searchEntityId = array(); - - foreach ($associated as $product) { - $searchEntityId[] = $product->getId(); - } - } - - if (!count($searchEntityId)) { - return false; - } - - $result = array(); - $data = array(); - - $data['store_id'] = $object->getStoreId(); - $data['entity_id'] = $object->getId(); - - $search['store_id'] = $object->getStoreId(); - $search['entity_id'] = $searchEntityId; - $search['attribute_id'] = $priceAttributeId; - - foreach ($this->_customerGroups as $group) { - $search['customer_group_id'] = $group->getId(); - $data['customer_group_id'] = $group->getId(); - - $value = $this->_getResource()->getMinimalValue($search); - if (is_null($value)) - continue; - $data['value'] = $value; - $result[] = $data; - } - - return $result; - } - - public function isAttributeIdUsed() - { - return false; - } - - protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) - { - if ($attribute->getAttributeCode() != 'minimal_price') - return false; - - return true; - } -} \ No newline at end of file + + */ +class Mage_CatalogIndex_Model_Indexer_Minimalprice extends Mage_CatalogIndex_Model_Indexer_Abstract +{ + protected $_customerGroups = array(); + protected $_runOnce = true; + protected $_processChildren = false; + + protected function _construct() + { + $this->_init('catalogindex/indexer_minimalprice'); + $this->_currencyModel = Mage::getModel('directory/currency'); + $this->_customerGroups = Mage::getModel('customer/group')->getCollection(); + + return parent::_construct(); + } + + public function getTierPriceAttribute() + { + $data = $this->getData('tier_price_attribute'); + if (is_null($data)) { + $data = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'tier_price'); + $this->setData('tier_price_attribute', $data); + } + return $data; + } + + public function getPriceAttribute() + { + $data = $this->getData('price_attribute'); + if (is_null($data)) { + $data = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'price'); + $this->setData('price_attribute', $data); + } + return $data; + } + + public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null) + { + $searchEntityId = $object->getId(); + $priceAttributeId = $this->getTierPriceAttribute()->getId(); + if ($object->isGrouped()) { + $priceAttributeId = $this->getPriceAttribute()->getId(); + $associated = $object->getTypeInstance(true)->getAssociatedProducts($object); + $searchEntityId = array(); + + foreach ($associated as $product) { + $searchEntityId[] = $product->getId(); + } + } + + if (!count($searchEntityId)) { + return false; + } + + $result = array(); + $data = array(); + + $data['store_id'] = $object->getStoreId(); + $data['entity_id'] = $object->getId(); + + $search['store_id'] = $object->getStoreId(); + $search['entity_id'] = $searchEntityId; + $search['attribute_id'] = $priceAttributeId; + + foreach ($this->_customerGroups as $group) { + $search['customer_group_id'] = $group->getId(); + $data['customer_group_id'] = $group->getId(); + + $value = $this->_getResource()->getMinimalValue($search); + if (is_null($value)) + continue; + $data['value'] = $value; + $result[] = $data; + } + + return $result; + } + + public function isAttributeIdUsed() + { + return false; + } + + protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) + { + if ($attribute->getAttributeCode() != 'minimal_price') + return false; + + return true; + } +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php index 2d97d0e49e..65b7a16af2 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,4 +86,4 @@ protected function _getIndexableAttributeConditions() $conditions = "frontend_input = 'price' AND attribute_code <> 'price'"; return $conditions; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php index 9e982b49a2..eb0bbac020 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,4 +96,4 @@ protected function _getIndexableAttributeConditions() return $conditions; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php index 3e9cd84b6b..0f26f90efe 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function getWebsiteId() } return $this->_websiteId; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php index 935298afe2..eba7be0dc2 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogIndex_Model_Mysql4_Aggregation extends Mage_Core_Model_Mysql4_Abstract @@ -211,4 +211,4 @@ public function getProductCategoryPaths($productIds) ); return $this->_getReadAdapter()->fetchCol($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php index 1f287a8e2c..b62333c9bb 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -100,4 +100,4 @@ public function applyFilterToCollection($collection, $attribute, $value) ->where($alias.'.value = ?', $value); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php index 034f90e928..c3d1491fbd 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogIndex_Model_Mysql4_Data_Abstract extends Mage_Core_Model_Mysql4_Abstract @@ -296,4 +296,4 @@ protected function _addAttributeFilter(Varien_Db_Select $select, $attributeCode, return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php index ae4d31c606..5022bc7094 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogIndex_Model_Mysql4_Data_Configurable extends Mage_CatalogIndex_Model_Mysql4_Data_Abstract diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php index 151edbe1c6..c55d79a717 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php index ee87801262..268e4cafd9 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -70,7 +70,7 @@ public function clear($eav = true, $price = true, $minimal = true, $finalPrice = if ($products instanceof Mage_Catalog_Model_Product) { $products = $products->getId(); } elseif ($products instanceof Mage_Catalog_Model_Product_Condition_Interface) { - $suffix = 'entity_id IN ('.$products->getIdsSelect($this->_getWriteAdapter())->__toString().')'; + $suffix = 'entity_id IN ('.$products->getIdsSelect($this->_getWriteAdapter())->__toString().')'; } else if (!is_numeric($products) && !is_array($products)) { Mage::throwException('Invalid products supplied for indexing'); @@ -666,4 +666,4 @@ public function updateCatalogProductFlat($storeId, $productIds = null, $tableNam return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php index 8417f3d291..f96ec1c460 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,4 +114,4 @@ public function loadAttributeCodesByCondition($conditions) } return $this->_getReadAdapter()->fetchCol($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php index 59cbcc7535..45e22961be 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,4 +40,4 @@ protected function _construct() $this->_attributeIdFieldName = 'attribute_id'; $this->_storeIdFieldName = 'store_id'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php index 03075d643e..f475eb8aa7 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,4 +65,4 @@ public function cleanup($productId, $storeId = null, $attributeId = null) $conditions = implode (' AND ', $conditions); $this->_getWriteAdapter()->delete($this->getMainTable(), $conditions); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php index eab4c7bae6..705bf69d8b 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,4 +40,4 @@ protected function _construct() $this->_attributeIdFieldName = 'attribute_id'; $this->_storeIdFieldName = 'store_id'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php index d500a76c8f..65e9a6b3d9 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php index 345a0651ca..b9b575b152 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,4 +49,4 @@ public function getProductTypes($ids) ->where('main_table.entity_id in (?)', $ids); return $this->_getReadAdapter()->fetchAll($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php index 9cccf4dd0f..680b60cdb1 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * 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_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogIndex_Model_Mysql4_Setup extends Mage_Core_Model_Resource_Setup @@ -54,4 +60,4 @@ protected function _setWebsiteInfo($table, $websiteId, $storeIds) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Observer.php b/app/code/core/Mage/CatalogIndex/Model/Observer.php index d25bf41f53..396ef797e4 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Observer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Observer.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -197,7 +197,7 @@ public function processAttributeChangeEvent(Varien_Event_Observer $observer) $this->_getAggregator()->clearCacheData($tags); } } elseif ($attribute->getIsFilterable()) { - $this->_getAggregator()->clearCacheData($tags); + $this->_getAggregator()->clearCacheData($tags); } return $this; @@ -398,4 +398,4 @@ public function catalogProductFlatUpdateProduct(Varien_Event_Observer $observer) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Price.php b/app/code/core/Mage/CatalogIndex/Model/Price.php index bd116e82a0..b9916cc55e 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Price.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,4 +72,4 @@ public function addMinimalPrices(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_ } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php index 0c78580f48..a76dc374ff 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php +++ b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -110,4 +110,4 @@ public function assignProductTypes($products) } return $result; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogIndex/etc/config.xml b/app/code/core/Mage/CatalogIndex/etc/config.xml index 2afb2b4021..f1e98f32eb 100644 --- a/app/code/core/Mage/CatalogIndex/etc/config.xml +++ b/app/code/core/Mage/CatalogIndex/etc/config.xml @@ -19,10 +19,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php index fccf181200..507600db25 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php index 542f6c2464..07b2a095e2 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php index 12509522b2..8abfca6b60 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php index 4594e44725..666730358a 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php index 825ec7444b..524fa3294d 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php index 0702d4eae0..f38aa9ebb4 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php index f634c46ace..08fda72d23 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,4 +40,4 @@ $installer->getTable('catalog_product_entity'), 'entity_id' ); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php index cb6e6d2785..283cbfdcec 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php index 776169ebc3..c19127dfe0 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php index 09a27a53f1..5a04f51ce8 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php index eedceafbb5..b1fc3ae8d9 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -18,10 +18,10 @@ * 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_CatalogIndex - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Helper/Data.php b/app/code/core/Mage/CatalogInventory/Helper/Data.php index 92d1a40959..cef6d94553 100644 --- a/app/code/core/Mage/CatalogInventory/Helper/Data.php +++ b/app/code/core/Mage/CatalogInventory/Helper/Data.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php index 9cc3485ea6..9b1fc955f6 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -177,4 +177,4 @@ public function updateLowStockDate() $this->getTable('catalog/product'), $this->_getWriteAdapter()->quote($this->_configTypeIds) )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php index 0e8fdf03a4..bfb1f0088a 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -88,4 +88,4 @@ public function addCatalogInventoryToProductCollection($productCollection) null, 'left'); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php index 3f941dfa44..3cab6a8ad6 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php @@ -1,138 +1,138 @@ - - */ -class Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract -{ - protected function _construct() - { - $this->_init('cataloginventory/stock_item'); - } - - /** - * Add stock filter to collection - * - * @param mixed $stock - * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection - */ - public function addStockFilter($stock) - { - if ($stock instanceof Mage_CatalogInventory_Model_Stock) { - $this->addFieldToFilter('main_table.stock_id', $stock->getId()); - } - else { - $this->addFieldToFilter('main_table.stock_id', $stock); - } - return $this; - } - - /** - * Add product filter to collection - * - * @param mixed $products - * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection - */ - public function addProductsFilter($products) - { - $productIds = array(); - foreach ($products as $product) { - if ($product instanceof Mage_Catalog_Model_Product) { - $productIds[] = $product->getId(); - } - else { - $productIds[] = $product; - } - } - if (empty($productIds)) { - $productIds[] = false; - $this->_setIsLoaded(true); - } - $this->addFieldToFilter('main_table.product_id', array('in'=>$productIds)); - return $this; - } - - /** - * Join Stock Status to collection - * - * @param int $storeId - * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection - */ - public function joinStockStatus($storeId = null) - { - $websiteId = Mage::app()->getStore($storeId)->getWebsiteId(); - $this->getSelect()->joinLeft( - array('status_table' => $this->getTable('cataloginventory/stock_status')), - '`main_table`.`product_id`=`status_table`.`product_id`' - . ' AND `main_table`.`stock_id`=`status_table`.`stock_id`' - . $this->getConnection()->quoteInto(' AND `status_table`.`website_id`=?', $websiteId), - array('stock_status') - ); - - return $this; - } - - public function addManagedFilter($isStockManagedInConfig) - { - if ($isStockManagedInConfig) { - $this->getSelect()->where('(manage_stock = 1 OR use_config_manage_stock = 1)'); - } else { - $this->addFieldToFilter('manage_stock', 1); - } - - return $this; - } - - public function addQtyFilter($comparsionMethod, $qty) - { - $allowedMethods = array('<', '>', '=', '<=', '>=', '<>'); - if (!in_array($comparsionMethod, $allowedMethods)) { - Mage::throwException(Mage::helper('cataloginventory')->__('%s is not correct comparsion method.', $comparsionMethod)); - } - $this->getSelect()->where("main_table.qty {$comparsionMethod} ?", $qty); - return $this; - } - - /** - * Load data - * - * @return Varien_Data_Collection_Db - */ - public function load($printQuery = false, $logQuery = false) - { - if (!$this->isLoaded()) { - $this->getSelect()->joinInner(array('_products_table' => $this->getTable('catalog/product')), - 'main_table.product_id=_products_table.entity_id', 'type_id' - ); - } - return parent::load($printQuery, $logQuery); - } -} + + */ +class Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract +{ + protected function _construct() + { + $this->_init('cataloginventory/stock_item'); + } + + /** + * Add stock filter to collection + * + * @param mixed $stock + * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection + */ + public function addStockFilter($stock) + { + if ($stock instanceof Mage_CatalogInventory_Model_Stock) { + $this->addFieldToFilter('main_table.stock_id', $stock->getId()); + } + else { + $this->addFieldToFilter('main_table.stock_id', $stock); + } + return $this; + } + + /** + * Add product filter to collection + * + * @param mixed $products + * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection + */ + public function addProductsFilter($products) + { + $productIds = array(); + foreach ($products as $product) { + if ($product instanceof Mage_Catalog_Model_Product) { + $productIds[] = $product->getId(); + } + else { + $productIds[] = $product; + } + } + if (empty($productIds)) { + $productIds[] = false; + $this->_setIsLoaded(true); + } + $this->addFieldToFilter('main_table.product_id', array('in'=>$productIds)); + return $this; + } + + /** + * Join Stock Status to collection + * + * @param int $storeId + * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection + */ + public function joinStockStatus($storeId = null) + { + $websiteId = Mage::app()->getStore($storeId)->getWebsiteId(); + $this->getSelect()->joinLeft( + array('status_table' => $this->getTable('cataloginventory/stock_status')), + '`main_table`.`product_id`=`status_table`.`product_id`' + . ' AND `main_table`.`stock_id`=`status_table`.`stock_id`' + . $this->getConnection()->quoteInto(' AND `status_table`.`website_id`=?', $websiteId), + array('stock_status') + ); + + return $this; + } + + public function addManagedFilter($isStockManagedInConfig) + { + if ($isStockManagedInConfig) { + $this->getSelect()->where('(manage_stock = 1 OR use_config_manage_stock = 1)'); + } else { + $this->addFieldToFilter('manage_stock', 1); + } + + return $this; + } + + public function addQtyFilter($comparsionMethod, $qty) + { + $allowedMethods = array('<', '>', '=', '<=', '>=', '<>'); + if (!in_array($comparsionMethod, $allowedMethods)) { + Mage::throwException(Mage::helper('cataloginventory')->__('%s is not correct comparsion method.', $comparsionMethod)); + } + $this->getSelect()->where("main_table.qty {$comparsionMethod} ?", $qty); + return $this; + } + + /** + * Load data + * + * @return Varien_Data_Collection_Db + */ + public function load($printQuery = false, $logQuery = false) + { + if (!$this->isLoaded()) { + $this->getSelect()->joinInner(array('_products_table' => $this->getTable('catalog/product')), + 'main_table.product_id=_products_table.entity_id', 'type_id' + ); + } + return parent::load($printQuery, $logQuery); + } +} diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php index a990852ae7..ef386a8178 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -232,4 +232,24 @@ public function prepareCatalogProductIndexSelect(Varien_Db_Select $select, $enti return $this; } + + /** + * Add only is in stock products filter to product collection + * + * @param Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection $collection + * @return Mage_CatalogInventory_Model_Stock_Status + */ + public function addIsInStockFilterToCollection($collection) + { + $websiteId = Mage::app()->getStore($collection->getStoreId())->getWebsiteId(); + $collection->getSelect() + ->join( + array('stock_status_index' => $this->getMainTable()), + 'e.entity_id = stock_status_index.product_id AND stock_status_index.website_id = ' . $websiteId + . ' AND stock_status_index.stock_id = ' . Mage_CatalogInventory_Model_Stock::DEFAULT_STOCK_ID, + array()) + ->where('stock_status_index.stock_status=?', Mage_CatalogInventory_Model_Stock_Status::STATUS_IN_STOCK); + + return $this; + } } diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php index 274189d76b..ec80f45563 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Observer.php +++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php index 15c037e619..f091cdc875 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php +++ b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogInventory_Model_Source_Backorders @@ -34,4 +34,4 @@ public function toOptionArray() array('value' => Mage_CatalogInventory_Model_Stock::BACKORDERS_YES_NOTIFY , 'label'=>Mage::helper('cataloginventory')->__('Allow Qty Below 0 and Notify Customer')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php index d8364388ce..36fc187a6e 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php @@ -1,55 +1,55 @@ - - */ -class Mage_CatalogInventory_Model_Source_Stock -{ - /** - * Retrieve option array - * - * @return array - */ - public function toOptionArray() - { - return array( - array( - 'value' => Mage_CatalogInventory_Model_Stock::STOCK_IN_STOCK, - 'label' => Mage::helper('cataloginventory')->__('In Stock') - ), - array( - 'value' => Mage_CatalogInventory_Model_Stock::STOCK_OUT_OF_STOCK, - 'label' => Mage::helper('cataloginventory')->__('Out of Stock') - ), - ); - } -} + + */ +class Mage_CatalogInventory_Model_Source_Stock +{ + /** + * Retrieve option array + * + * @return array + */ + public function toOptionArray() + { + return array( + array( + 'value' => Mage_CatalogInventory_Model_Stock::STOCK_IN_STOCK, + 'label' => Mage::helper('cataloginventory')->__('In Stock') + ), + array( + 'value' => Mage_CatalogInventory_Model_Stock::STOCK_OUT_OF_STOCK, + 'label' => Mage::helper('cataloginventory')->__('Out of Stock') + ), + ); + } +} diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Stock.php index d9f4fb568b..1ae5d26a4c 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php index 132fb725f2..e2200d641c 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php @@ -18,10 +18,10 @@ * 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_CatalogInvemtory - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php index 67b641e201..225fe68cf6 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -118,4 +118,4 @@ public function update($productId, $data) return true; } -} // Class Mage_CatalogInventory_Model_Stock_Item_Api End \ No newline at end of file +} // Class Mage_CatalogInventory_Model_Stock_Item_Api End diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php index a8dbd0af1f..22caf96197 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -78,4 +78,4 @@ public function update($productId, $data) return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php index ef0c65fb74..bd1df05f3a 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -516,4 +516,16 @@ public function prepareCatalogProductIndexSelect(Varien_Db_Select $select, $enti return $this; } + + /** + * Add only is in stock products filter to product collection + * + * @param Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection $collection + * @return Mage_CatalogInventory_Model_Stock_Status + */ + public function addIsInStockFilterToCollection($collection) + { + $this->_getResource()->addIsInStockFilterToCollection($collection); + return $this; + } } diff --git a/app/code/core/Mage/CatalogInventory/etc/api.xml b/app/code/core/Mage/CatalogInventory/etc/api.xml index 1166ec597b..cb39729c8b 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api.xml @@ -21,8 +21,8 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -78,4 +78,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/CatalogInventory/etc/config.xml b/app/code/core/Mage/CatalogInventory/etc/config.xml index 12a82ad350..d71e599837 100644 --- a/app/code/core/Mage/CatalogInventory/etc/config.xml +++ b/app/code/core/Mage/CatalogInventory/etc/config.xml @@ -19,10 +19,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/system.xml b/app/code/core/Mage/CatalogInventory/etc/system.xml index 026538adef..448739daa3 100644 --- a/app/code/core/Mage/CatalogInventory/etc/system.xml +++ b/app/code/core/Mage/CatalogInventory/etc/system.xml @@ -19,10 +19,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -138,4 +138,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php index 172b7aaa26..f1db56d9e5 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php index 664682cf7d..a333e242c7 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php index 504d2afb0c..1eeb1fdc23 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ $installer->startSetup(); $installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'manage_stock', 'tinyint(1) unsigned NOT NULL DEFAULT 0'); $installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'use_config_manage_stock', 'tinyint(1) unsigned NOT NULL DEFAULT 1'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php index 26bd5a4a07..78c9130d0b 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,4 +30,4 @@ $installer->startSetup(); $installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'stock_status_changed_automatically', 'tinyint(1) unsigned NOT NULL DEFAULT 0'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php index 715cb70661..ab5a0928b7 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,4 +42,4 @@ )); } -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php index c3dacc8f9f..5fbe0e0b3e 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Helper/Data.php b/app/code/core/Mage/CatalogRule/Helper/Data.php index d826f61c7b..3d2c72ec15 100644 --- a/app/code/core/Mage/CatalogRule/Helper/Data.php +++ b/app/code/core/Mage/CatalogRule/Helper/Data.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php index 77a2cb2be5..c60080b3ad 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -359,24 +359,24 @@ protected function _getRuleProductsStmt($fromDate, $toDate, $productId=null, $we array($fieldAlias=>$tableAlias.'.value') ); } else { - foreach (Mage::app()->getWebsites() as $website) { - $websiteId = $website->getId(); - $defaultGroup = $website->getDefaultGroup(); - if ($defaultGroup instanceof Mage_Core_Model_Store_Group) { - $storeId = $defaultGroup->getDefaultStoreId(); - } else { + foreach (Mage::app()->getWebsites() as $website) { + $websiteId = $website->getId(); + $defaultGroup = $website->getDefaultGroup(); + if ($defaultGroup instanceof Mage_Core_Model_Store_Group) { + $storeId = $defaultGroup->getDefaultStoreId(); + } else { $storeId = Mage_Core_Model_App::ADMIN_STORE_ID; } - $storeId = $defaultGroup->getDefaultStoreId(); - $tableAlias = 'pp'.$websiteId; - $fieldAlias = 'website_'.$websiteId.'_price'; - $select->joinLeft( - array($tableAlias=>$priceTable), - sprintf($joinCondition, $tableAlias, $storeId), - array($fieldAlias=>$tableAlias.'.value') - ); - } + $storeId = $defaultGroup->getDefaultStoreId(); + $tableAlias = 'pp'.$websiteId; + $fieldAlias = 'website_'.$websiteId.'_price'; + $select->joinLeft( + array($tableAlias=>$priceTable), + sprintf($joinCondition, $tableAlias, $storeId), + array($fieldAlias=>$tableAlias.'.value') + ); + } } return $read->query($select); } @@ -510,6 +510,15 @@ public function applyAllRulesForDateRange($fromDate=null, $toDate=null, $product $this->_saveRuleProductPrices($dayPrices); } $this->_saveRuleProductPrices($dayPrices); + + $write->delete($this->getTable('catalogrule/rule_group_website'), array()); + + $select = $write->select() + ->distinct(true) + ->from($this->getTable('catalogrule/rule_product'), array('rule_id', 'customer_group_id', 'website_id')); + $query = $select->insertFromSelect($this->getTable('catalogrule/rule_group_website')); + $write->query($query); + $write->commit(); } catch (Exception $e) { $write->rollback(); @@ -735,4 +744,4 @@ public function applyToProduct($rule, $product, $websiteIds) $write->commit(); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php index 4ead18cf7d..89a98b298b 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function addWebsiteFilter($websiteIds) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php index a72f1d7597..21ab33635f 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php index 3211a96b46..7fca635d79 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,4 +44,4 @@ public function getProductIds() $idsSelect->distinct(true); return $this->getConnection()->fetchCol($idsSelect); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php index 89612d5d1f..7a7c63b54d 100644 --- a/app/code/core/Mage/CatalogRule/Model/Observer.php +++ b/app/code/core/Mage/CatalogRule/Model/Observer.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -201,4 +201,4 @@ public function prepareCatalogProductPriceIndexTable(Varien_Event_Observer $obse return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php index 23570da443..24b5ddfc1f 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -227,4 +227,4 @@ public function applyAll() $indexProcess->reindexAll(); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php index d6882496eb..1893d9decc 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php index adfc54ddbd..0e5fea2297 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,4 +52,4 @@ public function asHtml() $html.= $this->getRemoveLinkHtml(); return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php index 153074222b..2fad277113 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php index 841af84b90..5241cdabf1 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -377,4 +377,4 @@ public function validate(Varien_Object $object) return parent::validate($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml index 027ad63598..2197ac24dc 100644 --- a/app/code/core/Mage/CatalogRule/etc/config.xml +++ b/app/code/core/Mage/CatalogRule/etc/config.xml @@ -19,16 +19,16 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 0.7.7 + 0.7.8 @@ -49,6 +49,7 @@ catalogrule_product
 catalogrule_product_price
 catalogrule_affected_product
 + catalogrule_group_website
 diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php index b4fcf0a07f..7094726496 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php index 1a35fed426..8429ffab1d 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->getConnection()->addColumn($this->getTable('catalogrule'), 'simple_action', 'varchar(32) not null'); $installer->getConnection()->addColumn($this->getTable('catalogrule'), 'discount_amount', 'decimal(12,4) not null'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php index 7023e6f5b4..974638f6ca 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php index 5e0ae82774..125a55a05f 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->getConnection()->addColumn($this->getTable('catalogrule_product_price'), 'latest_start_date', 'date'); $installer->getConnection()->addColumn($this->getTable('catalogrule_product_price'), 'earliest_end_date', 'date'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php index c461a5182c..efdb625140 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php index dd929c9593..d7ee6f42a0 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php index b6a5a57a69..b87d8df5d2 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ 'sort_order', array('rule_id', 'from_time','to_time','website_id','customer_group_id','product_id','sort_order'), 'unique' -); \ No newline at end of file +); diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php index a7b41bdd71..299f379c3d 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php index fa09496365..09ce9044e0 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -198,7 +198,7 @@ public function getAttributeSelectElement($attribute) ->setExtraParams($extra) ->setValue($this->getAttributeValue($attribute)) ->setOptions($options) - ->setClass('multiselect') + ->setClass('multiselect') ->getHtml(); } @@ -270,4 +270,4 @@ public function getDateInput($attribute, $part = 'from') ->setClass('input-text') ->getHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php index a3562329e9..7d893e170d 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php index 4f44f47fdd..fa1844ef45 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php +++ b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -93,4 +93,4 @@ public function getSuggestData() /* * */ -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogSearch/Block/Layer.php b/app/code/core/Mage/CatalogSearch/Block/Layer.php index 3e550d873f..a91b25085d 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Layer.php +++ b/app/code/core/Mage/CatalogSearch/Block/Layer.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -66,4 +66,4 @@ public function canShowBlock() } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogSearch/Block/Result.php b/app/code/core/Mage/CatalogSearch/Block/Result.php index d828519137..990d6fc925 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Result.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Term.php b/app/code/core/Mage/CatalogSearch/Block/Term.php index 9b3b1b0703..56976a3561 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Term.php +++ b/app/code/core/Mage/CatalogSearch/Block/Term.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogSearch_Block_Term extends Mage_Core_Block_Template @@ -74,15 +74,15 @@ public function getTerms() } public function getSearchUrl($obj) - { - $url = Mage::getModel('core/url'); - /* - * url encoding will be done in Url.php http_build_query - * so no need to explicitly called urlencode for the text - */ - $url->setQueryParam('q', $obj->getName()); - return $url->getUrl('catalogsearch/result'); - } + { + $url = Mage::getModel('core/url'); + /* + * url encoding will be done in Url.php http_build_query + * so no need to explicitly called urlencode for the text + */ + $url->setQueryParam('q', $obj->getName()); + return $url->getUrl('catalogsearch/result'); + } public function getMaxPopularity() { @@ -93,4 +93,4 @@ public function getMinPopularity() { return $this->_minPopularity; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogSearch/Helper/Data.php b/app/code/core/Mage/CatalogSearch/Helper/Data.php index 1c427af4fe..f27ed12f50 100644 --- a/app/code/core/Mage/CatalogSearch/Helper/Data.php +++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -81,8 +81,10 @@ public function getQuery() { if (!$this->_query) { $this->_query = Mage::getModel('catalogsearch/query') - ->loadByQuery($this->getQueryText()) - ->setQueryText($this->getQueryText()); + ->loadByQuery($this->getQueryText()); + if (!$this->_query->getId()) { + $this->_query->setQueryText($this->getQueryText()); + } } return $this->_query; } diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php index fb96c8699c..a33aac5aeb 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php index 82402e6be1..a0d64bafa7 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -121,4 +121,4 @@ public function getSearchType($storeId = null) { return Mage::getStoreConfig(self::XML_PATH_CATALOG_SEARCH_TYPE, $storeId); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php index dd116e73f3..0aa543413d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer.php b/app/code/core/Mage/CatalogSearch/Model/Layer.php index fb3c7b96d6..0a52eb3ee4 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Layer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Layer.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogSearch_Model_Layer extends Mage_Catalog_Model_Layer @@ -56,7 +56,7 @@ public function getProductCollection() public function prepareProductCollection($collection) { $collection->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes()) - ->addSearchFilter(Mage::helper('catalogsearch')->getQueryText()) + ->addSearchFilter(Mage::helper('catalogsearch')->getQuery()->getQueryText()) ->setStore(Mage::app()->getStore()) ->addMinimalPrice() ->addFinalPrice() @@ -120,4 +120,4 @@ protected function _prepareAttribute($attribute) $attribute->setIsFilterable(Mage_Catalog_Model_Layer_Filter_Attribute::OPTIONS_ONLY_WITH_RESULTS); return $attribute; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php index 8cfc83be60..c8e633f9aa 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogSearch_Model_Mysql4_Advanced_Collection extends Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection @@ -128,4 +128,4 @@ public function addFieldsToFilter($fields) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php index dbb17d972a..642a399bed 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php index fee9c62628..dd27e6ebb2 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php index cc9320ce1d..4372b647be 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,7 +49,7 @@ protected function _construct() */ protected function _getLoadSelect($field, $value, $object) { - $select = $this->_getReadAdapter()->select() + $select = $this->_getReadAdapter()->select() ->from($this->getMainTable()) ->where($this->getMainTable().'.'.$field.'=?', $value); return $select; @@ -66,13 +66,11 @@ public function loadByQuery(Mage_Core_Model_Abstract $object, $value) { $select = $this->_getReadAdapter()->select() ->from($this->getMainTable()) - ->where('query_text=:query_text') - ->where('store_id=:store_id'); - $bind = array( - ':query_text' => $value, - ':store_id' => $object->getStoreId() - ); - if ($data = $this->_getReadAdapter()->fetchRow($select, $bind)) { + ->where('synonym_for=?', $value) + ->orWhere('query_text=?', $value) + ->where('store_id=?', $object->getStoreId()) + ->order('synonym_for DESC'); + if ($data = $this->_getReadAdapter()->fetchRow($select)) { $object->setData($data); $this->_afterLoad($object); } diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php index 0ac955205e..50636c2b08 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php index be6598a2d1..8cba764a7a 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Query.php b/app/code/core/Mage/CatalogSearch/Model/Query.php index 1e28361c3a..9ca8bfc1d8 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Query.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Model/Session.php b/app/code/core/Mage/CatalogSearch/Model/Session.php index b9202e951a..32ea0be09d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Session.php +++ b/app/code/core/Mage/CatalogSearch/Model/Session.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_CatalogSearch_Model_Session extends Mage_Core_Model_Session_Abstract diff --git a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php index 3225f924a9..a8c96500bc 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php index 27c42d5a5c..ac6614231a 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php index 0a0f50d0da..e1c60c98d9 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/controllers/TermController.php b/app/code/core/Mage/CatalogSearch/controllers/TermController.php index ed39e41773..ae62544be2 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/TermController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/TermController.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,15 +30,15 @@ class Mage_CatalogSearch_TermController extends Mage_Core_Controller_Front_Actio public function preDispatch(){ parent::preDispatch(); if(!Mage::getStoreConfig('catalog/seo/search_terms')){ - $this->_redirect('noroute'); - $this->setFlag('',self::FLAG_NO_DISPATCH,true); - } - return $this; + $this->_redirect('noroute'); + $this->setFlag('',self::FLAG_NO_DISPATCH,true); + } + return $this; } public function popularAction() { - $this->loadLayout(); - $this->renderLayout(); + $this->loadLayout(); + $this->renderLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml index 1cbab3d672..77188de172 100644 --- a/app/code/core/Mage/CatalogSearch/etc/config.xml +++ b/app/code/core/Mage/CatalogSearch/etc/config.xml @@ -19,10 +19,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -196,4 +196,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/CatalogSearch/etc/system.xml b/app/code/core/Mage/CatalogSearch/etc/system.xml index 9e8c792b47..6b72e4fc5f 100644 --- a/app/code/core/Mage/CatalogSearch/etc/system.xml +++ b/app/code/core/Mage/CatalogSearch/etc/system.xml @@ -19,10 +19,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -109,4 +109,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php index 7b0da42fd2..30432b4ce2 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_CatalogSearch - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php index 576f67d037..d1d565a982 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php index d6dbbbc91b..cc7be61202 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php index fca1f61cfa..515ec6c675 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php index 5e8217894d..fb6c828afe 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -1,31 +1,31 @@ -startSetup(); -$installer->endSetup(); +startSetup(); +$installer->endSetup(); diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php index 47a5e0a7cd..bda7c4f263 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -1,75 +1,75 @@ -getConnection(); -/* @var $installer Mage_Core_Model_Resource_Setup */ -/* @var $connection Varien_Db_Adapter_Pdo_Mysql */ - -$installer->startSetup(); - -$installer->run(" -DROP TABLE IF EXISTS `{$installer->getTable('catalogsearch_fulltext')}`; -CREATE TABLE `{$installer->getTable('catalogsearch_fulltext')}` ( - `product_id` int(10) unsigned NOT NULL, - `store_id` smallint(5) unsigned NOT NULL, - `data_index` longtext NOT NULL, - PRIMARY KEY (`product_id`,`store_id`), - FULLTEXT KEY `data_index` (`data_index`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - -CREATE TABLE `{$installer->getTable('catalogsearch_result')}` ( - `query_id` int(10) unsigned NOT NULL, - `product_id` int(10) unsigned NOT NULL, - `relevance` decimal(6,4) NOT NULL default '0.0000', - PRIMARY KEY (`query_id`,`product_id`), - KEY `IDX_QUERY` (`query_id`), - KEY `IDX_PRODUCT` (`product_id`), - KEY `IDX_RELEVANCE` (`query_id`, `relevance`), - CONSTRAINT `FK_CATALOGSEARCH_RESULT_QUERY` FOREIGN KEY (`query_id`) REFERENCES `{$installer->getTable('catalogsearch_query')}` (`query_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_CATALOGSEARCH_RESULT_CATALOG_PRODUCT` FOREIGN KEY (`product_id`) REFERENCES `{$installer->getTable('catalog_product_entity')}` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -"); - -$connection->dropForeignKey($installer->getTable('catalogsearch_query'), 'FK_catalogsearch_query'); -$connection->dropKey($installer->getTable('catalogsearch_query'), 'FK_catalogsearch_query'); -$connection->addConstraint('FK_CATALOGSEARCH_QUERY_STORE', - $installer->getTable('catalogsearch_query'), 'store_id', - $installer->getTable('core_store'), 'store_id' -); -$connection->addColumn($installer->getTable('catalogsearch_query'), 'is_active', 'tinyint(1) DEFAULT 1 AFTER `display_in_terms`'); -$connection->addColumn($installer->getTable('catalogsearch_query'), 'is_processed', 'tinyint(1) DEFAULT 0 AFTER `is_active`'); - -$connection->dropKey($installer->getTable('catalogsearch_query'), 'search_query'); -$connection->addKey($installer->getTable('catalogsearch_query'), 'IDX_SEARCH_QUERY', array( - 'query_text', 'store_id', 'popularity' -)); - -$installer->endSetup(); - -//Mage::app()->reinitStores(); -//Mage::getModel('catalogsearch/fulltext')->rebuildIndex(); +getConnection(); +/* @var $installer Mage_Core_Model_Resource_Setup */ +/* @var $connection Varien_Db_Adapter_Pdo_Mysql */ + +$installer->startSetup(); + +$installer->run(" +DROP TABLE IF EXISTS `{$installer->getTable('catalogsearch_fulltext')}`; +CREATE TABLE `{$installer->getTable('catalogsearch_fulltext')}` ( + `product_id` int(10) unsigned NOT NULL, + `store_id` smallint(5) unsigned NOT NULL, + `data_index` longtext NOT NULL, + PRIMARY KEY (`product_id`,`store_id`), + FULLTEXT KEY `data_index` (`data_index`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE `{$installer->getTable('catalogsearch_result')}` ( + `query_id` int(10) unsigned NOT NULL, + `product_id` int(10) unsigned NOT NULL, + `relevance` decimal(6,4) NOT NULL default '0.0000', + PRIMARY KEY (`query_id`,`product_id`), + KEY `IDX_QUERY` (`query_id`), + KEY `IDX_PRODUCT` (`product_id`), + KEY `IDX_RELEVANCE` (`query_id`, `relevance`), + CONSTRAINT `FK_CATALOGSEARCH_RESULT_QUERY` FOREIGN KEY (`query_id`) REFERENCES `{$installer->getTable('catalogsearch_query')}` (`query_id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `FK_CATALOGSEARCH_RESULT_CATALOG_PRODUCT` FOREIGN KEY (`product_id`) REFERENCES `{$installer->getTable('catalog_product_entity')}` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +"); + +$connection->dropForeignKey($installer->getTable('catalogsearch_query'), 'FK_catalogsearch_query'); +$connection->dropKey($installer->getTable('catalogsearch_query'), 'FK_catalogsearch_query'); +$connection->addConstraint('FK_CATALOGSEARCH_QUERY_STORE', + $installer->getTable('catalogsearch_query'), 'store_id', + $installer->getTable('core_store'), 'store_id' +); +$connection->addColumn($installer->getTable('catalogsearch_query'), 'is_active', 'tinyint(1) DEFAULT 1 AFTER `display_in_terms`'); +$connection->addColumn($installer->getTable('catalogsearch_query'), 'is_processed', 'tinyint(1) DEFAULT 0 AFTER `is_active`'); + +$connection->dropKey($installer->getTable('catalogsearch_query'), 'search_query'); +$connection->addKey($installer->getTable('catalogsearch_query'), 'IDX_SEARCH_QUERY', array( + 'query_text', 'store_id', 'popularity' +)); + +$installer->endSetup(); + +//Mage::app()->reinitStores(); +//Mage::getModel('catalogsearch/fulltext')->rebuildIndex(); diff --git a/app/code/core/Mage/Checkout/Block/Agreements.php b/app/code/core/Mage/Checkout/Block/Agreements.php index 7ce5d5bc53..d8df24b772 100644 --- a/app/code/core/Mage/Checkout/Block/Agreements.php +++ b/app/code/core/Mage/Checkout/Block/Agreements.php @@ -1,5 +1,28 @@ getData('agreements'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Cart.php b/app/code/core/Mage/Checkout/Block/Cart.php index 59ef26eda1..1058ed409a 100644 --- a/app/code/core/Mage/Checkout/Block/Cart.php +++ b/app/code/core/Mage/Checkout/Block/Cart.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php index 2dc237ccb7..c8f3c95e88 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -186,4 +186,4 @@ public function getTotalsCache() } return $this->_totals; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php index 858a55fb58..8e58c96a9d 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ public function getCouponCode() } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php index 6fbfa234c3..598230a9b1 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php index 71e11c3ccc..aaa2a00d79 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php @@ -340,4 +340,4 @@ public function getFormatedOptionValue($optionValue) return $result; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php index 95f49e7008..c937faeef7 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,4 +111,4 @@ public function getOptionList() return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php index 84d866ba91..601ab26324 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php index 68f270a0be..69df5abee0 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -176,4 +176,4 @@ public function isZipCodeRequired() } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php index 50bdcc3d5c..4437ab0527 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,6 +36,9 @@ class Mage_Checkout_Block_Cart_Sidebar extends Mage_Checkout_Block_Cart_Abstract { const XML_PATH_CHECKOUT_SIDEBAR_COUNT = 'checkout/sidebar/count'; + /** + * Class constructor + */ public function __construct() { parent::__construct(); @@ -72,19 +75,30 @@ public function getRecentItems($count = null) /** * Get shopping cart subtotal. + * * It will include tax, if required by config settings. * - * @return decimal + * @param bool $skipTax flag for getting price with tax or not. Ignored in case when we display just subtotal incl.tax + * @return decimal */ - public function getSubtotal($skipTax = false) + public function getSubtotal($skipTax = true) { $subtotal = 0; $totals = $this->getTotals(); + $config = Mage::getSingleton('tax/config'); if (isset($totals['subtotal'])) { - $subtotal = $totals['subtotal']->getValue(); - if (!$skipTax) { - if ((!$this->helper('tax')->displayCartBothPrices()) && $this->helper('tax')->displayCartPriceInclTax()) { - $subtotal = $this->_addTax($subtotal); + if ($config->displayCartSubtotalBoth()) { + if ($skipTax) { + $subtotal = $totals['subtotal']->getValueExclTax(); + } else { + $subtotal = $totals['subtotal']->getValueInclTax(); + } + } elseif($config->displayCartSubtotalInclTax()) { + $subtotal = $totals['subtotal']->getValueInclTax(); + } else { + $subtotal = $totals['subtotal']->getValue(); + if (!$skipTax && isset($totals['tax'])) { + $subtotal+= $totals['tax']->getValue(); } } } @@ -99,12 +113,19 @@ public function getSubtotal($skipTax = false) */ public function getSubtotalInclTax() { - if (!$this->helper('tax')->displayCartBothPrices()) { + if (!Mage::getSingleton('tax/config')->displayCartSubtotalBoth()) { return 0; } - return $this->_addTax($this->getSubtotal(true)); + return $this->getSubtotal(false); } + /** + * Add tax to amount + * + * @param float $price + * @param bool $exclShippingTax + * @return float + */ private function _addTax($price, $exclShippingTax=true) { $totals = $this->getTotals(); if (isset($totals['tax'])) { @@ -117,27 +138,53 @@ private function _addTax($price, $exclShippingTax=true) { return $price; } + /** + * Get shipping tax amount + * + * @return float + */ protected function _getShippingTaxAmount() { return $this->getQuote()->getShippingAddress()->getShippingTaxAmount(); } + /** + * Get shopping cart items qty based on configuration (summary qty or items qty) + * + * @return int | float + */ public function getSummaryCount() { return Mage::getSingleton('checkout/cart')->getSummaryQty(); } + /** + * Get incl/excl tax label + * + * @param bool $flag + * @return string + */ public function getIncExcTax($flag) { $text = Mage::helper('tax')->getIncExcText($flag); return $text ? ' ('.$text.')' : ''; } + /** + * Check if one page checkout is available + * + * @return bool + */ public function isPossibleOnepageCheckout() { return $this->helper('checkout')->canOnepageCheckout(); } + /** + * Get one page checkout page url + * + * @return bool + */ public function getCheckoutUrl() { return $this->helper('checkout/url')->getCheckoutUrl(); diff --git a/app/code/core/Mage/Checkout/Block/Cart/Totals.php b/app/code/core/Mage/Checkout/Block/Cart/Totals.php index 17ea3f9341..d60e54a247 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Totals.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Totals.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Checkout_Block_Cart_Totals extends Mage_Checkout_Block_Cart_Abstract @@ -124,4 +124,4 @@ public function displayBaseGrandtotal() } return '-'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Links.php b/app/code/core/Mage/Checkout/Block/Links.php index 861f055fa9..5ee0fde9ef 100644 --- a/app/code/core/Mage/Checkout/Block/Links.php +++ b/app/code/core/Mage/Checkout/Block/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php index 7be69e8d48..0d1581d8a8 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php index fdc973b44a..3f921a7a1c 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php index ad6437e19f..5ca8b95447 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php index cda1944ca2..b800be672c 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -128,4 +128,4 @@ public function getBackUrl() { return $this->getUrl('*/*/backtoshipping'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php index a3b4560387..a3c04faff8 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -78,4 +78,4 @@ public function getVirtualQuoteItems() } return $items; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php index 905759d72d..b311bc85ed 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php index a9f7d23e5b..313f8fecc6 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php index 2c961ad82c..247a905e94 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,4 +51,4 @@ protected function _toHtml() } return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php index d92d90a858..c561346203 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/State.php b/app/code/core/Mage/Checkout/Block/Multishipping/State.php index e992b61d91..59340a30b5 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/State.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php index 9c6c98a1a1..81ae413033 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Onepage.php b/app/code/core/Mage/Checkout/Block/Onepage.php index 141f6dcce2..ac6e140389 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage.php +++ b/app/code/core/Mage/Checkout/Block/Onepage.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -191,4 +191,4 @@ public function getPayment() return $payment; } */ -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php index 3660960416..1566c053e8 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php index ef7921d1f3..6e77b9e663 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -101,4 +101,4 @@ public function getSaveUrl() { } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php index 5721666486..1441faafa0 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,4 +53,4 @@ public function getContinueShoppingUrl() { return Mage::getUrl('checkout/cart'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Link.php b/app/code/core/Mage/Checkout/Block/Onepage/Link.php index 2357b8f36c..1fcec09c4b 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Link.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Link.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ public function isPossibleOnepageCheckout() { return $this->helper('checkout')->canOnepageCheckout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Login.php b/app/code/core/Mage/Checkout/Block/Onepage/Login.php index 8879de82b7..1e2a56afc6 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Login.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Login.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -81,4 +81,4 @@ public function getUsername() { return Mage::getSingleton('customer/session')->getUsername(true); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php index 176d4fcf0d..aeec00b771 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ protected function _construct() )); parent::_construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php index 2a8f4c4238..e2cc7a5ff7 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,4 +55,4 @@ protected function _toHtml() } return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php index f74f2a519d..7021016f92 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php index 1f522dd916..2370e53285 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -85,4 +85,4 @@ public function formatPrice($price) { return $this->getQuote()->getStore()->formatPrice($price); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review.php b/app/code/core/Mage/Checkout/Block/Onepage/Review.php index f9cd41e9d8..275931744d 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Review.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Review.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,4 +44,4 @@ protected function _construct() $this->getQuote()->collectTotals()->save(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php index 53062b8fda..4db25ff90a 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,11 +35,11 @@ class Mage_Checkout_Block_Onepage_Review_Info extends Mage_Sales_Block_Items_Abs { public function getItems() { - return Mage::getSingleton('checkout/session')->getQuote()->getAllVisibleItems(); + return Mage::getSingleton('checkout/session')->getQuote()->getAllVisibleItems(); } public function getTotals() { return Mage::getSingleton('checkout/session')->getQuote()->getTotals(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php index f1319c5e86..3947cc0a30 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function isShow() { return !$this->getQuote()->isVirtual(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php index 913ba215d0..91e908966c 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,4 +52,4 @@ public function isShow() { return !$this->getQuote()->isVirtual(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php index e6f676f9f4..26e8afda92 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php index 886453335c..b151b60437 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,7 +41,7 @@ public function getShippingRates() { if (empty($this->_rates)) { - $this->getAddress()->collectShippingRates()->save(); + $this->getAddress()->collectShippingRates()->save(); $groups = $this->getAddress()->getGroupedAllShippingRates(); /* @@ -50,7 +50,7 @@ public function getShippingRates() $ratesFilter->addFilter(Mage::app()->getStore()->getPriceFilter(), 'price'); foreach ($groups as $code => $groupItems) { - $groups[$code] = $ratesFilter->filter($groupItems); + $groups[$code] = $ratesFilter->filter($groupItems); } } */ @@ -86,4 +86,4 @@ public function getShippingPrice($price, $flag) { return $this->getQuote()->getStore()->convertPrice(Mage::helper('tax')->getShippingPrice($price, $flag, $this->getAddress()), true); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Success.php b/app/code/core/Mage/Checkout/Block/Onepage/Success.php index bab637bb9c..0a8b49f94c 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Success.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Success.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -95,4 +95,4 @@ public function isOrderVisible() return !in_array($this->_order->getState(), Mage::getSingleton('sales/order_config')->getInvisibleOnFrontStates()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Success.php b/app/code/core/Mage/Checkout/Block/Success.php index 38dd24ff51..0e93d263d2 100644 --- a/app/code/core/Mage/Checkout/Block/Success.php +++ b/app/code/core/Mage/Checkout/Block/Success.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,8 +29,8 @@ class Mage_Checkout_Block_Success extends Mage_Core_Block_Template { public function getRealOrderId() { - $order = Mage::getModel('sales/order')->load($this->getLastOrderId()); - #print_r($order->getData()); - return $order->getIncrementId(); + $order = Mage::getModel('sales/order')->load($this->getLastOrderId()); + #print_r($order->getData()); + return $order->getIncrementId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Total/Default.php b/app/code/core/Mage/Checkout/Block/Total/Default.php index 14a1fa9b65..5a3be21e43 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Default.php +++ b/app/code/core/Mage/Checkout/Block/Total/Default.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,4 +64,4 @@ public function getStore() { return $this->_store; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Block/Total/Tax.php b/app/code/core/Mage/Checkout/Block/Total/Tax.php index a6243975b2..b7922ace0b 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Tax.php +++ b/app/code/core/Mage/Checkout/Block/Total/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ class Mage_Checkout_Block_Total_Tax extends Mage_Checkout_Block_Total_Default { protected $_template = 'checkout/total/tax.phtml'; -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Controller/Action.php b/app/code/core/Mage/Checkout/Controller/Action.php index 5080e11c6e..fe4a431baf 100644 --- a/app/code/core/Mage/Checkout/Controller/Action.php +++ b/app/code/core/Mage/Checkout/Controller/Action.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Exception.php b/app/code/core/Mage/Checkout/Exception.php index 6017170fc3..ea2e8b89ce 100644 --- a/app/code/core/Mage/Checkout/Exception.php +++ b/app/code/core/Mage/Checkout/Exception.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,4 +30,4 @@ class Mage_Checkout_Exception extends Zend_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Helper/Cart.php b/app/code/core/Mage/Checkout/Helper/Cart.php index da51cbc50f..44b16fec11 100644 --- a/app/code/core/Mage/Checkout/Helper/Cart.php +++ b/app/code/core/Mage/Checkout/Helper/Cart.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php index e346048825..7aba7c9ceb 100644 --- a/app/code/core/Mage/Checkout/Helper/Data.php +++ b/app/code/core/Mage/Checkout/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -110,7 +110,7 @@ public function getPriceInclTax($item) } /** - * Get sales item (quote item, order item etc) row total price including tax + * Get sales item (quote item, order item etc) row total price including tax * * @param Varien_Object $item * @return float @@ -282,4 +282,4 @@ public function isAllowedGuestCheckout(Mage_Sales_Model_Quote $quote, $store = n return $guestCheckout; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Helper/Url.php b/app/code/core/Mage/Checkout/Helper/Url.php index 66fa6f9034..ba3b1654e8 100644 --- a/app/code/core/Mage/Checkout/Helper/Url.php +++ b/app/code/core/Mage/Checkout/Helper/Url.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Model/Agreement.php b/app/code/core/Mage/Checkout/Model/Agreement.php index ea7593b6c8..3e2dc110e8 100644 --- a/app/code/core/Mage/Checkout/Model/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Agreement.php @@ -18,10 +18,10 @@ * 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_CheckoutAgreement - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Checkout_Model_Agreement extends Mage_Core_Model_Abstract @@ -30,4 +30,4 @@ protected function _construct() { $this->_init('checkout/agreement'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php index 32e9d4baf3..cd0367119a 100644 --- a/app/code/core/Mage/Checkout/Model/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Cart.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -357,6 +357,10 @@ public function save() $this->getQuote()->collectTotals(); $this->getQuote()->save(); $this->getCheckoutSession()->setQuoteId($this->getQuote()->getId()); + /** + * Cart save usually called after chenges with cart items. + */ + Mage::dispatchEvent('checkout_cart_save_after', array('cart'=>$this)); return $this; } @@ -537,4 +541,4 @@ public function getItemsQty() { return $this->getQuote()->getItemsQty()*1; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php index 91aa2392fe..c5dd1fc819 100644 --- a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php +++ b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php @@ -1,35 +1,35 @@ -0, 'label'=>Mage::helper('checkout')->__('Display number of items in cart')), - array('value'=>1, 'label'=>Mage::helper('checkout')->__('Display item quantities')), - ); - } -} +0, 'label'=>Mage::helper('checkout')->__('Display number of items in cart')), + array('value'=>1, 'label'=>Mage::helper('checkout')->__('Display item quantities')), + ); + } +} diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php index 34068d12a9..b9a703248b 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php @@ -18,10 +18,10 @@ * 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_CheckoutAgreement - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Checkout_Model_Mysql4_Agreement extends Mage_Core_Model_Mysql4_Abstract diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php index db777aa996..cb21ffac61 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php @@ -18,10 +18,10 @@ * 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_CheckoutAgreement - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Checkout_Model_Mysql4_Agreement_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php index e4cbdeab87..27a704554d 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Observer.php b/app/code/core/Mage/Checkout/Model/Observer.php index 2674d840d2..e76338c3b7 100644 --- a/app/code/core/Mage/Checkout/Model/Observer.php +++ b/app/code/core/Mage/Checkout/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Model/Session.php b/app/code/core/Mage/Checkout/Model/Session.php index c506d4bf56..0f01564532 100644 --- a/app/code/core/Mage/Checkout/Model/Session.php +++ b/app/code/core/Mage/Checkout/Model/Session.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +55,23 @@ public function getQuote() /* @var $quote Mage_Sales_Model_Quote */ if ($this->getQuoteId()) { $quote->load($this->getQuoteId()); - if (!$quote->getId()) { + if ($quote->getId()) { + /** + * If current currency code of quote is not equal current currency code of store, + * need recalculate totals of quote. It is possible if customer use currency switcher or + * store switcher. + */ + if ($quote->getQuoteCurrencyCode() != Mage::app()->getStore()->getCurrentCurrencyCode()) { + $quote->setStore(Mage::app()->getStore()); + $quote->collectTotals()->save(); + /* + * We mast to create new quote object, because collectTotals() + * can to create links with other objects. + */ + $quote = Mage::getModel('sales/quote')->setStoreId(Mage::app()->getStore()->getId()); + $quote->load($this->getQuoteId()); + } + } else { $this->setQuoteId(null); } } @@ -191,4 +207,4 @@ public function replaceQuote($quote) $this->setQuoteId($quote->getId()); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/Model/Type/Abstract.php b/app/code/core/Mage/Checkout/Model/Type/Abstract.php index 93c089dc81..1f7dbd36d4 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Abstract.php +++ b/app/code/core/Mage/Checkout/Model/Type/Abstract.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php index 94b85dc923..229cb37b0f 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php @@ -18,17 +18,17 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Multishipping checkout model * - * @category Mage - * @package Mage_Checkout + * @category Mage + * @package Mage_Checkout * @author Magento Core Team */ class Mage_Checkout_Model_Type_Multishipping extends Mage_Checkout_Model_Type_Abstract @@ -40,7 +40,8 @@ public function __construct() } /** - * Initialize multishipping checkout + * Initialize multishipping checkout. + * Split virtual/not virtual items between default billing/shipping addresses * * @return Mage_Checkout_Model_Type_Multishipping */ @@ -49,61 +50,60 @@ protected function _init() /** * reset quote shipping addresses and items */ - $this->getQuote()->setIsMultiShipping(true); + $quote = $this->getQuote(); + $quote->setIsMultiShipping(true); if (!$this->getCustomer()->getId()) { return $this; } if ($this->getCheckoutSession()->getCheckoutState() === Mage_Checkout_Model_Session::CHECKOUT_STATE_BEGIN) { $this->getCheckoutSession()->setCheckoutState(true); - /** * Remove all addresses */ - $addresses = $this->getQuote()->getAllAddresses(); + $addresses = $quote->getAllAddresses(); foreach ($addresses as $address) { - $this->getQuote()->removeAddress($address->getId()); + $quote->removeAddress($address->getId()); } if ($defaultShipping = $this->getCustomerDefaultShippingAddress()) { - $this->getQuote()->getShippingAddress() - ->importCustomerAddress($defaultShipping); + $quote->getShippingAddress()->importCustomerAddress($defaultShipping); foreach ($this->getQuoteItems() as $item) { /** - * Items with parent id we add in importQuoteItem method + * Items with parent id we add in importQuoteItem method. + * Skip virtual items */ - if ($item->getParentItemId()) { - continue; - } - if ($item->getProduct()->getIsVirtual()) { + if ($item->getParentItemId() || $item->getProduct()->getIsVirtual()) { continue; } - $this->getQuote()->getShippingAddress() - ->addItem($item); + $quote->getShippingAddress()->addItem($item); } } if ($this->getCustomerDefaultBillingAddress()) { - $this->getQuote()->getBillingAddress() + $quote->getBillingAddress() ->importCustomerAddress($this->getCustomerDefaultBillingAddress()); foreach ($this->getQuoteItems() as $item) { if ($item->getParentItemId()) { continue; } if ($item->getProduct()->getIsVirtual()) { - $this->getQuote()->getBillingAddress()->addItem($item); + $quote->getBillingAddress()->addItem($item); } } } - $this->save(); - } else { - $this->getQuote()->collectTotals(); } return $this; } + /** + * Get quote items assigned to different quote addresses populated per item qty. + * Based on result array we can display each item separately + * + * @return array + */ public function getQuoteShippingAddressesItems() { $items = array(); @@ -113,46 +113,48 @@ public function getQuoteShippingAddressesItems() if ($item->getParentItemId()) { continue; } - if ($item->getProduct()->getIsVirtual()) { $items[] = $item; continue; } - else { - if ($item->getQty() > 1) { - for ($i = 0, $n = $item->getQty(); $i < $n; $i++) { - if ($i == 0) { - $addressItem = $item; - } - else { - $addressItem = clone $item; - } - $addressItem->setQty(1) - ->setCustomerAddressId($address->getCustomerAddressId()) - ->save(); - $items[] = $addressItem; + if ($item->getQty() > 1) { + for ($i = 0, $n = $item->getQty(); $i < $n; $i++) { + if ($i == 0) { + $addressItem = $item; + } else { + $addressItem = clone $item; } + $addressItem->setQty(1) + ->setCustomerAddressId($address->getCustomerAddressId()) + ->save(); + $items[] = $addressItem; } - else { - $item->setCustomerAddressId($address->getCustomerAddressId()); - $items[] = $item; - } + } else { + $item->setCustomerAddressId($address->getCustomerAddressId()); + $items[] = $item; } } } return $items; } + /** + * Remove item from address + * + * @param int $addressId + * @param int $itemId + * @return Mage_Checkout_Model_Type_Multishipping + */ public function removeAddressItem($addressId, $itemId) { $address = $this->getQuote()->getAddressById($addressId); /* @var $address Mage_Sales_Model_Quote_Address */ if ($address) { - if ($item = $address->getItemById($itemId)) { + $item = $address->getValidItemById($itemId); + if ($item) { if ($item->getQty()>1 && !$item->getProduct()->getIsVirtual()) { $item->setQty($item->getQty()-1); - } - else { + } else { $address->removeItem($item->getId()); } @@ -164,18 +166,30 @@ public function removeAddressItem($addressId, $itemId) $newItemQty = $quoteItem->getQty()-1; if ($newItemQty > 0 && !$item->getProduct()->getIsVirtual()) { $quoteItem->setQty($quoteItem->getQty()-1); - } - else { + } else { $this->getQuote()->removeItem($quoteItem->getId()); } } - $this->save(); } } return $this; } + /** + * Assign quote items to addresses and specify items qty + * + * array structure: + * array( + * $quoteItemId => array( + * 'qty' => $qty, + * 'address' => $customerAddressId + * ) + * ) + * + * @param array $info + * @return Mage_Checkout_Model_Type_Multishipping + */ public function setShippingItemsInformation($info) { if (is_array($info)) { @@ -190,10 +204,10 @@ public function setShippingItemsInformation($info) if ($allQty > $maxQty) { Mage::throwException(Mage::helper('checkout')->__('Maximum qty allowed for Shipping to multiple addresses is %s', $maxQty)); } - - $addresses = $this->getQuote()->getAllShippingAddresses(); + $quote = $this->getQuote(); + $addresses = $quote->getAllShippingAddresses(); foreach ($addresses as $address) { - $this->getQuote()->removeAddress($address->getId()); + $quote->removeAddress($address->getId()); } foreach ($info as $itemData) { @@ -202,29 +216,35 @@ public function setShippingItemsInformation($info) } } - if ($billingAddress = $this->getQuote()->getBillingAddress()) { - $this->getQuote()->removeAddress($billingAddress->getId()); + if ($billingAddress = $quote->getBillingAddress()) { + $quote->removeAddress($billingAddress->getId()); } - $this->getQuote()->getBillingAddress() - ->importCustomerAddress($this->getCustomerDefaultBillingAddress()); + $quote->getBillingAddress()->importCustomerAddress($this->getCustomerDefaultBillingAddress()); - foreach ($this->getQuote()->getAllItems() as $_item) { + foreach ($quote->getAllItems() as $_item) { if (!$_item->getProduct()->getIsVirtual()) { continue; } if (isset($itemData[$_item->getId()]['qty']) && ($qty = (int)$itemData[$_item->getId()]['qty'])) { $_item->setQty($qty); } - $this->getQuote()->getBillingAddress()->addItem($_item); + $quote->getBillingAddress()->addItem($_item); } $this->save(); - Mage::dispatchEvent('checkout_type_multishipping_set_shipping_items', array('quote'=>$this->getQuote())); + Mage::dispatchEvent('checkout_type_multishipping_set_shipping_items', array('quote'=>$quote)); } return $this; } + /** + * Add quote item to specific shipping address based on customer address id + * + * @param int $quoteItemId + * @param array $data array('qty'=>$qty, 'address'=>$customerAddressId) + * @return Mage_Checkout_Model_Type_Multishipping + */ protected function _addShippingItem($quoteItemId, $data) { $qty = isset($data['qty']) ? (int) $data['qty'] : 0; @@ -235,33 +255,34 @@ protected function _addShippingItem($quoteItemId, $data) if ($addressId && $quoteItem) { $quoteItem->setMultisippingQty((int)$quoteItem->getMultisippingQty()+$qty); $quoteItem->setQty($quoteItem->getMultisippingQty()); - $address = $this->getCustomer()->getAddressById($addressId); if ($address) { if (!$quoteAddress = $this->getQuote()->getShippingAddressByCustomerAddressId($addressId)) { - $quoteAddress = Mage::getModel('sales/quote_address') - ->importCustomerAddress($address); + $quoteAddress = Mage::getModel('sales/quote_address')->importCustomerAddress($address); $this->getQuote()->addShippingAddress($quoteAddress); } $quoteAddress = $this->getQuote()->getShippingAddressByCustomerAddressId($address->getId()); - if ($quoteAddressItem = $quoteAddress->getItemByQuoteItemId($quoteItemId)) { $quoteAddressItem->setQty((int)($quoteAddressItem->getQty()+$qty)); - } - else { + } else { $quoteAddress->addItem($quoteItem, $qty); } /** - * Collect rates for shipping method page only + * Require shiping rate recollect */ - //$quoteAddress->setCollectShippingRates(true); $quoteAddress->setCollectShippingRates((boolean) $this->getCollectRatesFlag()); } } return $this; } + /** + * Reimport customer address info to quote shipping address + * + * @param int $addressId customer address id + * @return Mage_Checkout_Model_Type_Multishipping + */ public function updateQuoteCustomerShippingAddress($addressId) { if ($address = $this->getCustomer()->getAddressById($addressId)) { @@ -274,6 +295,12 @@ public function updateQuoteCustomerShippingAddress($addressId) return $this; } + /** + * Reimport customer billing address to quote + * + * @param int $addressId customer address id + * @return Mage_Checkout_Model_Type_Multishipping + */ public function setQuoteCustomerBillingAddress($addressId) { if ($address = $this->getCustomer()->getAddressById($addressId)) { @@ -285,23 +312,32 @@ public function setQuoteCustomerBillingAddress($addressId) return $this; } + /** + * Assign shipping methods to addresses + * + * @param array $methods + * @return Mage_Checkout_Model_Type_Multishipping + */ public function setShippingMethods($methods) { $addresses = $this->getQuote()->getAllShippingAddresses(); foreach ($addresses as $address) { if (isset($methods[$address->getId()])) { $address->setShippingMethod($methods[$address->getId()]); - } - elseif (!$address->getShippingMethod()) { + } elseif (!$address->getShippingMethod()) { Mage::throwException(Mage::helper('checkout')->__('Please select shipping methods for all addresses')); } } - $addresses = $this->getQuote() - ->collectTotals() - ->save(); + $this->save(); return $this; } + /** + * Set payment method info to quote payment + * + * @param array $payment + * @return Mage_Checkout_Model_Type_Multishipping + */ public function setPaymentMethod($payment) { if (!isset($payment['method'])) { @@ -314,28 +350,28 @@ public function setPaymentMethod($payment) } /** - * Prepare order + * Prepare order based on quote address * - * @param Mage_Sales_Model_Quote_Address $address - * @return Mage_Sales_Model_Order + * @param Mage_Sales_Model_Quote_Address $address + * @return Mage_Sales_Model_Order */ protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address) { - $this->getQuote()->unsReservedOrderId(); - $this->getQuote()->reserveOrderId(); + $quote = $this->getQuote(); + $quote->unsReservedOrderId(); + $quote->reserveOrderId(); $convertQuote = Mage::getSingleton('sales/convert_quote'); $order = $convertQuote->addressToOrder($address); $order->setBillingAddress( - $convertQuote->addressToOrderAddress($this->getQuote()->getBillingAddress()) + $convertQuote->addressToOrderAddress($quote->getBillingAddress()) ); if ($address->getAddressType() == 'billing') { $order->setIsVirtual(1); - } - else { + } else { $order->setShippingAddress($convertQuote->addressToOrderAddress($address)); } - $order->setPayment($convertQuote->paymentToOrderPayment($this->getQuote()->getPayment())); + $order->setPayment($convertQuote->paymentToOrderPayment($quote->getPayment())); foreach ($address->getAllItems() as $item) { $item->setProductType($item->getQuoteItem()->getProductType()) @@ -350,14 +386,20 @@ protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address) return $order; } + /** + * Validate quote data + * + * @return Mage_Checkout_Model_Type_Multishipping + */ protected function _validate() { $helper = Mage::helper('checkout'); - if (!$this->getQuote()->getIsMultiShipping()) { + $quote = $this->getQuote(); + if (!$quote->getIsMultiShipping()) { Mage::throwException($helper->__('Invalid checkout type.')); } - $addresses = $this->getQuote()->getAllShippingAddresses(); + $addresses = $quote->getAllShippingAddresses(); foreach ($addresses as $address) { $addressValidation = $address->validate(); if ($addressValidation !== true) { @@ -369,13 +411,18 @@ protected function _validate() Mage::throwException($helper->__('Please specify shipping methods for all addresses.')); } } - $addressValidation = $this->getQuote()->getBillingAddress()->validate(); + $addressValidation = $quote->getBillingAddress()->validate(); if ($addressValidation !== true) { Mage::throwException($helper->__('Please check billing address information.')); } return $this; } + /** + * Create orders per each quote address + * + * @return Mage_Checkout_Model_Type_Multishipping + */ public function createOrders() { $orderIds = array(); @@ -398,10 +445,8 @@ public function createOrders() } foreach ($orders as $order) { - #$order->save(); $order->place(); $order->save(); - $order->sendNewOrderEmail(); $orderIds[$order->getId()] = $order->getIncrementId(); } @@ -410,10 +455,14 @@ public function createOrders() $this->getQuote() ->setIsActive(false) ->save(); - return $this; } + /** + * Collect quote totals and save quote object + * + * @return Mage_Checkout_Model_Type_Multishipping + */ public function save() { $this->getQuote()->collectTotals() @@ -421,12 +470,22 @@ public function save() return $this; } + /** + * Specify BEGIN state in checkout session whot allow reinit multishipping checkout + * + * @return Mage_Checkout_Model_Type_Multishipping + */ public function reset() { $this->getCheckoutSession()->setCheckoutState(Mage_Checkout_Model_Session::CHECKOUT_STATE_BEGIN); return $this; } + /** + * Check if quote amount is allowed for multishipping checkout + * + * @return bool + */ public function validateMinimumAmount() { return !(Mage::getStoreConfigFlag('sales/minimum_order/active') @@ -434,6 +493,11 @@ public function validateMinimumAmount() && !$this->getQuote()->validateMinimumAmount()); } + /** + * Get notification message for case when multishipping checkout is not allowed + * + * @return string + */ public function getMinimumAmountDescription() { $descr = Mage::getStoreConfig('sales/minimum_order/multi_address_description'); diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php index 2ac8e3784c..13cacbbe16 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php index d7408d45d0..a55177f8f5 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php +++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php @@ -18,15 +18,31 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Checkout_Model_Type_Onepage { + /** + * Error message of "customer already exists" + * + * @var string + */ + private $_customerEmailExistsMessage = ''; + + /** + * Set customer already exists message + * @return Mage_Checkout_Model_Type_Onepage + */ + public function __construct() + { + $this->_customerEmailExistsMessage = Mage::helper('checkout')->__('There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.'); + } + /** * Enter description here... * @@ -63,6 +79,16 @@ public function initCheckout() } } } + + /** + * Reset multishipping flag before any manipulations with quote address + * addAddress method for quote object related on this flag + */ + if ($this->getQuote()->getIsMultiShipping()) { + $this->getQuote()->setIsMultiShipping(false); + $this->getQuote()->save(); + } + /* * want to laod the correct customer information by assiging to address * instead of just loading from sales/quote_address @@ -71,10 +97,6 @@ public function initCheckout() if ($customer) { $this->getQuote()->assignCustomer($customer); } - if ($this->getQuote()->getIsMultiShipping()) { - $this->getQuote()->setIsMultiShipping(false); - $this->getQuote()->save(); - } return $this; } @@ -160,7 +182,7 @@ public function saveBilling($data, $customerAddressId) if (!$this->getQuote()->getCustomerId() && Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER == $this->getQuote()->getCheckoutMethod()) { if ($this->_customerEmailExists($address->getEmail(), Mage::app()->getWebsite()->getId())) { return array('error' => 1, - 'message' => Mage::helper('checkout')->__('There is already a customer registered using this email address') + 'message' => $this->_customerEmailExistsMessage ); } } @@ -411,12 +433,24 @@ protected function validateOrder() */ public function saveOrder() { - $this->validateOrder(); $billing = $this->getQuote()->getBillingAddress(); if (!$this->getQuote()->isVirtual()) { $shipping = $this->getQuote()->getShippingAddress(); } + + /* + * Check if before this step checkout method was not defined use default values. + * Related to issue with some browsers when checkout method was not saved during first step. + */ + if (!$this->getQuote()->getCheckoutMethod()) { + if (Mage::helper('checkout')->isAllowedGuestCheckout($this->getQuote(), $this->getQuote()->getStore())) { + $this->getQuote()->setCheckoutMethod(Mage_Sales_Model_Quote::CHECKOUT_METHOD_GUEST); + } else { + $this->getQuote()->setCheckoutMethod(Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER); + } + } + switch ($this->getQuote()->getCheckoutMethod()) { case Mage_Sales_Model_Quote::CHECKOUT_METHOD_GUEST: if (!$this->getQuote()->isAllowedGuestCheckout()) { @@ -530,7 +564,7 @@ public function saveOrder() // check again, if customer exists if ($this->getQuote()->getCheckoutMethod() == Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER) { if ($this->_customerEmailExists($customer->getEmail(), Mage::app()->getWebsite()->getId())) { - Mage::throwException(Mage::helper('checkout')->__('There is already a customer registered using this email address')); + Mage::throwException($this->_customerEmailExistsMessage); } } $order->place(); @@ -555,11 +589,15 @@ public function saveOrder() $shipping->setCustomerId($customer->getId())->setCustomerAddressId($customerShippingId); } - if ($customer->isConfirmationRequired()) { - $customer->sendNewAccountEmail('confirmation'); - } - else { - $customer->sendNewAccountEmail(); + try { + if ($customer->isConfirmationRequired()) { + $customer->sendNewAccountEmail('confirmation'); + } + else { + $customer->sendNewAccountEmail(); + } + } catch (Exception $e) { + Mage::logException($e); } } @@ -591,7 +629,11 @@ public function saveOrder() * we only want to send to customer about new order when there is no redirect to third party */ if(!$redirectUrl){ - $order->sendNewOrderEmail(); + try { + $order->sendNewOrderEmail(); + } catch (Exception $e) { + Mage::logException($e); + } } if ($this->getQuote()->getCheckoutMethod(true)==Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER diff --git a/app/code/core/Mage/Checkout/Model/Type/Standard.php b/app/code/core/Mage/Checkout/Model/Type/Standard.php index 7bf24e19b8..883090b9f7 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Standard.php +++ b/app/code/core/Mage/Checkout/Model/Type/Standard.php @@ -18,8 +18,8 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php index b0af211fbf..bb40c6b4db 100644 --- a/app/code/core/Mage/Checkout/controllers/CartController.php +++ b/app/code/core/Mage/Checkout/controllers/CartController.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -366,4 +366,4 @@ public function couponPostAction() $this->_goBack(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/controllers/IndexController.php b/app/code/core/Mage/Checkout/controllers/IndexController.php index a86ab2bc81..b94dd11e51 100644 --- a/app/code/core/Mage/Checkout/controllers/IndexController.php +++ b/app/code/core/Mage/Checkout/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Checkout_IndexController extends Mage_Core_Controller_Front_Action @@ -30,4 +30,4 @@ function indexAction() { $this->_redirect('checkout/onepage', array('_secure'=>true)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php index 57ef39e9c8..11799eb032 100644 --- a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php +++ b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/controllers/MultishippingController.php b/app/code/core/Mage/Checkout/controllers/MultishippingController.php index d48d0da0c2..790bbae1b6 100644 --- a/app/code/core/Mage/Checkout/controllers/MultishippingController.php +++ b/app/code/core/Mage/Checkout/controllers/MultishippingController.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php index 3aa7b1e803..cb7be8ccc4 100644 --- a/app/code/core/Mage/Checkout/controllers/OnepageController.php +++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/etc/config.xml b/app/code/core/Mage/Checkout/etc/config.xml index b863e29722..7765625979 100644 --- a/app/code/core/Mage/Checkout/etc/config.xml +++ b/app/code/core/Mage/Checkout/etc/config.xml @@ -19,10 +19,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml index 7671f36d32..a47d67f606 100644 --- a/app/code/core/Mage/Checkout/etc/system.xml +++ b/app/code/core/Mage/Checkout/etc/system.xml @@ -19,10 +19,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -223,4 +223,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php index 35b88f4683..00b933f4d5 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php index 554e1303c0..944adb1c90 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php index 040704db6c..72364ac4a3 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php index f60e41727c..6665e56bed 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php index 9a77a31d08..cc115e442d 100644 --- a/app/code/core/Mage/Cms/Block/Block.php +++ b/app/code/core/Mage/Cms/Block/Block.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php index fd417ad66f..2dbc739120 100644 --- a/app/code/core/Mage/Cms/Block/Page.php +++ b/app/code/core/Mage/Cms/Block/Page.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Helper/Data.php b/app/code/core/Mage/Cms/Helper/Data.php index d68cb3490a..fa2ac17c8c 100644 --- a/app/code/core/Mage/Cms/Helper/Data.php +++ b/app/code/core/Mage/Cms/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Helper/Page.php b/app/code/core/Mage/Cms/Helper/Page.php index 71e6da6733..742ec3b626 100644 --- a/app/code/core/Mage/Cms/Helper/Page.php +++ b/app/code/core/Mage/Cms/Helper/Page.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +74,7 @@ protected function _renderPage(Mage_Core_Controller_Varien_Action $action, $pag return false; } - $inRange = Mage::app()->getLocale()->IsStoreDateInInterval(null, $page->getCustomThemeFrom(), $page->getCustomThemeTo()); + $inRange = Mage::app()->getLocale()->isStoreDateInInterval(null, $page->getCustomThemeFrom(), $page->getCustomThemeTo()); if ($page->getCustomTheme()) { if ($inRange) { diff --git a/app/code/core/Mage/Cms/Model/Block.php b/app/code/core/Mage/Cms/Model/Block.php index f6bf7e3734..b054854bc7 100644 --- a/app/code/core/Mage/Cms/Model/Block.php +++ b/app/code/core/Mage/Cms/Model/Block.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block.php b/app/code/core/Mage/Cms/Model/Mysql4/Block.php index 696bfd106d..a194afb78f 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Block.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Block.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php index 5ba2136582..8de04b7c4c 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page.php b/app/code/core/Mage/Cms/Model/Mysql4/Page.php index 65791fd1ec..7a68dc954c 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Page.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Page.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,11 +62,11 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) } if (!$this->getIsUniquePageToStores($object)) { - Mage::throwException(Mage::helper('cms')->__('Page Identifier for specified store already exist.')); + Mage::throwException(Mage::helper('cms')->__('Page URL Key for specified store already exist.')); } if ($this->isNumericPageIdentifier($object)) { - Mage::throwException(Mage::helper('cms')->__('Page Identifier cannot consist only of numbers.')); + Mage::throwException(Mage::helper('cms')->__('Page URL Key cannot consist only of numbers.')); } if (! $object->getId()) { diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php index e65250e494..7597acc3a5 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Cms/Model/Observer.php b/app/code/core/Mage/Cms/Model/Observer.php index e87e4ce398..3cd0c92a48 100644 --- a/app/code/core/Mage/Cms/Model/Observer.php +++ b/app/code/core/Mage/Cms/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -73,4 +73,19 @@ public function noCookies(Varien_Event_Observer $observer) } return $this; } + + /** + * Add additional settings to wysiwyg config for Widgets Insertion Plugin + * + * @param Varien_Event_Observer $observer + * @return Mage_Cms_Model_Observer + */ + public function prepareWidgetsPluginConfig(Varien_Event_Observer $observer) + { + $config = $observer->getEvent()->getConfig(); + $settings = Mage::getModel('cms/widget_config')->getPluginSettings($config); + $config->addData($settings); + return $this; + } + } diff --git a/app/code/core/Mage/Cms/controllers/IndexController.php b/app/code/core/Mage/Cms/controllers/IndexController.php index 0ea8f7501b..422941089c 100644 --- a/app/code/core/Mage/Cms/controllers/IndexController.php +++ b/app/code/core/Mage/Cms/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/controllers/PageController.php b/app/code/core/Mage/Cms/controllers/PageController.php index 9a0e56c276..a599f0aad3 100644 --- a/app/code/core/Mage/Cms/controllers/PageController.php +++ b/app/code/core/Mage/Cms/controllers/PageController.php @@ -18,10 +18,10 @@ * 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_Cms - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml index 48dc255974..cc23b690a3 100644 --- a/app/code/core/Mage/Cms/etc/config.xml +++ b/app/code/core/Mage/Cms/etc/config.xml @@ -19,10 +19,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -86,6 +86,16 @@ + + + + + cms/observer + prepareWidgetsPluginConfig + + + + @@ -168,7 +178,7 @@ content/images jpg,jpeg,png,gif jpg,jpeg,png,gif - flv,swf,avi,mov + flv,swf,avi,mov,rm,wmv 1000 800 100 diff --git a/app/code/core/Mage/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml index 79614b4e10..f0a1a3fd36 100644 --- a/app/code/core/Mage/Cms/etc/system.xml +++ b/app/code/core/Mage/Cms/etc/system.xml @@ -19,10 +19,10 @@ * 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_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -111,4 +111,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php index e7fa0926fe..c81de8e987 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php index bfcae22ef2..6c88658a25 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php index 73b8474b04..59effbf7a3 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php index 0e6d3a24f9..652f18d56f 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php index 1b57280e61..bef721931e 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,4 +55,4 @@ "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php index 2ebdaae036..d8020803b4 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cms - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ $installer->getConnection()->dropColumn($this->getTable('cms/block'), 'store_id'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php index e3586f7b2c..89467854ee 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Compiler/Block/Process.php b/app/code/core/Mage/Compiler/Block/Process.php index da34d9be53..486a215810 100644 --- a/app/code/core/Mage/Compiler/Block/Process.php +++ b/app/code/core/Mage/Compiler/Block/Process.php @@ -18,10 +18,10 @@ * 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_Compiler - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Compiler + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Compiler/Helper/Data.php b/app/code/core/Mage/Compiler/Helper/Data.php index 766dea965e..7a8d9fb4c7 100644 --- a/app/code/core/Mage/Compiler/Helper/Data.php +++ b/app/code/core/Mage/Compiler/Helper/Data.php @@ -1,36 +1,36 @@ - - */ -class Mage_Compiler_Helper_Data extends Mage_Core_Helper_Abstract -{ -} // Class Mage_Api_Helper_Data End \ No newline at end of file + + */ +class Mage_Compiler_Helper_Data extends Mage_Core_Helper_Abstract +{ +} // Class Mage_Api_Helper_Data End diff --git a/app/code/core/Mage/Compiler/Model/Process.php b/app/code/core/Mage/Compiler/Model/Process.php index 5923947beb..9a35b5dfab 100644 --- a/app/code/core/Mage/Compiler/Model/Process.php +++ b/app/code/core/Mage/Compiler/Model/Process.php @@ -18,10 +18,10 @@ * 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_Compiler - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Compiler + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -448,4 +448,4 @@ public function validate() return $result; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Compiler/controllers/ProcessController.php b/app/code/core/Mage/Compiler/controllers/ProcessController.php index d8bfad537f..aa7fc6c6e2 100644 --- a/app/code/core/Mage/Compiler/controllers/ProcessController.php +++ b/app/code/core/Mage/Compiler/controllers/ProcessController.php @@ -18,10 +18,10 @@ * 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_Compiler - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Compiler + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -107,4 +107,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('system/tools/compiler'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Compiler/etc/compilation.xml b/app/code/core/Mage/Compiler/etc/compilation.xml index 0139877c9a..1dea0b8f3a 100644 --- a/app/code/core/Mage/Compiler/etc/compilation.xml +++ b/app/code/core/Mage/Compiler/etc/compilation.xml @@ -20,9 +20,9 @@ * needs please refer to http://www.magentocommerce.com for more information. * * @category Mage - * @package Mage_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @package Mage_Compiler + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Compiler/etc/config.xml b/app/code/core/Mage/Compiler/etc/config.xml index 1256d820b1..6b92d426ea 100644 --- a/app/code/core/Mage/Compiler/etc/config.xml +++ b/app/code/core/Mage/Compiler/etc/config.xml @@ -1,86 +1,86 @@ - - - - - - 0.1.0 - - - - - - Mage_Compiler_Model - compiler_mysql4 - - - Mage_Compiler_Model_Mysql4 - - - compiler_configuration
- - - - - - - - Mage_Compiler - - - - - - - - admin - - Mage_Compiler - compiler - - - - - - - - - - Mage_Compiler.csv - - - - - - - - compiler.xml - - - - - \ No newline at end of file + + + + + + 0.1.0 + + + + + + Mage_Compiler_Model + compiler_mysql4 + + + Mage_Compiler_Model_Mysql4 + + + compiler_configuration
+ + + + + + + + Mage_Compiler + + + + + + + + admin + + Mage_Compiler + compiler + + + + + + + + + + Mage_Compiler.csv + + + + + + + + compiler.xml + + + + + diff --git a/app/code/core/Mage/Contacts/Helper/Data.php b/app/code/core/Mage/Contacts/Helper/Data.php index 8390198fd6..a92e9b5b9e 100644 --- a/app/code/core/Mage/Contacts/Helper/Data.php +++ b/app/code/core/Mage/Contacts/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Contacts - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Contacts/controllers/IndexController.php b/app/code/core/Mage/Contacts/controllers/IndexController.php index ad5866ed6e..adaf3fd1d8 100644 --- a/app/code/core/Mage/Contacts/controllers/IndexController.php +++ b/app/code/core/Mage/Contacts/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Contacts - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Contacts/etc/config.xml b/app/code/core/Mage/Contacts/etc/config.xml index 30f8c26405..6032086455 100644 --- a/app/code/core/Mage/Contacts/etc/config.xml +++ b/app/code/core/Mage/Contacts/etc/config.xml @@ -19,10 +19,10 @@ * 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_Contacts - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml index 25b15ae709..788b8aa956 100644 --- a/app/code/core/Mage/Contacts/etc/system.xml +++ b/app/code/core/Mage/Contacts/etc/system.xml @@ -19,10 +19,10 @@ * 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_Contacts - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php index 122e5dbbf3..77081deabf 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php @@ -18,10 +18,10 @@ * 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_Contacts - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php index 2945159e0f..2a808dcb2f 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php @@ -18,11 +18,11 @@ * 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_Contacts - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; -/* @var $installer Mage_Core_Model_Resource_Setup */ \ No newline at end of file +/* @var $installer Mage_Core_Model_Resource_Setup */ diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php index 2232896979..a764883f79 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Contacts - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php index 19a8e60ed2..861a3091f2 100644 --- a/app/code/core/Mage/Core/Block/Abstract.php +++ b/app/code/core/Mage/Core/Block/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Flush.php b/app/code/core/Mage/Core/Block/Flush.php index ac76637903..83ee972036 100644 --- a/app/code/core/Mage/Core/Block/Flush.php +++ b/app/code/core/Mage/Core/Block/Flush.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Html/Calendar.php b/app/code/core/Mage/Core/Block/Html/Calendar.php index 5dfc225fec..a0cbd85467 100644 --- a/app/code/core/Mage/Core/Block/Html/Calendar.php +++ b/app/code/core/Mage/Core/Block/Html/Calendar.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Block/Html/Date.php b/app/code/core/Mage/Core/Block/Html/Date.php index 7fc2cb4d2b..18ce897fc5 100644 --- a/app/code/core/Mage/Core/Block/Html/Date.php +++ b/app/code/core/Mage/Core/Block/Html/Date.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Html/Select.php b/app/code/core/Mage/Core/Block/Html/Select.php index ef83877154..9a31ae95a5 100644 --- a/app/code/core/Mage/Core/Block/Html/Select.php +++ b/app/code/core/Mage/Core/Block/Html/Select.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php index 51657b7be0..d6887a0d08 100644 --- a/app/code/core/Mage/Core/Block/Messages.php +++ b/app/code/core/Mage/Core/Block/Messages.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Block/Profiler.php b/app/code/core/Mage/Core/Block/Profiler.php index 82a313a2a9..46c02886d0 100644 --- a/app/code/core/Mage/Core/Block/Profiler.php +++ b/app/code/core/Mage/Core/Block/Profiler.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,11 +29,11 @@ class Mage_Core_Block_Profiler extends Mage_Core_Block_Abstract { protected function _toHtml() { - if (!$this->_beforeToHtml() - || !Mage::getStoreConfig('dev/debug/profiler') - || !Mage::helper('core')->isDevAllowed()) { - return ''; - } + if (!$this->_beforeToHtml() + || !Mage::getStoreConfig('dev/debug/profiler') + || !Mage::helper('core')->isDevAllowed()) { + return ''; + } $timers = Varien_Profiler::getTimers(); @@ -69,4 +69,4 @@ protected function _toHtml() return $out; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Block/Saver.php b/app/code/core/Mage/Core/Block/Saver.php index 2cc2dfea61..78b2ae7b8b 100644 --- a/app/code/core/Mage/Core/Block/Saver.php +++ b/app/code/core/Mage/Core/Block/Saver.php @@ -18,8 +18,8 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Store/Switcher.php b/app/code/core/Mage/Core/Block/Store/Switcher.php index baf162d389..ac38043c7d 100644 --- a/app/code/core/Mage/Core/Block/Store/Switcher.php +++ b/app/code/core/Mage/Core/Block/Store/Switcher.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php index 65086f8f0f..79e4ec5574 100644 --- a/app/code/core/Mage/Core/Block/Template.php +++ b/app/code/core/Mage/Core/Block/Template.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Template/Facade.php b/app/code/core/Mage/Core/Block/Template/Facade.php index e2c212c64b..f61366ab32 100644 --- a/app/code/core/Mage/Core/Block/Template/Facade.php +++ b/app/code/core/Mage/Core/Block/Template/Facade.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -93,4 +93,4 @@ public function ifEquals($conditionKeys) } return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Block/Template/Smarty.php b/app/code/core/Mage/Core/Block/Template/Smarty.php index 7af4398b12..91b2850268 100644 --- a/app/code/core/Mage/Core/Block/Template/Smarty.php +++ b/app/code/core/Mage/Core/Block/Template/Smarty.php @@ -18,14 +18,14 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Core_Block_Template_Smarty extends Mage_Core_Block_Template { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Block/Template/Zend.php b/app/code/core/Mage/Core/Block/Template/Zend.php index 799d09c443..34279222c7 100644 --- a/app/code/core/Mage/Core/Block/Template/Zend.php +++ b/app/code/core/Mage/Core/Block/Template/Zend.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text.php b/app/code/core/Mage/Core/Block/Text.php index 344530e6e1..3fe458fdc2 100644 --- a/app/code/core/Mage/Core/Block/Text.php +++ b/app/code/core/Mage/Core/Block/Text.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/List.php b/app/code/core/Mage/Core/Block/Text/List.php index 5aca524f78..9e5f9dd118 100644 --- a/app/code/core/Mage/Core/Block/Text/List.php +++ b/app/code/core/Mage/Core/Block/Text/List.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,16 +32,16 @@ class Mage_Core_Block_Text_List extends Mage_Core_Block_Text { - protected function _toHtml() - { - $this->setText(''); - foreach ($this->getSortedChildren() as $name) { - $block = $this->getLayout()->getBlock($name); - if (!$block) { - Mage::throwException(Mage::helper('core')->__('Invalid block: %s', $name)); - } - $this->addText($block->toHtml()); - } - return parent::_toHtml(); - } -} \ No newline at end of file + protected function _toHtml() + { + $this->setText(''); + foreach ($this->getSortedChildren() as $name) { + $block = $this->getLayout()->getBlock($name); + if (!$block) { + Mage::throwException(Mage::helper('core')->__('Invalid block: %s', $name)); + } + $this->addText($block->toHtml()); + } + return parent::_toHtml(); + } +} diff --git a/app/code/core/Mage/Core/Block/Text/List/Item.php b/app/code/core/Mage/Core/Block/Text/List/Item.php index d59636eebf..ca668a924c 100644 --- a/app/code/core/Mage/Core/Block/Text/List/Item.php +++ b/app/code/core/Mage/Core/Block/Text/List/Item.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/List/Link.php b/app/code/core/Mage/Core/Block/Text/List/Link.php index f0b2ba29ad..2fe046d6a1 100644 --- a/app/code/core/Mage/Core/Block/Text/List/Link.php +++ b/app/code/core/Mage/Core/Block/Text/List/Link.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag.php b/app/code/core/Mage/Core/Block/Text/Tag.php index f9c55260a5..25d8597896 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag.php +++ b/app/code/core/Mage/Core/Block/Text/Tag.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css.php b/app/code/core/Mage/Core/Block/Text/Tag/Css.php index c3210b709d..ceed2bcd41 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Css.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Css.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php index 28a189e457..5fbd1cdc7e 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php index dcef9300f5..009d61ebfa 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Js.php b/app/code/core/Mage/Core/Block/Text/Tag/Js.php index 584fdf160c..01bb59d655 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Js.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Js.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php index 26e5cfd89d..140809aa57 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,4 +41,4 @@ protected function _toHtml() return parent::_toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Controller/Front/Action.php b/app/code/core/Mage/Core/Controller/Front/Action.php index 9d5aff916e..39197df38e 100644 --- a/app/code/core/Mage/Core/Controller/Front/Action.php +++ b/app/code/core/Mage/Core/Controller/Front/Action.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Front/Router.php b/app/code/core/Mage/Core/Controller/Front/Router.php index fde04d6287..d9a62a0263 100644 --- a/app/code/core/Mage/Core/Controller/Front/Router.php +++ b/app/code/core/Mage/Core/Controller/Front/Router.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,4 +93,4 @@ public function getUrl($params=array()) return $url; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php index ef29372fba..be6818ee3a 100644 --- a/app/code/core/Mage/Core/Controller/Request/Http.php +++ b/app/code/core/Mage/Core/Controller/Request/Http.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -437,4 +437,4 @@ public function getBeforeForwardInfo($name = null) return null; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Controller/Response/Http.php b/app/code/core/Mage/Core/Controller/Response/Http.php index 3493815003..6a7c04bf16 100644 --- a/app/code/core/Mage/Core/Controller/Response/Http.php +++ b/app/code/core/Mage/Core/Controller/Response/Http.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,4 +80,4 @@ public function sendResponse() Mage::dispatchEvent('http_response_send_before', array('response'=>$this)); return parent::sendResponse(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php index 5b12422e7f..a292cdd5d2 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Action.php +++ b/app/code/core/Mage/Core/Controller/Varien/Action.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Exception.php b/app/code/core/Mage/Core/Controller/Varien/Exception.php index 004e230783..8375e4084b 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Exception.php +++ b/app/code/core/Mage/Core/Controller/Varien/Exception.php @@ -1,125 +1,125 @@ -_resultCallback = self::RESULT_FORWARD; - if (null === $actionName) { - $actionName = $this->_defaultActionName; - } - $this->_resultCallbackParams = array($actionName, $controllerName, $moduleName, $params); - return $this; - } - - /** - * Prepare data for redirecting - * - * @param string $path - * @param array $arguments - * @return Mage_Core_Controller_Varien_Exception - */ - public function prepareRedirect($path, $arguments = array()) - { - $this->_resultCallback = self::RESULT_REDIRECT; - $this->_resultCallbackParams($path, $arguments); - return $this; - } - - /** - * Prepare data for running a custom action - * - * @param string $actionName - * @return Mage_Core_Controller_Varien_Exception - */ - public function prepareFork($actionName = null) - { - if (null === $actionName) { - $actionName = $this->_defaultActionName; - } - $this->_resultCallback = $actionName; - return $this; - } - - /** - * Prepare a flag data - * - * @param string $action - * @param string $flag - * @param bool $value - * @return Mage_Core_Controller_Varien_Exception - */ - public function prepareFlag($action, $flag, $value) - { - $this->_flags[] = array($action, $flag, $value); - return $this; - } - - /** - * Return all set flags - * - * @return array - */ - public function getResultFlags() - { - return $this->_flags; - } - - /** - * Return results as callback for a controller - * - * @return array - */ - public function getResultCallback() - { - if (null === $this->_resultCallback) { - $this->prepareFork(); - } - return array($this->_resultCallback, $this->_resultCallbackParams); - } -} +_resultCallback = self::RESULT_FORWARD; + if (null === $actionName) { + $actionName = $this->_defaultActionName; + } + $this->_resultCallbackParams = array($actionName, $controllerName, $moduleName, $params); + return $this; + } + + /** + * Prepare data for redirecting + * + * @param string $path + * @param array $arguments + * @return Mage_Core_Controller_Varien_Exception + */ + public function prepareRedirect($path, $arguments = array()) + { + $this->_resultCallback = self::RESULT_REDIRECT; + $this->_resultCallbackParams($path, $arguments); + return $this; + } + + /** + * Prepare data for running a custom action + * + * @param string $actionName + * @return Mage_Core_Controller_Varien_Exception + */ + public function prepareFork($actionName = null) + { + if (null === $actionName) { + $actionName = $this->_defaultActionName; + } + $this->_resultCallback = $actionName; + return $this; + } + + /** + * Prepare a flag data + * + * @param string $action + * @param string $flag + * @param bool $value + * @return Mage_Core_Controller_Varien_Exception + */ + public function prepareFlag($action, $flag, $value) + { + $this->_flags[] = array($action, $flag, $value); + return $this; + } + + /** + * Return all set flags + * + * @return array + */ + public function getResultFlags() + { + return $this->_flags; + } + + /** + * Return results as callback for a controller + * + * @return array + */ + public function getResultCallback() + { + if (null === $this->_resultCallback) { + $this->prepareFork(); + } + return array($this->_resultCallback, $this->_resultCallbackParams); + } +} diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php index 6731ddc95d..aa865fa14d 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Front.php +++ b/app/code/core/Mage/Core/Controller/Varien/Front.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -280,4 +280,4 @@ protected function _processRewriteUrl($url) } return $url; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php index 4ad9624732..26563b03e6 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ abstract class Mage_Core_Controller_Varien_Router_Abstract @@ -50,4 +50,4 @@ public function getRouteByFrontName($frontName) } abstract public function match(Zend_Controller_Request_Http $request); -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php index aff8519c20..699fcffb83 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,4 +86,4 @@ protected function _getCurrentSecureUrl($request) { return Mage::app()->getStore(Mage_Core_Model_App::ADMIN_STORE_ID)->getBaseUrl('link', true).ltrim($request->getPathInfo(), '/'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php index 7952673c43..c7c5123838 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Core_Controller_Varien_Router_Default extends Mage_Core_Controller_Varien_Router_Abstract @@ -42,4 +42,4 @@ public function getUrl($routeName, $params) } */ -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php index 1eea173cd4..92c2f9cdf2 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Core_Controller_Varien_Router_Standard extends Mage_Core_Controller_Varien_Router_Abstract @@ -424,4 +424,4 @@ protected function _shouldBeSecure($path) && substr(Mage::getStoreConfig('web/secure/base_url'),0,5)=='https' && Mage::getConfig()->shouldUrlBeSecure($path); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Exception.php b/app/code/core/Mage/Core/Exception.php index c900382d5e..e715488f9f 100644 --- a/app/code/core/Mage/Core/Exception.php +++ b/app/code/core/Mage/Core/Exception.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function getMessages($type='') } return isset($this->_messages[$type]) ? $this->_messages[$type] : array(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php index a64b2b76b9..80015eff15 100644 --- a/app/code/core/Mage/Core/Helper/Abstract.php +++ b/app/code/core/Mage/Core/Helper/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -171,7 +171,7 @@ public function htmlEscape($data, $allowedTags = null) if (is_array($data)) { $result = array(); foreach ($data as $item) { - $result[] = $this->htmlEscape($item); + $result[] = $this->htmlEscape($item); } } else { // process single item @@ -296,4 +296,4 @@ public function translateArray($arr = array()) } return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php index 8f2b56869f..2a891f46f6 100644 --- a/app/code/core/Mage/Core/Helper/Data.php +++ b/app/code/core/Mage/Core/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -588,4 +588,14 @@ public function jsonDecode($encodedValue, $objectDecodeType = Zend_Json::TYPE_AR { return Zend_Json::decode($encodedValue, $objectDecodeType); } + + /** + * Generate a hash from unique ID + * @param $prefix + * @return string + */ + public function uniqHash($prefix = '') + { + return $prefix . md5(uniqid(microtime(), true)); + } } diff --git a/app/code/core/Mage/Core/Helper/Http.php b/app/code/core/Mage/Core/Helper/Http.php index d364883c7a..7215757b14 100644 --- a/app/code/core/Mage/Core/Helper/Http.php +++ b/app/code/core/Mage/Core/Helper/Http.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Helper/Js.php b/app/code/core/Mage/Core/Helper/Js.php index 01253e18ad..c6f13078e3 100644 --- a/app/code/core/Mage/Core/Helper/Js.php +++ b/app/code/core/Mage/Core/Helper/Js.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -122,58 +122,58 @@ public function getJsSkinUrl($file) protected function _getTranslateData() { if ($this->_translateData ===null) { - $this->_translateData = array( - 'Please select an option.' => $this->__('Please select an option.'), - 'This is a required field.' => $this->__('This is a required field.'), - 'Please enter a valid number in this field.' => $this->__('Please enter a valid number in this field.'), - 'Please use numbers only in this field. please avoid spaces or other characters such as dots or commas.' => - $this->__('Please use numbers only in this field. please avoid spaces or other characters such as dots or commas.'), - 'Please use letters only (a-z) in this field.' => $this->__('Please use letters only (a-z) in this field.'), - 'Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.' => - $this->__('Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.'), - 'Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.' => - $this->__('Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.'), - 'Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.' => - $this->__('Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.'), - 'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.' => - $this->__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'), - 'Please enter a valid date.' => $this->__('Please enter a valid date.'), - 'Please enter a valid email address. For example johndoe@domain.com.' => - $this->__('Please enter a valid email address. For example johndoe@domain.com.'), - 'Please enter 6 or more characters.' => $this->__('Please enter 6 or more characters.'), - 'Please make sure your passwords match.' => $this->__('Please make sure your passwords match.'), - 'Please enter a valid URL. http:// is required' => $this->__('Please enter a valid URL. http:// is required'), - 'Please enter a valid URL. For example http://www.example.com or www.example.com' => - $this->__('Please enter a valid URL. For example http://www.example.com or www.example.com'), - 'Please enter a valid social security number. For example 123-45-6789.' => - $this->__('Please enter a valid social security number. For example 123-45-6789.'), - 'Please enter a valid zip code. For example 90602 or 90602-1234.' => - $this->__('Please enter a valid zip code. For example 90602 or 90602-1234.'), - 'Please enter a valid zip code.' => $this->__('Please enter a valid zip code.'), - 'Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.' => - $this->__('Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.'), - 'Please enter a valid $ amount. For example $100.00.' => - $this->__('Please enter a valid $ amount. For example $100.00.'), - 'Please select one of the above options.' => $this->__('Please select one of the above options.'), - 'Please select one of the options.' => $this->__('Please select one of the options.'), - 'Please enter a valid number in this field.' => $this->__('Please enter a valid number in this field.'), - 'Please select State/Province.' => $this->__('Please select State/Province.'), - 'Please enter valid password.' => $this->__('Please enter valid password.'), - 'Please enter 6 or more characters. Leading or trailing spaces will be ignored.' => - $this->__('Please enter 6 or more characters. Leading or trailing spaces will be ignored.'), - 'Please use letters only (a-z or A-Z) in this field.' => $this->__('Please use letters only (a-z or A-Z) in this field.'), - 'Please enter a number greater than 0 in this field.' => - $this->__('Please enter a number greater than 0 in this field.'), - 'Please enter a valid credit card number.' => $this->__('Please enter a valid credit card number.'), - 'Please wait, loading...' => $this->__('Please wait, loading...'), - 'Please choose to register or to checkout as a guest' => $this->__('Please choose to register or to checkout as a guest'), - 'Error: Passwords do not match' => $this->__('Error: Passwords do not match'), - 'Your order can not be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.' => - $this->__('Your order can not be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.'), - 'Please specify shipping method.' => $this->__('Please specify shipping method.'), - 'Your order can not be completed at this time as there is no payment methods available for it.' => - $this->__('Your order can not be completed at this time as there is no payment methods available for it.'), - 'Please specify payment method.' => $this->__('Please specify payment method.'), + $this->_translateData = array( + 'Please select an option.' => $this->__('Please select an option.'), + 'This is a required field.' => $this->__('This is a required field.'), + 'Please enter a valid number in this field.' => $this->__('Please enter a valid number in this field.'), + 'Please use numbers only in this field. please avoid spaces or other characters such as dots or commas.' => + $this->__('Please use numbers only in this field. please avoid spaces or other characters such as dots or commas.'), + 'Please use letters only (a-z) in this field.' => $this->__('Please use letters only (a-z) in this field.'), + 'Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.' => + $this->__('Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.'), + 'Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.' => + $this->__('Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.'), + 'Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.' => + $this->__('Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.'), + 'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.' => + $this->__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'), + 'Please enter a valid date.' => $this->__('Please enter a valid date.'), + 'Please enter a valid email address. For example johndoe@domain.com.' => + $this->__('Please enter a valid email address. For example johndoe@domain.com.'), + 'Please enter 6 or more characters.' => $this->__('Please enter 6 or more characters.'), + 'Please make sure your passwords match.' => $this->__('Please make sure your passwords match.'), + 'Please enter a valid URL. http:// is required' => $this->__('Please enter a valid URL. http:// is required'), + 'Please enter a valid URL. For example http://www.example.com or www.example.com' => + $this->__('Please enter a valid URL. For example http://www.example.com or www.example.com'), + 'Please enter a valid social security number. For example 123-45-6789.' => + $this->__('Please enter a valid social security number. For example 123-45-6789.'), + 'Please enter a valid zip code. For example 90602 or 90602-1234.' => + $this->__('Please enter a valid zip code. For example 90602 or 90602-1234.'), + 'Please enter a valid zip code.' => $this->__('Please enter a valid zip code.'), + 'Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.' => + $this->__('Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.'), + 'Please enter a valid $ amount. For example $100.00.' => + $this->__('Please enter a valid $ amount. For example $100.00.'), + 'Please select one of the above options.' => $this->__('Please select one of the above options.'), + 'Please select one of the options.' => $this->__('Please select one of the options.'), + 'Please enter a valid number in this field.' => $this->__('Please enter a valid number in this field.'), + 'Please select State/Province.' => $this->__('Please select State/Province.'), + 'Please enter valid password.' => $this->__('Please enter valid password.'), + 'Please enter 6 or more characters. Leading or trailing spaces will be ignored.' => + $this->__('Please enter 6 or more characters. Leading or trailing spaces will be ignored.'), + 'Please use letters only (a-z or A-Z) in this field.' => $this->__('Please use letters only (a-z or A-Z) in this field.'), + 'Please enter a number greater than 0 in this field.' => + $this->__('Please enter a number greater than 0 in this field.'), + 'Please enter a valid credit card number.' => $this->__('Please enter a valid credit card number.'), + 'Please wait, loading...' => $this->__('Please wait, loading...'), + 'Please choose to register or to checkout as a guest' => $this->__('Please choose to register or to checkout as a guest'), + 'Error: Passwords do not match' => $this->__('Error: Passwords do not match'), + 'Your order can not be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.' => + $this->__('Your order can not be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.'), + 'Please specify shipping method.' => $this->__('Please specify shipping method.'), + 'Your order can not be completed at this time as there is no payment methods available for it.' => + $this->__('Your order can not be completed at this time as there is no payment methods available for it.'), + 'Please specify payment method.' => $this->__('Please specify payment method.'), 'Credit card number doesn\'t match credit card type' => $this->__('Credit card number doesn\'t match credit card type'), 'Card type doesn\'t match credit card number' => $this->__('Card type doesn\'t match credit card number'), 'Please enter a valid credit card verification number.' => $this->__('Please enter a valid credit card verification number.'), @@ -183,16 +183,16 @@ protected function _getTranslateData() 'Maximum length exceeded.' => $this->__('Maximum length exceeded.'), - //Mage_Rule + //Mage_Rule - 'Your session has been expired, you will be relogged in now.' => $this->__('Your session has been expired, you will be relogged in now.'), - 'Incorrect credit card expiration date' => $this->__('Incorrect credit card expiration date'), - ); - foreach ($this->_translateData as $key=>$value) { - if ($key == $value) { - unset($this->_translateData[$key]); - } - } + 'Your session has been expired, you will be relogged in now.' => $this->__('Your session has been expired, you will be relogged in now.'), + 'Incorrect credit card expiration date' => $this->__('Incorrect credit card expiration date'), + ); + foreach ($this->_translateData as $key=>$value) { + if ($key == $value) { + unset($this->_translateData[$key]); + } + } } return $this->_translateData; } diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php index 03780a5d2e..1950443ba7 100644 --- a/app/code/core/Mage/Core/Helper/String.php +++ b/app/code/core/Mage/Core/Helper/String.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php index ca735a6afe..ce88fe0f04 100644 --- a/app/code/core/Mage/Core/Helper/Url.php +++ b/app/code/core/Mage/Core/Helper/Url.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php index 80e5b1d94f..c7aff1b872 100644 --- a/app/code/core/Mage/Core/Model/Abstract.php +++ b/app/code/core/Mage/Core/Model/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index d4a7d6ebee..607e2c8812 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -723,7 +723,7 @@ public function getWebsite($id=null) } elseif ($id instanceof Mage_Core_Model_Website) { return $id; } elseif ($id === true) { - return $this->_website; + return $this->_website; } if (empty($this->_websites[$id])) { diff --git a/app/code/core/Mage/Core/Model/App/Area.php b/app/code/core/Mage/Core/Model/App/Area.php index b29e0ba259..04a5807f04 100644 --- a/app/code/core/Mage/Core/Model/App/Area.php +++ b/app/code/core/Mage/Core/Model/App/Area.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index 7c80eef899..f294b5326a 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/Base.php b/app/code/core/Mage/Core/Model/Config/Base.php index 8343f0d791..206bef6dd9 100644 --- a/app/code/core/Mage/Core/Model/Config/Base.php +++ b/app/code/core/Mage/Core/Model/Config/Base.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function __construct($sourceData=null) $this->_elementClass = 'Mage_Core_Model_Config_Element'; parent::__construct($sourceData); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Config/Data.php b/app/code/core/Mage/Core/Model/Config/Data.php index b08369d787..217a96677f 100644 --- a/app/code/core/Mage/Core/Model/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Config/Data.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/Element.php b/app/code/core/Mage/Core/Model/Config/Element.php index b61339e0ed..e5b5293815 100644 --- a/app/code/core/Mage/Core/Model/Config/Element.php +++ b/app/code/core/Mage/Core/Model/Config/Element.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/Options.php b/app/code/core/Mage/Core/Model/Config/Options.php index 84cf952648..0863a8cb18 100644 --- a/app/code/core/Mage/Core/Model/Config/Options.php +++ b/app/code/core/Mage/Core/Model/Config/Options.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Config/System.php b/app/code/core/Mage/Core/Model/Config/System.php index 47175bef3b..7365a799ba 100644 --- a/app/code/core/Mage/Core/Model/Config/System.php +++ b/app/code/core/Mage/Core/Model/Config/System.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,4 +44,4 @@ public function load($module) $this->loadFile($file); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Convert.php b/app/code/core/Mage/Core/Model/Convert.php index 3624979189..c5ad74e531 100644 --- a/app/code/core/Mage/Core/Model/Convert.php +++ b/app/code/core/Mage/Core/Model/Convert.php @@ -1,5 +1,4 @@ _init('core/design'); - } + protected function _construct() + { + $this->_init('core/design'); + } public function validate() { diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php index 1d4bd1eca3..7cd7003da9 100644 --- a/app/code/core/Mage/Core/Model/Design/Package.php +++ b/app/code/core/Mage/Core/Model/Design/Package.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,95 +47,95 @@ class Mage_Core_Model_Design_Package * * @var string */ - protected $_area; - - /** - * Package name - * - * @var string - */ - protected $_name; - - /** - * Package theme - * - * @var string - */ - protected $_theme; - - /** - * Package root directory - * - * @var string - */ - protected $_rootDir; - - protected $_config = null; - - /** - * Set store - * - * @param string|integer|Mage_Core_Model_Store $store - * @return Mage_Core_Model_Design_Package - */ - public function setStore($store) - { - $this->_store = $store; - return $this; - } - - /** - * Retrieve store - * - * @return string|integer|Mage_Core_Model_Store - */ - public function getStore() - { - if ($this->_store === null) { - return Mage::app()->getStore(); - } - return $this->_store; - } - - /** - * Set package area - * - * @param string $area - * @return Mage_Core_Model_Design_Package - */ - public function setArea($area) - { - $this->_area = $area; - return $this; - } - - /** - * Retrieve package area - * - * @return unknown - */ - public function getArea() - { - if (is_null($this->_area)) { - $this->_area = self::DEFAULT_AREA; - } - return $this->_area; - } - - /** - * Set package name - * In case of any problem, the default will be set. - * - * @param string $name - * @return Mage_Core_Model_Design_Package - */ - public function setPackageName($name = '') - { + protected $_area; + + /** + * Package name + * + * @var string + */ + protected $_name; + + /** + * Package theme + * + * @var string + */ + protected $_theme; + + /** + * Package root directory + * + * @var string + */ + protected $_rootDir; + + protected $_config = null; + + /** + * Set store + * + * @param string|integer|Mage_Core_Model_Store $store + * @return Mage_Core_Model_Design_Package + */ + public function setStore($store) + { + $this->_store = $store; + return $this; + } + + /** + * Retrieve store + * + * @return string|integer|Mage_Core_Model_Store + */ + public function getStore() + { + if ($this->_store === null) { + return Mage::app()->getStore(); + } + return $this->_store; + } + + /** + * Set package area + * + * @param string $area + * @return Mage_Core_Model_Design_Package + */ + public function setArea($area) + { + $this->_area = $area; + return $this; + } + + /** + * Retrieve package area + * + * @return unknown + */ + public function getArea() + { + if (is_null($this->_area)) { + $this->_area = self::DEFAULT_AREA; + } + return $this->_area; + } + + /** + * Set package name + * In case of any problem, the default will be set. + * + * @param string $name + * @return Mage_Core_Model_Design_Package + */ + public function setPackageName($name = '') + { if (empty($name)) { // see, if exceptions for user-agents defined in config - $customPackage = $this->_checkUserAgentAgainstRegexps('design/package/ua_regexp'); - if ($customPackage) { - $this->_name = $customPackage; + $customPackage = $this->_checkUserAgentAgainstRegexps('design/package/ua_regexp'); + if ($customPackage) { + $this->_name = $customPackage; } else { $this->_name = Mage::getStoreConfig('design/package/name', $this->getStore()); @@ -146,164 +146,164 @@ public function setPackageName($name = '') } // make sure not to crash, if wrong package specified if (!$this->designPackageExists($this->_name, $this->getArea())) { - $this->_name = self::DEFAULT_PACKAGE; - } - return $this; - } - - /** - * Set store/package/area at once, and get respective values, that were before - * - * $storePackageArea must be assoc array. The keys may be: - * 'store', 'package', 'area' - * - * @param array $storePackageArea - * @return array - */ - public function setAllGetOld($storePackageArea) - { - $oldValues = array(); - if (array_key_exists('store', $storePackageArea)) { - $oldValues['store'] = $this->getStore(); - $this->setStore($storePackageArea['store']); - } - if (array_key_exists('package', $storePackageArea)) { - $oldValues['package'] = $this->getPackageName(); - $this->setPackageName($storePackageArea['package']); - } - if (array_key_exists('area', $storePackageArea)) { - $oldValues['area'] = $this->getArea(); - $this->setArea($storePackageArea['area']); - } - return $oldValues; - } - - /** - * Retrieve package name - * - * @return string - */ - public function getPackageName() - { - if (null === $this->_name) { - $this->setPackageName(); - } - return $this->_name; - } - - public function designPackageExists($packageName, $area = self::DEFAULT_AREA) - { - return is_dir(Mage::getBaseDir('design') . DS . $area . DS . $packageName); - } - - /** - * Declare design package theme params - * - * @return Mage_Core_Model_Design_Package - */ - public function setTheme() - { - switch (func_num_args()) { - case 1: - foreach (array('layout', 'template', 'skin', 'locale') as $type) { - $this->_theme[$type] = func_get_arg(0); - } - break; - - case 2: - $this->_theme[func_get_arg(0)] = func_get_arg(1); - break; - - default: - throw Mage::exception(Mage::helper('core')->__('Wrong number of arguments for %s', __METHOD__)); - } - return $this; - } - - public function getTheme($type) - { - if (empty($this->_theme[$type])) { - $this->_theme[$type] = Mage::getStoreConfig('design/theme/'.$type, $this->getStore()); - if ($type!=='default' && empty($this->_theme[$type])) { - $this->_theme[$type] = $this->getTheme('default'); - if (empty($this->_theme[$type])) { - $this->_theme[$type] = self::DEFAULT_THEME; - } - - // "locale", "layout", "template" - } - } - - // + "default", "skin" - - // set exception value for theme, if defined in config + $this->_name = self::DEFAULT_PACKAGE; + } + return $this; + } + + /** + * Set store/package/area at once, and get respective values, that were before + * + * $storePackageArea must be assoc array. The keys may be: + * 'store', 'package', 'area' + * + * @param array $storePackageArea + * @return array + */ + public function setAllGetOld($storePackageArea) + { + $oldValues = array(); + if (array_key_exists('store', $storePackageArea)) { + $oldValues['store'] = $this->getStore(); + $this->setStore($storePackageArea['store']); + } + if (array_key_exists('package', $storePackageArea)) { + $oldValues['package'] = $this->getPackageName(); + $this->setPackageName($storePackageArea['package']); + } + if (array_key_exists('area', $storePackageArea)) { + $oldValues['area'] = $this->getArea(); + $this->setArea($storePackageArea['area']); + } + return $oldValues; + } + + /** + * Retrieve package name + * + * @return string + */ + public function getPackageName() + { + if (null === $this->_name) { + $this->setPackageName(); + } + return $this->_name; + } + + public function designPackageExists($packageName, $area = self::DEFAULT_AREA) + { + return is_dir(Mage::getBaseDir('design') . DS . $area . DS . $packageName); + } + + /** + * Declare design package theme params + * + * @return Mage_Core_Model_Design_Package + */ + public function setTheme() + { + switch (func_num_args()) { + case 1: + foreach (array('layout', 'template', 'skin', 'locale') as $type) { + $this->_theme[$type] = func_get_arg(0); + } + break; + + case 2: + $this->_theme[func_get_arg(0)] = func_get_arg(1); + break; + + default: + throw Mage::exception(Mage::helper('core')->__('Wrong number of arguments for %s', __METHOD__)); + } + return $this; + } + + public function getTheme($type) + { + if (empty($this->_theme[$type])) { + $this->_theme[$type] = Mage::getStoreConfig('design/theme/'.$type, $this->getStore()); + if ($type!=='default' && empty($this->_theme[$type])) { + $this->_theme[$type] = $this->getTheme('default'); + if (empty($this->_theme[$type])) { + $this->_theme[$type] = self::DEFAULT_THEME; + } + + // "locale", "layout", "template" + } + } + + // + "default", "skin" + + // set exception value for theme, if defined in config $customThemeType = $this->_checkUserAgentAgainstRegexps("design/theme/{$type}_ua_regexp"); if ($customThemeType) { $this->_theme[$type] = $customThemeType; } - return $this->_theme[$type]; - } - - public function getDefaultTheme() - { - return self::DEFAULT_THEME; - } - - public function updateParamDefaults(array &$params) - { - if ($this->getStore()) { - $params['_store'] = $this->getStore(); - } - if (empty($params['_area'])) { - $params['_area'] = $this->getArea(); - } - if (empty($params['_package'])) { - $params['_package'] = $this->getPackageName(); - } - if (empty($params['_theme'])) { - $params['_theme'] = $this->getTheme( (isset($params['_type'])) ? $params['_type'] : '' ); - } - if (empty($params['_default'])) { - $params['_default'] = false; - } - return $this; - } - - public function getBaseDir(array $params) - { - $this->updateParamDefaults($params); - $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('design').DS : ''). - $params['_area'].DS.$params['_package'].DS.$params['_theme'].DS.$params['_type']; - return $baseDir; - } - - public function getSkinBaseDir(array $params=array()) - { - $this->updateParamDefaults($params); - $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('skin').DS : ''). - $params['_area'].DS.$params['_package'].DS.$params['_theme']; - return $baseDir; - } - - public function getLocaleBaseDir(array $params=array()) - { - $this->updateParamDefaults($params); - $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('design').DS : ''). - $params['_area'].DS.$params['_package'].DS.$params['_theme'] . DS . 'locale' . DS . - Mage::app()->getLocale()->getLocaleCode(); - return $baseDir; - } - - public function getSkinBaseUrl(array $params=array()) - { - $this->updateParamDefaults($params); - $baseUrl = Mage::getBaseUrl('skin', isset($params['_secure'])?(bool)$params['_secure']:null) - .$params['_area'].'/'.$params['_package'].'/'.$params['_theme'].'/'; - return $baseUrl; - } - - /** + return $this->_theme[$type]; + } + + public function getDefaultTheme() + { + return self::DEFAULT_THEME; + } + + public function updateParamDefaults(array &$params) + { + if ($this->getStore()) { + $params['_store'] = $this->getStore(); + } + if (empty($params['_area'])) { + $params['_area'] = $this->getArea(); + } + if (empty($params['_package'])) { + $params['_package'] = $this->getPackageName(); + } + if (empty($params['_theme'])) { + $params['_theme'] = $this->getTheme( (isset($params['_type'])) ? $params['_type'] : '' ); + } + if (empty($params['_default'])) { + $params['_default'] = false; + } + return $this; + } + + public function getBaseDir(array $params) + { + $this->updateParamDefaults($params); + $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('design').DS : ''). + $params['_area'].DS.$params['_package'].DS.$params['_theme'].DS.$params['_type']; + return $baseDir; + } + + public function getSkinBaseDir(array $params=array()) + { + $this->updateParamDefaults($params); + $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('skin').DS : ''). + $params['_area'].DS.$params['_package'].DS.$params['_theme']; + return $baseDir; + } + + public function getLocaleBaseDir(array $params=array()) + { + $this->updateParamDefaults($params); + $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('design').DS : ''). + $params['_area'].DS.$params['_package'].DS.$params['_theme'] . DS . 'locale' . DS . + Mage::app()->getLocale()->getLocaleCode(); + return $baseDir; + } + + public function getSkinBaseUrl(array $params=array()) + { + $this->updateParamDefaults($params); + $baseUrl = Mage::getBaseUrl('skin', isset($params['_secure'])?(bool)$params['_secure']:null) + .$params['_area'].'/'.$params['_package'].'/'.$params['_theme'].'/'; + return $baseUrl; + } + + /** * Get absolute file path for requested file or false if doesn't exist * * Possible params: @@ -324,29 +324,29 @@ public function getSkinBaseUrl(array $params=array()) */ public function validateFile($file, array $params) { - Varien_Profiler::start(__METHOD__); - switch ($params['_type']) { - case 'skin': - $fileName = $this->getSkinBaseDir($params); - break; - - case 'locale': - $fileName = $this->getLocaleBasedir($params); - break; - - default: - $fileName = $this->getBaseDir($params); - break; - } - $fileName.= DS.$file; - - $testFile = (empty($params['_relative']) ? '' : Mage::getBaseDir('design').DS) . $fileName; - - if ($this->getDefaultTheme()!==$params['_theme'] && !file_exists($testFile)) { - return false; - } - Varien_Profiler::stop(__METHOD__); - return $fileName; + Varien_Profiler::start(__METHOD__); + switch ($params['_type']) { + case 'skin': + $fileName = $this->getSkinBaseDir($params); + break; + + case 'locale': + $fileName = $this->getLocaleBasedir($params); + break; + + default: + $fileName = $this->getBaseDir($params); + break; + } + $fileName.= DS.$file; + + $testFile = (empty($params['_relative']) ? '' : Mage::getBaseDir('design').DS) . $fileName; + + if ($this->getDefaultTheme()!==$params['_theme'] && !file_exists($testFile)) { + return false; + } + Varien_Profiler::stop(__METHOD__); + return $fileName; } /** @@ -360,25 +360,25 @@ public function validateFile($file, array $params) */ public function getFilename($file, array $params) { - Varien_Profiler::start(__METHOD__); - $this->updateParamDefaults($params); - $filename = $this->validateFile($file, $params); - if (false===$filename) { - $params['_theme'] = $this->getFallbackTheme(); - $filename = $this->validateFile($file, $params); - if (false===$filename) { - if ($this->getDefaultTheme()===$params['_theme']) { - return $params['_default']; - } - $params['_theme'] = $this->getDefaultTheme(); - $filename = $this->validateFile($file, $params); - if (false===$filename) { - return $params['_default']; - } - } - } - Varien_Profiler::stop(__METHOD__); - return $filename; + Varien_Profiler::start(__METHOD__); + $this->updateParamDefaults($params); + $filename = $this->validateFile($file, $params); + if (false===$filename) { + $params['_theme'] = $this->getFallbackTheme(); + $filename = $this->validateFile($file, $params); + if (false===$filename) { + if ($this->getDefaultTheme()===$params['_theme']) { + return $params['_default']; + } + $params['_theme'] = $this->getDefaultTheme(); + $filename = $this->validateFile($file, $params); + if (false===$filename) { + return $params['_default']; + } + } + } + Varien_Profiler::stop(__METHOD__); + return $filename; } public function getFallbackTheme() @@ -388,20 +388,20 @@ public function getFallbackTheme() public function getLayoutFilename($file, array $params=array()) { - $params['_type'] = 'layout'; - return $this->getFilename($file, $params); + $params['_type'] = 'layout'; + return $this->getFilename($file, $params); } public function getTemplateFilename($file, array $params=array()) { - $params['_type'] = 'template'; - return $this->getFilename($file, $params); + $params['_type'] = 'template'; + return $this->getFilename($file, $params); } public function getLocaleFileName($file, array $params=array()) { $params['_type'] = 'locale'; - return $this->getFilename($file, $params); + return $this->getFilename($file, $params); } /** @@ -413,37 +413,37 @@ public function getLocaleFileName($file, array $params=array()) */ public function getSkinUrl($file=null, array $params=array()) { - Varien_Profiler::start(__METHOD__); - if (empty($params['_type'])) { - $params['_type'] = 'skin'; - } - if (empty($params['_default'])) { - $params['_default'] = false; - } - $this->updateParamDefaults($params); - if (!empty($file)) { - $filename = $this->validateFile($file, $params); - if (false===$filename) { - - $params['_theme'] = $this->getFallbackTheme(); - $filename = $this->validateFile($file, $params); - if (false===$filename) { - if ($this->getDefaultTheme()===$params['_theme']) { - return $params['_default']; - } - $params['_theme'] = $this->getDefaultTheme(); - $filename = $this->validateFile($file, $params); - if (false===$filename) { - return $params['_default']; - } - } - - } - } - - $url = $this->getSkinBaseUrl($params).(!empty($file) ? $file : ''); - Varien_Profiler::stop(__METHOD__); - return $url; + Varien_Profiler::start(__METHOD__); + if (empty($params['_type'])) { + $params['_type'] = 'skin'; + } + if (empty($params['_default'])) { + $params['_default'] = false; + } + $this->updateParamDefaults($params); + if (!empty($file)) { + $filename = $this->validateFile($file, $params); + if (false===$filename) { + + $params['_theme'] = $this->getFallbackTheme(); + $filename = $this->validateFile($file, $params); + if (false===$filename) { + if ($this->getDefaultTheme()===$params['_theme']) { + return $params['_default']; + } + $params['_theme'] = $this->getDefaultTheme(); + $filename = $this->validateFile($file, $params); + if (false===$filename) { + return $params['_default']; + } + } + + } + } + + $url = $this->getSkinBaseUrl($params).(!empty($file) ? $file : ''); + Varien_Profiler::stop(__METHOD__); + return $url; } public function getPackageList() @@ -472,17 +472,17 @@ private function _listDirectories($path, $fullPath = false){ $result = array(); $dir = opendir($path); if ($dir) { - while ($entry = readdir($dir)) { - if (substr($entry, 0, 1) == '.' || !is_dir($path . DS . $entry)){ - continue; - } - if ($fullPath) { - $entry = $path . DS . $entry; - } - $result[] = $entry; - } - unset($entry); - closedir($dir); + while ($entry = readdir($dir)) { + if (substr($entry, 0, 1) == '.' || !is_dir($path . DS . $entry)){ + continue; + } + if ($fullPath) { + $entry = $path . DS . $entry; + } + $result[] = $entry; + } + unset($entry); + closedir($dir); } return $result; diff --git a/app/code/core/Mage/Core/Model/Design/Source/Apply.php b/app/code/core/Mage/Core/Model/Design/Source/Apply.php index a051583bec..1300048ea9 100644 --- a/app/code/core/Mage/Core/Model/Design/Source/Apply.php +++ b/app/code/core/Mage/Core/Model/Design/Source/Apply.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,4 +44,4 @@ public function getAllOptions() return $this->_options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Design/Source/Design.php b/app/code/core/Mage/Core/Model/Design/Source/Design.php index fd920f911f..c42092a186 100644 --- a/app/code/core/Mage/Core/Model/Design/Source/Design.php +++ b/app/code/core/Mage/Core/Model/Design/Source/Design.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -99,4 +99,4 @@ public function getOptionText($value) return $value; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Email.php b/app/code/core/Mage/Core/Model/Email.php index 0edcfe412d..d233ccf5ad 100644 --- a/app/code/core/Mage/Core/Model/Email.php +++ b/app/code/core/Mage/Core/Model/Email.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +38,7 @@ */ class Mage_Core_Model_Email extends Varien_Object { - protected $_tplVars = array(); + protected $_tplVars = array(); protected $_block; public function __construct() @@ -116,4 +116,4 @@ public function send() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php index 659ae977bf..c24f9faf5b 100644 --- a/app/code/core/Mage/Core/Model/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Email/Template.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -561,4 +561,4 @@ public function setReplyTo($email) $this->getMail()->addHeader('Reply-To', $email); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php index acc4599f52..9649e6eeae 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,15 +42,14 @@ class Mage_Core_Model_Email_Template_Filter extends Varien_Filter_Template protected $_useAbsoluteLinks = false; /** - * Use session in URL flag + * Whether to allow SID in store directive: NO * * @var bool */ - protected $_useSessionInUrl; + protected $_useSessionInUrl = false; /** - * Url Instance - * + * @deprecated after 1.4.0.0-alpha2 * @var Mage_Core_Model_Url */ protected static $_urlInstance; @@ -84,14 +83,14 @@ public function setUseAbsoluteLinks($flag) } /** - * Set Use session in URL flag + * Setter whether SID is allowed in store directive + * Doesn't set anything intentionally, since SID is not allowed in any kind of emails * * @param bool $flag * @return Mage_Core_Model_Email_Template_Filter */ public function setUseSessionInUrl($flag) { - $this->_useSessionInUrl = (bool)$flag; return $this; } @@ -266,29 +265,7 @@ public function storeDirective($construction) unset($params['url']); } - if (!self::$_urlInstance) { - self::$_urlInstance = Mage::getModel('core/url')->setStore( - Mage::app()->getStore(Mage::getDesign()->getStore())->getId() - ); - } - $_urlInstanceOldStore = null; - if (!empty($path) && !Mage::getStoreConfigFlag(Mage_Core_Model_Store::XML_PATH_STORE_IN_URL) - && !Mage::app()->isSingleStoreMode()) - { - $params['_query']['___store'] = Mage::app()->getStore(Mage::getDesign()->getStore())->getCode(); - } elseif (!empty($path) && Mage::getStoreConfigFlag(Mage_Core_Model_Store::XML_PATH_STORE_IN_URL) - && !Mage::app()->isSingleStoreMode()) - { - $_urlInstanceOldStore = self::$_urlInstance->getStore(); - self::$_urlInstance->setStore(Mage::app()->getStore(Mage::getDesign()->getStore())->getCode()); - } - - $url = self::$_urlInstance->getUrl($path, $params); - if (null ==! $_urlInstanceOldStore) { - self::$_urlInstance->setStore($_urlInstanceOldStore); - } - - return $url; + return Mage::app()->getStore(Mage::getDesign()->getStore())->getUrl($path, $params); } /** diff --git a/app/code/core/Mage/Core/Model/Email/Transport.php b/app/code/core/Mage/Core/Model/Email/Transport.php index c2f5a18f7c..6c8ae16c3f 100644 --- a/app/code/core/Mage/Core/Model/Email/Transport.php +++ b/app/code/core/Mage/Core/Model/Email/Transport.php @@ -18,14 +18,14 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Core_Model_Email_Transport extends Zend_Mail_Transport_Sendmail +class Mage_Core_Model_Email_Transport extends Zend_Mail_Transport_Sendmail { - -} \ No newline at end of file + +} diff --git a/app/code/core/Mage/Core/Model/Encryption.php b/app/code/core/Mage/Core/Model/Encryption.php index 5efacf4e46..7f61a2b874 100644 --- a/app/code/core/Mage/Core/Model/Encryption.php +++ b/app/code/core/Mage/Core/Model/Encryption.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Flag.php b/app/code/core/Mage/Core/Model/Flag.php index 9119ab7e98..6626a343aa 100644 --- a/app/code/core/Mage/Core/Model/Flag.php +++ b/app/code/core/Mage/Core/Model/Flag.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -105,4 +105,4 @@ public function loadSelf() return $this->load($this->_flagCode, 'flag_code'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Language.php b/app/code/core/Mage/Core/Model/Language.php index 70d4a89ddf..9c74ef76ab 100644 --- a/app/code/core/Mage/Core/Model/Language.php +++ b/app/code/core/Mage/Core/Model/Language.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ protected function _construct() { $this->_init('core/language'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Layout.php b/app/code/core/Mage/Core/Model/Layout.php index 9ee4bc554e..7037d7c385 100644 --- a/app/code/core/Mage/Core/Model/Layout.php +++ b/app/code/core/Mage/Core/Model/Layout.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Layout/Data.php b/app/code/core/Mage/Core/Model/Layout/Data.php index 29f58751af..0c58fcf15c 100644 --- a/app/code/core/Mage/Core/Model/Layout/Data.php +++ b/app/code/core/Mage/Core/Model/Layout/Data.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ protected function _construct() { $this->_init('core/layout'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Layout/Element.php b/app/code/core/Mage/Core/Model/Layout/Element.php index f8676767e5..352a9e87be 100644 --- a/app/code/core/Mage/Core/Model/Layout/Element.php +++ b/app/code/core/Mage/Core/Model/Layout/Element.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,4 +111,4 @@ public function prepareActionArgument($args) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php index 68abaddefc..f052963390 100644 --- a/app/code/core/Mage/Core/Model/Layout/Update.php +++ b/app/code/core/Mage/Core/Model/Layout/Update.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php index 9996482077..863e14220c 100644 --- a/app/code/core/Mage/Core/Model/Locale.php +++ b/app/code/core/Mage/Core/Model/Locale.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -757,14 +757,14 @@ public function getCountryTranslationList() } /** - * Is Store dat in iterval + * Checks if current date of the given store (in the store timezone) is within the range * * @param int|string|Mage_Core_Model_Store $store * @param string|null $dateFrom * @param string|null $dateTo * @return bool */ - public function IsStoreDateInInterval($store, $dateFrom = null, $dateTo = null) + public function isStoreDateInInterval($store, $dateFrom = null, $dateTo = null) { if (!$store instanceof Mage_Core_Model_Store) { $store = Mage::app()->getStore($store); diff --git a/app/code/core/Mage/Core/Model/Message.php b/app/code/core/Mage/Core/Model/Message.php index 70b8e1f223..21267ea754 100644 --- a/app/code/core/Mage/Core/Model/Message.php +++ b/app/code/core/Mage/Core/Model/Message.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -79,4 +79,4 @@ public function success($code, $class='', $method='') { return $this->_factory($code, self::SUCCESS, $class, $method); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Message/Abstract.php b/app/code/core/Mage/Core/Model/Message/Abstract.php index 2dba4b25b5..ddd5c7495e 100644 --- a/app/code/core/Mage/Core/Model/Message/Abstract.php +++ b/app/code/core/Mage/Core/Model/Message/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Message/Collection.php b/app/code/core/Mage/Core/Model/Message/Collection.php index 0087b3c8ff..23d901dd46 100644 --- a/app/code/core/Mage/Core/Model/Message/Collection.php +++ b/app/code/core/Mage/Core/Model/Message/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -196,4 +196,4 @@ public function count($type=null) } return count($this->_messages); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Message/Error.php b/app/code/core/Mage/Core/Model/Message/Error.php index 5f6823c29c..3f750850c2 100644 --- a/app/code/core/Mage/Core/Model/Message/Error.php +++ b/app/code/core/Mage/Core/Model/Message/Error.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Message/Notice.php b/app/code/core/Mage/Core/Model/Message/Notice.php index 5fe7a807e2..94840307c8 100644 --- a/app/code/core/Mage/Core/Model/Message/Notice.php +++ b/app/code/core/Mage/Core/Model/Message/Notice.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ public function __construct($code) { parent::__construct(Mage_Core_Model_Message::NOTICE, $code); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Message/Success.php b/app/code/core/Mage/Core/Model/Message/Success.php index 0ad1331330..8d42140871 100644 --- a/app/code/core/Mage/Core/Model/Message/Success.php +++ b/app/code/core/Mage/Core/Model/Message/Success.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ public function __construct($code) { parent::__construct(Mage_Core_Model_Message::SUCCESS, $code); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Message/Warning.php b/app/code/core/Mage/Core/Model/Message/Warning.php index 001fe0ab31..ab2e340036 100644 --- a/app/code/core/Mage/Core/Model/Message/Warning.php +++ b/app/code/core/Mage/Core/Model/Message/Warning.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ public function __construct($code) { parent::__construct(Mage_Core_Model_Message::WARNING, $code); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php index aed549d3cd..1ea958fe2e 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php index 16e8f2febc..21f0cd41d6 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -237,9 +237,9 @@ protected function _getCacheTags() { $tags = parent::_getCacheTags(); foreach ($tags as $key => $value) { - $tags[$key] = Mage::app()->prepareCacheId($value); + $tags[$key] = Mage::app()->prepareCacheId($value); } $tags[] = Mage_Core_Model_App::CACHE_TAG; return $tags; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config.php b/app/code/core/Mage/Core/Model/Mysql4/Config.php index 5f2780dfa2..66fa80e34e 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -230,4 +230,4 @@ public function deleteConfig($path, $scope, $scopeId) )); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php index 7aab169eb2..356b33004b 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) $object->setValue(join(',', $object->getValue())); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php index ead31ce3fd..386a20ed59 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -59,4 +59,4 @@ public function addValueFilter($value) $this->getSelect()->where('value=?', $value); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php index 662927a558..3d527761af 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) parent::_beforeSave($object); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php index 84fd34e487..9d5d58a645 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ protected function _construct() $this->_init('core/convert_history'); parent::_construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php index fc108da496..db110c6ead 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) $object->setUpdatedAt($this->formatDate(time())); parent::_beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php index 5007f0bb25..b7686eb0d0 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('core/convert_profile'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design.php b/app/code/core/Mage/Core/Model/Mysql4/Design.php index 42dd1e5648..21f45f8a7a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design.php @@ -18,10 +18,10 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php index 31510016e1..4eb9e3265e 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php @@ -18,28 +18,28 @@ * 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_Admin - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Core_Model_Mysql4_Design_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { - protected function _construct() - { - $this->_init('core/design'); - } + protected function _construct() + { + $this->_init('core/design'); + } - public function joinStore(){ - $this->getSelect() + public function joinStore(){ + $this->getSelect() ->join(array('s'=>$this->getTable('core/store')), 's.store_id = main_table.store_id', array('s.name')); - return $this; - } + return $this; + } - public function addDateFilter($date = null) + public function addDateFilter($date = null) { if (is_null($date)) $date = date("Y-m-d"); diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php index 60e32ad581..2ce2389943 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,4 +49,4 @@ public function toOptionArray() return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php index f5769fa7a4..b01a43f8f7 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Core_Model_Mysql4_Design_Theme extends Varien_Directory_Collection @@ -48,4 +48,4 @@ public function toOptionArray() return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php index dbdc2fd38f..188a1050e8 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -176,8 +176,8 @@ protected function _prepareSave(Mage_Core_Model_Email_Template $template) $data['template_sender_email'] = $template->getTemplateSenderEmail(); if(!$template->getAddedAt()) { - $template->setAddedAt(Mage::getSingleton('core/date')->gmtDate()); - $template->setModifiedAt(Mage::getSingleton('core/date')->gmtDate()); + $template->setAddedAt(Mage::getSingleton('core/date')->gmtDate()); + $template->setModifiedAt(Mage::getSingleton('core/date')->gmtDate()); } $data['modified_at'] = $template->getModifiedAt(); @@ -199,13 +199,13 @@ protected function _prepareSave(Mage_Core_Model_Email_Template $template) $errorString = ''; foreach($validateInput->getMessages() as $message) { - if(is_array($message)) { - foreach($message as $str) { - $errorString.= $str . "\n"; - } - } else { - $errorString.= $message . "\n"; - } + if(is_array($message)) { + foreach($message as $str) { + $errorString.= $str . "\n"; + } + } else { + $errorString.= $message . "\n"; + } } diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php index 4bf4fe4d0d..92e9a4a5bd 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,4 +58,4 @@ public function toOptionArray() return $this->_toOptionArray('template_id', 'template_code'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Flag.php b/app/code/core/Mage/Core/Model/Mysql4/Flag.php index 32ef78ff79..6d6ef5c7de 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Flag.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Flag.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Core_Model_Mysql4_Flag extends Mage_Core_Model_Mysql4_Abstract @@ -30,4 +30,4 @@ protected function _construct() { $this->_init('core/flag', 'flag_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/History.php b/app/code/core/Mage/Core/Model/Mysql4/History.php index af67c9f18e..f83760255f 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/History.php +++ b/app/code/core/Mage/Core/Model/Mysql4/History.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,4 +62,4 @@ public function addChanges($code, $userId, $data) { } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language.php b/app/code/core/Mage/Core/Model/Mysql4/Language.php index 6d3d258429..ff2ba4d501 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Language.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Language.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ protected function _construct() { $this->_init('core/language', 'language_code'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php index 40fa34cabd..54b172f3ef 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,4 +41,4 @@ public function toOptionHash() { return $this->_toOptionHash('language_code', 'language_title'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Layout.php b/app/code/core/Mage/Core/Model/Mysql4/Layout.php index 049ea8ec34..10387a5d8e 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Layout.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Layout.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,10 +51,11 @@ public function fetchUpdatesByHandle($handle, $params = array()) $select = $readAdapter->select() ->from(array('update'=>$this->getMainTable()), array('xml')) ->join(array('link'=>$this->getTable('core/layout_link')), 'link.layout_update_id=update.layout_update_id', '') - ->where('link.store_id=?', $storeId) + ->where('link.store_id IN (0, ?)', $storeId) ->where('link.package=?', $package) ->where('link.theme=?', $theme) - ->where('update.handle = ?', $handle); + ->where('update.handle = ?', $handle) + ->order('update.sort_order ASC'); foreach ($readAdapter->fetchAll($select) as $update) { $updateStr .= $update['xml']; diff --git a/app/code/core/Mage/Core/Model/Mysql4/Resource.php b/app/code/core/Mage/Core/Model/Mysql4/Resource.php index 59dfacb1d1..fbb9241b16 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Resource.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Resource.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ #require_once 'Mage/Core/Model/Mysql4.php'; @@ -84,12 +84,12 @@ function setDbVersion($resName, $version) if ($this -> getDbVersion($resName)) { self::$_versions[$resName] = $version; - $condition = $this->_write->quoteInto('code=?', $resName); - return $this->_write->update($this->_resTable, $dbModuleInfo, $condition); + $condition = $this->_write->quoteInto('code=?', $resName); + return $this->_write->update($this->_resTable, $dbModuleInfo, $condition); } else { self::$_versions[$resName] = $version; - return $this->_write->insert($this->_resTable, $dbModuleInfo); + return $this->_write->insert($this->_resTable, $dbModuleInfo); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Session.php b/app/code/core/Mage/Core/Model/Mysql4/Session.php index af05d7a7a7..8adeaa7bf1 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Session.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store.php b/app/code/core/Mage/Core/Model/Mysql4/Store.php index eabfb3e442..a6c672392d 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -116,4 +116,4 @@ protected function _getLoadSelect($field, $value, $object) return $select; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php index c6ad7e0b60..2e643d428c 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -166,4 +166,4 @@ public function addRootCategoryIdAttribute() ); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php index 9f8b237b49..76878d925b 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -98,4 +98,4 @@ protected function _saveDefaultStore($groupId, $storeId) $this->_getWriteAdapter()->update($this->getMainTable(), $bind, $condition); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php index 2e25340d29..6ae3486b2a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate.php b/app/code/core/Mage/Core/Model/Mysql4/Translate.php index 14da5e51f1..7702826bcb 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php index 3f036a7b58..314dc75f9a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,7 +50,7 @@ public function load(Mage_Core_Model_Abstract $object, $value, $field=null) return $result; } else { - return parent::load($object, $value, $field); + return parent::load($object, $value, $field); } } diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php index b963717606..dd61457f1a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php index 03d528965a..31539af2b0 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,4 +98,4 @@ public function filterAllByCategory() ->where('id_path like ?', "category%"); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website.php b/app/code/core/Mage/Core/Model/Mysql4/Website.php index e99b898ef4..b36ccfaf20 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Website.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Website.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -115,4 +115,4 @@ public function getDefaultStoresSelect($withDefault = false) { return $select; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php index 3923ccabe9..97657b1e0c 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Resource.php b/app/code/core/Mage/Core/Model/Resource.php index d93a9ee277..7012c6b7b8 100644 --- a/app/code/core/Mage/Core/Model/Resource.php +++ b/app/code/core/Mage/Core/Model/Resource.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,7 +60,7 @@ class Mage_Core_Model_Resource * @var array */ protected $_entities = array(); - + protected $_mappedTableNames; /** @@ -161,14 +161,14 @@ public function getTableName($modelEntity) } else { $tableName = $modelEntity; } - + Mage::dispatchEvent('resource_get_tablename', array('resource' => $this, 'model_entity' => $modelEntity, 'table_name' => $tableName)); $mappedTableName = $this->getMappedTableName($tableName); if ($mappedTableName) { - $tableName = $mappedTableName; + $tableName = $mappedTableName; } else { - $tablePrefix = (string)Mage::getConfig()->getTablePrefix(); - $tableName = $tablePrefix . $tableName; + $tablePrefix = (string)Mage::getConfig()->getTablePrefix(); + $tableName = $tablePrefix . $tableName; } return $tableName; @@ -176,19 +176,19 @@ public function getTableName($modelEntity) public function setMappedTableName($tableName, $mappedName) { - $this->_mappedTableNames[$tableName] = $mappedName; - return $this; + $this->_mappedTableNames[$tableName] = $mappedName; + return $this; } - + public function getMappedTableName($tableName) { - if (isset($this->_mappedTableNames[$tableName])) { - return $this->_mappedTableNames[$tableName]; - } else { - return false; - } + if (isset($this->_mappedTableNames[$tableName])) { + return $this->_mappedTableNames[$tableName]; + } else { + return false; + } } - + public function cleanDbRow(&$row) { if (!empty($row) && is_array($row)) { @@ -212,9 +212,9 @@ public function createConnection($name, $type, $config) public function checkDbConnection() { - if (!$this->getConnection('core_read')) { - //Mage::app()->getResponse()->setRedirect(Mage::getUrl('install')); - } + if (!$this->getConnection('core_read')) { + //Mage::app()->getResponse()->setRedirect(Mage::getUrl('install')); + } } public function getAutoUpdate() diff --git a/app/code/core/Mage/Core/Model/Resource/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Abstract.php index 3d8aae0474..56dd5bb45d 100644 --- a/app/code/core/Mage/Core/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -104,9 +104,9 @@ public function formatDate($date, $includeTime=true) } } - if (empty($date)) { - return new Zend_Db_Expr('NULL'); - } + if (empty($date)) { + return new Zend_Db_Expr('NULL'); + } if (!is_numeric($date)) { $date = strtotime($date); diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php index 291c3f451a..1d66204756 100644 --- a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,20 +29,20 @@ abstract class Mage_Core_Model_Resource_Entity_Abstract { protected $_name = null; protected $_config = array(); - + public function __construct($config) { $this->_config = $config; } - + public function getConfig($key='') { if (''===$key) { - return $this->_config; + return $this->_config; } elseif (isset($this->_config->$key)) { - return $this->_config->$key; + return $this->_config->$key; } else { return false; } - } -} \ No newline at end of file + } +} diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php index e0a8a9dccc..c6f21e4f4e 100644 --- a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php +++ b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ function getTable() { return $this->getConfig('table'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Resource/Iterator.php b/app/code/core/Mage/Core/Model/Resource/Iterator.php index 9420a3b423..c7c6c4e463 100644 --- a/app/code/core/Mage/Core/Model/Resource/Iterator.php +++ b/app/code/core/Mage/Core/Model/Resource/Iterator.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -86,4 +86,4 @@ protected function _getStatement($query, $conn=null) Mage::throwException($hlp->__('Invalid query')); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php index b3b2e3902f..aefdb45f01 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -63,7 +63,7 @@ public function __construct($resourceName) } else { $this->_connectionConfig = $config->getResourceConnectionConfig(self::DEFAULT_SETUP_CONNECTION); } - + $modName = (string)$this->_resourceConfig->setup->module; $this->_moduleConfig = $config->getModuleConfig($modName); $this->_conn = Mage::getSingleton('core/resource')->getConnection($this->_resourceName); @@ -388,7 +388,6 @@ public function getTableRow($table, $idField, $id, $field=null, $parentField=nul $sql .= $this->_conn->quoteInto(" and $parentField=?", $parentId); } $this->_setupCache[$table][$parentId][$id] = $this->_conn->fetchRow($sql, $id); - $this->_conn->fetchAll($sql, $id); } if (is_null($field)) { return $this->_setupCache[$table][$parentId][$id]; @@ -561,4 +560,4 @@ public function endSetup() "); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php index e0e734b4bd..848bea9b68 100644 --- a/app/code/core/Mage/Core/Model/Resource/Transaction.php +++ b/app/code/core/Mage/Core/Model/Resource/Transaction.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php index d8689298b2..e0642ea42c 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,16 +32,16 @@ abstract class Mage_Core_Model_Resource_Type_Abstract public function getEntityClass() { - return $this->_entityClass; + return $this->_entityClass; } - + public function setName($name) { $this->_name = $name; } - + public function getName() { return $this->_name; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db.php b/app/code/core/Mage/Core/Model/Resource/Type/Db.php index a15296b65b..4297bb7f52 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ public function __construct() { $this->_entityClass = 'Mage_Core_Model_Resource_Entity_Table'; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php index bf7fdd9053..c285a3c4a7 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php @@ -18,16 +18,16 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Mysqi Resource - * + * * @category Mage * @package Mage_Core * @module Core @@ -36,15 +36,15 @@ class Mage_Core_Model_Resource_Type_Db_Mysqli extends Mage_Core_Model_Resource_T { public function getConnection($config) { - $configArr = (array)$config; - $configArr['profiler'] = !empty($configArr['profiler']) && $configArr['profiler']!=='false'; - + $configArr = (array)$config; + $configArr['profiler'] = !empty($configArr['profiler']) && $configArr['profiler']!=='false'; + $conn = new Varien_Db_Adapter_Mysqli($configArr); - + if (!empty($configArr['initStatements']) && $conn) { $conn->query($configArr['initStatements']); } return $conn; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php index 6e288921d7..fd846662f2 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php @@ -18,19 +18,19 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Core_Model_Resource_Type_Db_Mysqli_Setup extends Mage_Core_Model_Resource_Type_Db { - public function getConnection($config) - { - $conn = new Varien_Db_Adapter_Mysqli((array)$config); + public function getConnection($config) + { + $conn = new Varien_Db_Adapter_Mysqli((array)$config); - return $conn; - } -} \ No newline at end of file + return $conn; + } +} diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php index 0220ccaab5..bf546262ca 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,8 +36,8 @@ class Mage_Core_Model_Resource_Type_Db_Pdo_Mysql extends Mage_Core_Model_Resourc */ public function getConnection($config) { - $configArr = (array)$config; - $configArr['profiler'] = !empty($configArr['profiler']) && $configArr['profiler']!=='false'; + $configArr = (array)$config; + $configArr['profiler'] = !empty($configArr['profiler']) && $configArr['profiler']!=='false'; $conn = $this->_getDbAdapterInstance($configArr); diff --git a/app/code/core/Mage/Core/Model/Session.php b/app/code/core/Mage/Core/Model/Session.php index 3a0d9b0738..453b416a0f 100644 --- a/app/code/core/Mage/Core/Model/Session.php +++ b/app/code/core/Mage/Core/Model/Session.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php index 2eae9de460..740bf4ba14 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,6 +44,7 @@ class Mage_Core_Model_Session_Abstract extends Mage_Core_Model_Session_Abstract_ const XML_PATH_USE_HTTP_VIA = 'web/session/use_http_via'; const XML_PATH_USE_X_FORWARDED = 'web/session/use_http_x_forwarded_for'; const XML_PATH_USE_USER_AGENT = 'web/session/use_http_user_agent'; + const XML_PATH_USE_FRONTEND_SID = 'web/session/use_frontend_sid'; const XML_NODE_USET_AGENT_SKIP = 'global/session/validation/http_user_agent_skip'; const XML_PATH_LOG_EXCEPTION_FILE = 'dev/log/exception_file'; @@ -171,6 +172,17 @@ public function useValidateHttpUserAgent() return (bool)$use; } + /** + * Check whether SID can be used for session initialization + * Admin area will always have this feature enabled + * + * @return bool + */ + public function useSid() + { + return Mage::app()->getStore()->isAdmin() || Mage::getStoreConfig(self::XML_PATH_USE_FRONTEND_SID); + } + /** * Retrieve skip User Agent validation strings (Flash etc) * @@ -311,7 +323,7 @@ public function addMessages($messages) */ public function setSessionId($id=null) { - if (is_null($id)) { + if (is_null($id) && $this->useSid()) { $_queryParam = $this->getSessionIdQueryParam(); if (isset($_GET[$_queryParam])) { $id = $_GET[$_queryParam]; diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php index 36961c55e2..72bbcfadbc 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php index cc989d9585..bc3bf7fc50 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,24 +42,24 @@ abstract class Mage_Core_Model_Session_Abstract_Zend extends Varien_Object public function getNamespace() { - return $this->_namespace; + return $this->_namespace; } public function start() { Varien_Profiler::start(__METHOD__.'/setOptions'); $options = array( - 'save_path'=>Mage::getBaseDir('session'), - 'use_only_cookies'=>'off', + 'save_path'=>Mage::getBaseDir('session'), + 'use_only_cookies'=>'off', ); if ($this->getCookieDomain()) { - $options['cookie_domain'] = $this->getCookieDomain(); + $options['cookie_domain'] = $this->getCookieDomain(); } if ($this->getCookiePath()) { - $options['cookie_path'] = $this->getCookiePath(); + $options['cookie_path'] = $this->getCookiePath(); } if ($this->getCookieLifetime()) { - $options['cookie_lifetime'] = $this->getCookieLifetime(); + $options['cookie_lifetime'] = $this->getCookieLifetime(); } Zend_Session::setOptions($options); Varien_Profiler::stop(__METHOD__.'/setOptions'); @@ -67,7 +67,7 @@ public function start() Varien_Profiler::start(__METHOD__.'/setHandler'); $sessionResource = Mage::getResourceSingleton('core/session'); if ($sessionResource->hasConnection()) { - Zend_Session::setSaveHandler($sessionResource); + Zend_Session::setSaveHandler($sessionResource); } Varien_Profiler::stop(__METHOD__.'/setHandler'); */ @@ -85,9 +85,9 @@ public function start() */ public function init($namespace) { - if (!Zend_Session::sessionExists()) { - $this->start(); - } + if (!Zend_Session::sessionExists()) { + $this->start(); + } Varien_Profiler::start(__METHOD__.'/init'); $this->_namespace = new Zend_Session_Namespace($namespace, Zend_Session_Namespace::SINGLE_INSTANCE); @@ -161,4 +161,4 @@ public function setSessionId($id=null) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Session/Exception.php b/app/code/core/Mage/Core/Model/Session/Exception.php index a5e3bb010d..d2d5f2180b 100644 --- a/app/code/core/Mage/Core/Model/Session/Exception.php +++ b/app/code/core/Mage/Core/Model/Session/Exception.php @@ -1,38 +1,38 @@ - - */ -class Mage_Core_Model_Session_Exception extends Mage_Core_Exception -{} + + */ +class Mage_Core_Model_Session_Exception extends Mage_Core_Exception +{} diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 529969f4f4..785ba1d102 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -493,10 +493,10 @@ public function isAdmin() public function isAdminUrlSecure() { if ($this->_isAdminSecure === null) { - $this->_isAdminSecure = Mage::getStoreConfigFlag( - Mage_Core_Model_Url::XML_PATH_SECURE_IN_ADMIN, - $this->getId() - ); + $this->_isAdminSecure = Mage::getStoreConfigFlag( + Mage_Core_Model_Url::XML_PATH_SECURE_IN_ADMIN, + $this->getId() + ); } return $this->_isAdminSecure; } @@ -504,10 +504,10 @@ public function isAdminUrlSecure() public function isFrontUrlSecure() { if ($this->_isFrontSecure === null) { - $this->_isFrontSecure = Mage::getStoreConfigFlag( - Mage_Core_Model_Url::XML_PATH_SECURE_IN_FRONT, - $this->getId() - ); + $this->_isFrontSecure = Mage::getStoreConfigFlag( + Mage_Core_Model_Url::XML_PATH_SECURE_IN_FRONT, + $this->getId() + ); } return $this->_isFrontSecure; } @@ -841,9 +841,9 @@ public function getCurrentUrl($fromStore = true) $query = Mage::getSingleton('core/url')->escape(ltrim(Mage::app()->getRequest()->getRequestString(), '/')); if (Mage::app()->getStore()->isCurrentlySecure()) { - $parsedUrl = parse_url($this->getUrl('', array('_secure' => true))); + $parsedUrl = parse_url($this->getUrl('', array('_secure' => true))); } else { - $parsedUrl = parse_url($this->getUrl('')); + $parsedUrl = parse_url($this->getUrl('')); } $parsedQuery = array(); if (isset($parsedUrl['query'])) { @@ -897,9 +897,9 @@ protected function _beforeDelete() * * @return Mage_Core_Model_Store */ - protected function _afterDelte() + protected function _afterDelete() { - parent::_afterDelte(); + parent::_afterDelete(); Mage::getConfig()->removeCache(); return $this; } diff --git a/app/code/core/Mage/Core/Model/Store/Exception.php b/app/code/core/Mage/Core/Model/Store/Exception.php index 3e4df90d34..5e6bb4f60d 100644 --- a/app/code/core/Mage/Core/Model/Store/Exception.php +++ b/app/code/core/Mage/Core/Model/Store/Exception.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php index fb91ce24f0..e0d4d4e78b 100644 --- a/app/code/core/Mage/Core/Model/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Store/Group.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php index 2099e51bb8..d0db6d1628 100644 --- a/app/code/core/Mage/Core/Model/Translate.php +++ b/app/code/core/Mage/Core/Model/Translate.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Translate/Abstract.php b/app/code/core/Mage/Core/Model/Translate/Abstract.php index 2cc2dfea61..78b2ae7b8b 100644 --- a/app/code/core/Mage/Core/Model/Translate/Abstract.php +++ b/app/code/core/Mage/Core/Model/Translate/Abstract.php @@ -18,8 +18,8 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Translate/Expr.php b/app/code/core/Mage/Core/Model/Translate/Expr.php index beeb088dc3..1ce97c2117 100644 --- a/app/code/core/Mage/Core/Model/Translate/Expr.php +++ b/app/code/core/Mage/Core/Model/Translate/Expr.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php index 7bec912c31..8ca144c992 100644 --- a/app/code/core/Mage/Core/Model/Translate/Inline.php +++ b/app/code/core/Mage/Core/Model/Translate/Inline.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Translate/String.php b/app/code/core/Mage/Core/Model/Translate/String.php index 8039c16dd7..dc0548dcc3 100644 --- a/app/code/core/Mage/Core/Model/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Translate/String.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php index a60389d962..78bbef7deb 100644 --- a/app/code/core/Mage/Core/Model/Url.php +++ b/app/code/core/Mage/Core/Model/Url.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -978,4 +978,4 @@ public function sessionVarCallback($match) } return ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php index b3af300f32..ebdf32e151 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -84,12 +84,12 @@ public function loadByRequestPath($path) foreach ($path as $pathInfo) { $this->load($pathInfo, 'request_path'); if ($this->getId()) { - return $this; + return $this; } } } else { - $this->load($path, 'request_path'); + $this->load($path, 'request_path'); } return $this; } @@ -266,7 +266,7 @@ public function rewrite(Zend_Controller_Request_Http $request=null, Zend_Control } if ($queryString = $this->_getQueryString()) { - $targetUrl .= '?'.$queryString; + $targetUrl .= '?'.$queryString; } $request->setRequestUri($targetUrl); diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php index d64570bce4..f4cc38aac7 100644 --- a/app/code/core/Mage/Core/Model/Website.php +++ b/app/code/core/Mage/Core/Model/Website.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/controllers/AjaxController.php b/app/code/core/Mage/Core/controllers/AjaxController.php index 0ea0d174a7..19a1fb4f62 100644 --- a/app/code/core/Mage/Core/controllers/AjaxController.php +++ b/app/code/core/Mage/Core/controllers/AjaxController.php @@ -1,4 +1,4 @@ -getRequest()->getPost('translate')) { - try { - if ($area = $this->getRequest()->getPost('area')) { - Mage::getDesign()->setArea($area); - } - Mage::getModel('core/translate_inline')->processAjaxPost($translate); - echo "{success:true}"; - } - catch (Exception $e) { - echo "{error:true,message:'" . $e->getMessage() . "'}"; - } - } - exit(); - } + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ +class Mage_Core_AjaxController extends Mage_Core_Controller_Front_Action +{ + public function translateAction () + { + if ($translate = $this->getRequest()->getPost('translate')) { + try { + if ($area = $this->getRequest()->getPost('area')) { + Mage::getDesign()->setArea($area); + } + Mage::getModel('core/translate_inline')->processAjaxPost($translate); + echo "{success:true}"; + } + catch (Exception $e) { + echo "{error:true,message:'" . $e->getMessage() . "'}"; + } + } + exit(); + } } diff --git a/app/code/core/Mage/Core/controllers/IndexController.php b/app/code/core/Mage/Core/controllers/IndexController.php index fffbd95901..22c8bde3d4 100644 --- a/app/code/core/Mage/Core/controllers/IndexController.php +++ b/app/code/core/Mage/Core/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index 82a29cf4d4..c6166bfca1 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -19,16 +19,16 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 0.8.13 + 0.8.14 @@ -251,13 +251,14 @@ 0 0 0 + 1 1 1 - + diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 81c43ac546..c812bff435 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -19,10 +19,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -507,7 +507,7 @@ 1 1 1 - Logging from Mage::log(). File is located in {{base_dir}}/var/log + Logging from Mage::log(). File is located in {{base_dir}}/var/log @@ -516,7 +516,7 @@ 1 1 1 - Logging from Mage::logException(). File is located in {{base_dir}}/var/log + Logging from Mage::logException(). File is located in {{base_dir}}/var/log @@ -1136,6 +1136,16 @@ 0 0 + + + Allows Customers to stay logged in when switching between different Stores. + select + adminhtml/system_config_source_yesno + 50 + 1 + 1 + 0 + @@ -1156,7 +1166,7 @@ 1 - + select adminhtml/system_config_source_yesno 200 diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php index 1c50b92430..725c39ff45 100644 --- a/app/code/core/Mage/Core/functions.php +++ b/app/code/core/Mage/Core/functions.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php index 37ad4ea2ea..0fe0ef6f99 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php index a3dde857fa..7f475c7c48 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -219,4 +219,4 @@ "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php index 1f13778894..d1d7c55777 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php index 818dbc531a..082918c13d 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php index 88cb33e949..f4c13c0f16 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php index 6d30ee82a3..bfa1b8270f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php index 509cd1ce15..3105752244 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php index dc282e1016..51d04c1e8f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php index 9dbe562f6c..76b530aca8 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php index aa91b02def..8a0d87eb1d 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php index 9416c7ff80..de596dbc3e 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php index 3b0db45375..fef7b81c3f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -1,35 +1,35 @@ -startSetup(); - -$installer->getConnection()->addColumn($this->getTable('core/url_rewrite'), 'entity_id', 'INT( 10 ) NOT NULL AFTER `store_id`'); -$installer->run("UPDATE {$this->getTable('core/url_rewrite')} set `entity_id` = SUBSTR(`id_path`, LOCATE('/', `id_path`)+1, IF(LOCATE('/', `id_path`, LOCATE('/', `id_path`)+1) = 0, LENGTH(`id_path`) , LOCATE('/', `id_path`, LOCATE('/', `id_path`)+1)) - LOCATE('/', `id_path`)+1);"); - -$installer->endSetup(); \ No newline at end of file +startSetup(); + +$installer->getConnection()->addColumn($this->getTable('core/url_rewrite'), 'entity_id', 'INT( 10 ) NOT NULL AFTER `store_id`'); +$installer->run("UPDATE {$this->getTable('core/url_rewrite')} set `entity_id` = SUBSTR(`id_path`, LOCATE('/', `id_path`)+1, IF(LOCATE('/', `id_path`, LOCATE('/', `id_path`)+1) = 0, LENGTH(`id_path`) , LOCATE('/', `id_path`, LOCATE('/', `id_path`)+1)) - LOCATE('/', `id_path`)+1);"); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php index b904457f14..fed7bbc6d8 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -1,34 +1,34 @@ -startSetup(); - -$installer->run("CREATE INDEX entity_id ON {$this->getTable('core/url_rewrite')} (entity_id);"); - -$installer->endSetup(); \ No newline at end of file +startSetup(); + +$installer->run("CREATE INDEX entity_id ON {$this->getTable('core/url_rewrite')} (entity_id);"); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php index 4b0b80e3b8..660fc907f5 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -46,4 +46,4 @@ $installer->getTable('core_store'), 'store_id' ); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php index 253d6c9f3b..00198e726b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ $installer->getTable('core_store_group'), 'name', 'name', 'varchar(255) not null', true ); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php index a487f4efbb..9a82deec6b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php index 76905f9403..b9b3053e1d 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->run("UPDATE {$this->getTable('core/url_rewrite')} SET type = IF(id_path LIKE 'category/%', 1, IF(id_path LIKE 'product/%', 2, 3));"); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php index 3a36127677..c444a97d3b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,4 +51,4 @@ ADD INDEX `IDX_TARGET_PATH` (`store_id`, `target_path`); DROP TABLE IF EXISTS `{$installer->getTable('core_url_rewrite_tag')}`; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php index bbe82f9c52..2c48043d33 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php index be29356b3d..3c8813fae0 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,4 +53,4 @@ ); } -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php index f760e1ff2b..60d5940964 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php index 962896b300..84173c49ee 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php index 745e5a4afc..f7cf4b1d26 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php index b7d2fa2736..9753e41c76 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Cron/Exception.php b/app/code/core/Mage/Cron/Exception.php index 8b5675d376..4fdaa2f5c7 100644 --- a/app/code/core/Mage/Cron/Exception.php +++ b/app/code/core/Mage/Cron/Exception.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ class Mage_Cron_Exception extends Mage_Core_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Cron/Helper/Data.php b/app/code/core/Mage/Cron/Helper/Data.php index 696e28120e..e17b8e1bce 100644 --- a/app/code/core/Mage/Cron/Helper/Data.php +++ b/app/code/core/Mage/Cron/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php index a1b220de83..7336376053 100644 --- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php @@ -18,10 +18,10 @@ * 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_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ public function _construct() { $this->_init('cron/schedule', 'schedule_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php index 30f3dac114..dcb024e85e 100644 --- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php +++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php @@ -18,10 +18,10 @@ * 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_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ public function _construct() { $this->_init('cron/schedule'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php index 1d8c2cc731..336c6e1e9f 100644 --- a/app/code/core/Mage/Cron/Model/Observer.php +++ b/app/code/core/Mage/Cron/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,7 +152,7 @@ public function generate() */ $config = Mage::getConfig()->getNode('crontab/jobs'); if ($config instanceof Mage_Core_Model_Config_Element) { - $this->_generateJobs($config->children(), $exists); + $this->_generateJobs($config->children(), $exists); } /** @@ -160,7 +160,7 @@ public function generate() */ $config = Mage::getConfig()->getNode('default/crontab/jobs'); if ($config instanceof Mage_Core_Model_Config_Element) { - $this->_generateJobs($config->children(), $exists); + $this->_generateJobs($config->children(), $exists); } /** @@ -250,4 +250,4 @@ public function cleanup() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php index 8f45f0699a..83bfad63e9 100644 --- a/app/code/core/Mage/Cron/Model/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Schedule.php @@ -18,10 +18,10 @@ * 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_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -186,4 +186,4 @@ public function getNumeric($value) return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml index 8fa3ad147e..a87034812c 100644 --- a/app/code/core/Mage/Cron/etc/config.xml +++ b/app/code/core/Mage/Cron/etc/config.xml @@ -19,10 +19,10 @@ * 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_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cron/etc/system.xml b/app/code/core/Mage/Cron/etc/system.xml index 23aeadde81..364e970b78 100644 --- a/app/code/core/Mage/Cron/etc/system.xml +++ b/app/code/core/Mage/Cron/etc/system.xml @@ -19,10 +19,10 @@ * 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_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -91,4 +91,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php index 67f9382084..febff9116a 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php index 7d7538d9ed..0be0e454db 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Cron - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Customer/Block/Account.php b/app/code/core/Mage/Customer/Block/Account.php index 9e1eb959d2..ef61be5c80 100644 --- a/app/code/core/Mage/Customer/Block/Account.php +++ b/app/code/core/Mage/Customer/Block/Account.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function __construct() $this->setTemplate('customer/account.phtml'); Mage::app()->getFrontController()->getAction()->getLayout()->getBlock('root')->setHeaderTitle(Mage::helper('customer')->__('My Account')); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard.php b/app/code/core/Mage/Customer/Block/Account/Dashboard.php index 3894122663..0a6940b29f 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,7 +33,7 @@ */ class Mage_Customer_Block_Account_Dashboard extends Mage_Core_Block_Template { - protected $_subscription = null; + protected $_subscription = null; public function getCustomer() { @@ -77,25 +77,25 @@ public function getTagsUrl() public function getSubscriptionObject() { - if(is_null($this->_subscription)) { - $this->_subscription = Mage::getModel('newsletter/subscriber')->loadByCustomer($this->getCustomer()); - } + if(is_null($this->_subscription)) { + $this->_subscription = Mage::getModel('newsletter/subscriber')->loadByCustomer($this->getCustomer()); + } - return $this->_subscription; + return $this->_subscription; } public function getManageNewsletterUrl() { - return $this->getUrl('*/newsletter/manage'); + return $this->getUrl('*/newsletter/manage'); } public function getSubscriptionText() { - if($this->getSubscriptionObject()->isSubscribed()) { - return Mage::helper('customer')->__('You are currently subscribed to our newsletter'); - } + if($this->getSubscriptionObject()->isSubscribed()) { + return Mage::helper('customer')->__('You are currently subscribed to our newsletter'); + } - return Mage::helper('customer')->__('You are currently not subscribed to our newsletter'); + return Mage::helper('customer')->__('You are currently not subscribed to our newsletter'); } public function getPrimaryAddresses() @@ -124,4 +124,4 @@ public function getBackUrl() } return $this->getUrl('customer/account/'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php index a12d466307..cf6e728cb0 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,10 +34,10 @@ class Mage_Customer_Block_Account_Dashboard_Address extends Mage_Core_Block_Template { - public function getCustomer() - { - return Mage::getSingleton('customer/session')->getCustomer(); - } + public function getCustomer() + { + return Mage::getSingleton('customer/session')->getCustomer(); + } public function getPrimaryShippingAddressHtml() { @@ -55,7 +55,7 @@ public function getPrimaryBillingAddressHtml() $address = $this->getCustomer()->getPrimaryBillingAddress(); if( $address instanceof Varien_Object ) { - return $address->format('html'); + return $address->format('html'); } else { return Mage::helper('customer')->__('You have not set a primary billing address.'); } @@ -63,12 +63,12 @@ public function getPrimaryBillingAddressHtml() public function getPrimaryShippingAddressEditUrl() { - return Mage::getUrl('customer/address/edit', array('id'=>$this->getCustomer()->getDefaultShipping())); + return Mage::getUrl('customer/address/edit', array('id'=>$this->getCustomer()->getDefaultShipping())); } public function getPrimaryBillingAddressEditUrl() { - return Mage::getUrl('customer/address/edit', array('id'=>$this->getCustomer()->getDefaultBilling())); + return Mage::getUrl('customer/address/edit', array('id'=>$this->getCustomer()->getDefaultBilling())); } public function getAddressBookUrl() diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php index 95a070c412..7ad52e4b46 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php @@ -1,31 +1,31 @@ -getCustomer()->getName(); - } - -} +getCustomer()->getName(); + } + +} diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php index 8a875c1aa4..63f283c645 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,13 +49,13 @@ public function getChangePasswordUrl() * * @return Mage_Newsletter_Model_Subscriber */ - public function getSubscriptionObject() + public function getSubscriptionObject() { - if(is_null($this->_subscription)) { - $this->_subscription = Mage::getModel('newsletter/subscriber')->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer()); - } + if(is_null($this->_subscription)) { + $this->_subscription = Mage::getModel('newsletter/subscriber')->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer()); + } - return $this->_subscription; + return $this->_subscription; } /** @@ -65,7 +65,7 @@ public function getSubscriptionObject() */ public function getIsSubscribed() { - return $this->getSubscriptionObject()->isSubscribed(); + return $this->getSubscriptionObject()->isSubscribed(); } /** @@ -77,4 +77,4 @@ public function isNewsletterEnabled() { return $this->getLayout()->getBlockSingleton('customer/form_register')->isNewsletterEnabled(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php index 3bde446e31..9eb4761196 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function getSubscriptionObject() } return $this->_subscription; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php index d623d10612..05528d8a48 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,68 +62,68 @@ public function getCartItemsCount() return $this->_cartItemsCount; } - public function getWishlist() - { - if( !$this->_wishlist ) { - $this->_wishlist = Mage::getModel('wishlist/wishlist') - ->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer()); - $this->_wishlist->getItemCollection() - ->addAttributeToSelect('name') - ->addAttributeToSelect('price') + public function getWishlist() + { + if( !$this->_wishlist ) { + $this->_wishlist = Mage::getModel('wishlist/wishlist') + ->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer()); + $this->_wishlist->getItemCollection() + ->addAttributeToSelect('name') + ->addAttributeToSelect('price') ->addAttributeToSelect('small_image') - ->addAttributeToFilter('store_id', array('in' => $this->_wishlist->getSharedStoreIds())) - ->addAttributeToSort('added_at', 'desc') + ->addAttributeToFilter('store_id', array('in' => $this->_wishlist->getSharedStoreIds())) + ->addAttributeToSort('added_at', 'desc') ->setCurPage(1) - ->setPageSize(3) - ->load(); - } - - return $this->_wishlist->getItemCollection(); - } - - public function getWishlistCount() - { - return $this->getWishlist()->getSize(); - } - - public function getWishlistAddToCartLink($wishlistItem) - { - return Mage::getUrl('wishlist/index/cart', array('item' => $wishlistItem->getId())); - } - - public function getCompareItems() - { - if( !$this->_compareItems ) { - $this->_compareItems = Mage::getResourceModel('catalog/product_compare_item_collection') - ->setStoreId(Mage::app()->getStore()->getId()); - $this->_compareItems->setCustomerId(Mage::getSingleton('customer/session')->getCustomerId()); - $this->_compareItems - ->addAttributeToSelect('name') - ->useProductItem() - ->load(); - - } - - return $this->_compareItems; - } - - public function getCompareJsObjectName() - { - return "dashboardSidebarCompareJsObject"; - } - - public function getCompareRemoveUrlTemplate() - { - return $this->getUrl('catalog/product_compare/remove',array('product'=>'#{id}')); - } - - public function getCompareAddUrlTemplate() - { - return $this->getUrl('catalog/product_compare/add',array('product'=>'#{id}')); - } - - public function getCompareUrl() - { - return $this->getUrl('catalog/product_compare'); - } -} \ No newline at end of file + ->setPageSize(3) + ->load(); + } + + return $this->_wishlist->getItemCollection(); + } + + public function getWishlistCount() + { + return $this->getWishlist()->getSize(); + } + + public function getWishlistAddToCartLink($wishlistItem) + { + return Mage::getUrl('wishlist/index/cart', array('item' => $wishlistItem->getId())); + } + + public function getCompareItems() + { + if( !$this->_compareItems ) { + $this->_compareItems = Mage::getResourceModel('catalog/product_compare_item_collection') + ->setStoreId(Mage::app()->getStore()->getId()); + $this->_compareItems->setCustomerId(Mage::getSingleton('customer/session')->getCustomerId()); + $this->_compareItems + ->addAttributeToSelect('name') + ->useProductItem() + ->load(); + + } + + return $this->_compareItems; + } + + public function getCompareJsObjectName() + { + return "dashboardSidebarCompareJsObject"; + } + + public function getCompareRemoveUrlTemplate() + { + return $this->getUrl('catalog/product_compare/remove',array('product'=>'#{id}')); + } + + public function getCompareAddUrlTemplate() + { + return $this->getUrl('catalog/product_compare/add',array('product'=>'#{id}')); + } + + public function getCompareUrl() + { + return $this->getUrl('catalog/product_compare'); + } +} diff --git a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php index e31247eae3..da1584a1d2 100644 --- a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php +++ b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,4 +35,4 @@ class Mage_Customer_Block_Account_Forgotpassword extends Mage_Core_Block_Template { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Block/Account/Navigation.php b/app/code/core/Mage/Customer/Block/Account/Navigation.php index c22dce9c9f..5ca9831a73 100644 --- a/app/code/core/Mage/Customer/Block/Account/Navigation.php +++ b/app/code/core/Mage/Customer/Block/Account/Navigation.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Block/Address/Book.php b/app/code/core/Mage/Customer/Block/Address/Book.php index 040b4adaa8..a383367b02 100644 --- a/app/code/core/Mage/Customer/Block/Address/Book.php +++ b/app/code/core/Mage/Customer/Block/Address/Book.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Block/Address/Edit.php b/app/code/core/Mage/Customer/Block/Address/Edit.php index a4ec30dd6c..b59fb40d34 100644 --- a/app/code/core/Mage/Customer/Block/Address/Edit.php +++ b/app/code/core/Mage/Customer/Block/Address/Edit.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php index bb465a75a9..76be84430a 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,7 +86,7 @@ public function render(Mage_Customer_Model_Address_Abstract $address, $format=nu $data = $address->getData(); if ($this->getType()->getHtmlEscape()) { foreach ($data as $key => $value) { - $data[$key] = $this->htmlEscape($value); + $data[$key] = $this->htmlEscape($value); } } $formater->setVariables(array_merge($data, array('country'=>$address->getCountryModel()->getName()))); diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php index 5564fa449a..0e0b767ca9 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Form/Edit.php b/app/code/core/Mage/Customer/Block/Form/Edit.php index 4d55ac9bcb..5dbf7cecf1 100644 --- a/app/code/core/Mage/Customer/Block/Form/Edit.php +++ b/app/code/core/Mage/Customer/Block/Form/Edit.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Block/Form/Login.php b/app/code/core/Mage/Customer/Block/Form/Login.php index a48484ffaa..3a8c9e6a09 100644 --- a/app/code/core/Mage/Customer/Block/Form/Login.php +++ b/app/code/core/Mage/Customer/Block/Form/Login.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php index 16c63729e9..3b0865fd1e 100644 --- a/app/code/core/Mage/Customer/Block/Form/Register.php +++ b/app/code/core/Mage/Customer/Block/Form/Register.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -114,4 +114,4 @@ public function isNewsletterEnabled() { return !Mage::getStoreConfigFlag('advanced/modules_disable_output/Mage_Newsletter'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Block/Newsletter.php b/app/code/core/Mage/Customer/Block/Newsletter.php index f600dab9eb..0edebd88b6 100644 --- a/app/code/core/Mage/Customer/Block/Newsletter.php +++ b/app/code/core/Mage/Customer/Block/Newsletter.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Abstract.php b/app/code/core/Mage/Customer/Block/Widget/Abstract.php index cf7b104334..5bef3cfc50 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Abstract.php +++ b/app/code/core/Mage/Customer/Block/Widget/Abstract.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Customer_Block_Widget_Abstract extends Mage_Core_Block_Template @@ -56,4 +56,4 @@ public function getFieldName($field) { return sprintf($this->getFieldNameFormat(), $field); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Block/Widget/Dob.php b/app/code/core/Mage/Customer/Block/Widget/Dob.php index 5c4fe0eb0e..a489e2871f 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Dob.php +++ b/app/code/core/Mage/Customer/Block/Widget/Dob.php @@ -18,14 +18,21 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Customer_Block_Widget_Dob extends Mage_Customer_Block_Widget_Abstract { + /** + * Date inputs + * + * @var array + */ + protected $_dateInputs = array(); + public function _construct() { parent::_construct(); @@ -75,4 +82,38 @@ public function getDateFormat() { return Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT); } -} \ No newline at end of file + + /** + * Add date input html + * + * @param string $code + * @param string $html + */ + public function setDateInput($code, $html) + { + $this->_dateInputs[$code] = $html; + } + + /** + * Sort date inputs by dateformat order of current locale + * + * @return string + */ + public function getSortedDateInputs() + { + $strtr = array( + '%b' => '%1$s', + '%B' => '%1$s', + '%m' => '%1$s', + '%d' => '%2$s', + '%e' => '%2$s', + '%Y' => '%3$s', + '%y' => '%3$s' + ); + + $dateFormat = preg_replace('/[^\%\w]/', '\\1', $this->getDateFormat()); + + return sprintf(strtr($dateFormat, $strtr), + $this->_dateInputs['m'], $this->_dateInputs['d'], $this->_dateInputs['y']); + } +} diff --git a/app/code/core/Mage/Customer/Block/Widget/Name.php b/app/code/core/Mage/Customer/Block/Widget/Name.php index 4db1ac7c36..4b52f32c80 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Name.php +++ b/app/code/core/Mage/Customer/Block/Widget/Name.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Customer_Block_Widget_Name extends Mage_Customer_Block_Widget_Abstract @@ -121,4 +121,4 @@ public function getContainerClassName() $class .= $this->showSuffix() ? '-suffix' : ''; return $class; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php index 8afc0fd225..fd3cf25bc3 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php +++ b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Customer_Block_Widget_Taxvat extends Mage_Customer_Block_Widget_Abstract diff --git a/app/code/core/Mage/Customer/Exception.php b/app/code/core/Mage/Customer/Exception.php index a395111206..1f3b79942d 100644 --- a/app/code/core/Mage/Customer/Exception.php +++ b/app/code/core/Mage/Customer/Exception.php @@ -18,13 +18,13 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Customer_Exception extends Mage_Core_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Helper/Address.php b/app/code/core/Mage/Customer/Helper/Address.php index 65bd43d1e9..29832dd950 100644 --- a/app/code/core/Mage/Customer/Helper/Address.php +++ b/app/code/core/Mage/Customer/Helper/Address.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Helper/Data.php b/app/code/core/Mage/Customer/Helper/Data.php index 1dbbfc4294..95f360317e 100644 --- a/app/code/core/Mage/Customer/Helper/Data.php +++ b/app/code/core/Mage/Customer/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Address.php b/app/code/core/Mage/Customer/Model/Address.php index d14018b0af..4983a771c5 100644 --- a/app/code/core/Mage/Customer/Model/Address.php +++ b/app/code/core/Mage/Customer/Model/Address.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -113,4 +113,4 @@ public function __clone() { $this->setId(null); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Address/Abstract.php b/app/code/core/Mage/Customer/Model/Address/Abstract.php index 1ac0d4c662..2b89d281a1 100644 --- a/app/code/core/Mage/Customer/Model/Address/Abstract.php +++ b/app/code/core/Mage/Customer/Model/Address/Abstract.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -167,28 +167,28 @@ public function getRegion() $region = $this->getData('region'); if ($regionId) { - if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) { - $region = $this->getRegionModel($regionId)->getName(); - $this->setData('region', $region); - } + if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) { + $region = $this->getRegionModel($regionId)->getName(); + $this->setData('region', $region); + } } if (!empty($region) && is_string($region)) { - $this->setData('region', $region); - } + $this->setData('region', $region); + } elseif (!$regionId && is_numeric($region)) { if ($this->getRegionModel($region)->getCountryId() == $this->getCountryId()) { $this->setData('region', $this->getRegionModel($region)->getName()); $this->setData('region_id', $region); } } - elseif ($regionId && !$region) { - if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) { - $this->setData('region', $this->getRegionModel($regionId)->getName()); - } - } + elseif ($regionId && !$region) { + if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) { + $this->setData('region', $this->getRegionModel($regionId)->getName()); + } + } - return $this->getData('region'); + return $this->getData('region'); } /** @@ -205,15 +205,15 @@ public function getRegionCode() $this->setData('region_code', $this->getRegionModel($region)->getCode()); } } - elseif ($regionId) { - if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) { - $this->setData('region_code', $this->getRegionModel($regionId)->getCode()); - } - } + elseif ($regionId) { + if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) { + $this->setData('region_code', $this->getRegionModel($regionId)->getCode()); + } + } elseif (is_string($region)) { - $this->setData('region_code', $region); - } - return $this->getData('region_code'); + $this->setData('region_code', $region); + } + return $this->getData('region_code'); } public function getRegionId() @@ -234,12 +234,12 @@ public function getRegionId() public function getCountry() { - /*if ($this->getData('country_id') && !$this->getData('country')) { - $this->setData('country', Mage::getModel('directory/country')->load($this->getData('country_id'))->getIso2Code()); - } - return $this->getData('country');*/ - $country = $this->getCountryId(); - return $country ? $country : $this->getData('country'); + /*if ($this->getData('country_id') && !$this->getData('country')) { + $this->setData('country', Mage::getModel('directory/country')->load($this->getData('country_id'))->getIso2Code()); + } + return $this->getData('country');*/ + $country = $this->getCountryId(); + return $country ? $country : $this->getData('country'); } /** @@ -287,7 +287,7 @@ public function getHtmlFormat() */ public function getFormated($html=false) { - return $this->format($html ? 'html' : 'text');//Mage::getModel('directory/country')->load($this->getCountryId())->formatAddress($this, $html); + return $this->format($html ? 'html' : 'text');//Mage::getModel('directory/country')->load($this->getCountryId())->formatAddress($this, $html); } public function format($type) @@ -297,7 +297,7 @@ public function format($type) return null; } - return $formatType->getRenderer()->render($this); + return $formatType->getRenderer()->render($this); } /** @@ -366,4 +366,4 @@ public function validate() } return $errors; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php index 7136142749..f4237c7902 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api.php +++ b/app/code/core/Mage/Customer/Model/Address/Api.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -234,4 +234,4 @@ public function delete($addressId) return true; } -} // Class Mage_Customer_Model_Address_Api End \ No newline at end of file +} // Class Mage_Customer_Model_Address_Api End diff --git a/app/code/core/Mage/Customer/Model/Address/Api/V2.php b/app/code/core/Mage/Customer/Model/Address/Api/V2.php index 6b35df5187..0b186c6a48 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -184,4 +184,4 @@ public function delete($addressId) return true; } -} // Class Mage_Customer_Model_Address_Api End \ No newline at end of file +} // Class Mage_Customer_Model_Address_Api End diff --git a/app/code/core/Mage/Customer/Model/Address/Config.php b/app/code/core/Mage/Customer/Model/Address/Config.php index 0cca30b567..a3d79eec2b 100644 --- a/app/code/core/Mage/Customer/Model/Address/Config.php +++ b/app/code/core/Mage/Customer/Model/Address/Config.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api/Resource.php b/app/code/core/Mage/Customer/Model/Api/Resource.php index ca8fb31738..2f23b744ea 100644 --- a/app/code/core/Mage/Customer/Model/Api/Resource.php +++ b/app/code/core/Mage/Customer/Model/Api/Resource.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -87,4 +87,4 @@ public function getAllowedAttributes($entity, array $filter = null) return $result; } -} // Class Mage_Customer_Model_Api_Resource End \ No newline at end of file +} // Class Mage_Customer_Model_Api_Resource End diff --git a/app/code/core/Mage/Customer/Model/Config/Share.php b/app/code/core/Mage/Customer/Model/Config/Share.php index 5c514fca3b..243247df93 100644 --- a/app/code/core/Mage/Customer/Model/Config/Share.php +++ b/app/code/core/Mage/Customer/Model/Config/Share.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php index 3ad8246f15..cd1b0c98ff 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php @@ -1,5 +1,4 @@ $memory); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php index 3e04c3539e..78be0c793f 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php @@ -1,5 +1,4 @@ setData($this->_collections); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php index c84d77db80..c5597107b8 100644 --- a/app/code/core/Mage/Customer/Model/Customer.php +++ b/app/code/core/Mage/Customer/Model/Customer.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,6 +42,7 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract const EXCEPTION_EMAIL_NOT_CONFIRMED = 1; const EXCEPTION_INVALID_EMAIL_OR_PASSWORD = 2; + const EXCEPTION_EMAIL_EXISTS = 3; const SUBSCRIBED_YES = 'yes'; const SUBSCRIBED_NO = 'no'; @@ -97,10 +98,14 @@ public function authenticate($login, $password) { $this->loadByEmail($login); if ($this->getConfirmation() && $this->isConfirmationRequired()) { - throw new Exception(Mage::helper('customer')->__('This account is not confirmed.'), self::EXCEPTION_EMAIL_NOT_CONFIRMED); + throw Mage::exception('Mage_Core', Mage::helper('customer')->__('This account is not confirmed.'), + self::EXCEPTION_EMAIL_NOT_CONFIRMED + ); } if (!$this->validatePassword($password)) { - throw new Exception(Mage::helper('customer')->__('Invalid login or password.'), self::EXCEPTION_INVALID_EMAIL_OR_PASSWORD); + throw Mage::exception('Mage_Core', Mage::helper('customer')->__('Invalid login or password.'), + self::EXCEPTION_INVALID_EMAIL_OR_PASSWORD + ); } Mage::dispatchEvent('customer_customer_authenticated', array( 'model' => $this, @@ -1047,14 +1052,14 @@ public function canSkipConfirmation() && strtolower($this->getSkipConfirmationIfEmail()) === strtolower($this->getEmail()); } - public function __clone() + public function __clone() { - $newAddressCollection = $this->getPrimaryAddresses(); - $newAddressCollection = array_merge($newAddressCollection, $this->getAdditionalAddresses()); - $this->setId(null); - $this->cleanAllAddresses(); + $newAddressCollection = $this->getPrimaryAddresses(); + $newAddressCollection = array_merge($newAddressCollection, $this->getAdditionalAddresses()); + $this->setId(null); + $this->cleanAllAddresses(); foreach ($newAddressCollection as $address) { - $this->addAddress(clone $address); + $this->addAddress(clone $address); } } } diff --git a/app/code/core/Mage/Customer/Model/Customer/Api.php b/app/code/core/Mage/Customer/Model/Customer/Api.php index c5faffb19d..e75a5bce6d 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -181,4 +181,4 @@ public function delete($customerId) return true; } -} // Class Mage_Customer_Model_Customer_Api End \ No newline at end of file +} // Class Mage_Customer_Model_Customer_Api End diff --git a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php index abab42c5b8..ab0b8f2265 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -151,4 +151,4 @@ public function update($customerId, $customerData) $customer->save(); return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php index 147e6f1788..1606de092a 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php index 0d78fc9de6..ef3a689ede 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,4 +55,4 @@ public function validate($object) return parent::validate($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php index 5d295efb49..1166aabff3 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php index 3269cc940e..ec9f375739 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php index ee51ab96d2..0abac03500 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php index 3fc5de39f1..1e0cf5bb63 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php index 21e10a183b..9b2d90c470 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -80,4 +80,4 @@ public function getOptionText($value) } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php index dae6d54066..6a8fc7d1a8 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function getOptionText($value) } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Entity/Address.php b/app/code/core/Mage/Customer/Model/Entity/Address.php index 630c8d34e1..5dbc97e162 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -85,4 +85,4 @@ public function setCustomerId($object, $id) $object->setData('customer_id', $id); return $object; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php index b7294bee6a..f582c5ca30 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php index 940807e6c5..0ea9312e34 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function beforeSave($object) $object->implodeStreetAddress(); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php index 466aea9c10..4188b871d1 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,7 +39,7 @@ public function getAllOptions() $this->_options = Mage::getResourceModel('directory/country_collection')->load()->toOptionArray(); /*$baseUrl = Mage::getBaseUrl(); foreach ($this->_options as $index=>$option) { - $this->_options[$index]['style'] = 'background-image:url('.$baseUrl.'skins/default/images/icons/flags/'.strtolower($option['title']).'.gif)'; + $this->_options[$index]['style'] = 'background-image:url('.$baseUrl.'skins/default/images/icons/flags/'.strtolower($option['title']).'.gif)'; }*/ } return $this->_options; diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php index bf0b613594..886f368a30 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php index 9d8ee5e940..8acbae930e 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function setCustomerFilter($customer) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer.php b/app/code/core/Mage/Customer/Model/Entity/Customer.php index 51fba527b7..cd295de22e 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Customer.php +++ b/app/code/core/Mage/Customer/Model/Entity/Customer.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -75,6 +75,11 @@ protected function _getDefaultAttributes() protected function _beforeSave(Varien_Object $customer) { parent::_beforeSave($customer); + + if (!$customer->getEmail()) { + Mage::throwException(Mage::helper('customer')->__('Customer email is required')); + } + $select = $this->_getReadAdapter()->select() ->from($this->getEntityTable(), array($this->getEntityIdField())) ->where('email=?', $customer->getEmail()); @@ -86,7 +91,9 @@ protected function _beforeSave(Varien_Object $customer) } if ($this->_getWriteAdapter()->fetchOne($select)) { - Mage::throwException(Mage::helper('customer')->__('Customer email already exists')); + throw Mage::exception('Mage_Core', Mage::helper('customer')->__('Customer email already exists'), + Mage_Customer_Model_Customer::EXCEPTION_EMAIL_EXISTS + ); } // set confirmation key logic diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php index 9579e8a19e..c1471fe319 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Entity/Group.php b/app/code/core/Mage/Customer/Model/Entity/Group.php index b946f06f47..620008d5af 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Group.php +++ b/app/code/core/Mage/Customer/Model/Entity/Group.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -66,8 +66,8 @@ protected function _afterDelete(Mage_Core_Model_Abstract $group) foreach ($customerCollection as $customer) { $defaultGroupId = Mage::getStoreConfig(Mage_Customer_Model_Group::XML_PATH_DEFAULT_ID, $customer->getStoreId()); $customer->setGroupId($defaultGroupId); - $customer->save(); + $customer->save(); } return parent::_afterDelete($group); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php index 64a61b536b..7e8c0741a9 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -75,4 +75,4 @@ public function toOptionHash() { return parent::_toOptionHash('customer_group_id', 'customer_group_code'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Entity/Setup.php b/app/code/core/Mage/Customer/Model/Entity/Setup.php index 3d796143e7..cb75988e29 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Setup.php +++ b/app/code/core/Mage/Customer/Model/Entity/Setup.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -157,15 +157,22 @@ public function getDefaultEntities() 'backend' => 'customer/customer_attribute_backend_shipping', ), 'taxvat' => array( - 'label' => 'Tax/VAT number', + 'label' => 'Tax/VAT Number', 'visible' => true, 'required' => false, ), 'confirmation' => array( - 'label' => 'Is confirmed', + 'label' => 'Is Confirmed', 'visible' => false, 'required' => false, ), + 'created_at' => array( + 'type' => 'static', + 'label' => 'Created At', + 'visible' => false, + 'required' => false, + 'input' => 'date', + ), ), ), diff --git a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php index 5b8e539991..a06946361e 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ protected function _construct() { $this->setEntity(Mage::getResourceSingleton('customer/wishlist')); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Group.php b/app/code/core/Mage/Customer/Model/Group.php index a8ecb7dd08..8e1028af7c 100644 --- a/app/code/core/Mage/Customer/Model/Group.php +++ b/app/code/core/Mage/Customer/Model/Group.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Group/Api.php b/app/code/core/Mage/Customer/Model/Group/Api.php index daec990158..aadf2cc74a 100644 --- a/app/code/core/Mage/Customer/Model/Group/Api.php +++ b/app/code/core/Mage/Customer/Model/Group/Api.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function items() return $result; } -} // Class Mage_Customer_Model_Group_Api End \ No newline at end of file +} // Class Mage_Customer_Model_Group_Api End diff --git a/app/code/core/Mage/Customer/Model/Group/Api/V2.php b/app/code/core/Mage/Customer/Model/Group/Api/V2.php index 9a2f69e154..220c1f4062 100644 --- a/app/code/core/Mage/Customer/Model/Group/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Group/Api/V2.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Customer_Model_Group_Api_V2 extends Mage_Customer_Model_Group_Api { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Customer/Model/Observer.php b/app/code/core/Mage/Customer/Model/Observer.php index e678a775e0..1f1c31bc09 100644 --- a/app/code/core/Mage/Customer/Model/Observer.php +++ b/app/code/core/Mage/Customer/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,7 +35,7 @@ public function beforeLoadLayout($observer) { $loggedIn = Mage::getSingleton('customer/session')->isLoggedIn(); - $observer->getEvent()->getLayout()->getUpdate() - ->addHandle('customer_logged_'.($loggedIn?'in':'out')); + $observer->getEvent()->getLayout()->getUpdate() + ->addHandle('customer_logged_'.($loggedIn?'in':'out')); } } diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php index da5ba9b783..4847f7da68 100644 --- a/app/code/core/Mage/Customer/Model/Session.php +++ b/app/code/core/Mage/Customer/Model/Session.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php index f942838099..fd6e5b9460 100644 --- a/app/code/core/Mage/Customer/controllers/AccountController.php +++ b/app/code/core/Mage/Customer/controllers/AccountController.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -137,8 +137,7 @@ public function loginPostAction() if ($session->getCustomer()->getIsJustConfirmed()) { $this->_welcomeCustomer($session->getCustomer(), true); } - } - catch (Exception $e) { + } catch (Mage_Core_Exception $e) { switch ($e->getCode()) { case Mage_Customer_Model_Customer::EXCEPTION_EMAIL_NOT_CONFIRMED: $message = Mage::helper('customer')->__('This account is not confirmed. Click here to resend confirmation email.', @@ -153,6 +152,8 @@ public function loginPostAction() } $session->addError($message); $session->setUsername($login['username']); + } catch (Exception $e) { + // Mage::logException($e); // PA DSS violation: this exception log can disclose customer password } } else { $session->addError($this->__('Login and password are required')); @@ -235,10 +236,12 @@ public function createAction() */ public function createPostAction() { - if ($this->_getSession()->isLoggedIn()) { + $session = $this->_getSession(); + if ($session->isLoggedIn()) { $this->_redirect('*/*/'); return; } + $session->setEscapeMessages(true); // prevent XSS injection in user input if ($this->getRequest()->isPost()) { $errors = array(); @@ -289,45 +292,49 @@ public function createPostAction() $customer->save(); if ($customer->isConfirmationRequired()) { - $customer->sendNewAccountEmail('confirmation', $this->_getSession()->getBeforeAuthUrl()); - $this->_getSession()->addSuccess($this->__('Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.', + $customer->sendNewAccountEmail('confirmation', $session->getBeforeAuthUrl()); + $session->addSuccess($this->__('Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.', Mage::helper('customer')->getEmailConfirmationUrl($customer->getEmail()) )); $this->_redirectSuccess(Mage::getUrl('*/*/index', array('_secure'=>true))); return; } else { - $this->_getSession()->setCustomerAsLoggedIn($customer); + $session->setCustomerAsLoggedIn($customer); $url = $this->_welcomeCustomer($customer); $this->_redirectSuccess($url); return; } } else { - $this->_getSession()->setCustomerFormData($this->getRequest()->getPost()); + $session->setCustomerFormData($this->getRequest()->getPost()); if (is_array($errors)) { foreach ($errors as $errorMessage) { - $this->_getSession()->addError($errorMessage); + $session->addError($errorMessage); } } else { - $this->_getSession()->addError($this->__('Invalid customer data')); + $session->addError($this->__('Invalid customer data')); } } } catch (Mage_Core_Exception $e) { - $this->_getSession()->addError($e->getMessage()) - ->setCustomerFormData($this->getRequest()->getPost()); + $session->setCustomerFormData($this->getRequest()->getPost()); + if ($e->getCode() === Mage_Customer_Model_Customer::EXCEPTION_EMAIL_EXISTS) { + $url = Mage::getUrl('customer/account/forgotpassword'); + $message = $this->__('There is already an account with this emails address. If you are sure that it is your email address, click here to get your password and access your account.', $url); + $session->setEscapeMessages(false); + } + else { + $message = $e->getMessage(); + } + $session->addError($message); } catch (Exception $e) { - $this->_getSession()->setCustomerFormData($this->getRequest()->getPost()) + $session->setCustomerFormData($this->getRequest()->getPost()) ->addException($e, $this->__('Can\'t save customer')); } } - /** - * Protect XSS injection in user input - */ - $this->_getSession()->setEscapeMessages(true); - $this->_redirectError(Mage::getUrl('*/*/create', array('_secure'=>true))); + $this->_redirectError(Mage::getUrl('*/*/create', array('_secure' => true))); } /** diff --git a/app/code/core/Mage/Customer/controllers/AddressController.php b/app/code/core/Mage/Customer/controllers/AddressController.php index a20899cb0d..c5df8fe66f 100644 --- a/app/code/core/Mage/Customer/controllers/AddressController.php +++ b/app/code/core/Mage/Customer/controllers/AddressController.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -132,7 +132,7 @@ public function formPostAction() $this->_getSession()->setAddressFormData($this->getRequest()->getPost()); if (is_array($accressValidation)) { foreach ($accressValidation as $errorMessage) { - $this->_getSession()->addError($errorMessage); + $this->_getSession()->addError($errorMessage); } } else { $this->_getSession()->addError($this->__('Can\'t save address')); diff --git a/app/code/core/Mage/Customer/controllers/ReviewController.php b/app/code/core/Mage/Customer/controllers/ReviewController.php index 41c1c8cf34..c441979929 100644 --- a/app/code/core/Mage/Customer/controllers/ReviewController.php +++ b/app/code/core/Mage/Customer/controllers/ReviewController.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/etc/api.xml b/app/code/core/Mage/Customer/etc/api.xml index dca680eade..ce4a21e07b 100644 --- a/app/code/core/Mage/Customer/etc/api.xml +++ b/app/code/core/Mage/Customer/etc/api.xml @@ -21,8 +21,8 @@ * * @category Mage * @package Mage_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -176,4 +176,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml index 36cd15f621..852b02935e 100644 --- a/app/code/core/Mage/Customer/etc/config.xml +++ b/app/code/core/Mage/Customer/etc/config.xml @@ -19,16 +19,16 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 1.4.0.0.2 + 1.4.0.0.4 @@ -312,4 +312,4 @@ T: {{var telephone}} - \ No newline at end of file + diff --git a/app/code/core/Mage/Customer/etc/system.xml b/app/code/core/Mage/Customer/etc/system.xml index bd278e909d..98b6daf33d 100644 --- a/app/code/core/Mage/Customer/etc/system.xml +++ b/app/code/core/Mage/Customer/etc/system.xml @@ -19,10 +19,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php index 190ad8d72a..145ec4e04b 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php index 6892ec64d0..2e41c29d6e 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -245,4 +245,4 @@ INSERT INTO `{$installer->getTable('customer_group')}` VALUES(0, 'NOT LOGGED IN', 3), (1, 'General', 3), (2, 'Wholesale', 3), (3, 'Retailer', 3); "); $installer->endSetup(); -$installer->installEntities(); \ No newline at end of file +$installer->installEntities(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php index 5432bb1db0..2f2b639cf1 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup()->run(" diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php index 7a91496064..e5fc69d2ba 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,9 +18,9 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php index 5cbce1c5d1..fe4d5f811f 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -73,4 +73,4 @@ $this->getConnection()->dropColumn($this->getTable('customer_address_entity_decimal'), 'store_id'); $this->getConnection()->dropColumn($this->getTable('customer_address_entity_datetime'), 'store_id'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php index 044bf865a9..48a93407a2 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -63,4 +63,4 @@ $installer->getConnection()->dropColumn($this->getTable('customer_entity'), 'parent_id'); $installer->installEntities(); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php index 8ec4abcbe9..4739858411 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -1,27 +1,27 @@ -installEntities(); \ No newline at end of file +installEntities(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php index d2bf9e7c0f..16a827df8d 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php index 7a91496064..e5fc69d2ba 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -18,9 +18,9 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php index 5c4d0106d7..8638597b9b 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ if ($attrId = $this->getAttribute('customer', 'birthdate', 'attribute_id')) { diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php index 08670e57d3..b006a7beec 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php index 014af28901..8d6a30f91c 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php index 88275e9d9e..e964dfcb2c 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php index 29c1f45ac6..01bd201a15 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -41,4 +41,4 @@ $installer->getConnection()->addKey($installer->getTable('customer_entity_text'), 'IDX_VALUE', array('entity_id', 'attribute_id')); $installer->getConnection()->addKey($installer->getTable('customer_entity_varchar'), 'IDX_VALUE', array('entity_id', 'attribute_id', 'value')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php index 44cede0737..ae7363da65 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -60,4 +60,4 @@ $installer->getConnection()->addKey($tableName, 'IDX_ATTRIBUTE_VALUE', array('entity_id', 'attribute_id'), 'unique'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Helper/Data.php b/app/code/core/Mage/Dataflow/Helper/Data.php index b6df390565..b78ed5fe78 100644 --- a/app/code/core/Mage/Dataflow/Helper/Data.php +++ b/app/code/core/Mage/Dataflow/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php index 1ec0f42e2d..45e96dfb34 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Batch.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php index 2ebd914b0e..cecc99d0e7 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,4 +91,4 @@ public function deleteCollection($batchId = null) } return $this->getResource()->deleteCollection($this); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Batch/Export.php index afbebc1111..dde6bd7ad1 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Export.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ protected function _construct() { $this->_init('dataflow/batch_export'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Batch/Import.php index 838bb2d1c8..5e655cce11 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Import.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ protected function _construct() { $this->_init('dataflow/batch_import'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Io.php b/app/code/core/Mage/Dataflow/Model/Batch/Io.php index 5d1da80bdc..4c756ecdb0 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Io.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Io.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -203,4 +203,4 @@ public function getFileSize() { return $this->_fileSize; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Convert.php b/app/code/core/Mage/Dataflow/Model/Convert.php index 3c79bb5ce8..a8f21ac733 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert.php +++ b/app/code/core/Mage/Dataflow/Model/Convert.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action.php b/app/code/core/Mage/Dataflow/Model/Convert/Action.php index 2495ab30bb..558e27fb57 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php index de2681154b..52b86d0ead 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php index 04c0458252..233b604363 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php index a3fd94862a..6abb821677 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php index 035ba7c057..73c17b4170 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php index f77d02ea34..f1ffc38dee 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php index bf392890ab..b1c8ddcfc2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php index 1012da7a6b..f62f240998 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php index 05320f9cf2..bf39d78449 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -188,4 +188,4 @@ public function save() } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php index e8ac45f843..2278963fa8 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php index 46c20b096a..44792dcfb7 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php index 679d5a8e56..3b421423ed 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php index 983feaea85..773021e2a2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php index ac7535f813..00a90af337 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -140,7 +140,7 @@ public function validateDataGrid($data=null) if (count($data)==0) { return true; } - $this->addException("Invalid data type, expecting 2D grid array.", Mage_Dataflow_Model_Convert_Exception::FATAL); + $this->addException("Invalid data type, expecting 2D grid array.", Mage_Dataflow_Model_Convert_Exception::FATAL); } return true; } @@ -198,4 +198,4 @@ public function getBatchParams($key = null) } return $this->_batchParams; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php index 5cb5e39c03..75a9c272e1 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php index 24dd6607d4..df8efbc048 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php index c546218019..d36dd8b3d4 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php index 0fae53f821..5f56a88c63 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php index e20e78c188..62aa5f8078 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php @@ -1,5 +1,28 @@ cp($file, $this->getBatchModel()->getIoAdapter()->getFile(true)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php index 1c9d1714c8..06911634e8 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php index 7779fa3f3e..0dfee06d83 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php index a810d2a85c..cc2279ebf2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php index 86968ed80b..b5dcc52e1b 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php index 874e337923..1bf7c3077c 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php index 0d3dd588b6..25225866fe 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -159,4 +159,4 @@ function getDataflowProfile() { return $this->_dataflow_profile; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php index 0ea13f2152..d231690e45 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php index 5167b89153..820ae6e67c 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php index 8b16d8e75d..b1dd15b95a 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php index 068c8ce0e1..eec300e830 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php index 04d090f188..91102887af 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php index 0878b0fa47..5d45e7faf1 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Import.php b/app/code/core/Mage/Dataflow/Model/Import.php index 2e968880c4..1d0678e076 100644 --- a/app/code/core/Mage/Dataflow/Model/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Import.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php index b06e1b1c3b..be7535df48 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ protected function _construct() { $this->_init('dataflow/batch', 'batch_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php index ccd778e8a8..7183126e0b 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,4 +74,4 @@ public function deleteCollection(Mage_Dataflow_Model_Batch_Abstract $object) ); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php index 260aa77eaf..7bad96540b 100755 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,4 +56,4 @@ public function addExpireFilter() $this->getSelect()->where('created_at < ?', $expire); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php index 09f83a349f..f1c47e9e2a 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ protected function _construct() { $this->_init('dataflow/batch_export', 'batch_export_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php index 329b76672a..4825e777a4 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ protected function _construct() { $this->_init('dataflow/batch_import', 'batch_import_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php index 781c0a1118..3114c3386b 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,202 +29,202 @@ class Mage_Catalog_Model_Mysql4_Convert { protected $_productsBySku; protected $_productEntity; - protected $_skuAttribute; - - public function getConnection() - { - return Mage::getSingleton('core/resource')->getConnection('catalog_write'); - } - - public function getSelect() - { - return $this->getConnection()->select(); - } - - public function getTable($table) - { - return Mage::getSingleton('core/resource')->getTableName($table); - } - - public function getProductEntity($field=null) - { - if (!$this->_productEntity) { - $this->_productEntity = Mage::getResourceModel('catalog/product') - ->loadAllAttributes(); - } - return is_null($field) ? $this->_productEntity : $this->_productEntity->getData($field); - } - - public function getSkuAttribute($field='attribute_id') - { - if (!$this->_skuAttribute) { - $this->_skuAttribute = $this->getProductEntity()->getAttribute('sku'); - } - return $this->_skuAttribute->getData($field); - } - - public function getProductIdBySku($sku) - { - if (!$this->_productsBySku) { - $select = $this->getSelect() - ->from($this->getTable('catalog/product'), array('entity_id', 'sku')); - $products = $this->getConnection()->fetchAll($select); - - $this->_productsBySku = array(); - foreach ($products as $p) { - $this->_productsBySku[$p['sku']] = $p['entity_id']; - } - } - return isset($this->_productsBySku[$sku]) ? $this->_productsBySku[$sku] : false; - } - - public function addProductToStore($productId, $storeId) - { - $write = $this->getConnection(); - $table = $this->getTable('catalog/product_store'); + protected $_skuAttribute; + + public function getConnection() + { + return Mage::getSingleton('core/resource')->getConnection('catalog_write'); + } + + public function getSelect() + { + return $this->getConnection()->select(); + } + + public function getTable($table) + { + return Mage::getSingleton('core/resource')->getTableName($table); + } + + public function getProductEntity($field=null) + { + if (!$this->_productEntity) { + $this->_productEntity = Mage::getResourceModel('catalog/product') + ->loadAllAttributes(); + } + return is_null($field) ? $this->_productEntity : $this->_productEntity->getData($field); + } + + public function getSkuAttribute($field='attribute_id') + { + if (!$this->_skuAttribute) { + $this->_skuAttribute = $this->getProductEntity()->getAttribute('sku'); + } + return $this->_skuAttribute->getData($field); + } + + public function getProductIdBySku($sku) + { + if (!$this->_productsBySku) { + $select = $this->getSelect() + ->from($this->getTable('catalog/product'), array('entity_id', 'sku')); + $products = $this->getConnection()->fetchAll($select); + + $this->_productsBySku = array(); + foreach ($products as $p) { + $this->_productsBySku[$p['sku']] = $p['entity_id']; + } + } + return isset($this->_productsBySku[$sku]) ? $this->_productsBySku[$sku] : false; + } + + public function addProductToStore($productId, $storeId) + { + $write = $this->getConnection(); + $table = $this->getTable('catalog/product_store'); try { - if (!$write->fetchOne("select * from $table where product_id=".(int)$productId." and store_id=".(int)$storeId)) { + if (!$write->fetchOne("select * from $table where product_id=".(int)$productId." and store_id=".(int)$storeId)) { $write->query("insert into $table (product_id, store_id) values (".(int)$productId.",".(int)$storeId.")"); - } + } } catch (Exception $e) { throw $e; } - return $this; - } - - public function exportAttributes() - { - $attributeFields = array( - 'attribute_code', - 'frontend_label', 'frontend_input', 'frontend_class', 'frontend_model', - 'backend_type', 'backend_table', 'backend_model', - 'source_model', 'attribute_model', - 'is_visible', 'is_user_defined', 'is_global', 'is_required', 'is_unique', - 'is_visible_on_front', 'is_searchable', 'is_filterable', 'is_comparable', - 'default_value', 'apply_to', 'use_in_super_product', - ); - - $select = $this->getSelect() - ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code') - ->join(array('a'=>$this->getTable('eav/attribute')), 'a.entity_type_id=et.entity_type_id', $attributeFields) - ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category')) - ->order('if(not a.is_user_defined, 1, 2)')->order('attribute_code'); - - $attributes = $this->getConnection()->fetchAll($select); - - return $attributes; - } - - public function exportAttributeSets() - { - $select = $this->getSelect() - ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code') - ->join(array('s'=>$this->getTable('eav/attribute_set')), 's.entity_type_id=et.entity_type_id', 'attribute_set_name') - ->join(array('g'=>$this->getTable('eav/attribute_group')), 'g.attribute_set_id=s.attribute_set_id', 'attribute_group_name') - ->join(array('ea'=>$this->getTable('eav/entity_attribute')), 'ea.attribute_group_id=g.attribute_group_id', array()) - ->join(array('a'=>$this->getTable('eav/attribute')), 'a.attribute_id=ea.attribute_id', 'attribute_code') - ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category')) - ->order('et.entity_type_code')->order('s.sort_order')->order('g.sort_order'); - - $sets = $this->getConnection()->fetchAll($select); - - return $sets; - } - - public function exportAttributeOptions() - { - $select = $this->getSelect() - ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code') - ->join(array('a'=>$this->getTable('eav/attribute')), 'a.entity_type_id=et.entity_type_id', 'attribute_code') - ->join(array('ao'=>$this->getTable('eav/attribute_option')), 'ao.attribute_id=a.attribute_id', array()) - ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category')) - ->order('a.attribute_code')->order('ao.sort_order'); - - $stores = Mage::getConfig()->getNode('stores')->children(); - foreach ($stores as $storeName=>$storeConfig) { - $select->joinLeft( - array($storeName=>$this->getTable('eav/attribute_option_value')), - "$storeName.option_id=ao.option_id and $storeName.store_id=".$storeConfig->descend('system/store/id'), - array($storeName=>"$storeName.value") - ); - } - - $options = $this->getConnection()->fetchAll($select); - - return $options; - } - - public function exportProductLinks() - { - $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type'); - $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id'); - - $select = $this->getSelect() - ->from(array('lt'=>$this->getTable('catalog/product_link_type')), array('link_type'=>'code')) - ->join(array('l'=>$this->getTable('catalog/product_link')), 'l.link_type_id=lt.link_type_id', array()) - ->join(array('sku'=>$skuTable), 'sku.entity_id=l.product_id'.$skuCond, array('sku'=>'value')) - ->join(array('linked'=>$skuTable), 'linked.entity_id=l.product_id'.$skuCond, array('linked'=>'value')) - ->order('sku')->order('link_type'); - $links = $this->getConnection()->fetchAll($select); - - return $links; - } - - public function exportProductsInCategories() - { - $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type'); - $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id'); - - $select = $this->getSelect() - ->from(array('cp'=>$this->getTable('catalog/category_product')), array('category_id', 'position')) - ->join(array('sku'=>$skuTable), 'sku.entity_id=cp.product_id'.$skuCond, array('sku'=>'value')) - ->order('category_id')->order('position')->order('sku'); - - $prodCats = $this->getConnection()->fetchAll($select); - - return $prodCats; - } - - public function exportProductsInStores() - { - $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type'); - $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id'); - - $select = $this->getSelect() - ->from(array('ps'=>$this->getTable('catalog/product_store')), array()) - ->join(array('s'=>$this->getTable('core/store')), 's.store_id=ps.store_id', array('store'=>'code')) - ->join(array('sku'=>$skuTable), 'sku.entity_id=ps.product_id'.$skuCond, array('sku'=>'value')) - ->order('store')->order('sku'); - - $prodStores = $this->getConnection()->fetchAll($select); - - return $prodStores; - } - - public function exportCategories() - { - $collection = Mage::getResourceModel('catalog/category_collection') - ->addAttributeToSelect('*') - ->load(); - - $categories = array(); - foreach ($collection as $object) { - $row = $object->getData(); - $categories[] = $row; - } - - return $categories; - } - - public function exportProducts() - { - $attrSets = Mage::getResourceModel('eav/entity_attribute_set_collection')->load(); - $attrSetName = array(); - foreach ($attrSets as $attrSet) { - $attrSetName[$attrSet->getId()] = $attrSet->getAttributeSetName(); - } - - $select = $this->getSelect() + return $this; + } + + public function exportAttributes() + { + $attributeFields = array( + 'attribute_code', + 'frontend_label', 'frontend_input', 'frontend_class', 'frontend_model', + 'backend_type', 'backend_table', 'backend_model', + 'source_model', 'attribute_model', + 'is_visible', 'is_user_defined', 'is_global', 'is_required', 'is_unique', + 'is_visible_on_front', 'is_searchable', 'is_filterable', 'is_comparable', + 'default_value', 'apply_to', 'use_in_super_product', + ); + + $select = $this->getSelect() + ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code') + ->join(array('a'=>$this->getTable('eav/attribute')), 'a.entity_type_id=et.entity_type_id', $attributeFields) + ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category')) + ->order('if(not a.is_user_defined, 1, 2)')->order('attribute_code'); + + $attributes = $this->getConnection()->fetchAll($select); + + return $attributes; + } + + public function exportAttributeSets() + { + $select = $this->getSelect() + ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code') + ->join(array('s'=>$this->getTable('eav/attribute_set')), 's.entity_type_id=et.entity_type_id', 'attribute_set_name') + ->join(array('g'=>$this->getTable('eav/attribute_group')), 'g.attribute_set_id=s.attribute_set_id', 'attribute_group_name') + ->join(array('ea'=>$this->getTable('eav/entity_attribute')), 'ea.attribute_group_id=g.attribute_group_id', array()) + ->join(array('a'=>$this->getTable('eav/attribute')), 'a.attribute_id=ea.attribute_id', 'attribute_code') + ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category')) + ->order('et.entity_type_code')->order('s.sort_order')->order('g.sort_order'); + + $sets = $this->getConnection()->fetchAll($select); + + return $sets; + } + + public function exportAttributeOptions() + { + $select = $this->getSelect() + ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code') + ->join(array('a'=>$this->getTable('eav/attribute')), 'a.entity_type_id=et.entity_type_id', 'attribute_code') + ->join(array('ao'=>$this->getTable('eav/attribute_option')), 'ao.attribute_id=a.attribute_id', array()) + ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category')) + ->order('a.attribute_code')->order('ao.sort_order'); + + $stores = Mage::getConfig()->getNode('stores')->children(); + foreach ($stores as $storeName=>$storeConfig) { + $select->joinLeft( + array($storeName=>$this->getTable('eav/attribute_option_value')), + "$storeName.option_id=ao.option_id and $storeName.store_id=".$storeConfig->descend('system/store/id'), + array($storeName=>"$storeName.value") + ); + } + + $options = $this->getConnection()->fetchAll($select); + + return $options; + } + + public function exportProductLinks() + { + $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type'); + $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id'); + + $select = $this->getSelect() + ->from(array('lt'=>$this->getTable('catalog/product_link_type')), array('link_type'=>'code')) + ->join(array('l'=>$this->getTable('catalog/product_link')), 'l.link_type_id=lt.link_type_id', array()) + ->join(array('sku'=>$skuTable), 'sku.entity_id=l.product_id'.$skuCond, array('sku'=>'value')) + ->join(array('linked'=>$skuTable), 'linked.entity_id=l.product_id'.$skuCond, array('linked'=>'value')) + ->order('sku')->order('link_type'); + $links = $this->getConnection()->fetchAll($select); + + return $links; + } + + public function exportProductsInCategories() + { + $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type'); + $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id'); + + $select = $this->getSelect() + ->from(array('cp'=>$this->getTable('catalog/category_product')), array('category_id', 'position')) + ->join(array('sku'=>$skuTable), 'sku.entity_id=cp.product_id'.$skuCond, array('sku'=>'value')) + ->order('category_id')->order('position')->order('sku'); + + $prodCats = $this->getConnection()->fetchAll($select); + + return $prodCats; + } + + public function exportProductsInStores() + { + $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type'); + $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id'); + + $select = $this->getSelect() + ->from(array('ps'=>$this->getTable('catalog/product_store')), array()) + ->join(array('s'=>$this->getTable('core/store')), 's.store_id=ps.store_id', array('store'=>'code')) + ->join(array('sku'=>$skuTable), 'sku.entity_id=ps.product_id'.$skuCond, array('sku'=>'value')) + ->order('store')->order('sku'); + + $prodStores = $this->getConnection()->fetchAll($select); + + return $prodStores; + } + + public function exportCategories() + { + $collection = Mage::getResourceModel('catalog/category_collection') + ->addAttributeToSelect('*') + ->load(); + + $categories = array(); + foreach ($collection as $object) { + $row = $object->getData(); + $categories[] = $row; + } + + return $categories; + } + + public function exportProducts() + { + $attrSets = Mage::getResourceModel('eav/entity_attribute_set_collection')->load(); + $attrSetName = array(); + foreach ($attrSets as $attrSet) { + $attrSetName[$attrSet->getId()] = $attrSet->getAttributeSetName(); + } + + $select = $this->getSelect() ->from(array('ao'=>$this->getTable('eav/attribute_option')), array('attribute_id', 'option_id')) ->join(array('aov'=>$this->getTable('eav/attribute_option_value')), 'aov.option_id=ao.option_id', array('value_id', 'value')) ->where('aov.store_id=0'); @@ -232,47 +232,47 @@ public function exportProducts() echo $select->__toString(); die(); - $collection = Mage::getResourceModel('catalog/product_collection') - ->addAttributeToSelect('*') - ->load(); - - $products = array(); - foreach ($collection as $object) { - $r = $object->getData(); - - unset($r['entity_id'], $r['entity_type_id']); - $r['attribute_set_id'] = $attrSetName[$r['attribute_set_id']]; - - $products[] = $r; - } - - return $products; - } - - public function exportImageGallery() - { - return array(); - } - - public function getProductAttributeOption($attribute, $value) - { - #$attribute = Mage::get - } - - public function importProducts(array $data) - { - /* - $entity = Mage::getResourceModel('catalog/product') - ->loadAllAttributes(); - - $options = - - foreach ($data as $row) { - if (empty($row['sku'])) { - continue; - } - $sku = $row['sku']; - } - */ - } -} \ No newline at end of file + $collection = Mage::getResourceModel('catalog/product_collection') + ->addAttributeToSelect('*') + ->load(); + + $products = array(); + foreach ($collection as $object) { + $r = $object->getData(); + + unset($r['entity_id'], $r['entity_type_id']); + $r['attribute_set_id'] = $attrSetName[$r['attribute_set_id']]; + + $products[] = $r; + } + + return $products; + } + + public function exportImageGallery() + { + return array(); + } + + public function getProductAttributeOption($attribute, $value) + { + #$attribute = Mage::get + } + + public function importProducts(array $data) + { + /* + $entity = Mage::getResourceModel('catalog/product') + ->loadAllAttributes(); + + $options = + + foreach ($data as $row) { + if (empty($row['sku'])) { + continue; + } + $sku = $row['sku']; + } + */ + } +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php index 54ae451522..bc727566e3 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php index 89f7b5b359..aa97ca547d 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php index d55d17aade..7a8f13a741 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,4 +58,4 @@ public function isProfileExists($name, $id = null) return $this->_getReadAdapter()->fetchOne($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php index 8f2da7a123..8521c90558 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,4 +49,4 @@ public function addStoreFilter($storeIds) $this->getSelect()->where('main_table.store_id IN (?)', array(0, $storeIds)); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php index 76e57b4b5e..591733329d 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) parent::_beforeSave($object); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php index 641373d955..def546bac3 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function joinAdminUser() ); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php index 607e6aaead..691e59802e 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php index 38b15e0fbd..7d569bcba8 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Profile.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Dataflow/Model/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Profile/History.php index 87f3d4e60d..59d46f7184 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Profile/History.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,4 +51,4 @@ protected function _beforeSave() parent::_beforeSave(); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Dataflow/Model/Session.php b/app/code/core/Mage/Dataflow/Model/Session.php index cfa0ef482b..d6cdb185bb 100644 --- a/app/code/core/Mage/Dataflow/Model/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Session.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php index b559dd14a1..9bff11cdc6 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,4 +85,3 @@ public function load() } } - \ No newline at end of file diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php index 669b5cb81c..3871c5f870 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,7 +35,7 @@ class Mage_Dataflow_Model_Session_Parser_Csv extends Mage_Dataflow_Model_Convert_Parser_Abstract { - public function parse() + public function parse() { $fDel = $this->getVar('delimiter', ','); $fEnc = $this->getVar('enclose', '"'); diff --git a/app/code/core/Mage/Dataflow/etc/config.xml b/app/code/core/Mage/Dataflow/etc/config.xml index 2e877f8ef4..053a41bddb 100644 --- a/app/code/core/Mage/Dataflow/etc/config.xml +++ b/app/code/core/Mage/Dataflow/etc/config.xml @@ -19,10 +19,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -72,4 +72,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php index 2f6116eeca..8139790187 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php index ab2cacffe6..eb32118ae2 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -1,5 +1,28 @@ startSetup()->run(" drop table if exists {$this->getTable('dataflow_profile')}; @@ -40,4 +63,4 @@ "); } -$this->endSetup(); \ No newline at end of file +$this->endSetup(); diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php index 5ebd5b71fe..9deabb042f 100755 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -1,5 +1,28 @@ startSetup()->run(" INSERT INTO `{$this->getTable('dataflow_profile')}` (`profile_id`, `name`, `created_at`, `updated_at`, `actions_xml`, `gui_data`, `direction`, `entity_type`, `store_id`, `data_transfer`) VALUES (NULL, 'Export All Products', NOW(), NOW(), '\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n true\r\n\r\n\r\n\r\n file\r\n var/export\r\n \r\n\r\n\r\n', 'a:5:{s:4:\"file\";a:7:{s:4:\"type\";s:4:\"file\";s:8:\"filename\";s:23:\"export_all_products.csv\";s:4:\"path\";s:10:\"var/export\";s:4:\"host\";s:0:\"\";s:4:\"user\";s:0:\"\";s:8:\"password\";s:0:\"\";s:7:\"passive\";s:0:\"\";}s:5:\"parse\";a:5:{s:4:\"type\";s:3:\"csv\";s:12:\"single_sheet\";s:0:\"\";s:9:\"delimiter\";s:1:\",\";s:7:\"enclose\";s:1:\"\"\";s:10:\"fieldnames\";s:4:\"true\";}s:3:\"map\";a:3:{s:14:\"only_specified\";s:0:\"\";s:7:\"product\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}s:8:\"customer\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}}s:7:\"product\";a:1:{s:6:\"filter\";a:8:{s:4:\"name\";s:0:\"\";s:3:\"sku\";s:0:\"\";s:4:\"type\";s:1:\"0\";s:13:\"attribute_set\";s:0:\"\";s:5:\"price\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:3:\"qty\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:10:\"visibility\";s:1:\"0\";s:6:\"status\";s:1:\"0\";}}s:8:\"customer\";a:1:{s:6:\"filter\";a:10:{s:9:\"firstname\";s:0:\"\";s:8:\"lastname\";s:0:\"\";s:5:\"email\";s:0:\"\";s:5:\"group\";s:1:\"0\";s:10:\"adressType\";s:15:\"default_billing\";s:9:\"telephone\";s:0:\"\";s:8:\"postcode\";s:0:\"\";s:7:\"country\";s:0:\"\";s:6:\"region\";s:0:\"\";s:10:\"created_at\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}}}}', 'export', 'product', 0, 'file'), @@ -10,4 +33,4 @@ (NULL, 'Import Customers', NOW(), NOW(), '\r\n \r\n \r\n true\r\n \r\n customer/convert_adapter_customer\r\n parse\r\n', 'a:5:{s:4:\"file\";a:7:{s:4:\"type\";s:4:\"file\";s:8:\"filename\";s:19:\"export_customer.csv\";s:4:\"path\";s:10:\"var/export\";s:4:\"host\";s:0:\"\";s:4:\"user\";s:0:\"\";s:8:\"password\";s:0:\"\";s:7:\"passive\";s:0:\"\";}s:5:\"parse\";a:5:{s:4:\"type\";s:3:\"csv\";s:12:\"single_sheet\";s:0:\"\";s:9:\"delimiter\";s:1:\",\";s:7:\"enclose\";s:1:\"\"\";s:10:\"fieldnames\";s:4:\"true\";}s:3:\"map\";a:3:{s:14:\"only_specified\";s:0:\"\";s:7:\"product\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}s:8:\"customer\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}}s:7:\"product\";a:1:{s:6:\"filter\";a:8:{s:4:\"name\";s:0:\"\";s:3:\"sku\";s:0:\"\";s:4:\"type\";s:1:\"0\";s:13:\"attribute_set\";s:0:\"\";s:5:\"price\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:3:\"qty\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:10:\"visibility\";s:1:\"0\";s:6:\"status\";s:1:\"0\";}}s:8:\"customer\";a:1:{s:6:\"filter\";a:10:{s:9:\"firstname\";s:0:\"\";s:8:\"lastname\";s:0:\"\";s:5:\"email\";s:0:\"\";s:5:\"group\";s:1:\"0\";s:10:\"adressType\";s:15:\"default_billing\";s:9:\"telephone\";s:0:\"\";s:8:\"postcode\";s:0:\"\";s:7:\"country\";s:0:\"\";s:6:\"region\";s:0:\"\";s:10:\"created_at\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}}}}', 'import', 'customer', 0, 'interactive'); "); -$this->endSetup(); \ No newline at end of file +$this->endSetup(); diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php index cebb37e875..fd5f75c09e 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,4 +77,4 @@ CONSTRAINT `FK_DATAFLOW_BATCH_IMPORT_BATCH` FOREIGN KEY (`batch_id`) REFERENCES `{$installer->getTable('dataflow_batch')}` (`batch_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php index e7af1c78f7..1c032055e7 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_Dataflow - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,4 +30,4 @@ $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('dataflow_batch'), 'params', 'text default NULL AFTER adapter'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php index 77ea4daf24..53b3b5c06c 100644 --- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php +++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function render(Varien_Data_Form_Element_Abstract $element) } return parent::render($element); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php index ba70726bf2..fbd11a5471 100644 --- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Directory_Block_Adminhtml_Frontend_Region_Updater diff --git a/app/code/core/Mage/Directory/Block/Currency.php b/app/code/core/Mage/Directory/Block/Currency.php index 99e0e2adda..dedd936ee8 100644 --- a/app/code/core/Mage/Directory/Block/Currency.php +++ b/app/code/core/Mage/Directory/Block/Currency.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Block/Data.php b/app/code/core/Mage/Directory/Block/Data.php index cc70d18c70..635026f9c3 100644 --- a/app/code/core/Mage/Directory/Block/Data.php +++ b/app/code/core/Mage/Directory/Block/Data.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,18 +53,18 @@ public function getCountryCollection() public function getCountryHtmlSelect($defValue=null, $name='country_id', $id='country', $title='Country') { Varien_Profiler::start('TEST: '.__METHOD__); - if (is_null($defValue)) { - $defValue = $this->getCountryId(); - } - $cacheKey = 'DIRECTORY_COUNTRY_SELECT_STORE_'.Mage::app()->getStore()->getCode(); - if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) { - $options = unserialize($cache); - } else { - $options = $this->getCountryCollection()->toOptionArray(); - if (Mage::app()->useCache('config')) { - Mage::app()->saveCache(serialize($options), $cacheKey, array('config')); - } - } + if (is_null($defValue)) { + $defValue = $this->getCountryId(); + } + $cacheKey = 'DIRECTORY_COUNTRY_SELECT_STORE_'.Mage::app()->getStore()->getCode(); + if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) { + $options = unserialize($cache); + } else { + $options = $this->getCountryCollection()->toOptionArray(); + if (Mage::app()->useCache('config')) { + Mage::app()->saveCache(serialize($options), $cacheKey, array('config')); + } + } $html = $this->getLayout()->createBlock('core/html_select') ->setName($name) ->setId($id) @@ -95,15 +95,15 @@ public function getRegionCollection() public function getRegionHtmlSelect() { Varien_Profiler::start('TEST: '.__METHOD__); - $cacheKey = 'DIRECTORY_REGION_SELECT_STORE'.Mage::app()->getStore()->getId(); - if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) { - $options = unserialize($cache); - } else { - $options = $this->getRegionCollection()->toOptionArray(); - if (Mage::app()->useCache('config')) { - Mage::app()->saveCache(serialize($options), $cacheKey, array('config')); - } - } + $cacheKey = 'DIRECTORY_REGION_SELECT_STORE'.Mage::app()->getStore()->getId(); + if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) { + $options = unserialize($cache); + } else { + $options = $this->getRegionCollection()->toOptionArray(); + if (Mage::app()->useCache('config')) { + Mage::app()->saveCache(serialize($options), $cacheKey, array('config')); + } + } $html = $this->getLayout()->createBlock('core/html_select') ->setName('region') ->setTitle(Mage::helper('directory')->__('State/Province')) @@ -128,28 +128,28 @@ public function getCountryId() public function getRegionsJs() { Varien_Profiler::start('TEST: '.__METHOD__); - $regionsJs = $this->getData('regions_js'); - if (!$regionsJs) { - $countryIds = array(); - foreach ($this->getCountryCollection() as $country) { - $countryIds[] = $country->getCountryId(); - } - $collection = Mage::getModel('directory/region')->getResourceCollection() - ->addCountryFilter($countryIds) - ->load(); - $regions = array(); - foreach ($collection as $region) { - if (!$region->getRegionId()) { - continue; - } - $regions[$region->getCountryId()][$region->getRegionId()] = array( - 'code'=>$region->getCode(), - 'name'=>$region->getName() - ); - } - $regionsJs = Mage::helper('core')->jsonEncode($regions); - } - Varien_Profiler::stop('TEST: '.__METHOD__); - return $regionsJs; + $regionsJs = $this->getData('regions_js'); + if (!$regionsJs) { + $countryIds = array(); + foreach ($this->getCountryCollection() as $country) { + $countryIds[] = $country->getCountryId(); + } + $collection = Mage::getModel('directory/region')->getResourceCollection() + ->addCountryFilter($countryIds) + ->load(); + $regions = array(); + foreach ($collection as $region) { + if (!$region->getRegionId()) { + continue; + } + $regions[$region->getCountryId()][$region->getRegionId()] = array( + 'code'=>$region->getCode(), + 'name'=>$region->getName() + ); + } + $regionsJs = Mage::helper('core')->jsonEncode($regions); + } + Varien_Profiler::stop('TEST: '.__METHOD__); + return $regionsJs; } } diff --git a/app/code/core/Mage/Directory/Exception.php b/app/code/core/Mage/Directory/Exception.php index 285bdf0394..a14e660c0f 100644 --- a/app/code/core/Mage/Directory/Exception.php +++ b/app/code/core/Mage/Directory/Exception.php @@ -18,13 +18,13 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Directory_Exception extends Mage_Core_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php index 20f5b48d41..c06df2977e 100644 --- a/app/code/core/Mage/Directory/Helper/Data.php +++ b/app/code/core/Mage/Directory/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,41 +64,41 @@ public function getCountryCollection() public function getRegionJson() { - Varien_Profiler::start('TEST: '.__METHOD__); - if (!$this->_regionJson) { - $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE'.Mage::app()->getStore()->getId(); - if (Mage::app()->useCache('config')) { - $json = Mage::app()->loadCache($cacheKey); - } - if (empty($json)) { - $countryIds = array(); - foreach ($this->getCountryCollection() as $country) { - $countryIds[] = $country->getCountryId(); - } - $collection = Mage::getModel('directory/region')->getResourceCollection() - ->addCountryFilter($countryIds) - ->load(); - $regions = array(); - foreach ($collection as $region) { - if (!$region->getRegionId()) { - continue; - } - $regions[$region->getCountryId()][$region->getRegionId()] = array( - 'code'=>$region->getCode(), - 'name'=>$region->getName() - ); - } - $json = Mage::helper('core')->jsonEncode($regions); + Varien_Profiler::start('TEST: '.__METHOD__); + if (!$this->_regionJson) { + $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE'.Mage::app()->getStore()->getId(); + if (Mage::app()->useCache('config')) { + $json = Mage::app()->loadCache($cacheKey); + } + if (empty($json)) { + $countryIds = array(); + foreach ($this->getCountryCollection() as $country) { + $countryIds[] = $country->getCountryId(); + } + $collection = Mage::getModel('directory/region')->getResourceCollection() + ->addCountryFilter($countryIds) + ->load(); + $regions = array(); + foreach ($collection as $region) { + if (!$region->getRegionId()) { + continue; + } + $regions[$region->getCountryId()][$region->getRegionId()] = array( + 'code'=>$region->getCode(), + 'name'=>$region->getName() + ); + } + $json = Mage::helper('core')->jsonEncode($regions); - if (Mage::app()->useCache('config')) { - Mage::app()->saveCache($json, $cacheKey, array('config')); + if (Mage::app()->useCache('config')) { + Mage::app()->saveCache($json, $cacheKey, array('config')); } - } - $this->_regionJson = $json; - } + } + $this->_regionJson = $json; + } - Varien_Profiler::stop('TEST: '.__METHOD__); - return $this->_regionJson; + Varien_Profiler::stop('TEST: '.__METHOD__); + return $this->_regionJson; } public function currencyConvert($amount, $from, $to=null) diff --git a/app/code/core/Mage/Directory/Helper/Url.php b/app/code/core/Mage/Directory/Helper/Url.php index dd1460acf7..0c783546c9 100644 --- a/app/code/core/Mage/Directory/Helper/Url.php +++ b/app/code/core/Mage/Directory/Helper/Url.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Country.php b/app/code/core/Mage/Directory/Model/Country.php index 048340caad..ff95bbcf37 100644 --- a/app/code/core/Mage/Directory/Model/Country.php +++ b/app/code/core/Mage/Directory/Model/Country.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -151,4 +151,4 @@ public function getName() return $this->getData('name'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Directory/Model/Country/Api.php b/app/code/core/Mage/Directory/Model/Country/Api.php index b431a02742..d448aeb161 100644 --- a/app/code/core/Mage/Directory/Model/Country/Api.php +++ b/app/code/core/Mage/Directory/Model/Country/Api.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,4 +51,4 @@ public function items() return $result; } -} // Class Mage_Directory_Model_Country_Api End \ No newline at end of file +} // Class Mage_Directory_Model_Country_Api End diff --git a/app/code/core/Mage/Directory/Model/Country/Api/V2.php b/app/code/core/Mage/Directory/Model/Country/Api/V2.php index 7e81432ca6..150377ee3c 100644 --- a/app/code/core/Mage/Directory/Model/Country/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Country/Api/V2.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Directory_Model_Country_Api_V2 extends Mage_Directory_Model_Country_Api { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Directory/Model/Country/Format.php b/app/code/core/Mage/Directory/Model/Country/Format.php index 433cbf6076..65c1aff148 100644 --- a/app/code/core/Mage/Directory/Model/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Country/Format.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Currency.php b/app/code/core/Mage/Directory/Model/Currency.php index cb8714f201..c83f59a9e2 100644 --- a/app/code/core/Mage/Directory/Model/Currency.php +++ b/app/code/core/Mage/Directory/Model/Currency.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -128,8 +128,8 @@ public function getRate($toCurrency) } return $rates[$code]; } - - /** + + /** * Get currency rate (base=>allowed or allowed=>base) * * @param string $toCurrency @@ -302,4 +302,4 @@ public function saveRates($rates) $this->_getResource()->saveRates($rates); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Directory/Model/Currency/Filter.php b/app/code/core/Mage/Directory/Model/Currency/Filter.php index dd0dc901ec..da992a4009 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Filter.php +++ b/app/code/core/Mage/Directory/Model/Currency/Filter.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php index a926815b46..ad2e6c254d 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,7 +69,7 @@ abstract protected function _convert($currencyFrom, $currencyTo); protected function _saveRates($rates) { foreach ($rates as $currencyCode => $currencyRates) { - Mage::getModel('directory/currency') + Mage::getModel('directory/currency') ->setId($currencyCode) ->setRates($currencyRates) ->save(); @@ -100,15 +100,15 @@ public function fetchRates() $data[$currencyFrom] = array(); } - foreach ($currencies as $currencyTo) { - if ($currencyFrom == $currencyTo) { - $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1); - } - else { - $data[$currencyFrom][$currencyTo] = $this->_numberFormat($this->_convert($currencyFrom, $currencyTo)); - } - } - ksort($data[$currencyFrom]); + foreach ($currencies as $currencyTo) { + if ($currencyFrom == $currencyTo) { + $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1); + } + else { + $data[$currencyFrom][$currencyTo] = $this->_numberFormat($this->_convert($currencyFrom, $currencyTo)); + } + } + ksort($data[$currencyFrom]); } return $data; diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php index b5ed10a963..aad48557f9 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country.php b/app/code/core/Mage/Directory/Model/Mysql4/Country.php index 840d0efe15..52ea430a41 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php index 2d3cd545f7..b83e14b5f5 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php index 6dfedbfe78..c4ade781fc 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php index 5c7f091071..cbe843f0b1 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php index bd07677ff4..5b55d9796b 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -93,8 +93,8 @@ public function getRate($currencyFrom, $currencyTo) return self::$_rateCache[$currencyFrom][$currencyTo]; } - - /** + + /** * Retrieve currency rate (base=>allowed or allowed=>base) * * @param string $currencyFrom @@ -126,7 +126,7 @@ public function getAnyRate($currencyFrom, $currencyTo) self::$_rateCache[$currencyFrom][$currencyTo] = $read->fetchOne($select); } - + return self::$_rateCache[$currencyFrom][$currencyTo]; } diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php index cc451946bc..2068fbb5de 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region.php b/app/code/core/Mage/Directory/Model/Mysql4/Region.php index 3bd8d1dde9..201fa95475 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Region.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Region.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php index 3eab19d4af..fd1d8c77f8 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Observer.php b/app/code/core/Mage/Directory/Model/Observer.php index 6f00cb7b61..b00134b838 100644 --- a/app/code/core/Mage/Directory/Model/Observer.php +++ b/app/code/core/Mage/Directory/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,7 +62,7 @@ public function scheduledUpdateCurrencyRates($schedule) if( sizeof($errors) > 0 ) { foreach ($errors as $error) { - $importWarnings[] = Mage::helper('directory')->__('WARNING:') . ' ' . $error; + $importWarnings[] = Mage::helper('directory')->__('WARNING:') . ' ' . $error; } } @@ -91,4 +91,4 @@ public function scheduledUpdateCurrencyRates($schedule) $translate->setTranslateInline(true); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Directory/Model/Region.php b/app/code/core/Mage/Directory/Model/Region.php index 6c6d91d255..5ea0f8cdba 100644 --- a/app/code/core/Mage/Directory/Model/Region.php +++ b/app/code/core/Mage/Directory/Model/Region.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Region/Api.php b/app/code/core/Mage/Directory/Model/Region/Api.php index 7e89c1991a..848b59229d 100644 --- a/app/code/core/Mage/Directory/Model/Region/Api.php +++ b/app/code/core/Mage/Directory/Model/Region/Api.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -59,4 +59,4 @@ public function items($country) return $result; } -} // Class Mage_Directory_Model_Region_Api End \ No newline at end of file +} // Class Mage_Directory_Model_Region_Api End diff --git a/app/code/core/Mage/Directory/Model/Region/Api/V2.php b/app/code/core/Mage/Directory/Model/Region/Api/V2.php index 4696f7ae67..ac873481bb 100644 --- a/app/code/core/Mage/Directory/Model/Region/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Region/Api/V2.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_Directory_Model_Region_Api_V2 extends Mage_Directory_Model_Region_Api { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Directory/controllers/CurrencyController.php b/app/code/core/Mage/Directory/controllers/CurrencyController.php index d6f573463d..432a1bbbea 100644 --- a/app/code/core/Mage/Directory/controllers/CurrencyController.php +++ b/app/code/core/Mage/Directory/controllers/CurrencyController.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,11 +38,6 @@ public function switchAction() if ($curency = (string) $this->getRequest()->getParam('currency')) { Mage::app()->getStore()->setCurrentCurrencyCode($curency); } - if (Mage::getSingleton('checkout/session')->getQuote()) { - Mage::getSingleton('checkout/session')->getQuote() - ->collectTotals() - ->save(); - } $this->_redirectReferer(Mage::getBaseUrl()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Directory/etc/api.xml b/app/code/core/Mage/Directory/etc/api.xml index 2f06f91f8a..0eb939c9ec 100644 --- a/app/code/core/Mage/Directory/etc/api.xml +++ b/app/code/core/Mage/Directory/etc/api.xml @@ -21,8 +21,8 @@ * * @category Mage * @package Mage_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -82,4 +82,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml index 339b4416d8..8b7396b933 100644 --- a/app/code/core/Mage/Directory/etc/config.xml +++ b/app/code/core/Mage/Directory/etc/config.xml @@ -19,16 +19,16 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 0.8.5 + 0.8.7 diff --git a/app/code/core/Mage/Directory/etc/system.xml b/app/code/core/Mage/Directory/etc/system.xml index bb0b0cb5ad..176a4f85be 100644 --- a/app/code/core/Mage/Directory/etc/system.xml +++ b/app/code/core/Mage/Directory/etc/system.xml @@ -1,23 +1,29 @@ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php index 640b7bb6e2..59fe48d421 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php index 0e7f85ce4d..fef123648a 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -277,4 +277,4 @@ ('EUR', 'EUR', 1.000000000000),('EUR', 'USD', 1.415000000000), ('USD', 'EUR', 0.706700000000),('USD', 'USD', 1.000000000000); "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php index 3bf5374fd7..0874804133 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php index 53e64278fe..46c82f8870 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php index 9702f7d0a2..004fc2a981 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php index 5db208e2ce..ba7de18916 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php index d6695fece5..5ca9296e2d 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php index bf83948be7..a250256667 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php index 95fec9c964..ff93cc2f40 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index c74d21e845..c966ecb608 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index a015e936d7..240220334b 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php index d990998445..a896639ea0 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php index eeba7a3671..97eac571ec 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,4 +53,4 @@ public function getLinksTitle() return Mage::getStoreConfig(Mage_Downloadable_Model_Link::XML_PATH_LINKS_TITLE); } } -?> \ No newline at end of file +?> diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php index 6a095f8763..7fd8061515 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php index 95524f67a7..7d5ef1662e 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php index c5b93f92d4..babc4219b1 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php index e3c5eef04e..644db79cb1 100644 --- a/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,4 +67,4 @@ public function getLinksTitle() return Mage::getStoreConfig(Mage_Downloadable_Model_Link::XML_PATH_LINKS_TITLE); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php index e83cc362bd..05efa6f9e2 100644 --- a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php +++ b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function getDownloadableProductsUrl() { return $this->getUrl('downloadable/customer/products', array('_secure' => true)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php index 83fd10c222..ed2bd7ff43 100644 --- a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php +++ b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php index b7a000ae32..45c4b8771b 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,4 +69,4 @@ public function getPurchasedLinkUrl($item) '_nosid' => true )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php index 3809286e80..836aa343c9 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,4 +69,4 @@ public function getPurchasedLinkUrl($item) '_nosid' => true )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php index b9d5c69199..40637de665 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,4 +59,4 @@ public function getLinksTitle() return Mage::getStoreConfig(Mage_Downloadable_Model_Link::XML_PATH_LINKS_TITLE); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Helper/Data.php b/app/code/core/Mage/Downloadable/Helper/Data.php index ca30d221e3..997852314c 100644 --- a/app/code/core/Mage/Downloadable/Helper/Data.php +++ b/app/code/core/Mage/Downloadable/Helper/Data.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Helper/Download.php b/app/code/core/Mage/Downloadable/Helper/Download.php index e1082334e2..d8ae34ef47 100644 --- a/app/code/core/Mage/Downloadable/Helper/Download.php +++ b/app/code/core/Mage/Downloadable/Helper/Download.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Helper/File.php b/app/code/core/Mage/Downloadable/Helper/File.php index 56011856c7..f826925f1c 100644 --- a/app/code/core/Mage/Downloadable/Helper/File.php +++ b/app/code/core/Mage/Downloadable/Helper/File.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php index 9b8d956042..791d9c854d 100644 --- a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link.php b/app/code/core/Mage/Downloadable/Model/Link.php index f48ceb532e..ea8599d3e7 100644 --- a/app/code/core/Mage/Downloadable/Model/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Link.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php index 94cce588b2..9f454bc571 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,4 +43,4 @@ protected function _construct() parent::_construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php index 2eb25cb3cd..f696d9e143 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,4 +50,4 @@ protected function _construct() parent::_construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php index 551ab26cb7..9be6e46ead 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php index b3c975cecc..d744cc61bb 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php index d2d2424f95..8287918934 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ protected function _construct() $this->_init('downloadable/link_purchased', 'purchased_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php index d995fdbaad..61b4359574 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,4 +50,4 @@ public function addPurchasedItemsToResult() '`purchased_items`.purchased_id=`main_table`.purchased_id'); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php index 2455dbb5af..27b7924408 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ protected function _construct() $this->_init('downloadable/link_purchased_item', 'item_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php index e16bdedaaf..679834cc15 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,4 +43,4 @@ protected function _construct() $this->_init('downloadable/link_purchased_item'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php index 525f43b76e..0628065c5d 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php index 684df4f560..dfde419768 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Observer.php b/app/code/core/Mage/Downloadable/Model/Observer.php index 9d11ce4e02..865079160a 100644 --- a/app/code/core/Mage/Downloadable/Model/Observer.php +++ b/app/code/core/Mage/Downloadable/Model/Observer.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Product/Price.php b/app/code/core/Mage/Downloadable/Model/Product/Price.php index 6e5fa18d97..6ecb5be455 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Price.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Price.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php index 39fe36f079..486a534c42 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Type.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -374,6 +374,13 @@ public function beforeSave($product = null) } } } + + /* + * After "Downloadable Information" tab was made non-ajax we should + * set this flag "true" to force saving of 'required_options' attribute + */ + $this->getProduct($product)->setCanSaveCustomOptions(true); + $this->getProduct($product)->setLinksExist($linksExist); } diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php index 90ddfeacf9..a3769a52a8 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php index 23dd80963a..e8b2c9c582 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php index b73e13198a..596a1d1cfc 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php @@ -18,10 +18,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sample.php b/app/code/core/Mage/Downloadable/Model/Sample.php index d50ce88bbb..e0e17a48d1 100644 --- a/app/code/core/Mage/Downloadable/Model/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Sample.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php index 4ccf9aaa6e..99fe0edd41 100644 --- a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php +++ b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php @@ -1,50 +1,50 @@ - - */ -class Mage_Downloadable_Model_System_Config_Source_Contentdisposition -{ - public function toOptionArray() - { - return array( - array( - 'value' => 'attachment', - 'label' => Mage::helper('downloadable')->__('attachment') - ), - array( - 'value' => 'inline', - 'label' => Mage::helper('downloadable')->__('inline') - ) - ); - } -} - + + */ +class Mage_Downloadable_Model_System_Config_Source_Contentdisposition +{ + public function toOptionArray() + { + return array( + array( + 'value' => 'attachment', + 'label' => Mage::helper('downloadable')->__('attachment') + ), + array( + 'value' => 'inline', + 'label' => Mage::helper('downloadable')->__('inline') + ) + ); + } +} + diff --git a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php index 7e1f44d5c7..67c3eda1e0 100644 --- a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php +++ b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/CustomerController.php b/app/code/core/Mage/Downloadable/controllers/CustomerController.php index 63289406bc..9c0d8ff62d 100644 --- a/app/code/core/Mage/Downloadable/controllers/CustomerController.php +++ b/app/code/core/Mage/Downloadable/controllers/CustomerController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/DownloadController.php b/app/code/core/Mage/Downloadable/controllers/DownloadController.php index da5204a601..7b93f1b0ae 100644 --- a/app/code/core/Mage/Downloadable/controllers/DownloadController.php +++ b/app/code/core/Mage/Downloadable/controllers/DownloadController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/FileController.php b/app/code/core/Mage/Downloadable/controllers/FileController.php index faf0a6085d..495518c481 100644 --- a/app/code/core/Mage/Downloadable/controllers/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/FileController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php index 9170741552..68c52aab6e 100644 --- a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php +++ b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/etc/config.xml b/app/code/core/Mage/Downloadable/etc/config.xml index cfce6421fa..777697868e 100644 --- a/app/code/core/Mage/Downloadable/etc/config.xml +++ b/app/code/core/Mage/Downloadable/etc/config.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/system.xml b/app/code/core/Mage/Downloadable/etc/system.xml index ffd0f0dbad..85a457ff8d 100644 --- a/app/code/core/Mage/Downloadable/etc/system.xml +++ b/app/code/core/Mage/Downloadable/etc/system.xml @@ -21,7 +21,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php index 586a691c90..955322a54c 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php index 4105ff3b9f..f1032f9463 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php index 2c8d71a136..58231e1f10 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php index 39a4ed774a..ad43746b91 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php index cca2a9dfac..7052a26d8b 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php index 588f6d87a8..f759efbae2 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php index dd547caf2f..846457a75d 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php index eb22389552..fa133af509 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php index a936d08a29..a3068f464e 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php index 54734960f3..1eb67c3a67 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php index 156223eba5..5a09b60604 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php index 6d8da15dee..12e1c034a9 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php index 3354f1d87e..75147cc052 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php index 64b33be879..14d67203e2 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php index 560dc747ff..1953f5d98c 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Exception.php b/app/code/core/Mage/Eav/Exception.php index 959e229b2d..92253aba09 100644 --- a/app/code/core/Mage/Eav/Exception.php +++ b/app/code/core/Mage/Eav/Exception.php @@ -18,13 +18,13 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Eav_Exception extends Mage_Core_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Helper/Data.php b/app/code/core/Mage/Eav/Helper/Data.php index 7d810148b9..d166d909b3 100644 --- a/app/code/core/Mage/Eav/Helper/Data.php +++ b/app/code/core/Mage/Eav/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php index 29bd286177..638a7d961d 100644 --- a/app/code/core/Mage/Eav/Model/Config.php +++ b/app/code/core/Mage/Eav/Model/Config.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -427,12 +427,15 @@ public function getAttribute($entityType, $code) } $attributeKey = $this->_getAttributeKey($entityTypeCode, $attribute->getAttributeCode()); } else { - $attribute = Mage::getModel($entityType->getAttributeModel())->loadByCode($entityType, $code); + $attribute = Mage::getModel($entityType->getAttributeModel()) + ->loadByCode($entityType, $code) + ->setAttributeCode($code); } } if ($attribute) { - $attribute->setEntityType($entityType); + $attribute->setEntityType($entityType) + ->setEntityTypeId($entityType->getId()); $this->_addAttributeReference($attribute->getId(), $attribute->getAttributeCode(), $entityTypeCode); $this->_save($attribute, $attributeKey); } diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php index f8a9c96126..d6484732ab 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php index 3ffb2004c6..6cf8166f6e 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -84,4 +84,4 @@ public function save() } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php index 0b8585f48b..a43100a983 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +55,7 @@ public function getStoreIds($stores) public function getStoreCode($storeId) { - return Mage::app()->getStore($storeId?$storeId:0)->getCode(); + return Mage::app()->getStore($storeId?$storeId:0)->getCode(); } public function loadAttributeSets($entityTypeId) @@ -98,4 +98,4 @@ public function getSourceOptionId(Mage_Eav_Model_Entity_Attribute_Source_Interfa } return null; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity.php b/app/code/core/Mage/Eav/Model/Entity.php index 00b41248e8..1b421051fe 100644 --- a/app/code/core/Mage/Eav/Model/Entity.php +++ b/app/code/core/Mage/Eav/Model/Entity.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php index 366358a26c..4d0b48e228 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php index da6bc61177..0fa1231ae1 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php index f429f4ef2d..0bb782f1f1 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -483,8 +483,8 @@ public function getBackendTable() if ($this->_dataTable === null) { if ($this->isStatic()) { $this->_dataTable = $this->getEntityType()->getValueTablePrefix(); - } elseif ($this->_getData('backend_table')) { - $this->_dataTable = $this->_getData('backend_table'); + } elseif ($backendTable = trim($this->_getData('backend_table'))) { + $this->_dataTable = $backendTable; } else { $this->_dataTable = $this->getEntity()->getValueTablePrefix().'_'.$this->getBackendType(); } diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php index a617392838..a05e50496e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php index 54f6169a31..5363318d43 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php index c3e54141a0..2a9b1397f4 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Eav_Model_Entity_Attribute_Backend_Datetime extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php index d9bb5db7a1..bcc21a1cac 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,4 +34,4 @@ class Mage_Eav_Model_Entity_Attribute_Backend_Default extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php index 0d2efeb11d..ca6cb94701 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function beforeSave($object) $this->getAttribute()->getEntity()->setNewIncrementId($object); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php index bb09370ffb..4272fa62e1 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function beforeSave($object); public function afterSave($object); public function beforeDelete($object); public function afterDelete($object); -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php index cac891506d..b5aea37680 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ protected function _beforeSave($object) $object->setData($this->getAttribute()->getAttributeCode(), Mage::app()->getStore()->getId()); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php index 39ad33c7fd..b9c39f2fa2 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function beforeSave($object) $object->setData($this->getAttribute()->getAttributeCode(), now()); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php index a8cda47f20..8f87f55985 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ public function beforeSave($object) { $object->setData($this->getAttribute()->getAttributeCode(), now()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php index ca27b4dc65..1fd040e573 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,4 +91,4 @@ public function getPart() { return $this->_part; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php index c206591980..b3e6b97408 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php index 80f6eed9df..e0265ff57e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php index d6188b439c..a6d9a6fbd7 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php @@ -18,14 +18,14 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Eav_Model_Entity_Attribute_Frontend_Default extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php index 4e1e354386..64cba0406d 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ interface Mage_Eav_Model_Entity_Attribute_Frontend_Interface { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php index b68451e107..d78e8242cd 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,6 +32,11 @@ protected function _construct() $this->_init('eav/entity_attribute_group'); } + /** + * Checks if current attribute group exists + * + * @return boolean + */ public function itemExists() { return $this->_getResource()->itemExists($this); @@ -41,4 +46,4 @@ public function deleteGroups() { return $this->_getResource()->deleteGroups($this); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php index 6f8009f4e1..4b01d6e359 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php @@ -18,14 +18,14 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ interface Mage_Eav_Model_Entity_Attribute_Interface { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php index d6e8538320..20a93314e1 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php index 2b0682a0ad..6dc6b64c44 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -94,6 +94,15 @@ public function organizeData($data) { $modelGroupArray = array(); $modelAttributeArray = array(); + $attributeIds = array(); + if ($data['attributes']) { + $ids = array(); + foreach ($data['attributes'] as $attribute) { + $ids[] = $attribute[0]; + } + $attributeIds = Mage::getResourceSingleton('eav/entity_attribute') + ->getValidAttributeIds($ids); + } if( $data['groups'] ) { foreach( $data['groups'] as $group ) { $modelGroup = Mage::getModel('eav/entity_attribute_group'); @@ -104,7 +113,7 @@ public function organizeData($data) if( $data['attributes'] ) { foreach( $data['attributes'] as $attribute ) { - if( $attribute[1] == $group[0] ) { + if( $attribute[1] == $group[0] && in_array($attribute[0], $attributeIds) ) { $modelAttribute = Mage::getModel('eav/entity_attribute'); $modelAttribute->setId($attribute[0]) ->setAttributeGroupId($attribute[1]) diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php index 366e9540ef..7285b2f519 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -142,4 +142,4 @@ public function getFlatUpdateSelect($store) { return null; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php index f676ff80fc..4cc3869c1f 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php index ad9f3048a0..63546cd481 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php index a82956b745..0395cddbb5 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,4 +47,4 @@ public function getAllOptions(); * @return mixed */ public function getOptionText($value); -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php index 5282146fe4..9171ad393f 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php index ab7a60ec3e..864153e94e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -207,4 +207,4 @@ public function getFlatUpdateSelect($store) return Mage::getResourceModel('eav/entity_attribute_option') ->getFlatUpdateSelect($this->getAttribute(), $store); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection.php b/app/code/core/Mage/Eav/Model/Entity/Collection.php index b138174022..26fccfed68 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Collection.php +++ b/app/code/core/Mage/Eav/Model/Entity/Collection.php @@ -1,37 +1,37 @@ -getConnection('customeralert_type')); - - #$this->setConnection(Mage::getSingleton('core/resource')->getConnection('core_read')); - } -} \ No newline at end of file +getConnection('customeralert_type')); + + #$this->setConnection(Mage::getSingleton('core/resource')->getConnection('core_read')); + } +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php index 3ad7d268d3..cdf387af51 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -989,7 +989,7 @@ public function _loadAttributes($printQuery = false, $logQuery = false) foreach ($this->_selectAttributes as $attributeCode => $attributeId) { $attribute = Mage::getSingleton('eav/config')->getCollectionAttribute($entity->getType(), $attributeCode); if ($attribute && !$attribute->isStatic()) { - $tableAttributes[$attribute->getBackendTable()][] = $attributeId; + $tableAttributes[$attribute->getBackendTable()][] = $attributeId; } } @@ -1020,7 +1020,7 @@ public function _loadAttributes($printQuery = false, $logQuery = false) protected function _getLoadAttributesSelect($table, $attributeIds=array()) { if (empty($attributeIds)) { - $attributeIds = $this->_selectAttributes; + $attributeIds = $this->_selectAttributes; } $entityIdField = $this->getEntity()->getEntityIdField(); $select = $this->getConnection()->select() diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php index b437af87a2..d236460151 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,4 +68,4 @@ public function frontendFormat($id) $result = $id; return $result; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php index 75fe5678f3..ac8bab5a7f 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php index 9788d32196..ac80f2eab3 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php @@ -18,14 +18,14 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ interface Mage_Eav_Model_Entity_Increment_Interface { public function getNextId(); -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php index 419091d929..ee535d3fb9 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,4 +51,4 @@ public function getNextId() return $this->format($next); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Interface.php index 0f39227f77..bcb40c7158 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Interface.php @@ -18,14 +18,14 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ interface Mage_Eav_Model_Entity_Interface { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php index 206cec2313..4dc95a1dfc 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Setup.php +++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -458,6 +458,11 @@ public function getAttributeGroupId($entityTypeId, $setId, $groupId) if (!is_numeric($groupId)) { $groupId = $this->getAttributeGroup($entityTypeId, $setId, $groupId, 'attribute_group_id'); } + + if (!is_numeric($groupId)) { + $groupId = $this->getDefaultAttributeGroupId($entityTypeId, $setId); + } + if (!is_numeric($groupId)) { throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('Wrong attribute group ID')); } @@ -764,42 +769,40 @@ protected function _updateAttributeAdditionalData($entityTypeId, $id, $field, $v * @param string $field * @return mixed */ - public function getAttribute($entityTypeId, $id, $field=null) + public function getAttribute($entityTypeId, $id, $field = null) { - $joinTable = $this->getEntityType($entityTypeId, 'additional_attribute_table'); - if (!$joinTable) { - return $this->getTableRow('eav/attribute', - is_numeric($id) ? 'attribute_id' : 'attribute_code', $id, - $field, - 'entity_type_id', $this->getEntityTypeId($entityTypeId) - ); + $additionalTable = $this->getEntityType($entityTypeId, 'additional_attribute_table'); + $entityTypeId = $this->getEntityTypeId($entityTypeId); + $idField = (is_numeric($id) ? 'attribute_id' : 'attribute_code'); + if (!$additionalTable) { + return $this->getTableRow('eav/attribute', $idField, $id, $field, 'entity_type_id', $entityTypeId); } - $mainTable = $this->getTable('eav/attribute'); - $joinTable = $this->getTable($joinTable); - $parentId = $this->getEntityTypeId($entityTypeId); - $idField = (is_numeric($id) ? 'attribute_id' : 'attribute_code'); - $table = $mainTable . '-' . $joinTable; - if (empty($this->_setupCache[$table][$parentId][$id])) { - $sql = "select - $mainTable.*, - $joinTable.* - from - $mainTable - inner join $joinTable on $joinTable.attribute_id=$mainTable.attribute_id - where - $mainTable.$idField = :idField - and $mainTable.entity_type_id = :parentId"; - $bind = array( - 'idField' => $id, - 'parentId' => $parentId - ); - $this->_setupCache[$mainTable][$parentId][$id] = $this->_conn->fetchRow($sql, $bind); - $this->_conn->fetchAll($sql, $bind); + + $mainTable = $this->getTable('eav/attribute'); + if (empty($this->_setupCache[$mainTable][$entityTypeId][$id])) { + $additionalTable = $this->getTable($additionalTable); + $select = $this->_conn->select() + ->from(array('main' => $mainTable)) + ->join( + array('additional' => $additionalTable), + 'main.attribute_id=additional.attribute_id') + ->where("main.{$idField}=?", $id) + ->where("main.entity_type_id=?", $entityTypeId); + $row = $this->_conn->fetchRow($select); + + if (!$row) { + $this->_setupCache[$mainTable][$entityTypeId][$id] = false; + } else { + $this->_setupCache[$mainTable][$entityTypeId][$row['attribute_id']] = $row; + $this->_setupCache[$mainTable][$entityTypeId][$row['attribute_code']] = $row; + } } - if (is_null($field)) { - return $this->_setupCache[$mainTable][$parentId][$id]; + + $row = $this->_setupCache[$mainTable][$entityTypeId][$id]; + if (!is_null($field)) { + return isset($row[$field]) ? $row[$field] : false; } - return isset($this->_setupCache[$mainTable][$parentId][$id][$field]) ? $this->_setupCache[$mainTable][$parentId][$id][$field] : false; + return $row; } /** @@ -864,17 +867,12 @@ public function getAttributeTable($entityTypeId, $id) */ public function removeAttribute($entityTypeId, $code) { - $attributeId = $this->getAttributeId($entityTypeId, $code); - $additionalTable = $this->getEntityType($entityTypeId, 'additional_attribute_table'); - if ($attributeId) { - $this->deleteTableRow('eav/attribute', 'attribute_id', $attributeId); - if ($additionalTable) { - $additionalTable = $this->getTable($additionalTable); - $condition = $this->_conn->quoteInto("attribute_id=?", $attributeId); - $this->_conn->delete($additionalTable, $condition); - if (isset($this->_setupCache[$table.'-'.$additionalTable][0][$attributeId])) { - unset($this->_setupCache[$table][0][$attributeId]); - } + $mainTable = $this->getTable('eav/attribute'); + $attribute = $this->getAttribute($entityTypeId, $code); + if ($attribute) { + $this->deleteTableRow('eav/attribute', 'attribute_id', $attribute['attribute_id']); + if (isset($this->_setupCache[$mainTable][$attribute['entity_type_id']][$attribute['attribute_code']])) { + unset($this->_setupCache[$mainTable][$attribute['entity_type_id']][$attribute['attribute_code']]); } } return $this; diff --git a/app/code/core/Mage/Eav/Model/Entity/Store.php b/app/code/core/Mage/Eav/Model/Entity/Store.php index cdfd5d298c..142b53a313 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Store.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function loadByEntityStore($entityTypeId, $storeId) $this->_getResource()->loadByEntityStore($this, $entityTypeId, $storeId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php index 7d085c82b7..bca739b455 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Entity/Type.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Config.php b/app/code/core/Mage/Eav/Model/Mysql4/Config.php index 932e7436ff..cba3bf2d38 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Config.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Config.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,8 +51,8 @@ protected function _loadTypes() $select = $this->_getReadAdapter()->select()->from($this->getMainTable()); $data = $this->_getReadAdapter()->fetchAll($select); foreach ($data as $row) { - self::$_entityTypes['by_id'][$row['entity_type_id']] = $row; - self::$_entityTypes['by_code'][$row['entity_type_code']] = $row; + self::$_entityTypes['by_id'][$row['entity_type_id']] = $row; + self::$_entityTypes['by_code'][$row['entity_type_code']] = $row; } } @@ -86,10 +86,10 @@ public function fetchEntityTypeData($entityType) $attributes = $this->_loadTypeAttributes($info['entity_type_id']); $data['attributes'] = array(); foreach ($attributes as $attribute) { - $data['attributes'][$attribute['attribute_id']] = $attribute; - $data['attributes'][$attribute['attribute_code']] = $attribute['attribute_id']; + $data['attributes'][$attribute['attribute_id']] = $attribute; + $data['attributes'][$attribute['attribute_code']] = $attribute['attribute_id']; } } return $data; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php index f26893fe22..3671b94c7e 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -532,4 +532,18 @@ public function getStoreLabelsByAttributeId($attributeId) } return $values; } + + /** + * Load by given attributes ids and return only exist attribute ids + * + * @param array $attributeIds + * @return array + */ + public function getValidAttributeIds($attributeIds) + { + $select = $this->_getReadAdapter()->select() + ->from($this->getMainTable(), array('attribute_id')) + ->where('attribute_id in (?)', $attributeIds); + return $this->_getReadAdapter()->fetchCol($select); + } } diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php index 69007a41d7..14dfdb638f 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -283,7 +283,7 @@ protected function _addSetInfo() if ($this->_addSetInfoFlag) { $attributeIds = array(); foreach ($this->_data as &$dataItem) { - $attributeIds[] = $dataItem['attribute_id']; + $attributeIds[] = $dataItem['attribute_id']; } $attributeToSetInfo = array(); @@ -354,10 +354,10 @@ public function checkConfigurableProducts() public function setCodeFilter($code) { if (empty($code)) { - return $this; + return $this; } if (!is_array($code)) { - $code = array($code); + $code = array($code); } $this->getSelect()->where('main_table.attribute_code IN(?)', $code); return $this; diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php index e4e651c825..7e8d0ae0a4 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,16 +32,22 @@ protected function _construct() $this->_init('eav/attribute_group', 'attribute_group_id'); } + /** + * Checks if attribute group exists + * + * @param Mage_Eav_Model_Entity_Attribute_Group $object + * @return boolean + */ public function itemExists($object) { - $read = $this->_getReadAdapter(); - $select = $read->select()->from($this->getMainTable()) - ->where("attribute_group_name='{$object->getAttributeGroupName()}'"); - $data = $read->fetchRow($select); - if (!$data) { - return false; + $select = $this->_getReadAdapter()->select() + ->from($this->getMainTable()) + ->where('attribute_set_id = ?', $object->getAttributeSetId()) + ->where('attribute_group_name = ?', $object->getAttributeGroupName()); + if ($this->_getReadAdapter()->fetchRow($select)) { + return true; } - return true; + return false; } /** @@ -97,4 +103,4 @@ public function updateDefaultGroup($attributeSetId) ); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php index 44371972b8..8ee97a2c92 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,4 +48,4 @@ public function setAttributeSetFilter($setId) $this->getSelect()->order('main_table.sort_order'); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php index 33a6b6082a..ea983c5d05 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php index 1bcf827de9..b73e1aa02e 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php index 54f61f6a1f..f6e333fbfc 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,9 +52,12 @@ protected function _construct() protected function _afterSave(Mage_Core_Model_Abstract $object) { if ($object->getGroups()) { + /* @var $group Mage_Eav_Model_Entity_Attribute_Group */ foreach ($object->getGroups() as $group) { - /* @var $group Mage_Eav_Model_Entity_Attribute_Group */ $group->setAttributeSetId($object->getId()); + if ($group->itemExists() && !$group->getId()) { + continue; + } $group->save(); } } diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php index 65991e408d..dfc4b1d888 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,4 +47,4 @@ public function toOptionHash() { return parent::_toOptionHash('attribute_set_id', 'attribute_set_name'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php index 9fe7e6a9ed..19d8fc0b2f 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,4 +60,4 @@ public function loadByEntityStore(Mage_Core_Model_Abstract $object, $entityTypeI return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php index 40d134d94c..b5d9527186 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php index 3b12a026b2..81bc915256 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ public function _construct() { $this->_init('eav/entity_type'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml index aaa0286d8a..6d0b0ed587 100644 --- a/app/code/core/Mage/Eav/etc/config.xml +++ b/app/code/core/Mage/Eav/etc/config.xml @@ -19,10 +19,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php index 5f8c615669..045f3204fe 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php index 53d4950f06..3581a22d7e 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->run(" ALTER TABLE {$this->getTable('eav_attribute')} ADD COLUMN `is_configurable` TINYINT(1) UNSIGNED NOT NULL DEFAULT 1; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php index c7eeb555f2..245f0b1ca6 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -1,5 +1,5 @@ getTable('eav_attribute_group')} CHANGE `default_id` `default_id` smallint unsigned NULL default '0'; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php index 2af10b70ab..2c37771c47 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php index d29792776c..b7ba6509d9 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ ALTER TABLE {$installer->getTable('eav_attribute_group')} CHANGE `attribute_group_name` `attribute_group_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default ''; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php index 7d8f3cba5c..5f63770e40 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -18,10 +18,10 @@ * 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_Eav - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Eav + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Form.php b/app/code/core/Mage/GiftMessage/Block/Message/Form.php index 9d06478edd..f94217f21e 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Form.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php index 7a8213b6ed..5010a0b107 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php index 9cba6c6c89..d1671e3881 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Helper/Data.php b/app/code/core/Mage/GiftMessage/Helper/Data.php index 7292965c07..fb360320d2 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Data.php +++ b/app/code/core/Mage/GiftMessage/Helper/Data.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GiftMessage/Helper/Message.php b/app/code/core/Mage/GiftMessage/Helper/Message.php index 6f06b90420..09cc65758a 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Message.php +++ b/app/code/core/Mage/GiftMessage/Helper/Message.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php index b7d2ae99b7..30ff381309 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Url.php +++ b/app/code/core/Mage/GiftMessage/Helper/Url.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php index df213b0aab..f013a01855 100644 --- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php +++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php index cfaef7b3cc..9f3a754a3a 100644 --- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php +++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Message.php b/app/code/core/Mage/GiftMessage/Model/Message.php index 3c45576dd8..a7c2857137 100644 --- a/app/code/core/Mage/GiftMessage/Model/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Message.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php index 0eb4291dc0..845688e631 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php index e5f8537ff1..f0163dd043 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php index 38621f172e..78182dd362 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Observer.php b/app/code/core/Mage/GiftMessage/Model/Observer.php index 3d66b2b4b2..99d5b5ccd2 100644 --- a/app/code/core/Mage/GiftMessage/Model/Observer.php +++ b/app/code/core/Mage/GiftMessage/Model/Observer.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/controllers/IndexController.php b/app/code/core/Mage/GiftMessage/controllers/IndexController.php index d730e811d6..87ac4a3140 100644 --- a/app/code/core/Mage/GiftMessage/controllers/IndexController.php +++ b/app/code/core/Mage/GiftMessage/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml index 46edc99418..1b0edfd368 100644 --- a/app/code/core/Mage/GiftMessage/etc/config.xml +++ b/app/code/core/Mage/GiftMessage/etc/config.xml @@ -19,10 +19,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -230,4 +230,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/GiftMessage/etc/system.xml b/app/code/core/Mage/GiftMessage/etc/system.xml index 5d2a4f97dd..3ab12f0cfc 100644 --- a/app/code/core/Mage/GiftMessage/etc/system.xml +++ b/app/code/core/Mage/GiftMessage/etc/system.xml @@ -19,10 +19,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php index 2d9b3d8174..07fcd7ceab 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php index 009b315493..511cc1ed02 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup() ->addAttribute('quote', 'gift_message_id', array('type' => 'int', 'visible' => false, 'required' => false)) @@ -47,4 +47,4 @@ )) ->removeAttribute('catalog_product', 'gift_message_aviable') ->setConfigData('sales/gift_messages/allow', 1) - ->endSetup(); \ No newline at end of file + ->endSetup(); diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php index d6c561195a..f6e67f1c68 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,12 +18,12 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; /* @var $installer Mage_GiftMessage_Model_Mysql4_Setup */ -$installer->updateAttribute('catalog_product', 'gift_message_available', 'is_configurable', 0); \ No newline at end of file +$installer->updateAttribute('catalog_product', 'gift_message_available', 'is_configurable', 0); diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php index 7f929dc975..62844eb507 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -33,4 +33,4 @@ $installer->addAttribute('quote_address_item', 'gift_message_id', array('type' => 'int', 'visible' => false, 'required' => false)); $installer->addAttribute('order', 'gift_message_id', array('type' => 'int', 'visible' => false, 'required' => false)); $installer->addAttribute('order_item', 'gift_message_id', array('type' => 'int', 'visible' => false, 'required' => false)); -$installer->addAttribute('order_item', 'gift_message_available', array('type' => 'int', 'visible' => false, 'required' => false)); \ No newline at end of file +$installer->addAttribute('order_item', 'gift_message_available', array('type' => 'int', 'visible' => false, 'required' => false)); diff --git a/app/code/core/Mage/GiftRegistry/Helper/Data.php b/app/code/core/Mage/GiftRegistry/Helper/Data.php index e69de29bb2..8b13789179 100644 --- a/app/code/core/Mage/GiftRegistry/Helper/Data.php +++ b/app/code/core/Mage/GiftRegistry/Helper/Data.php @@ -0,0 +1 @@ + diff --git a/app/code/core/Mage/GiftRegistry/Model/Gift.php b/app/code/core/Mage/GiftRegistry/Model/Gift.php index ae46016bc0..29d935828d 100644 --- a/app/code/core/Mage/GiftRegistry/Model/Gift.php +++ b/app/code/core/Mage/GiftRegistry/Model/Gift.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftRegistry - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift.php b/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift.php index 4e0f5993e6..0ca5521afb 100644 --- a/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift.php +++ b/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftRegistry - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift/Collection.php b/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift/Collection.php index 21031e988a..dcd855341b 100644 --- a/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift/Collection.php +++ b/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GiftRegistry - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftRegistry/etc/config.xml b/app/code/core/Mage/GiftRegistry/etc/config.xml index da4eb9ab57..5daf735c5a 100644 --- a/app/code/core/Mage/GiftRegistry/etc/config.xml +++ b/app/code/core/Mage/GiftRegistry/etc/config.xml @@ -19,10 +19,10 @@ * 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_GiftRegistry - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GiftRegistry + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -81,4 +81,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php index 5fbe2acfcb..8da91fda9b 100644 --- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php +++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php @@ -18,10 +18,10 @@ * 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_GoogleAnalytics - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php index 575d0c92c4..d671d6b33d 100644 --- a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php +++ b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php @@ -18,10 +18,10 @@ * 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_GoogleAnalytics - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php index a9e5d1ebf5..65e7ffad5d 100644 --- a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php +++ b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php @@ -18,10 +18,10 @@ * 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_GoogleAnalytics - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleAnalytics/etc/config.xml b/app/code/core/Mage/GoogleAnalytics/etc/config.xml index d4472ca974..9112321580 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/config.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/config.xml @@ -19,10 +19,10 @@ * 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_GoogleAnalytics - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -94,4 +94,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml index fc2c4c5e4f..7f84df0426 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml @@ -19,10 +19,10 @@ * 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_GoogleAnalytics - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -66,4 +66,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php index c216a61de7..aecb519dcc 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,4 +54,4 @@ public function getConfirmButtonHtml() )); return $confirmButton->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php index 7e8866ba38..661dc2bd58 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -76,4 +76,4 @@ public function getStore() { return $this->_getData('store'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php index b1433402aa..87ac62c8d4 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -189,4 +189,4 @@ protected function _getStore() { return Mage::app()->getStore($this->getRequest()->getParam('store')); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php index b781660ae1..46e86a98dc 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -155,4 +155,4 @@ protected function _getStore() { return Mage::app()->getStore($this->getRequest()->getParam('store')); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php index 5b33cae2a9..d29e9603ac 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function render(Varien_Object $row) return sprintf('%s', $baseUrl . $itemId, $title, $title, $itemId); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php index 7d513f10e4..319718a40a 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ public function __construct() parent::__construct(); $this->setUseConfirm(false)->setSwitchUrl($this->getUrl('*/*/*', array('store' => null))); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php index 056d173909..eb54ba0f52 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,4 +53,4 @@ public function __construct() // { // return $this->getUrl('*/*/new', array('_current'=>true)); // } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php index 80f1c1afe3..d3feb975fe 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -108,15 +108,15 @@ public function __construct() }(); Event.observe(window, \'load\', function(){ - if ($("select_attribute_set")) { - Event.observe($("select_attribute_set"), \'change\', itemType.updateAttributes); - } - if ($("select_itemtype")) { - Event.observe($("select_itemtype"), \'change\', itemType.updateAttributes); - } - if ($("select_target_country")) { - Event.observe($("select_target_country"), \'change\', itemType.reloadItemTypes); - } + if ($("select_attribute_set")) { + Event.observe($("select_attribute_set"), \'change\', itemType.updateAttributes); + } + if ($("select_itemtype")) { + Event.observe($("select_itemtype"), \'change\', itemType.updateAttributes); + } + if ($("select_target_country")) { + Event.observe($("select_target_country"), \'change\', itemType.reloadItemTypes); + } }); '; } diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php index 501edcfea4..7499723495 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -137,4 +137,4 @@ protected function _toJson($data) { return Mage::helper('core')->jsonEncode($data); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php index 805abfef72..9fef5e6329 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -188,4 +188,4 @@ public function getSaveUrl() { return $this->getUrl('*/*/save', array('type_id' => $this->getItemType()->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php index e8842d3c29..38ab3574f2 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -92,4 +92,4 @@ public function getGridUrl() { return $this->getUrl('*/*/grid', array('_current'=>true)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php index 818101bcc1..0573e8556b 100644 --- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php +++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function render(Varien_Object $row) $iso = $row->getData($this->getColumn()->getIndex()); return Mage::getSingleton('googlebase/config')->getCountryInfo($iso, 'name'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Helper/Data.php b/app/code/core/Mage/GoogleBase/Helper/Data.php index 449cc3364a..18373a805f 100644 --- a/app/code/core/Mage/GoogleBase/Helper/Data.php +++ b/app/code/core/Mage/GoogleBase/Helper/Data.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,4 +33,4 @@ */ class Mage_GoogleBase_Helper_Data extends Mage_Core_Helper_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Attribute.php b/app/code/core/Mage/GoogleBase/Model/Attribute.php index 78118241e8..50af152f9a 100644 --- a/app/code/core/Mage/GoogleBase/Model/Attribute.php +++ b/app/code/core/Mage/GoogleBase/Model/Attribute.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -113,4 +113,4 @@ public function getGbaseAttributeType($attribute) return Mage_GoogleBase_Model_Service_Item::DEFAULT_ATTRIBUTE_TYPE; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Config.php b/app/code/core/Mage/GoogleBase/Model/Config.php index c77ed4ccee..3157e6aed2 100644 --- a/app/code/core/Mage/GoogleBase/Model/Config.php +++ b/app/code/core/Mage/GoogleBase/Model/Config.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GoogleBase/Model/Item.php b/app/code/core/Mage/GoogleBase/Model/Item.php index c61aff2990..d7da07c486 100644 --- a/app/code/core/Mage/GoogleBase/Model/Item.php +++ b/app/code/core/Mage/GoogleBase/Model/Item.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -357,4 +357,4 @@ protected function _getAttributesCollection() Mage::register(self::ATTRIBUTES_REGISTRY_KEY, $registry); return $collection; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php index 7820765718..d06f772186 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('googlebase/attributes', 'id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php index 5bd5e5245e..f7ba575ef3 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,34 +33,34 @@ */ class Mage_GoogleBase_Model_Mysql4_Attribute_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { - /** - * Whether to join attribute_set_id to attributes or not - */ + /** + * Whether to join attribute_set_id to attributes or not + */ protected $_joinAttributeSetFlag = true; - protected function _construct() - { - $this->_init('googlebase/attribute'); - } + protected function _construct() + { + $this->_init('googlebase/attribute'); + } - public function addAttributeSetFilter($attributeSetId, $targetCountry) - { - if (!$this->getJoinAttributeSetFlag()) { - return $this; - } - $this->getSelect()->where('attribute_set_id = ?', $attributeSetId); - $this->getSelect()->where('target_country = ?', $targetCountry); - return $this; - } + public function addAttributeSetFilter($attributeSetId, $targetCountry) + { + if (!$this->getJoinAttributeSetFlag()) { + return $this; + } + $this->getSelect()->where('attribute_set_id = ?', $attributeSetId); + $this->getSelect()->where('target_country = ?', $targetCountry); + return $this; + } - public function addTypeFilter($type_id) - { - $this->getSelect()->where('main_table.type_id = ?', $type_id); - return $this; - } + public function addTypeFilter($type_id) + { + $this->getSelect()->where('main_table.type_id = ?', $type_id); + return $this; + } - public function load($printQuery = false, $logQuery = false) + public function load($printQuery = false, $logQuery = false) { if ($this->isLoaded()) { return $this; @@ -73,22 +73,22 @@ public function load($printQuery = false, $logQuery = false) } protected function _joinAttributeSet() - { + { $this->getSelect() ->joinInner( array('types'=>$this->getTable('googlebase/types')), 'main_table.type_id=types.type_id', array('attribute_set_id' => 'types.attribute_set_id', 'target_country' => 'types.target_country')); return $this; - } + } - public function getJoinAttributeSetFlag() - { - return $this->_joinAttributeSetFlag; - } + public function getJoinAttributeSetFlag() + { + return $this->_joinAttributeSetFlag; + } - public function setJoinAttributeSetFlag($flag) - { - return $this->_joinAttributeSetFlag = (bool)$flag; - } -} \ No newline at end of file + public function setJoinAttributeSetFlag($flag) + { + return $this->_joinAttributeSetFlag = (bool)$flag; + } +} diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php index ffd67c1324..22b2d23c59 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -68,4 +68,4 @@ public function loadByProduct($model) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php index 5cb75e8d91..27803d9906 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,10 +33,10 @@ */ class Mage_GoogleBase_Model_Mysql4_Item_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { - protected function _construct() - { - $this->_init('googlebase/item'); - } + protected function _construct() + { + $this->_init('googlebase/item'); + } protected function _initSelect() { @@ -77,7 +77,7 @@ public function addProductFilterId($productId) public function addFieldToFilter($field, $condition=null) { if ($field == 'name') { - $conditionSql = $this->_getConditionSql('p.value', $condition); + $conditionSql = $this->_getConditionSql('IFNULL(p.value, p_d.value)', $condition); $this->getSelect()->where($conditionSql); } else { parent::addFieldToFilter($field, $condition); @@ -121,4 +121,4 @@ protected function _joinTables() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php index 2a84c7ef7d..5644ce3ae5 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function getTypeIdByAttributeSetId($attributeSetId, $targetCountry) return $this->_getReadAdapter()->fetchOne($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php index 0c7898448b..786e5fad0a 100644 --- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php +++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,25 +34,25 @@ class Mage_GoogleBase_Model_Mysql4_Type_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { - protected function _construct() - { - $this->_init('googlebase/type'); - } + protected function _construct() + { + $this->_init('googlebase/type'); + } - protected function _initSelect() - { - parent::_initSelect(); - $this->_joinAttributeSet(); - return $this; - } + protected function _initSelect() + { + parent::_initSelect(); + $this->_joinAttributeSet(); + return $this; + } - /** - * Add total count of Items for each type - * - * @return Mage_GoogleBase_Model_Mysql4_Type_Collection - */ - public function addItemsCount() - { + /** + * Add total count of Items for each type + * + * @return Mage_GoogleBase_Model_Mysql4_Type_Collection + */ + public function addItemsCount() + { $this->getSelect() ->joinLeft( array('items'=>$this->getTable('googlebase/items')), @@ -60,32 +60,32 @@ public function addItemsCount() array('items_total' => 'COUNT(items.item_id)')) ->group('main_table.type_id'); return $this; - } + } - /** - * Add country ISO filter to collection - * - * @param string $iso Two-letter country ISO code - * @return Mage_GoogleBase_Model_Mysql4_Type_Collection - */ - public function addCountryFilter($iso) - { + /** + * Add country ISO filter to collection + * + * @param string $iso Two-letter country ISO code + * @return Mage_GoogleBase_Model_Mysql4_Type_Collection + */ + public function addCountryFilter($iso) + { $this->getSelect()->where('target_country=?', $iso); return $this; - } + } - /** - * Join Attribute Set data - * - * @return Mage_GoogleBase_Model_Mysql4_Type_Collection - */ - protected function _joinAttributeSet() - { + /** + * Join Attribute Set data + * + * @return Mage_GoogleBase_Model_Mysql4_Type_Collection + */ + protected function _joinAttributeSet() + { $this->getSelect() ->join( array('set'=>$this->getTable('eav/attribute_set')), 'main_table.attribute_set_id=set.attribute_set_id', array('attribute_set_name' => 'set.attribute_set_name')); return $this; - } -} \ No newline at end of file + } +} diff --git a/app/code/core/Mage/GoogleBase/Model/Observer.php b/app/code/core/Mage/GoogleBase/Model/Observer.php index 056c6a5a5c..dd59fd1674 100644 --- a/app/code/core/Mage/GoogleBase/Model/Observer.php +++ b/app/code/core/Mage/GoogleBase/Model/Observer.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -95,4 +95,4 @@ public function deleteProductItem($observer) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Service.php b/app/code/core/Mage/GoogleBase/Model/Service.php index 0200b8f655..522d84fda9 100644 --- a/app/code/core/Mage/GoogleBase/Model/Service.php +++ b/app/code/core/Mage/GoogleBase/Model/Service.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -118,4 +118,4 @@ public function getDryRun() { return $this->getDataSetDefault('dry_run', false); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Service/Feed.php b/app/code/core/Mage/GoogleBase/Model/Service/Feed.php index 54cc6baeb4..735eba7989 100644 --- a/app/code/core/Mage/GoogleBase/Model/Service/Feed.php +++ b/app/code/core/Mage/GoogleBase/Model/Service/Feed.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -153,4 +153,4 @@ public function getAttributes($type, $targetCountry) } return array(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Service/Item.php b/app/code/core/Mage/GoogleBase/Model/Service/Item.php index 3079398f73..7e1917f3a9 100644 --- a/app/code/core/Mage/GoogleBase/Model/Service/Item.php +++ b/app/code/core/Mage/GoogleBase/Model/Service/Item.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -129,8 +129,8 @@ public function insert() ->setPublished($published); if ($expires = $this->_getAttributeValue('expiration_date')) { - $expires = $this->gBaseDate2DateTime($expires); - $this->getItem()->setExpires($expires); + $expires = $this->gBaseDate2DateTime($expires); + $this->getItem()->setExpires($expires); } } @@ -407,4 +407,4 @@ public function gBaseDate2DateTime($gBaseDate) { return Mage::getSingleton('core/date')->date(null, $gBaseDate); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php b/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php index 387eddf14b..8f5acc2e2c 100644 --- a/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php +++ b/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,4 +41,4 @@ public function toOptionArray() array('value' => 'HOSTED', 'label' => Mage::helper('googlebase')->__('Hosted')) ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php b/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php index 35af7621f7..5be114e735 100644 --- a/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php +++ b/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,4 +40,4 @@ public function toOptionArray() array('value' => 'clientlogin', 'label' => Mage::helper('googlebase')->__('ClientLogin')) ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Country.php b/app/code/core/Mage/GoogleBase/Model/Source/Country.php index c999218b13..2156d636dc 100644 --- a/app/code/core/Mage/GoogleBase/Model/Source/Country.php +++ b/app/code/core/Mage/GoogleBase/Model/Source/Country.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function toOptionArray() } return $result; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php b/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php index b9b5421480..de53290d31 100644 --- a/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php +++ b/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,4 +40,4 @@ public function getStatuses() '1' => Mage::helper('googlebase')->__('No') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/Model/Type.php b/app/code/core/Mage/GoogleBase/Model/Type.php index f44a7118ac..b728d87658 100644 --- a/app/code/core/Mage/GoogleBase/Model/Type.php +++ b/app/code/core/Mage/GoogleBase/Model/Type.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function loadByAttributeSetId($attributeSetId, $targetCountry) $typeId = $this->getResource()->getTypeIdByAttributeSetId($attributeSetId, $targetCountry); return $this->load($typeId); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/controllers/ItemsController.php b/app/code/core/Mage/GoogleBase/controllers/ItemsController.php index 16041bd010..ab4e55a543 100644 --- a/app/code/core/Mage/GoogleBase/controllers/ItemsController.php +++ b/app/code/core/Mage/GoogleBase/controllers/ItemsController.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GoogleBase/controllers/SelectionController.php b/app/code/core/Mage/GoogleBase/controllers/SelectionController.php index 9b39361194..08991a8528 100644 --- a/app/code/core/Mage/GoogleBase/controllers/SelectionController.php +++ b/app/code/core/Mage/GoogleBase/controllers/SelectionController.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function gridAction() ->toHtml() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/controllers/TypesController.php b/app/code/core/Mage/GoogleBase/controllers/TypesController.php index 71a7d8bf0a..d7712b7332 100644 --- a/app/code/core/Mage/GoogleBase/controllers/TypesController.php +++ b/app/code/core/Mage/GoogleBase/controllers/TypesController.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -233,4 +233,4 @@ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('catalog/googlebase/types'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleBase/etc/config.xml b/app/code/core/Mage/GoogleBase/etc/config.xml index 3f92f83588..05af802eae 100644 --- a/app/code/core/Mage/GoogleBase/etc/config.xml +++ b/app/code/core/Mage/GoogleBase/etc/config.xml @@ -19,10 +19,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleBase/etc/system.xml b/app/code/core/Mage/GoogleBase/etc/system.xml index 01a49fbe3a..7ac81405fc 100644 --- a/app/code/core/Mage/GoogleBase/etc/system.xml +++ b/app/code/core/Mage/GoogleBase/etc/system.xml @@ -19,10 +19,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -85,4 +85,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php index c3e0b0e412..40bf3555ce 100644 --- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -71,4 +71,4 @@ "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php index 0f2992f9af..eca999f156 100644 --- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -18,10 +18,10 @@ * 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_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleBase + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php index a1a65d6e7e..fd2900f5c8 100644 --- a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php +++ b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Block_Adminhtml_Shipping_Applicable_Countries @@ -32,8 +32,8 @@ class Mage_GoogleCheckout_Block_Adminhtml_Shipping_Applicable_Countries protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { - $html = parent::_getElementHtml($element); - $html .= $this->_appendJs($element); + $html = parent::_getElementHtml($element); + $html .= $this->_appendJs($element); return $html; } diff --git a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php index acb6b694e2..fb7ab77aec 100644 --- a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php +++ b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Block_Adminhtml_Shipping_Merchant @@ -69,12 +69,12 @@ protected function _getRowTemplateHtml($i=0) $html .= ''; $html .= '
'; - $html .= ' '; + $html .= ' '; $html .= '_getDisabled().'/> '; $html .= $this->_getRemoveRowButtonHtml(); $html .= '
'; - $html .= ''; + $html .= ''; return $html; } @@ -162,4 +162,4 @@ protected function _getRemoveRowButtonHtml($selector='li', $title='Remove') } return $this->_removeRowButtonHtml; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Block/Form.php b/app/code/core/Mage/GoogleCheckout/Block/Form.php index d6f6d33e9a..5552271b2b 100644 --- a/app/code/core/Mage/GoogleCheckout/Block/Form.php +++ b/app/code/core/Mage/GoogleCheckout/Block/Form.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GoogleCheckout/Block/Link.php b/app/code/core/Mage/GoogleCheckout/Block/Link.php index 161bcb4afb..44ff7beaff 100644 --- a/app/code/core/Mage/GoogleCheckout/Block/Link.php +++ b/app/code/core/Mage/GoogleCheckout/Block/Link.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -99,4 +99,4 @@ public function getIsDisabled() } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Block/Redirect.php b/app/code/core/Mage/GoogleCheckout/Block/Redirect.php index fa1ab30aa5..6d75291e7f 100644 --- a/app/code/core/Mage/GoogleCheckout/Block/Redirect.php +++ b/app/code/core/Mage/GoogleCheckout/Block/Redirect.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,4 +53,4 @@ public function getMessage () { return $this->__('You will be redirected to GoogleCheckout in a few seconds.'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Exception.php b/app/code/core/Mage/GoogleCheckout/Exception.php index c8d9194dc2..45bcae3d1f 100644 --- a/app/code/core/Mage/GoogleCheckout/Exception.php +++ b/app/code/core/Mage/GoogleCheckout/Exception.php @@ -18,13 +18,13 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Exception extends Mage_Core_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Helper/Data.php b/app/code/core/Mage/GoogleCheckout/Helper/Data.php index d06fb5e4f6..e46232ac2a 100644 --- a/app/code/core/Mage/GoogleCheckout/Helper/Data.php +++ b/app/code/core/Mage/GoogleCheckout/Helper/Data.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api.php b/app/code/core/Mage/GoogleCheckout/Model/Api.php index b7b55adc24..9d3e7d222d 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Api.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Api.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Api extends Varien_Object @@ -196,4 +196,4 @@ public function processBeacon() ->setRequestBody($_SERVER['QUERY_STRING']) ->save(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php index 007cb2d9cb..917a637a7a 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php @@ -18,17 +18,17 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Api_Debug extends Mage_Core_Model_Abstract { - protected function _construct() - { - $this->_init('googlecheckout/api_debug'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('googlecheckout/api_debug'); + } +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php index f48e322303..4dfec60a43 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ set_include_path(get_include_path().PS.Mage::getBaseDir('lib').DS.'googlecheckout'); diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php index 414094abcc..f3ea099380 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php @@ -18,13 +18,13 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Api_Xml_Calculate extends Mage_GoogleCheckout_Model_Api_Xml_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php index 042f85d94b..44d78bff20 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Api_Xml_Callback extends Mage_GoogleCheckout_Model_Api_Xml_Abstract @@ -763,4 +763,4 @@ protected function _formatAmount($amount) return Mage::helper('core')->currency($amount, true, false); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php index f8431f6105..366174491a 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Api_Xml_Checkout extends Mage_GoogleCheckout_Model_Api_Xml_Abstract diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php index eab62f67dc..ce26fea463 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Api_Xml_Order extends Mage_GoogleCheckout_Model_Api_Xml_Abstract @@ -175,4 +175,4 @@ public function addBuyerMessage($message, $sendMail=true) ->SendBuyerMessage($this->getGoogleOrderNumber(), $message, $sendMail?'true':'false'); return $this->_processGResponse($response); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php index fa69b2f244..b873f125f2 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php @@ -18,17 +18,17 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Mysql4_Api_Debug extends Mage_Core_Model_Mysql4_Abstract { - protected function _construct() - { - $this->_init('googlecheckout/api_debug', 'debug_id'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('googlecheckout/api_debug', 'debug_id'); + } +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php index a902831317..8aafaeb984 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php @@ -18,17 +18,17 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Mysql4_Api_Debug_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { - protected function _construct() - { - $this->_init('googlecheckout/api_debug'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('googlecheckout/api_debug'); + } +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php index 6e856b2ee3..b4a98e8ced 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php @@ -18,14 +18,14 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Mysql4_Setup extends Mage_Catalog_Model_Resource_Eav_Mysql4_Setup { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php index dcd0454b21..b504547bb6 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Mysql4_Tax extends Mage_Core_Model_Mysql4_Abstract @@ -44,4 +44,4 @@ public function fetchRuleRatesForCustomerTaxClass($customerTaxClass) return $rows; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Observer.php b/app/code/core/Mage/GoogleCheckout/Model/Observer.php index a63b3506e8..1ac987221d 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Observer.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Observer.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleCheckout/Model/Payment.php b/app/code/core/Mage/GoogleCheckout/Model/Payment.php index 7f2946b2c5..fd4d81e4e7 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Payment.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Payment.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstract @@ -162,4 +162,4 @@ public function cancel(Varien_Object $payment) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Shipping.php b/app/code/core/Mage/GoogleCheckout/Model/Shipping.php index b6780c2986..6b705d16dd 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Shipping.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Shipping.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,13 +35,13 @@ class Mage_GoogleCheckout_Model_Shipping extends Mage_Shipping_Model_Carrier_Abs { protected $_code = 'googlecheckout'; - /** - * Enter description here... - * - * @param Mage_Shipping_Model_Rate_Request $data - * @return Mage_Shipping_Model_Rate_Result - */ - public function collectRates(Mage_Shipping_Model_Rate_Request $request) + /** + * Enter description here... + * + * @param Mage_Shipping_Model_Rate_Request $data + * @return Mage_Shipping_Model_Rate_Result + */ + public function collectRates(Mage_Shipping_Model_Rate_Request $request) { // dummy placeholder return $this; diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php index 0fc094da5c..9e5de6f5a8 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,4 +52,4 @@ public function toOptionArray() return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php index cf2774a991..22bb4d30f4 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function toOptionArray() array('value'=>'en_GB', 'label'=>Mage::helper('googlecheckout')->__('United Kingdom')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php index 3c2bc123c0..b320cfc975 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function toOptionArray() )), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php index e4a33d114f..7039dccc3f 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function toOptionArray() array('value'=>'RESIDENTIAL', 'label'=>$hlp->__('Residential')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php index b76ccce983..a0247b80e3 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function toOptionArray() array('value'=>'IN', 'label'=>$hlp->__('Inches')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php index 0f581e3f6b..9021bdc18b 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function toOptionArray() // array('value'=>'description_based', 'label'=>$hlp->__('Description-based delivery')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php index fde3fceae0..d67204cd9b 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function toOptionArray() array('value'=>'PESSIMISTIC', 'label'=>$hlp->__('Pessimistic')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php b/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php index bf0856b39a..a37d87e01b 100644 --- a/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php +++ b/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_GoogleCheckout_ApiController extends Mage_Core_Controller_Front_Action @@ -41,4 +41,4 @@ public function beaconAction() { Mage::getModel('googlecheckout/api')->processBeacon(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php b/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php index 8c38ef5a6d..58ef7c8a98 100644 --- a/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php +++ b/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleCheckout/etc/config.xml b/app/code/core/Mage/GoogleCheckout/etc/config.xml index 2aeb2c5f9b..f088330a75 100644 --- a/app/code/core/Mage/GoogleCheckout/etc/config.xml +++ b/app/code/core/Mage/GoogleCheckout/etc/config.xml @@ -20,9 +20,9 @@ * needs please refer to http://www.magentocommerce.com for more information. * * @category Mage - * @package Mage_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -165,6 +165,7 @@ Something like this is to be added to resolve bug #4890 0 0 + 1 COMMERCIAL diff --git a/app/code/core/Mage/GoogleCheckout/etc/system.xml b/app/code/core/Mage/GoogleCheckout/etc/system.xml index 9c10af8677..9d95a4e23b 100644 --- a/app/code/core/Mage/GoogleCheckout/etc/system.xml +++ b/app/code/core/Mage/GoogleCheckout/etc/system.xml @@ -19,10 +19,10 @@ * 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_GoogleAnalytics - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -136,7 +136,7 @@ 0 - + If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if "Edit Cart" link was activated. select adminhtml/system_config_source_yesno @@ -333,7 +333,7 @@ select 24 adminhtml/system_config_source_shipping_allspecificcountries - googlecheckout/adminhtml_shipping_applicable_countries + googlecheckout/adminhtml_shipping_applicable_countries 1 1 0 @@ -371,7 +371,7 @@ select 34 adminhtml/system_config_source_shipping_allspecificcountries - googlecheckout/adminhtml_shipping_applicable_countries + googlecheckout/adminhtml_shipping_applicable_countries 1 1 0 @@ -408,7 +408,7 @@ select 44 adminhtml/system_config_source_shipping_allspecificcountries - googlecheckout/adminhtml_shipping_applicable_countries + googlecheckout/adminhtml_shipping_applicable_countries 1 1 0 @@ -464,4 +464,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php index 5f74c032c9..ee50e26c74 100644 --- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php index bd535c13ff..349135d3ce 100644 --- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -61,4 +61,4 @@ } $installer->addAttributeToSet('catalog_product', $attributeSetId, $attributeGroupId, $attributeId); } -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php index 8dfdceedee..275db718e9 100644 --- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php index 9e71ca3e9d..2476f998e9 100644 --- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php index c63a334ebf..67190c715f 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -190,4 +190,4 @@ public function _prepareLayout() return parent::_prepareLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php index f4b34245ee..fea2c34c33 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Renderer/Conversion.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Renderer/Conversion.php index 77b82d2368..3ba600da07 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Renderer/Conversion.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Renderer/Conversion.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -75,4 +75,4 @@ public function getJsonConversionPagesUrl() $storeViewsUrls = new Varien_Object($storeViewsUrls); return $storeViewsUrls->toJson(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php index da8c0aedb5..f994085d59 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code.php b/app/code/core/Mage/GoogleOptimizer/Block/Code.php index 56e9c69262..e4cd2515eb 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Code.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Code.php @@ -18,10 +18,10 @@ * 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_GoogleOptmizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -108,4 +108,4 @@ public function setScriptType($scriptType) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code/Category.php b/app/code/core/Mage/GoogleOptimizer/Block/Code/Category.php index 7d445d6fa1..70e970f267 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Code/Category.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Code/Category.php @@ -18,10 +18,10 @@ * 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_GoogleOptmizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,4 +49,4 @@ public function getGoogleOptimizer() { return $this->getCategory()->getGoogleOptimizerScripts(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code/Conversion.php b/app/code/core/Mage/GoogleOptimizer/Block/Code/Conversion.php index 8755a089b8..ab5884af16 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Code/Conversion.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Code/Conversion.php @@ -18,10 +18,10 @@ * 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_GoogleOptmizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,4 +68,4 @@ public function getPageType() { return $this->_pageType; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code/Page.php b/app/code/core/Mage/GoogleOptimizer/Block/Code/Page.php index 8d579e2b98..61785ca3c7 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Code/Page.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Code/Page.php @@ -18,10 +18,10 @@ * 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_GoogleOptmizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,4 +40,4 @@ protected function _initGoogleOptimizerModel() $this->_setGoogleOptimizerModel($cmsPage->getGoogleOptimizerScripts()); return parent::_initGoogleOptimizerModel(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code/Product.php b/app/code/core/Mage/GoogleOptimizer/Block/Code/Product.php index b21fb5d04c..b105fff0de 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Code/Product.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Code/Product.php @@ -18,10 +18,10 @@ * 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_GoogleOptmizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,4 +49,4 @@ public function getGoogleOptimizer() { return $this->getProduct()->getGoogleOptimizerScripts(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Js.php b/app/code/core/Mage/GoogleOptimizer/Block/Js.php index a2ee0ff01c..769ac5452c 100644 --- a/app/code/core/Mage/GoogleOptimizer/Block/Js.php +++ b/app/code/core/Mage/GoogleOptimizer/Block/Js.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,4 +62,4 @@ public function getConversionFieldKey () { return $this->getDataSetDefault('conversion_field_key', 'conversion_script'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Helper/Data.php b/app/code/core/Mage/GoogleOptimizer/Helper/Data.php index 126873f80a..b997ffb77c 100644 --- a/app/code/core/Mage/GoogleOptimizer/Helper/Data.php +++ b/app/code/core/Mage/GoogleOptimizer/Helper/Data.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -232,4 +232,4 @@ public function getProductAttributes(Varien_Object $product) } return $optimizerAttributes; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Adminhtml/System/Config/Source/Googleoptimizer/Conversionpages.php b/app/code/core/Mage/GoogleOptimizer/Model/Adminhtml/System/Config/Source/Googleoptimizer/Conversionpages.php index 39189087bf..0bd46d89b6 100644 --- a/app/code/core/Mage/GoogleOptimizer/Model/Adminhtml/System/Config/Source/Googleoptimizer/Conversionpages.php +++ b/app/code/core/Mage/GoogleOptimizer/Model/Adminhtml/System/Config/Source/Googleoptimizer/Conversionpages.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,4 +49,4 @@ public function toOptionArray() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Code.php b/app/code/core/Mage/GoogleOptimizer/Model/Code.php index 3cf1320389..57c1535414 100644 --- a/app/code/core/Mage/GoogleOptimizer/Model/Code.php +++ b/app/code/core/Mage/GoogleOptimizer/Model/Code.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -180,4 +180,4 @@ public function deleteScripts($storeId) $this->getResource()->deleteByEntityType($this, $storeId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Code/Category.php b/app/code/core/Mage/GoogleOptimizer/Model/Code/Category.php index 1347269bee..01852bc9b7 100644 --- a/app/code/core/Mage/GoogleOptimizer/Model/Code/Category.php +++ b/app/code/core/Mage/GoogleOptimizer/Model/Code/Category.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Code/Page.php b/app/code/core/Mage/GoogleOptimizer/Model/Code/Page.php index 037fa60636..f0f54eef2f 100644 --- a/app/code/core/Mage/GoogleOptimizer/Model/Code/Page.php +++ b/app/code/core/Mage/GoogleOptimizer/Model/Code/Page.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -68,4 +68,4 @@ protected function _validate() return parent::_validate(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Code/Product.php b/app/code/core/Mage/GoogleOptimizer/Model/Code/Product.php index d40ad57a43..c6301851e9 100644 --- a/app/code/core/Mage/GoogleOptimizer/Model/Code/Product.php +++ b/app/code/core/Mage/GoogleOptimizer/Model/Code/Product.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -68,9 +68,9 @@ protected function _validate() if ($attributes = $this->getAttributes()) { $attributesCount = 0; foreach ($attributes as $_attributeId=>$_attributeValue) { - if ($_attributeValue != '') { + if ($_attributeValue != '') { $attributesCount++; - } + } } if ($attributesCount && $attributesCount <= self::DEFAULT_COUNT_OF_ATTRIBUTES) { $attributesFlag = true; @@ -97,4 +97,4 @@ public function getAttributes() } return array(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code.php b/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code.php index a4a18ed1ed..56652d5bbc 100644 --- a/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code.php +++ b/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -107,4 +107,4 @@ public function deleteByEntityType($object, $store_id) $this->_afterDelete($object); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code/Collection.php b/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code/Collection.php index 20099c90d8..5624f9d71b 100644 --- a/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code/Collection.php +++ b/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code/Collection.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,8 +34,8 @@ */ class Mage_GoogleOptimizer_Model_Mysql4_Code_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { - protected function _construct() - { - $this->_init('googleoptimizer/code'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('googleoptimizer/code'); + } +} diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Observer.php b/app/code/core/Mage/GoogleOptimizer/Model/Observer.php index 52a260a7e2..f59c294f00 100644 --- a/app/code/core/Mage/GoogleOptimizer/Model/Observer.php +++ b/app/code/core/Mage/GoogleOptimizer/Model/Observer.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -281,4 +281,4 @@ public function deleteCategoryGoogleOptimizerScripts($observer) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/controllers/IndexController.php b/app/code/core/Mage/GoogleOptimizer/controllers/IndexController.php index 9db3cc4fa0..c4f6284ff7 100644 --- a/app/code/core/Mage/GoogleOptimizer/controllers/IndexController.php +++ b/app/code/core/Mage/GoogleOptimizer/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function codesAction() $this->getResponse()->setBody( Mage::helper('core')->jsonEncode($result) ); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/GoogleOptimizer/etc/config.xml b/app/code/core/Mage/GoogleOptimizer/etc/config.xml index eec8303a9b..c7cfc6311c 100644 --- a/app/code/core/Mage/GoogleOptimizer/etc/config.xml +++ b/app/code/core/Mage/GoogleOptimizer/etc/config.xml @@ -20,9 +20,9 @@ * needs please refer to http://www.magentocommerce.com for more information. * * @category Mage - * @package Mage_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleOptimizer/etc/system.xml b/app/code/core/Mage/GoogleOptimizer/etc/system.xml index 27bc7647fa..15bb9ac633 100644 --- a/app/code/core/Mage/GoogleOptimizer/etc/system.xml +++ b/app/code/core/Mage/GoogleOptimizer/etc/system.xml @@ -19,10 +19,10 @@ * 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_GoogleAnalytics - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-install-0.1.0.php index 2da94fc37c..6212c7fbc2 100644 --- a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-install-0.1.0.php @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.0-0.1.1.php index 351b3e80c4..414347c6d9 100644 --- a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->getConnection()->addColumn($installer->getTable('googleoptimizer/code'), 'conversion_page', "varchar(255) NOT NULL default ''"); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.1-0.1.2.php index 517bb751c5..199186061e 100644 --- a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -18,10 +18,10 @@ * 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_Directory - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleOptimizer + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->getConnection()->addColumn($installer->getTable('googleoptimizer/code'), 'additional_data', "text"); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Install/Block/Abstract.php b/app/code/core/Mage/Install/Block/Abstract.php index 8e6fc1d14f..45e03c3e78 100644 --- a/app/code/core/Mage/Install/Block/Abstract.php +++ b/app/code/core/Mage/Install/Block/Abstract.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Block/Admin.php b/app/code/core/Mage/Install/Block/Admin.php index 92f20a4941..21643c866a 100644 --- a/app/code/core/Mage/Install/Block/Admin.php +++ b/app/code/core/Mage/Install/Block/Admin.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Block/Begin.php b/app/code/core/Mage/Install/Block/Begin.php index 3282bfbc7c..82ac11bc92 100644 --- a/app/code/core/Mage/Install/Block/Begin.php +++ b/app/code/core/Mage/Install/Block/Begin.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Block/Config.php b/app/code/core/Mage/Install/Block/Config.php index d58a7cf1ed..cafbb25706 100644 --- a/app/code/core/Mage/Install/Block/Config.php +++ b/app/code/core/Mage/Install/Block/Config.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -97,4 +97,4 @@ public function getSessionSaveSelect() ->getHtml(); return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Install/Block/Download.php b/app/code/core/Mage/Install/Block/Download.php index 2d330e2b75..037ebbffce 100644 --- a/app/code/core/Mage/Install/Block/Download.php +++ b/app/code/core/Mage/Install/Block/Download.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Block/End.php b/app/code/core/Mage/Install/Block/End.php index cae0299738..0fc086503c 100644 --- a/app/code/core/Mage/Install/Block/End.php +++ b/app/code/core/Mage/Install/Block/End.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Block/Locale.php b/app/code/core/Mage/Install/Block/Locale.php index d7a496b489..ffb518f133 100644 --- a/app/code/core/Mage/Install/Block/Locale.php +++ b/app/code/core/Mage/Install/Block/Locale.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Block/State.php b/app/code/core/Mage/Install/Block/State.php index aa482baf16..837e17536c 100644 --- a/app/code/core/Mage/Install/Block/State.php +++ b/app/code/core/Mage/Install/Block/State.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ public function __construct() $this->setTemplate('install/state.phtml'); $this->assign('steps', Mage::getSingleton('install/wizard')->getSteps()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Install/Controller/Action.php b/app/code/core/Mage/Install/Controller/Action.php index 91fa5960a8..cd2a01e848 100644 --- a/app/code/core/Mage/Install/Controller/Action.php +++ b/app/code/core/Mage/Install/Controller/Action.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ protected function _construct() $this->setFlag('', self::FLAG_NO_CHECK_INSTALLATION, true); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Install/Helper/Data.php b/app/code/core/Mage/Install/Helper/Data.php index b69031f950..061f51995f 100644 --- a/app/code/core/Mage/Install/Helper/Data.php +++ b/app/code/core/Mage/Install/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Model/Config.php b/app/code/core/Mage/Install/Model/Config.php index de1136250a..f7f36f0e94 100644 --- a/app/code/core/Mage/Install/Model/Config.php +++ b/app/code/core/Mage/Install/Model/Config.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer.php b/app/code/core/Mage/Install/Model/Installer.php index 15aa7b8485..cbdf0f9265 100644 --- a/app/code/core/Mage/Install/Model/Installer.php +++ b/app/code/core/Mage/Install/Model/Installer.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Abstract.php index 8ccbda00e1..e887aad566 100644 --- a/app/code/core/Mage/Install/Model/Installer/Abstract.php +++ b/app/code/core/Mage/Install/Model/Installer/Abstract.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Config.php b/app/code/core/Mage/Install/Model/Installer/Config.php index e3ddbb7ef1..00d5db8741 100644 --- a/app/code/core/Mage/Install/Model/Installer/Config.php +++ b/app/code/core/Mage/Install/Model/Installer/Config.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -181,4 +181,4 @@ public function replaceTmpEncryptKey($key = null) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php index c5218d8ac7..5c8c29c2e9 100644 --- a/app/code/core/Mage/Install/Model/Installer/Console.php +++ b/app/code/core/Mage/Install/Model/Installer/Console.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Data.php b/app/code/core/Mage/Install/Model/Installer/Data.php index e7b324af1e..47e5809dc4 100644 --- a/app/code/core/Mage/Install/Model/Installer/Data.php +++ b/app/code/core/Mage/Install/Model/Installer/Data.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Db.php b/app/code/core/Mage/Install/Model/Installer/Db.php index ec2035a702..b9f42d6007 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db.php +++ b/app/code/core/Mage/Install/Model/Installer/Db.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -90,4 +90,4 @@ protected function _getConnenctionType() { return (string) Mage::getConfig()->getNode('global/resources/default_setup/connection/type'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Install/Model/Installer/Env.php b/app/code/core/Mage/Install/Model/Installer/Env.php index fa3015cc3f..ce734f9119 100644 --- a/app/code/core/Mage/Install/Model/Installer/Env.php +++ b/app/code/core/Mage/Install/Model/Installer/Env.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Model/Installer/Filesystem.php b/app/code/core/Mage/Install/Model/Installer/Filesystem.php index 75550bc90e..f52ad95284 100644 --- a/app/code/core/Mage/Install/Model/Installer/Filesystem.php +++ b/app/code/core/Mage/Install/Model/Installer/Filesystem.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Model/Installer/Pear.php b/app/code/core/Mage/Install/Model/Installer/Pear.php index a089489041..ae34d53f03 100644 --- a/app/code/core/Mage/Install/Model/Installer/Pear.php +++ b/app/code/core/Mage/Install/Model/Installer/Pear.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once "Varien/Pear/Package.php"; @@ -75,4 +75,4 @@ public function checkDownloads() } return $result; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Install/Model/Observer.php b/app/code/core/Mage/Install/Model/Observer.php index 960d24603b..d8698a99a3 100644 --- a/app/code/core/Mage/Install/Model/Observer.php +++ b/app/code/core/Mage/Install/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Model/Session.php b/app/code/core/Mage/Install/Model/Session.php index 00f131bd1e..2c961f47a1 100644 --- a/app/code/core/Mage/Install/Model/Session.php +++ b/app/code/core/Mage/Install/Model/Session.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/Model/Wizard.php b/app/code/core/Mage/Install/Model/Wizard.php index 3ca30a12f6..cbc64665f1 100644 --- a/app/code/core/Mage/Install/Model/Wizard.php +++ b/app/code/core/Mage/Install/Model/Wizard.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -126,4 +126,4 @@ protected function _getUrlPath($controller, $action) { return 'install/'.$controller.'/'.$action; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Install/controllers/IndexController.php b/app/code/core/Mage/Install/controllers/IndexController.php index 31dd80d4eb..03bd4a50f1 100644 --- a/app/code/core/Mage/Install/controllers/IndexController.php +++ b/app/code/core/Mage/Install/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/controllers/WizardController.php b/app/code/core/Mage/Install/controllers/WizardController.php index 6ee51b91e1..a988e90119 100644 --- a/app/code/core/Mage/Install/controllers/WizardController.php +++ b/app/code/core/Mage/Install/controllers/WizardController.php @@ -18,10 +18,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml index ccdb6a2adb..c307a6d548 100644 --- a/app/code/core/Mage/Install/etc/config.xml +++ b/app/code/core/Mage/Install/etc/config.xml @@ -1,112 +1,112 @@ - - - - - - 0.7.0 - - - - - - Mage_Install_Model - install_mysql4 - - - Mage_Install_Model_Mysql4 - - - - Mage_Install_Block - - - - - /install/wizard/checkSecureHost - - - - standard - - Mage_Install - install - - - - - - - -
main.xml
- - - - - - - core/resource - checkDbConnection - - - - - - - install/observer - installFailure - - - - - - - install/observer - bindLocale - - - - - - - - - Mage_Install.csv - - - - - - - - main.xml - - - - LICENSE.html - - \ No newline at end of file + + + + + + 0.7.0 + + + + + + Mage_Install_Model + install_mysql4 + + + Mage_Install_Model_Mysql4 + + + + Mage_Install_Block + + + + + /install/wizard/checkSecureHost + + + + standard + + Mage_Install + install + + + + + + + +
main.xml
+ + + + + + + core/resource + checkDbConnection + + + + + + + install/observer + installFailure + + + + + + + install/observer + bindLocale + + + + + + + + + Mage_Install.csv + + + + + + + + main.xml + + + + LICENSE.html + + diff --git a/app/code/core/Mage/Install/etc/install.xml b/app/code/core/Mage/Install/etc/install.xml index dad6a86dcd..483f3e511c 100644 --- a/app/code/core/Mage/Install/etc/install.xml +++ b/app/code/core/Mage/Install/etc/install.xml @@ -19,10 +19,10 @@ * 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_Install - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/Helper/Data.php b/app/code/core/Mage/Log/Helper/Data.php index c12fb105e4..2022f0cbae 100644 --- a/app/code/core/Mage/Log/Helper/Data.php +++ b/app/code/core/Mage/Log/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Log/Model/Aggregation.php b/app/code/core/Mage/Log/Model/Aggregation.php index 114debc6da..01aca0d665 100644 --- a/app/code/core/Mage/Log/Model/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Aggregation.php @@ -18,18 +18,18 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Log_Model_Aggregation extends Mage_Core_Model_Abstract { - protected function _construct() - { - $this->_init('log/aggregation'); - } + protected function _construct() + { + $this->_init('log/aggregation'); + } public function run() { @@ -126,4 +126,4 @@ private function _round($in) { return date("Y-m-d H:00:00", $this->_timestamp($in)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Cron.php b/app/code/core/Mage/Log/Model/Cron.php index 0f0e3a3103..2024e2c908 100644 --- a/app/code/core/Mage/Log/Model/Cron.php +++ b/app/code/core/Mage/Log/Model/Cron.php @@ -1,103 +1,103 @@ - - */ -class Mage_Log_Model_Cron extends Mage_Core_Model_Abstract -{ - const XML_PATH_EMAIL_LOG_CLEAN_TEMPLATE = 'system/log/error_email_template'; - const XML_PATH_EMAIL_LOG_CLEAN_IDENTITY = 'system/log/error_email_identity'; - const XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT = 'system/log/error_email'; - - /** - * Error messages - * - * @var array - */ - protected $_errors = array(); - - /** - * Send Log Clean Warnings - * - * @return Mage_Log_Model_Cron - */ - protected function _sendLogCleanEmail() - { - if (!$this->_errors) { - return $this; - } - if (!Mage::getStoreConfig(self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT)) { - return $this; - } - - $translate = Mage::getSingleton('core/translate'); - /* @var $translate Mage_Core_Model_Translate */ - $translate->setTranslateInline(false); - - $emailTemplate = Mage::getModel('core/email_template'); - /* @var $emailTemplate Mage_Core_Model_Email_Template */ - $emailTemplate->setDesignConfig(array('area' => 'backend')) - ->sendTransactional( - Mage::getStoreConfig(self::XML_PATH_EMAIL_LOG_CLEAN_TEMPLATE), - Mage::getStoreConfig(self::XML_PATH_EMAIL_LOG_CLEAN_IDENTITY), - Mage::getStoreConfig(self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT), - null, - array('warnings' => join("\n", $this->_errors)) - ); - - $translate->setTranslateInline(true); - - return $this; - } - - /** - * Clean logs - * - * @return Mage_Log_Model_Cron - */ - public function logClean() - { - $this->_errors = array(); - - try { - Mage::getModel('log/log')->clean(); - } - catch (Exception $e) { - $this->_errors[] = $e->getMessage(); - $this->_errors[] = $e->getTrace(); - } - - $this->_sendLogCleanEmail(); - - return $this; - } -} + + */ +class Mage_Log_Model_Cron extends Mage_Core_Model_Abstract +{ + const XML_PATH_EMAIL_LOG_CLEAN_TEMPLATE = 'system/log/error_email_template'; + const XML_PATH_EMAIL_LOG_CLEAN_IDENTITY = 'system/log/error_email_identity'; + const XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT = 'system/log/error_email'; + + /** + * Error messages + * + * @var array + */ + protected $_errors = array(); + + /** + * Send Log Clean Warnings + * + * @return Mage_Log_Model_Cron + */ + protected function _sendLogCleanEmail() + { + if (!$this->_errors) { + return $this; + } + if (!Mage::getStoreConfig(self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT)) { + return $this; + } + + $translate = Mage::getSingleton('core/translate'); + /* @var $translate Mage_Core_Model_Translate */ + $translate->setTranslateInline(false); + + $emailTemplate = Mage::getModel('core/email_template'); + /* @var $emailTemplate Mage_Core_Model_Email_Template */ + $emailTemplate->setDesignConfig(array('area' => 'backend')) + ->sendTransactional( + Mage::getStoreConfig(self::XML_PATH_EMAIL_LOG_CLEAN_TEMPLATE), + Mage::getStoreConfig(self::XML_PATH_EMAIL_LOG_CLEAN_IDENTITY), + Mage::getStoreConfig(self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT), + null, + array('warnings' => join("\n", $this->_errors)) + ); + + $translate->setTranslateInline(true); + + return $this; + } + + /** + * Clean logs + * + * @return Mage_Log_Model_Cron + */ + public function logClean() + { + $this->_errors = array(); + + try { + Mage::getModel('log/log')->clean(); + } + catch (Exception $e) { + $this->_errors[] = $e->getMessage(); + $this->_errors[] = $e->getTrace(); + } + + $this->_sendLogCleanEmail(); + + return $this; + } +} diff --git a/app/code/core/Mage/Log/Model/Customer.php b/app/code/core/Mage/Log/Model/Customer.php index 3a2a103bee..c998dacc95 100644 --- a/app/code/core/Mage/Log/Model/Customer.php +++ b/app/code/core/Mage/Log/Model/Customer.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,4 +52,4 @@ public function getLoginAtTimestamp() } return null; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Log.php b/app/code/core/Mage/Log/Model/Log.php index d061881305..3c276ca926 100644 --- a/app/code/core/Mage/Log/Model/Log.php +++ b/app/code/core/Mage/Log/Model/Log.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php index e7ff230791..48d10b788e 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Log_Model_Mysql4_Aggregation extends Mage_Core_Model_Mysql4_Abstract @@ -97,4 +97,4 @@ public function getLogId($from, $to) return $this->_getReadAdapter()->fetchOne($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Customer.php b/app/code/core/Mage/Log/Model/Mysql4/Customer.php index 61c7402e0d..ee9a4d95cd 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Customer.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Customer.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -118,4 +118,4 @@ public function load($object, $customerId) $object->setData($this->_read->fetchRow($select)); return $object; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Log.php b/app/code/core/Mage/Log/Model/Mysql4/Log.php index db5af20266..f651d25981 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Log.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Log.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -297,4 +297,4 @@ protected function _cleanUrls() ); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php index 5e375ee625..81c775452f 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -244,4 +244,4 @@ protected function _saveQuoteInfo($visitor) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Aggregator.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Aggregator.php index 607dc0395c..72b5586ad3 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Aggregator.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Aggregator.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -123,7 +123,7 @@ protected function _update($type) ->where("? - INTERVAL {$type['period']} {$type['period_type']} <= login_at", now()) ->where("logout_at IS NULL OR logout_at <= ? - INTERVAL {$type['period']} {$type['period_type']}", now()); - $customers = $this->_read->fetchCol($customerSelect); + $customers = $this->_read->fetchCol($customerSelect); $customerCount = count($customers); @@ -155,35 +155,35 @@ protected function _update($type) public function updateOneshot($minutes=60, $interval=300) { - $last_update = $this->_read->fetchOne("SELECT UNIX_TIMESTAMP(MAX(add_date)) FROM {$this->_summaryTable} WHERE type_id IS NULL"); - $next_update = $last_update + $interval; - - if( time() >= $next_update ) { - $stats = $this->_read->fetchAssoc("SELECT - u.visit_time, - v.visitor_id, - c.customer_id, - ROUND( (UNIX_TIMESTAMP(u.visit_time) - UNIX_TIMESTAMP(".now()." - INTERVAL {$minutes} MINUTE )) / {$interval} ) as _diff, - COUNT(DISTINCT(v.visitor_id)) as visitor_count, - COUNT(DISTINCT(c.customer_id)) as customer_count - FROM - {$this->_urlTable} u - LEFT JOIN {$this->_visitorTable} v ON(v.visitor_id = u.visitor_id) - LEFT JOIN {$this->_customerTable} c on(c.visitor_id = v.visitor_id) - WHERE - UNIX_TIMESTAMP(u.visit_time) > {$next_update} - group by _diff"); - - foreach( $stats as $stat ) { - $data = array( - 'type_id' => new Zend_Db_Expr('NULL'), - 'visitor_count' => $stat['visitor_count'], - 'customer_count' => $stat['customer_count'], - 'add_date' => $stat['visit_time'] - ); - $this->_write->insert($this->_summaryTable, $data); - } - } + $last_update = $this->_read->fetchOne("SELECT UNIX_TIMESTAMP(MAX(add_date)) FROM {$this->_summaryTable} WHERE type_id IS NULL"); + $next_update = $last_update + $interval; + + if( time() >= $next_update ) { + $stats = $this->_read->fetchAssoc("SELECT + u.visit_time, + v.visitor_id, + c.customer_id, + ROUND( (UNIX_TIMESTAMP(u.visit_time) - UNIX_TIMESTAMP(".now()." - INTERVAL {$minutes} MINUTE )) / {$interval} ) as _diff, + COUNT(DISTINCT(v.visitor_id)) as visitor_count, + COUNT(DISTINCT(c.customer_id)) as customer_count + FROM + {$this->_urlTable} u + LEFT JOIN {$this->_visitorTable} v ON(v.visitor_id = u.visitor_id) + LEFT JOIN {$this->_customerTable} c on(c.visitor_id = v.visitor_id) + WHERE + UNIX_TIMESTAMP(u.visit_time) > {$next_update} + group by _diff"); + + foreach( $stats as $stat ) { + $data = array( + 'type_id' => new Zend_Db_Expr('NULL'), + 'visitor_count' => $stat['visitor_count'], + 'customer_count' => $stat['customer_count'], + 'add_date' => $stat['visit_time'] + ); + $this->_write->insert($this->_summaryTable, $data); + } + } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php index f75c664a33..4dfa90590b 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -314,4 +314,4 @@ public function addVisitorStoreFilter($storeIds) { $this->_select->where('visitor_table.store_id IN (?)', $storeIds); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php index 584a0d7fe9..279442c623 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php index 66a69835b4..193d830fe4 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php index 7dc94b7b74..95be1666c2 100644 --- a/app/code/core/Mage/Log/Model/Visitor.php +++ b/app/code/core/Mage/Log/Model/Visitor.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -274,4 +274,4 @@ public function addQuoteData($data) $data->setQuoteData(Mage::getModel('sales/quote')->load($quoteId)); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Visitor/Aggregator.php b/app/code/core/Mage/Log/Model/Visitor/Aggregator.php index c3208127a0..166cd503d6 100644 --- a/app/code/core/Mage/Log/Model/Visitor/Aggregator.php +++ b/app/code/core/Mage/Log/Model/Visitor/Aggregator.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,4 +48,4 @@ public function updateOneShot() $this->getResource()->updateOneShot(); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Log/Model/Visitor/Online.php b/app/code/core/Mage/Log/Model/Visitor/Online.php index 25b253c3a7..6f37d15e50 100644 --- a/app/code/core/Mage/Log/Model/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Visitor/Online.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/etc/config.xml b/app/code/core/Mage/Log/etc/config.xml index 752e58c0f4..6809769ed2 100644 --- a/app/code/core/Mage/Log/etc/config.xml +++ b/app/code/core/Mage/Log/etc/config.xml @@ -19,10 +19,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -195,4 +195,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Log/etc/system.xml b/app/code/core/Mage/Log/etc/system.xml index 8b685a09b6..1f4aa97e02 100644 --- a/app/code/core/Mage/Log/etc/system.xml +++ b/app/code/core/Mage/Log/etc/system.xml @@ -19,10 +19,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -103,4 +103,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php index 97ffbaf732..beb5bda8e7 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php index 543651fb04..d4f14d6f68 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php index 5185da47ff..5c10f6c34d 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -1,34 +1,34 @@ -run(" -truncate table `{$this->getTable('log_quote')}`; -truncate table `{$this->getTable('log_url')}`; -truncate table `{$this->getTable('log_url_info')}`; -truncate table `{$this->getTable('log_visitor')}`; -truncate table `{$this->getTable('log_visitor_info')}`; -"); +run(" +truncate table `{$this->getTable('log_quote')}`; +truncate table `{$this->getTable('log_url')}`; +truncate table `{$this->getTable('log_url_info')}`; +truncate table `{$this->getTable('log_visitor')}`; +truncate table `{$this->getTable('log_visitor_info')}`; +"); diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php index ee3cccf52f..441dbef4e6 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php index 6fee6f29ab..b5352e5ccd 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php index d59ad7a6fd..eeb3339be0 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -18,10 +18,10 @@ * 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_Log - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/Helper/Data.php b/app/code/core/Mage/Media/Helper/Data.php index 05a609bbd7..a874792622 100644 --- a/app/code/core/Mage/Media/Helper/Data.php +++ b/app/code/core/Mage/Media/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Media - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Media + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php index 2f33e53c8a..cb3c13aec7 100644 --- a/app/code/core/Mage/Media/Model/File/Image.php +++ b/app/code/core/Mage/Media/Model/File/Image.php @@ -18,10 +18,10 @@ * 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_Media - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Media + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/Model/Image.php b/app/code/core/Mage/Media/Model/Image.php index 6ac141278e..a9eb414a02 100644 --- a/app/code/core/Mage/Media/Model/Image.php +++ b/app/code/core/Mage/Media/Model/Image.php @@ -18,10 +18,10 @@ * 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_Media - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Media + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/Model/Image/Config/Interface.php b/app/code/core/Mage/Media/Model/Image/Config/Interface.php index c167d02b78..1e35cc8798 100644 --- a/app/code/core/Mage/Media/Model/Image/Config/Interface.php +++ b/app/code/core/Mage/Media/Model/Image/Config/Interface.php @@ -18,10 +18,10 @@ * 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_Media - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Media + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Media/etc/config.xml b/app/code/core/Mage/Media/etc/config.xml index d8ea75058c..4afaac6aff 100644 --- a/app/code/core/Mage/Media/etc/config.xml +++ b/app/code/core/Mage/Media/etc/config.xml @@ -19,10 +19,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Media + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -73,4 +73,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Newsletter/Block/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Subscribe.php index 656eed37a4..5d2ee3b3e5 100644 --- a/app/code/core/Mage/Newsletter/Block/Subscribe.php +++ b/app/code/core/Mage/Newsletter/Block/Subscribe.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Newsletter/Helper/Data.php b/app/code/core/Mage/Newsletter/Helper/Data.php index 889de05e1b..863093f00f 100644 --- a/app/code/core/Mage/Newsletter/Helper/Data.php +++ b/app/code/core/Mage/Newsletter/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Message.php b/app/code/core/Mage/Newsletter/Model/Message.php index 4594903101..884158d9db 100644 --- a/app/code/core/Mage/Newsletter/Model/Message.php +++ b/app/code/core/Mage/Newsletter/Model/Message.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,4 +35,4 @@ class Mage_Newsletter_Model_Message extends Mage_Core_Model_Message { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php index 704e736f00..05aa351872 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php index d87d1072eb..5b2df946f8 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php index a0583ffbaf..52cf9e06dc 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php index cf712eba17..02fe996ce7 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -193,7 +193,9 @@ public function addStoreFilter($storeIds) if (!$this->_isStoreFilter) { $this->getSelect()->joinInner(array('store_link' => $this->getTable('queue_store_link')), 'main_table.queue_id = store_link.queue_id', array() - )->where('store_link.store_id IN (?)', $storeIds); + ) + ->where('store_link.store_id IN (?)', $storeIds) + ->group('main_table.queue_id'); $this->_isStoreFilter = true; } return $this; diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php index 44e028232e..d1f0dcbfef 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -31,7 +31,7 @@ * @package Mage_Newsletter * @author Magento Core Team */ -class Mage_Newsletter_Model_Mysql4_Subscriber +class Mage_Newsletter_Model_Mysql4_Subscriber extends Mage_Core_Model_Mysql4_Abstract { /** * DB read connection @@ -69,33 +69,18 @@ class Mage_Newsletter_Model_Mysql4_Subscriber protected $_messagesScope = 'newsletter/session'; /** - * Constructor + * Initialize resource model * - * Set read and write connection, get tablename from config + * Get tablename from config */ - public function __construct() + protected function _construct() { + $this->_init('newsletter/subscriber', 'subscriber_id'); $this->_subscriberTable = Mage::getSingleton('core/resource')->getTableName("newsletter/subscriber"); $this->_subscriberLinkTable = Mage::getSingleton('core/resource')->getTableName("newsletter/queue_link"); - $this->_read = Mage::getSingleton('core/resource')->getConnection('newsletter_read'); - $this->_write = Mage::getSingleton('core/resource')->getConnection('newsletter_write'); + $this->_read = $this->_getReadAdapter(); + $this->_write = $this->_getWriteAdapter(); } - - /** - * Load subscriber from DB - * - * @param int $subscriberId - * @return array - */ - public function load($subscriberId) - { - $select = $this->_read->select() - ->from($this->_subscriberTable) - ->where('subscriber_id=?',$subscriberId); - - return $this->_read->fetchRow($select); - } - /** * Set error messages scope * @@ -103,7 +88,7 @@ public function load($subscriberId) */ public function setMessagesScope($scope) { - $this->_messagesScope = $scope; + $this->_messagesScope = $scope; } /** @@ -160,34 +145,6 @@ public function loadByCustomer(Mage_Customer_Model_Customer $customer) return array(); } - /** - * Save subscriber info from it model. - * - * @param Mage_Newsletter_Model_Subscriber $subscriber - * @return Mage_Newsletter_Model_Subscriber - */ - public function save(Mage_Newsletter_Model_Subscriber $subscriber) - { - $this->_write->beginTransaction(); - try { - $data = $this->_prepareSave($subscriber); - if ($subscriber->getId()) { - $this->_write->update($this->_subscriberTable, $data, - $this->_write->quoteInto('subscriber_id=?',$subscriber->getId())); - } else { - $this->_write->insert($this->_subscriberTable, $data); - $subscriber->setId($this->_write->lastInsertId($this->_subscriberTable)); - } - $this->_write->commit(); - } - catch(Exception $e) { - $this->_write->rollBack(); - Mage::throwException(Mage::helper('newsletter')->__('Cannot save your subscription: %s', $e->getMessage())); - } - - return $subscriber; - } - /** * Generates random code for subscription confirmation * @@ -195,86 +152,24 @@ public function save(Mage_Newsletter_Model_Subscriber $subscriber) */ protected function _generateRandomCode() { - return md5(microtime() + rand()); - } - - /** - * Preapares data for saving of subscriber - * - * @param Mage_Newsletter_Model_Subscriber $subscriber - * @return array - */ - protected function _prepareSave(Mage_Newsletter_Model_Subscriber $subscriber) - { - $data = array(); - $data['customer_id'] = $subscriber->getCustomerId(); - $data['store_id'] = $subscriber->getStoreId() ? $subscriber->getStoreId() : 0; - $data['subscriber_status'] = $subscriber->getStatus(); - $data['subscriber_email'] = $subscriber->getEmail(); - $data['subscriber_confirm_code'] = $subscriber->getCode(); - - if($subscriber->getIsStatusChanged()) { - $data['change_status_at'] = Mage::getSingleton('core/date')->gmtDate(); - } - - $validators = array('subscriber_email' => 'EmailAddress'); - $filters = array(); - $input = new Zend_Filter_Input($filters, $validators, $data); - $session = Mage::getSingleton($this->_messagesScope); - if ($input->hasInvalid() || $input->hasMissing()) { - foreach ($input->getMessages() as $message) { - if(is_array($message)) { - foreach( $message as $error ) { - $session->addError($error); - } - } else { - $session->addError($message); - } - } - Mage::throwException(Mage::helper('newsletter')->__('Form was filled incorrectly')); - } - - return $data; - } - - /** - * Delete subscriber from DB - * - * @param int $subscriberId - */ - public function delete($subscriberId) - { - if(!(int)$subscriberId) { - Mage::throwException(Mage::helper('newsletter')->__('Invalid subscriber ID')); - } - - $this->_write->beginTransaction(); - try { - $this->_write->delete($this->_subscriberTable, - $this->_write->quoteInto('subscriber_id=?', $subscriberId)); - $this->_write->commit(); - } - catch (Exception $e) { - $this->_write->rollBack(); - Mage::throwException(Mage::helper('newsletter')->__('Cannot delete subscriber')); - } + return Mage::helper('core')->uniqHash(); } public function received(Mage_Newsletter_Model_Subscriber $subscriber, Mage_Newsletter_Model_Queue $queue) { - $this->_write->beginTransaction(); - try { - $data['letter_sent_at'] = now(); + $this->_write->beginTransaction(); + try { + $data['letter_sent_at'] = now(); $this->_write->update($this->_subscriberLinkTable, - $data, + $data, array($this->_write->quoteInto('subscriber_id=?', $subscriber->getId()), - $this->_write->quoteInto('queue_id=?', $queue->getId()))); + $this->_write->quoteInto('queue_id=?', $queue->getId()))); $this->_write->commit(); } catch (Exception $e) { $this->_write->rollBack(); Mage::throwException(Mage::helper('newsletter')->__('Cannot mark as received subscriber')); } - return $this; + return $this; } } diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php index 548824478a..e947e4cfd6 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,7 +33,7 @@ * @todo Refactoring this collection to Mage_Core_Model_Mysql4_Collection_Abstract. */ -class Mage_Newsletter_Model_Mysql4_Subscriber_Collection extends Varien_Data_Collection_Db +class Mage_Newsletter_Model_Mysql4_Subscriber_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { /** * Subscribers table name @@ -82,14 +82,13 @@ class Mage_Newsletter_Model_Mysql4_Subscriber_Collection extends Varien_Data_Col * * Configures collection */ - public function __construct() + protected function _construct() { - parent::__construct(Mage::getSingleton('core/resource')->getConnection('newsletter_read')); + parent::_construct(); $this->_subscriberTable = Mage::getSingleton('core/resource')->getTableName('newsletter/subscriber'); $this->_queueLinkTable = Mage::getSingleton('core/resource')->getTableName('newsletter/queue_link'); $this->_storeTable = Mage::getSingleton('core/resource')->getTableName('core/store'); - $this->_select->from(array('main_table'=>$this->_subscriberTable)); - $this->setItemObjectClass(Mage::getConfig()->getModelClassName('newsletter/subscriber')); + $this->_init('newsletter/subscriber'); } /** @@ -99,38 +98,19 @@ public function __construct() */ public function useQueue(Mage_Newsletter_Model_Queue $queue) { - $this->_select->join(array('link'=>$this->_queueLinkTable), "link.subscriber_id = main_table.subscriber_id", array()) + $this->getSelect()->join(array('link'=>$this->_queueLinkTable), "link.subscriber_id = main_table.subscriber_id", array()) ->where("link.queue_id = ? ", $queue->getId()); $this->_queueJoinedFlag = true; return $this; } - /** - * Retrive all ids for collection - * @todo : In future we need to extend all newslatter classes from abstract classes - * - * @return array - */ - public function getAllIds() - { - $idsSelect = clone $this->getSelect(); - $idsSelect->reset(Zend_Db_Select::ORDER); - $idsSelect->reset(Zend_Db_Select::LIMIT_COUNT); - $idsSelect->reset(Zend_Db_Select::LIMIT_OFFSET); - $idsSelect->reset(Zend_Db_Select::COLUMNS); - $idsSelect->from(null, - 'main_table.subscriber_id' - ); - return $this->getConnection()->fetchCol($idsSelect); - } - /** * Set using of links to only unsendet letter subscribers. */ public function useOnlyUnsent( ) { if($this->_queueJoinedFlag) { - $this->_select->where("link.letter_sent_at IS NULL"); + $this->getSelect()->where("link.letter_sent_at IS NULL"); } return $this; @@ -199,7 +179,7 @@ public function showStoreInfo() public function addFieldToFilter($field, $condition=null) { if(!is_null($condition)) { - $this->_select->where($this->_getConditionSql($this->_getFieldTableAlias($field), $condition)); + parent::addFieldToFilter($field, $condition); $this->_countFilterPart[] = $this->_getConditionSql($this->_getFieldTableAlias($field), $condition); } return $this; @@ -226,7 +206,7 @@ public function getSelectCountSql() { $this->_renderFilters(); - $countSelect = clone $this->_select; + $countSelect = clone $this->getSelect(); $countSelect->reset(Zend_Db_Select::HAVING); $countSelect->reset(Zend_Db_Select::ORDER); @@ -251,7 +231,7 @@ public function getSelectCountSql() */ public function useOnlyCustomers() { - $this->_select->where("main_table.customer_id > 0"); + $this->getSelect()->where("main_table.customer_id > 0"); return $this; } @@ -261,24 +241,20 @@ public function useOnlyCustomers() */ public function useOnlySubscribed() { - $this->_select->where("main_table.subscriber_status = ?", Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED); + $this->getSelect()->where("main_table.subscriber_status = ?", Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED); return $this; } /** - * Load subscribes to collection + * Filter collection by specified store ids * - * @param boolean $printQuery - * @param boolean $logQuery - * @return Varien_Data_Collection_Db + * @param array|int $storeIds + * @return Mage_Newsletter_Model_Mysql4_Subscriber_Collection */ - public function load($printQuery=false, $logQuery=false) + public function addStoreFilter($storeIds) { - if ($this->isLoaded()) { - return $this; - } - parent::load($printQuery, $logQuery); + $this->getSelect()->where('main_table.store_id IN (?)', $storeIds); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php index ea81c82a82..9248dfe019 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php index b1e2c3190e..d220b8ed10 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -71,4 +71,4 @@ public function toOptionArray() return $this->_toOptionArray('template_id', 'template_code'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Newsletter/Model/Observer.php b/app/code/core/Mage/Newsletter/Model/Observer.php index b6ecd9b913..ec6081ccd0 100644 --- a/app/code/core/Mage/Newsletter/Model/Observer.php +++ b/app/code/core/Mage/Newsletter/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Newsletter/Model/Problem.php b/app/code/core/Mage/Newsletter/Model/Problem.php index 5a1437bdf7..451248c594 100644 --- a/app/code/core/Mage/Newsletter/Model/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Problem.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Queue.php b/app/code/core/Mage/Newsletter/Model/Queue.php index 25cd40d4bf..ca190a650f 100644 --- a/app/code/core/Mage/Newsletter/Model/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Queue.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Newsletter/Model/Session.php b/app/code/core/Mage/Newsletter/Model/Session.php index 6f7ac54fe3..c0eb037bff 100644 --- a/app/code/core/Mage/Newsletter/Model/Session.php +++ b/app/code/core/Mage/Newsletter/Model/Session.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function getSuccess() $this->unsSuccessMessage(); return $message; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php index 83c1191919..061a2c681b 100644 --- a/app/code/core/Mage/Newsletter/Model/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Subscriber.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -31,7 +31,7 @@ * @package Mage_Newsletter * @author Magento Core Team */ -class Mage_Newsletter_Model_Subscriber extends Varien_Object +class Mage_Newsletter_Model_Subscriber extends Mage_Core_Model_Abstract { const STATUS_SUBSCRIBED = 1; const STATUS_NOT_ACTIVE = 2; @@ -49,6 +49,14 @@ class Mage_Newsletter_Model_Subscriber extends Varien_Object protected $_isStatusChanged = false; + /** + * Initialize resource model + */ + protected function _construct() + { + $this->_init('newsletter/subscriber'); + } + /** * Alias for getSubscriberId() * @@ -191,26 +199,6 @@ public function isSubscribed() return false; } - /** - * Return resource model - * - * @return Mage_Subscriber_Model_Mysql4_Subscriber - */ - public function getResource() - { - return Mage::getResourceSingleton('newsletter/subscriber'); - } - - /** - * Load subscriber data from resource model - * - * @param int $subscriberId - */ - public function load($subscriberId) - { - $this->addData($this->getResource()->load($subscriberId)); - return $this; - } /** * Load subscriber data from resource model by email @@ -244,23 +232,6 @@ public function loadByCustomer(Mage_Customer_Model_Customer $customer) return $this; } - /** - * Save subscriber data to resource model - * - */ - public function save() - { - return $this->getResource()->save($this); - } - - /** - * Deletes subscriber data - */ - public function delete() - { - $this->getResource()->delete($this->getId()); - $this->setId(null); - } public function randomSequence($length=32) { @@ -515,4 +486,4 @@ public function sendUnsubscriptionEmail() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php index fcd306ac5d..8207743ff9 100644 --- a/app/code/core/Mage/Newsletter/Model/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Template.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Newsletter/controllers/ManageController.php b/app/code/core/Mage/Newsletter/controllers/ManageController.php index 201e00ea6b..f2e0fa013f 100644 --- a/app/code/core/Mage/Newsletter/controllers/ManageController.php +++ b/app/code/core/Mage/Newsletter/controllers/ManageController.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,7 +49,7 @@ public function preDispatch() public function indexAction() { - $this->loadLayout(); + $this->loadLayout(); $this->_initLayoutMessages('customer/session'); $this->_initLayoutMessages('catalog/session'); diff --git a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php index 0bf3c748a2..8cde48334f 100644 --- a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php +++ b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -116,4 +116,4 @@ public function unsubscribeAction() } $this->_redirectReferer(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Newsletter/etc/config.xml b/app/code/core/Mage/Newsletter/etc/config.xml index ca16a6080d..40cf8d7ea0 100644 --- a/app/code/core/Mage/Newsletter/etc/config.xml +++ b/app/code/core/Mage/Newsletter/etc/config.xml @@ -19,10 +19,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/etc/system.xml b/app/code/core/Mage/Newsletter/etc/system.xml index 2a00f4ef88..08f60d41a0 100644 --- a/app/code/core/Mage/Newsletter/etc/system.xml +++ b/app/code/core/Mage/Newsletter/etc/system.xml @@ -19,10 +19,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -112,4 +112,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php index 746c8b1043..e0e9877db1 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php index 0c6af94cc6..13b164cd5f 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -120,4 +120,4 @@ KEY `modified_at` (`modified_at`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Newsletter templates'; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php index e1d93fb92e..b579170e19 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Newsletter - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,4 +55,4 @@ ON UPDATE CASCADE ON DELETE SET NULL; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Page/Block/Html.php b/app/code/core/Mage/Page/Block/Html.php index 8ab4824431..c5de88c9b7 100644 --- a/app/code/core/Mage/Page/Block/Html.php +++ b/app/code/core/Mage/Page/Block/Html.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php b/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php index 4e987179fd..314d5d57a1 100644 --- a/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php +++ b/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,17 +52,17 @@ class Mage_Page_Block_Html_Breadcrumbs extends Mage_Core_Block_Template function __construct() { - parent::__construct(); - $this->setTemplate('page/html/breadcrumbs.phtml'); + parent::__construct(); + $this->setTemplate('page/html/breadcrumbs.phtml'); } function addCrumb($crumbName, $crumbInfo, $after = false) { $this->_prepareArray($crumbInfo, array('label', 'title', 'link', 'first', 'last', 'readonly')); if ((!isset($this->_crumbs[$crumbName])) || (!$this->_crumbs[$crumbName]['readonly'])) { - $this->_crumbs[$crumbName] = $crumbInfo; + $this->_crumbs[$crumbName] = $crumbInfo; } - return $this; + return $this; } protected function _toHtml() @@ -73,7 +73,7 @@ protected function _toHtml() end($this->_crumbs); $this->_crumbs[key($this->_crumbs)]['last'] = true; } - $this->assign('crumbs', $this->_crumbs); - return parent::_toHtml(); + $this->assign('crumbs', $this->_crumbs); + return parent::_toHtml(); } } diff --git a/app/code/core/Mage/Page/Block/Html/Footer.php b/app/code/core/Mage/Page/Block/Html/Footer.php index fc65b65c16..9a6dace25c 100644 --- a/app/code/core/Mage/Page/Block/Html/Footer.php +++ b/app/code/core/Mage/Page/Block/Html/Footer.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Block/Html/Head.php b/app/code/core/Mage/Page/Block/Html/Head.php index 73bc5d9bb6..aa13954891 100644 --- a/app/code/core/Mage/Page/Block/Html/Head.php +++ b/app/code/core/Mage/Page/Block/Html/Head.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Header.php b/app/code/core/Mage/Page/Block/Html/Header.php index 2fcd0a45c5..853995ddd8 100644 --- a/app/code/core/Mage/Page/Block/Html/Header.php +++ b/app/code/core/Mage/Page/Block/Html/Header.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Block/Html/Notices.php b/app/code/core/Mage/Page/Block/Html/Notices.php index 79ac523b45..2b437e4c90 100644 --- a/app/code/core/Mage/Page/Block/Html/Notices.php +++ b/app/code/core/Mage/Page/Block/Html/Notices.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php index 4025fa0a75..4fdff08c55 100644 --- a/app/code/core/Mage/Page/Block/Html/Pager.php +++ b/app/code/core/Mage/Page/Block/Html/Pager.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -102,7 +102,7 @@ public function getPageVarName() public function setShowPerPage($varName) { - $this->_showPerPage=$varName; + $this->_showPerPage=$varName; } public function getShowPerPage() @@ -110,7 +110,7 @@ public function getShowPerPage() if(sizeof($this->getAvailableLimit())<=1) { return false; } - return $this->_showPerPage; + return $this->_showPerPage; } public function setLimitVarName($varName) diff --git a/app/code/core/Mage/Page/Block/Html/Toplinks.php b/app/code/core/Mage/Page/Block/Html/Toplinks.php index bd8e024d02..f7b94c3bb1 100644 --- a/app/code/core/Mage/Page/Block/Html/Toplinks.php +++ b/app/code/core/Mage/Page/Block/Html/Toplinks.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Block/Js/Translate.php b/app/code/core/Mage/Page/Block/Js/Translate.php index 93809d868d..b527e88444 100644 --- a/app/code/core/Mage/Page/Block/Js/Translate.php +++ b/app/code/core/Mage/Page/Block/Js/Translate.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Block/Redirect.php b/app/code/core/Mage/Page/Block/Redirect.php index a6cd026f0d..9468389f5a 100644 --- a/app/code/core/Mage/Page/Block/Redirect.php +++ b/app/code/core/Mage/Page/Block/Redirect.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,7 +34,7 @@ */ class Mage_Page_Block_Redirect extends Mage_Core_Block_Template { - + /** * HTML form hidden fields */ diff --git a/app/code/core/Mage/Page/Block/Switch.php b/app/code/core/Mage/Page/Block/Switch.php index fa0a983f43..377c67d858 100644 --- a/app/code/core/Mage/Page/Block/Switch.php +++ b/app/code/core/Mage/Page/Block/Switch.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -156,4 +156,4 @@ public function isStoreInUrl() } return $this->_storeInUrl; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Page/Block/Template/Container.php b/app/code/core/Mage/Page/Block/Template/Container.php index 8e86a7f956..ec0a88be19 100644 --- a/app/code/core/Mage/Page/Block/Template/Container.php +++ b/app/code/core/Mage/Page/Block/Template/Container.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php index f2e55a4e2d..cee60bf812 100644 --- a/app/code/core/Mage/Page/Block/Template/Links.php +++ b/app/code/core/Mage/Page/Block/Template/Links.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Helper/Data.php b/app/code/core/Mage/Page/Helper/Data.php index 7eefabcf10..de86728371 100644 --- a/app/code/core/Mage/Page/Helper/Data.php +++ b/app/code/core/Mage/Page/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Page/Helper/Html.php b/app/code/core/Mage/Page/Helper/Html.php index ace8d1a23f..ea57224c13 100644 --- a/app/code/core/Mage/Page/Helper/Html.php +++ b/app/code/core/Mage/Page/Helper/Html.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,4 +32,4 @@ class Mage_Page_Helper_Html extends Mage_Core_Helper_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Page/Helper/Layout.php b/app/code/core/Mage/Page/Helper/Layout.php index 24888196e5..380cdd7279 100644 --- a/app/code/core/Mage/Page/Helper/Layout.php +++ b/app/code/core/Mage/Page/Helper/Layout.php @@ -1,121 +1,121 @@ - - */ -class Mage_Page_Helper_Layout extends Mage_Core_Helper_Abstract -{ - /** - * Apply page layout handle - * - * @param string $pageLayout - * @return Mage_Page_Helper_Layout - */ - public function applyHandle($pageLayout) - { - $pageLayout = $this->_getConfig()->getPageLayout($pageLayout); - - if (!$pageLayout) { - return $this; - } - - $this->getLayout() - ->getUpdate() - ->addHandle($pageLayout->getLayoutHandle()); - - return $this; - } - - /** - * Apply page layout template - * (for old design packages) - * - * @param string $pageLayout - * @return Mage_Page_Helper_Layout - */ - public function applyTemplate($pageLayout = null) - { - if ($pageLayout === null) { - $pageLayout = $this->getCurrentPageLayout(); - } else { - $pageLayout = $this->_getConfig()->getPageLayout($pageLayout); - } - - if (!$pageLayout) { - return $this; - } - - if ($this->getLayout()->getBlock('root') && - !$this->getLayout()->getBlock('root')->getIsHandle()) { - // If not applied handle - $this->getLayout() - ->getBlock('root') - ->setTemplate($pageLayout->getTemplate()); - } - - return $this; - } - - /** - * Retrieve current applied page layout - * - * @return Varien_Object|boolean - */ - public function getCurrentPageLayout() - { - // All loaded handles - $handles = $this->getLayout()->getUpdate()->getHandles(); - // Handles used in page layouts - $pageLayoutHandles = $this->_getConfig()->getPageLayoutHandles(); - // Applied page layout handles - $appliedHandles = array_intersect($handles, $pageLayoutHandles); - - if (empty($appliedHandles)) { - return false; - } - - $currentHandle = array_pop($appliedHandles); - - $layoutCode = array_search($currentHandle, $pageLayoutHandles, true); - - return $this->_getConfig()->getPageLayout($layoutCode); - } - - /** - * Retrieve page config - * - * @return Mage_Page_Model_Config - */ - protected function _getConfig() - { - return Mage::getSingleton('page/config'); - } -} + + */ +class Mage_Page_Helper_Layout extends Mage_Core_Helper_Abstract +{ + /** + * Apply page layout handle + * + * @param string $pageLayout + * @return Mage_Page_Helper_Layout + */ + public function applyHandle($pageLayout) + { + $pageLayout = $this->_getConfig()->getPageLayout($pageLayout); + + if (!$pageLayout) { + return $this; + } + + $this->getLayout() + ->getUpdate() + ->addHandle($pageLayout->getLayoutHandle()); + + return $this; + } + + /** + * Apply page layout template + * (for old design packages) + * + * @param string $pageLayout + * @return Mage_Page_Helper_Layout + */ + public function applyTemplate($pageLayout = null) + { + if ($pageLayout === null) { + $pageLayout = $this->getCurrentPageLayout(); + } else { + $pageLayout = $this->_getConfig()->getPageLayout($pageLayout); + } + + if (!$pageLayout) { + return $this; + } + + if ($this->getLayout()->getBlock('root') && + !$this->getLayout()->getBlock('root')->getIsHandle()) { + // If not applied handle + $this->getLayout() + ->getBlock('root') + ->setTemplate($pageLayout->getTemplate()); + } + + return $this; + } + + /** + * Retrieve current applied page layout + * + * @return Varien_Object|boolean + */ + public function getCurrentPageLayout() + { + // All loaded handles + $handles = $this->getLayout()->getUpdate()->getHandles(); + // Handles used in page layouts + $pageLayoutHandles = $this->_getConfig()->getPageLayoutHandles(); + // Applied page layout handles + $appliedHandles = array_intersect($handles, $pageLayoutHandles); + + if (empty($appliedHandles)) { + return false; + } + + $currentHandle = array_pop($appliedHandles); + + $layoutCode = array_search($currentHandle, $pageLayoutHandles, true); + + return $this->_getConfig()->getPageLayout($layoutCode); + } + + /** + * Retrieve page config + * + * @return Mage_Page_Model_Config + */ + protected function _getConfig() + { + return Mage::getSingleton('page/config'); + } +} diff --git a/app/code/core/Mage/Page/Model/Config.php b/app/code/core/Mage/Page/Model/Config.php index 3ad3de3ca8..be627286e9 100644 --- a/app/code/core/Mage/Page/Model/Config.php +++ b/app/code/core/Mage/Page/Model/Config.php @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -74,10 +74,11 @@ protected function _appendPageLayouts($xmlPath) } foreach (Mage::getConfig()->getNode($xmlPath)->children() as $layoutCode => $layoutConfig) { $this->_pageLayouts[$layoutCode] = new Varien_Object(array( - 'label' => Mage::helper('page')->__((string)$layoutConfig->label), - 'code' => $layoutCode, - 'template' => (string) $layoutConfig->template, - 'layout_handle' => (string) $layoutConfig->layout_handle + 'label' => Mage::helper('page')->__((string)$layoutConfig->label), + 'code' => $layoutCode, + 'template' => (string)$layoutConfig->template, + 'layout_handle' => (string)$layoutConfig->layout_handle, + 'is_default' => (int)$layoutConfig->is_default, )); } return $this; diff --git a/app/code/core/Mage/Page/Model/Source/Layout.php b/app/code/core/Mage/Page/Model/Source/Layout.php index edf2a76fab..bf28b6bb36 100644 --- a/app/code/core/Mage/Page/Model/Source/Layout.php +++ b/app/code/core/Mage/Page/Model/Source/Layout.php @@ -1,83 +1,102 @@ - - */ -class Mage_Page_Model_Source_Layout -{ - - /** - * Page layout options - * - * @var array - */ - protected $_options = null; - - /** - * Retrieve page layout options - * - * @return array - */ - public function getOptions() - { - if ($this->_options === null) { - $this->_options = array(); - foreach (Mage::getSingleton('page/config')->getPageLayouts() as $layout) { - $this->_options[$layout->getCode()] = $layout->getLabel(); - } - } - - return $this->_options; - } - - /** - * Retrieve page layout options array - * - * @return array - */ - public function toOptionArray($withEmpty = false) - { - $options = array(); - - foreach ($this->getOptions() as $value => $label) { - $options[] = array( - 'label' => $label, - 'value' => $value - ); - } - - if ($withEmpty) { - array_unshift($options, array('value'=>'', 'label'=>Mage::helper('page')->__('-- Please Select --'))); - } - - return $options; - } -} + + */ +class Mage_Page_Model_Source_Layout +{ + + /** + * Page layout options + * + * @var array + */ + protected $_options = null; + + /** + * Default option + * @var string + */ + protected $_defaultValue = null; + + /** + * Retrieve page layout options + * + * @return array + */ + public function getOptions() + { + if ($this->_options === null) { + $this->_options = array(); + foreach (Mage::getSingleton('page/config')->getPageLayouts() as $layout) { + $this->_options[$layout->getCode()] = $layout->getLabel(); + if ($layout->getIsDefault()) { + $this->_defaultValue = $layout->getCode(); + } + } + } + + return $this->_options; + } + + /** + * Retrieve page layout options array + * + * @return array + */ + public function toOptionArray($withEmpty = false) + { + $options = array(); + + foreach ($this->getOptions() as $value => $label) { + $options[] = array( + 'label' => $label, + 'value' => $value + ); + } + + if ($withEmpty) { + array_unshift($options, array('value'=>'', 'label'=>Mage::helper('page')->__('-- Please Select --'))); + } + + return $options; + } + + /** + * Default options value getter + * @return string + */ + public function getDefaultValue() + { + $this->getOptions(); + return $this->_defaultValue; + } +} diff --git a/app/code/core/Mage/Page/etc/config.xml b/app/code/core/Mage/Page/etc/config.xml index c22d9423f2..db80a2e40b 100644 --- a/app/code/core/Mage/Page/etc/config.xml +++ b/app/code/core/Mage/Page/etc/config.xml @@ -53,6 +53,7 @@ page_one_column + 1 diff --git a/app/code/core/Mage/Page/etc/system.xml b/app/code/core/Mage/Page/etc/system.xml index ef2c86cf3e..85edfd883e 100644 --- a/app/code/core/Mage/Page/etc/system.xml +++ b/app/code/core/Mage/Page/etc/system.xml @@ -19,10 +19,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/Helper/Data.php b/app/code/core/Mage/Paygate/Helper/Data.php index 13887ef240..a33b5392f4 100644 --- a/app/code/core/Mage/Paygate/Helper/Data.php +++ b/app/code/core/Mage/Paygate/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php index 573590f303..651dcf4eae 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php index 8f9f0419cb..ea8cb3c2e5 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php @@ -18,17 +18,17 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Paygate_Model_Authorizenet_Debug extends Mage_Core_Model_Abstract +class Mage_Paygate_Model_Authorizenet_Debug extends Mage_Core_Model_Abstract { - protected function _construct() - { - $this->_init('paygate/authorizenet_debug'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('paygate/authorizenet_debug'); + } +} diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php index 85aefe32a8..b6e0b36ac9 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php @@ -18,14 +18,14 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Paygate_Model_Authorizenet_Request extends Varien_Object { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php index 6ad303e3f9..45a6b41e12 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php @@ -18,14 +18,14 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Paygate_Model_Authorizenet_Result extends Varien_Object { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php index 9c00a9acc7..86c873481b 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ public function getAllowedTypes() { return array('VI', 'MC', 'AE', 'DI', 'OT'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php index b0480b0615..d3dd948717 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,4 +45,4 @@ public function toOptionArray() ), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php index 5a20cc30ff..874989a630 100644 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php @@ -18,17 +18,17 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Paygate_Model_Mysql4_Authorizenet_Debug extends Mage_Core_Model_Mysql4_Abstract +class Mage_Paygate_Model_Mysql4_Authorizenet_Debug extends Mage_Core_Model_Mysql4_Abstract { - protected function _construct() - { - $this->_init('paygate/authorizenet_debug', 'debug_id'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('paygate/authorizenet_debug', 'debug_id'); + } +} diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php index 339acce38e..d19d4951ca 100644 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php +++ b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php @@ -18,17 +18,17 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract +class Mage_Paygate_Model_Mysql4_Authorizenet_Debug_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { - protected function _construct() - { - $this->_init('paygate/authorizenet_debug'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('paygate/authorizenet_debug'); + } +} diff --git a/app/code/core/Mage/Paygate/Model/Payflow/Pro.php b/app/code/core/Mage/Paygate/Model/Payflow/Pro.php index d31aec6a02..8834294236 100644 --- a/app/code/core/Mage/Paygate/Model/Payflow/Pro.php +++ b/app/code/core/Mage/Paygate/Model/Payflow/Pro.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -73,7 +73,7 @@ class Mage_Paygate_Model_Payflow_Pro extends Mage_Payment_Model_Method_Cc protected $_canUseCheckout = true; protected $_canUseForMultishipping = true; protected $_canSaveCc = false; - protected $_isProxy = false; + protected $_isProxy = false; /** * Fields that should be replaced in debug with '***' @@ -332,19 +332,19 @@ protected function _postRequest(Varien_Object $request) $client = new Varien_Http_Client(); - $_config = array( + $_config = array( 'maxredirects'=>5, 'timeout'=>30, ); - $_isProxy = $this->getConfigData('use_proxy', false); - if($_isProxy){ - $_config['proxy'] = $this->getConfigData('proxy_host') . ':' . $this->getConfigData('proxy_port');//http://proxy.shr.secureserver.net:3128', - $_config['httpproxytunnel'] = true; - $_config['proxytype'] = CURLPROXY_HTTP; - } + $_isProxy = $this->getConfigData('use_proxy', false); + if($_isProxy){ + $_config['proxy'] = $this->getConfigData('proxy_host') . ':' . $this->getConfigData('proxy_port');//http://proxy.shr.secureserver.net:3128', + $_config['httpproxytunnel'] = true; + $_config['proxytype'] = CURLPROXY_HTTP; + } - $uri = $this->getConfigData('url'); + $uri = $this->getConfigData('url'); $client->setUri($uri) ->setConfig($_config) ->setMethod(Zend_Http_Client::POST) @@ -452,7 +452,7 @@ protected function _buildRequest(Varien_Object $payment) protected function _generateRequestId() { - return md5(microtime() . rand(0, time())); + return Mage::helper('core')->uniqHash(); } /** diff --git a/app/code/core/Mage/Paygate/Model/Payflow/Pro/Request.php b/app/code/core/Mage/Paygate/Model/Payflow/Pro/Request.php index 5b1cde46c2..6f2752b133 100644 --- a/app/code/core/Mage/Paygate/Model/Payflow/Pro/Request.php +++ b/app/code/core/Mage/Paygate/Model/Payflow/Pro/Request.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,4 +35,4 @@ class Mage_Paygate_Model_Payflow_Pro_Request extends Varien_Object { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paygate/Model/Payflow/Pro/Result.php b/app/code/core/Mage/Paygate/Model/Payflow/Pro/Result.php index 9c3cc9e202..9b709d8963 100644 --- a/app/code/core/Mage/Paygate/Model/Payflow/Pro/Result.php +++ b/app/code/core/Mage/Paygate/Model/Payflow/Pro/Result.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,4 +35,4 @@ class Mage_Paygate_Model_Payflow_Pro_Result extends Varien_Object { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paygate/Model/Payflow/Source/Cctype.php b/app/code/core/Mage/Paygate/Model/Payflow/Source/Cctype.php index 1477bd3574..1d2658c885 100644 --- a/app/code/core/Mage/Paygate/Model/Payflow/Source/Cctype.php +++ b/app/code/core/Mage/Paygate/Model/Payflow/Source/Cctype.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ public function getAllowedTypes() { return array('VI', 'MC', 'AE', 'DI', 'OT'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paygate/Model/Payflow/Source/PaymentAction.php b/app/code/core/Mage/Paygate/Model/Payflow/Source/PaymentAction.php index dc48e52d0d..8192bcd665 100644 --- a/app/code/core/Mage/Paygate/Model/Payflow/Source/PaymentAction.php +++ b/app/code/core/Mage/Paygate/Model/Payflow/Source/PaymentAction.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,4 +45,4 @@ public function toOptionArray() ), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paygate/etc/config.xml b/app/code/core/Mage/Paygate/etc/config.xml index 3b949fa0f7..cf6b754501 100644 --- a/app/code/core/Mage/Paygate/etc/config.xml +++ b/app/code/core/Mage/Paygate/etc/config.xml @@ -19,10 +19,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/etc/system.xml b/app/code/core/Mage/Paygate/etc/system.xml index 839b315712..3efd42e96d 100644 --- a/app/code/core/Mage/Paygate/etc/system.xml +++ b/app/code/core/Mage/Paygate/etc/system.xml @@ -19,10 +19,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php index c6aa34e1aa..059c7487c4 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Payment/Block/Form.php b/app/code/core/Mage/Payment/Block/Form.php index dc3411947f..3e56c84e5b 100644 --- a/app/code/core/Mage/Payment/Block/Form.php +++ b/app/code/core/Mage/Payment/Block/Form.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function getInfoData($field) { return $this->htmlEscape($this->getMethod()->getInfoInstance()->getData($field)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Block/Form/Cc.php b/app/code/core/Mage/Payment/Block/Form/Cc.php index 54df61d35a..6736545f76 100644 --- a/app/code/core/Mage/Payment/Block/Form/Cc.php +++ b/app/code/core/Mage/Payment/Block/Form/Cc.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -113,4 +113,4 @@ public function hasVerification() } return true; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Block/Form/Ccsave.php b/app/code/core/Mage/Payment/Block/Form/Ccsave.php index 98074c79dc..f376b2f98c 100644 --- a/app/code/core/Mage/Payment/Block/Form/Ccsave.php +++ b/app/code/core/Mage/Payment/Block/Form/Ccsave.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Checkmo.php b/app/code/core/Mage/Payment/Block/Form/Checkmo.php index 5a41f20a18..08aea6df17 100644 --- a/app/code/core/Mage/Payment/Block/Form/Checkmo.php +++ b/app/code/core/Mage/Payment/Block/Form/Checkmo.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Container.php b/app/code/core/Mage/Payment/Block/Form/Container.php index 0f80efab1a..d66c63b201 100644 --- a/app/code/core/Mage/Payment/Block/Form/Container.php +++ b/app/code/core/Mage/Payment/Block/Form/Container.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,9 +42,9 @@ protected function _prepareLayout() * Create child blocks for payment methods forms */ foreach ($this->getMethods() as $method) { - $this->setChild( - 'payment.method.'.$method->getCode(), - $this->helper('payment')->getMethodFormBlock($method) + $this->setChild( + 'payment.method.'.$method->getCode(), + $this->helper('payment')->getMethodFormBlock($method) ); } @@ -142,4 +142,4 @@ public function getSelectedMethodCode() } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php b/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php index ead166f163..ba23f85b99 100644 --- a/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php @@ -1,35 +1,35 @@ -setTemplate('payment/form/purchaseorder.phtml'); - } -} +setTemplate('payment/form/purchaseorder.phtml'); + } +} diff --git a/app/code/core/Mage/Payment/Block/Info.php b/app/code/core/Mage/Payment/Block/Info.php index 09d7235571..b5f07c3838 100644 --- a/app/code/core/Mage/Payment/Block/Info.php +++ b/app/code/core/Mage/Payment/Block/Info.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -65,4 +65,4 @@ public function toPdf() $this->setTemplate('payment/info/pdf/default.phtml'); return $this->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Block/Info/Cc.php b/app/code/core/Mage/Payment/Block/Info/Cc.php index 952e94ff68..7f7939c040 100644 --- a/app/code/core/Mage/Payment/Block/Info/Cc.php +++ b/app/code/core/Mage/Payment/Block/Info/Cc.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -82,4 +82,4 @@ public function toPdf() $this->setTemplate('payment/info/pdf/cc.phtml'); return $this->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Block/Info/Ccsave.php b/app/code/core/Mage/Payment/Block/Info/Ccsave.php index 349273bb5e..5a6762871f 100644 --- a/app/code/core/Mage/Payment/Block/Info/Ccsave.php +++ b/app/code/core/Mage/Payment/Block/Info/Ccsave.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Payment_Block_Info_Ccsave extends Mage_Payment_Block_Info_Cc @@ -39,4 +39,4 @@ public function toPdf() return $this->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Block/Info/Checkmo.php b/app/code/core/Mage/Payment/Block/Info/Checkmo.php index a3d362a739..ad94dc0f27 100644 --- a/app/code/core/Mage/Payment/Block/Info/Checkmo.php +++ b/app/code/core/Mage/Payment/Block/Info/Checkmo.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -87,4 +87,4 @@ public function toPdf() return $this->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Block/Info/Container.php b/app/code/core/Mage/Payment/Block/Info/Container.php index 0c91892aaa..ccd91684c8 100644 --- a/app/code/core/Mage/Payment/Block/Info/Container.php +++ b/app/code/core/Mage/Payment/Block/Info/Container.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php b/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php index 24346b73fd..1931ff4b3b 100644 --- a/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php @@ -1,41 +1,41 @@ -setTemplate('payment/info/purchaseorder.phtml'); - } - - public function toPdf() - { - $this->setTemplate('payment/info/pdf/purchaseorder.phtml'); - return $this->toHtml(); - } -} +setTemplate('payment/info/purchaseorder.phtml'); + } + + public function toPdf() + { + $this->setTemplate('payment/info/pdf/purchaseorder.phtml'); + return $this->toHtml(); + } +} diff --git a/app/code/core/Mage/Payment/Exception.php b/app/code/core/Mage/Payment/Exception.php index 30d9daf30d..17c50606a1 100644 --- a/app/code/core/Mage/Payment/Exception.php +++ b/app/code/core/Mage/Payment/Exception.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function getFields() { return $this->_code; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php index d04c974f7c..d518f6fa06 100644 --- a/app/code/core/Mage/Payment/Helper/Data.php +++ b/app/code/core/Mage/Payment/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Payment/Model/Config.php b/app/code/core/Mage/Payment/Model/Config.php index d92eaa32a5..d1811eb669 100644 --- a/app/code/core/Mage/Payment/Model/Config.php +++ b/app/code/core/Mage/Payment/Model/Config.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Payment/Model/Info.php b/app/code/core/Mage/Payment/Model/Info.php index 709ae496cd..a80f7aa489 100644 --- a/app/code/core/Mage/Payment/Model/Info.php +++ b/app/code/core/Mage/Payment/Model/Info.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -103,4 +103,4 @@ public function decrypt($data) } return $data; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php index 97220b40f6..b901781277 100644 --- a/app/code/core/Mage/Payment/Model/Method/Abstract.php +++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php index 4262279f16..a34cfe533d 100644 --- a/app/code/core/Mage/Payment/Model/Method/Cc.php +++ b/app/code/core/Mage/Payment/Model/Method/Cc.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Ccsave.php b/app/code/core/Mage/Payment/Model/Method/Ccsave.php index d48740ef57..4d0d0e1672 100644 --- a/app/code/core/Mage/Payment/Model/Method/Ccsave.php +++ b/app/code/core/Mage/Payment/Model/Method/Ccsave.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ class Mage_Payment_Model_Method_Ccsave extends Mage_Payment_Model_Method_Cc protected $_canSaveCc = true; protected $_formBlockType = 'payment/form_ccsave'; protected $_infoBlockType = 'payment/info_ccsave'; -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Model/Method/Checkmo.php b/app/code/core/Mage/Payment/Model/Method/Checkmo.php index a06e731256..74ed623408 100644 --- a/app/code/core/Mage/Payment/Model/Method/Checkmo.php +++ b/app/code/core/Mage/Payment/Model/Method/Checkmo.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,4 +63,4 @@ public function getMailingAddress() return $this->getConfigData('mailing_address'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Model/Method/Free.php b/app/code/core/Mage/Payment/Model/Method/Free.php index ba50e9b44f..41898e4751 100644 --- a/app/code/core/Mage/Payment/Model/Method/Free.php +++ b/app/code/core/Mage/Payment/Model/Method/Free.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php b/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php index a6a99f43d1..3e3889ba00 100644 --- a/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function assignData($data) $this->getInfoInstance()->setPoNumber($data->getPoNumber()); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Model/Observer.php b/app/code/core/Mage/Payment/Model/Observer.php index 04c5c2e41a..eeb723d0e2 100644 --- a/app/code/core/Mage/Payment/Model/Observer.php +++ b/app/code/core/Mage/Payment/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -59,4 +59,4 @@ public function salesOrderBeforeSave($observer) $order->setForcedCanCreditmemo(true); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Model/Paygate/Request.php b/app/code/core/Mage/Payment/Model/Paygate/Request.php index 7c1e57e8b2..80a011b55e 100644 --- a/app/code/core/Mage/Payment/Model/Paygate/Request.php +++ b/app/code/core/Mage/Payment/Model/Paygate/Request.php @@ -18,14 +18,14 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Paygate_Model_Authorizenet_Request extends Varien_Object { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Model/Paygate/Result.php b/app/code/core/Mage/Payment/Model/Paygate/Result.php index 4ec12eb31e..87de7c054d 100644 --- a/app/code/core/Mage/Payment/Model/Paygate/Result.php +++ b/app/code/core/Mage/Payment/Model/Paygate/Result.php @@ -18,14 +18,14 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Payment_Model_Paygate_Result extends Varien_Object { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Model/Source/Cctype.php b/app/code/core/Mage/Payment/Model/Source/Cctype.php index 445034ba57..38b258b6e9 100644 --- a/app/code/core/Mage/Payment/Model/Source/Cctype.php +++ b/app/code/core/Mage/Payment/Model/Source/Cctype.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,4 +62,4 @@ public function toOptionArray() return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/Model/Source/Invoice.php b/app/code/core/Mage/Payment/Model/Source/Invoice.php index 24a6eee73f..d28f6b1803 100644 --- a/app/code/core/Mage/Payment/Model/Source/Invoice.php +++ b/app/code/core/Mage/Payment/Model/Source/Invoice.php @@ -18,10 +18,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,4 +44,4 @@ public function toOptionArray() ), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Payment/etc/config.xml b/app/code/core/Mage/Payment/etc/config.xml index 6e1847bb63..256f3c9cf4 100644 --- a/app/code/core/Mage/Payment/etc/config.xml +++ b/app/code/core/Mage/Payment/etc/config.xml @@ -19,10 +19,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -164,4 +164,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Payment/etc/system.xml b/app/code/core/Mage/Payment/etc/system.xml index 7e77234bff..f61dd1d872 100644 --- a/app/code/core/Mage/Payment/etc/system.xml +++ b/app/code/core/Mage/Payment/etc/system.xml @@ -19,10 +19,10 @@ * 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_Payment - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -403,4 +403,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Paypal/Block/Express/Form.php b/app/code/core/Mage/Paypal/Block/Express/Form.php index 0786c3dcab..328ddf0a90 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Form.php +++ b/app/code/core/Mage/Paypal/Block/Express/Form.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ protected function _construct() $this->setTemplate('paypal/express/form.phtml'); parent::_construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Block/Express/Info.php b/app/code/core/Mage/Paypal/Block/Express/Info.php index 8dafff906b..d1cb88baba 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Info.php +++ b/app/code/core/Mage/Paypal/Block/Express/Info.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function toPdf() $this->setTemplate('paypal/express/pdf/info.phtml'); return $this->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Block/Express/Review.php b/app/code/core/Mage/Paypal/Block/Express/Review.php index b7fc4dec26..1000b7cbdd 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -65,7 +65,7 @@ public function getAddress() public function getShippingRates() { if (empty($this->_rates)) { - #$this->getAddress()->collectShippingRates()->save(); + #$this->getAddress()->collectShippingRates()->save(); $groups = $this->getAddress()->getGroupedAllShippingRates(); /*if (!empty($groups)) { @@ -73,7 +73,7 @@ public function getShippingRates() $ratesFilter->addFilter(Mage::app()->getStore()->getPriceFilter(), 'price'); foreach ($groups as $code => $groupItems) { - $groups[$code] = $ratesFilter->filter($groupItems); + $groups[$code] = $ratesFilter->filter($groupItems); } }*/ return $this->_rates = $groups; @@ -113,4 +113,4 @@ public function isVirtual() { return $this->getReview()->getQuote()->getIsVirtual(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Block/Express/Review/Details.php b/app/code/core/Mage/Paypal/Block/Express/Review/Details.php index 9b19d9b150..c013b2b5ee 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Details.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Details.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -72,4 +72,4 @@ public function getTotals() // return $totalsFilter->filter($totals); return $this->getReview()->getQuote()->getTotals(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Block/Link/Shortcut.php b/app/code/core/Mage/Paypal/Block/Link/Shortcut.php index 6e17d7bb62..5d1ee5ae0d 100644 --- a/app/code/core/Mage/Paypal/Block/Link/Shortcut.php +++ b/app/code/core/Mage/Paypal/Block/Link/Shortcut.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,7 +56,9 @@ public function getImageUrl() public function _toHtml() { $quote = Mage::getSingleton('checkout/session')->getQuote(); - if (!Mage::getModel('paypal/express')->isAvailable($quote) || !$quote->validateMinimumAmount()) { + $paypalModel = Mage::getModel('paypal/express'); + if (!$paypalModel->isAvailable($quote) || !$paypalModel->isVisibleOnCartPage() + || !$quote->validateMinimumAmount()) { return ''; } return parent::_toHtml(); diff --git a/app/code/core/Mage/Paypal/Block/Standard/Form.php b/app/code/core/Mage/Paypal/Block/Standard/Form.php index 78604b854f..d6e5ddb962 100644 --- a/app/code/core/Mage/Paypal/Block/Standard/Form.php +++ b/app/code/core/Mage/Paypal/Block/Standard/Form.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ protected function _construct() $this->setTemplate('paypal/standard/form.phtml'); parent::_construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Block/Standard/Redirect.php b/app/code/core/Mage/Paypal/Block/Standard/Redirect.php index cf9f10f47e..f634b2629f 100644 --- a/app/code/core/Mage/Paypal/Block/Standard/Redirect.php +++ b/app/code/core/Mage/Paypal/Block/Standard/Redirect.php @@ -1,5 +1,28 @@ getApi()->getShippingAddress(); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Api/Abstract.php b/app/code/core/Mage/Paypal/Model/Api/Abstract.php index 308b8db888..948e23a9ea 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Abstract.php +++ b/app/code/core/Mage/Paypal/Model/Api/Abstract.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -287,7 +287,7 @@ public function getAmount() public function setAmount($data) { - $data = sprintf('%.2f', $data); + $data = sprintf('%.2f', $data); return $this->setSessionData('amount', $data); } diff --git a/app/code/core/Mage/Paypal/Model/Api/Debug.php b/app/code/core/Mage/Paypal/Model/Api/Debug.php index 2de18d6d41..c540e9b3de 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Debug.php +++ b/app/code/core/Mage/Paypal/Model/Api/Debug.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,4 +35,4 @@ protected function _construct() { $this->_init('paypal/api_debug'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php index 35285aa272..9e21620e48 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php +++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/Model/Direct.php b/app/code/core/Mage/Paypal/Model/Direct.php index e22339d19f..db78dbf9b7 100644 --- a/app/code/core/Mage/Paypal/Model/Direct.php +++ b/app/code/core/Mage/Paypal/Model/Direct.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -299,4 +299,4 @@ public function refund(Varien_Object $payment, $amount) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php index 35e65445a2..b39cbf091c 100644 --- a/app/code/core/Mage/Paypal/Model/Express.php +++ b/app/code/core/Mage/Paypal/Model/Express.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -540,4 +540,14 @@ public function isInitializeNeeded() { return is_object(Mage::registry('_singleton/checkout/type_onepage')); } + + /** + * Check whether is visible on cart page + * + * @return bool + */ + public function isVisibleOnCartPage() + { + return (bool)$this->getConfigData('visible_on_cart'); + } } diff --git a/app/code/core/Mage/Paypal/Model/Express/Review.php b/app/code/core/Mage/Paypal/Model/Express/Review.php index 7ae902c7c7..c3b2e9ff5a 100644 --- a/app/code/core/Mage/Paypal/Model/Express/Review.php +++ b/app/code/core/Mage/Paypal/Model/Express/Review.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -152,4 +152,4 @@ public function saveOrder() return $res; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/Paypal/Model/Mysql4/Api/Debug.php index 27023c5d07..f071601496 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Api/Debug.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Api/Debug.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,4 +36,4 @@ protected function _construct() { $this->_init('paypal/api_debug', 'debug_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/Paypal/Model/Mysql4/Api/Debug/Collection.php index dd1d5debb5..dd08cd6b49 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Api/Debug/Collection.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Api/Debug/Collection.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,4 +36,4 @@ protected function _construct() { $this->_init('paypal/api_debug'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php index 8a9b0b15a6..57c537e522 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Session.php b/app/code/core/Mage/Paypal/Model/Session.php index a769361128..0eaaf2cc5e 100644 --- a/app/code/core/Mage/Paypal/Model/Session.php +++ b/app/code/core/Mage/Paypal/Model/Session.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,4 +36,4 @@ public function __construct() { $this->init('paypal'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Source/Cctype.php b/app/code/core/Mage/Paypal/Model/Source/Cctype.php index bc688245af..7a0ad866de 100644 --- a/app/code/core/Mage/Paypal/Model/Source/Cctype.php +++ b/app/code/core/Mage/Paypal/Model/Source/Cctype.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ public function getAllowedTypes() { return array('VI', 'MC', 'AE', 'DI', 'OT'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Source/PaymentAction.php b/app/code/core/Mage/Paypal/Model/Source/PaymentAction.php index e79d37bbc4..cffabb3a3f 100644 --- a/app/code/core/Mage/Paypal/Model/Source/PaymentAction.php +++ b/app/code/core/Mage/Paypal/Model/Source/PaymentAction.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,4 +40,4 @@ public function toOptionArray() array('value' => Mage_Paypal_Model_Api_Abstract::PAYMENT_TYPE_SALE, 'label' => Mage::helper('paypal')->__('Sale')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Source/StandardAction.php b/app/code/core/Mage/Paypal/Model/Source/StandardAction.php index 59c9310b5a..0134c19b85 100644 --- a/app/code/core/Mage/Paypal/Model/Source/StandardAction.php +++ b/app/code/core/Mage/Paypal/Model/Source/StandardAction.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function toOptionArray() array('value' => Mage_Paypal_Model_Standard::PAYMENT_TYPE_SALE, 'label' => Mage::helper('paypal')->__('Sale')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/Model/Standard.php b/app/code/core/Mage/Paypal/Model/Standard.php index 348950b768..f3161cf929 100644 --- a/app/code/core/Mage/Paypal/Model/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Standard.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/controllers/ExpressController.php b/app/code/core/Mage/Paypal/controllers/ExpressController.php index eb48f1d530..3c1897d46d 100644 --- a/app/code/core/Mage/Paypal/controllers/ExpressController.php +++ b/app/code/core/Mage/Paypal/controllers/ExpressController.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -320,4 +320,4 @@ public function updateOrderAction() { $this->_redirect('checkout/onepage/success'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Paypal/controllers/StandardController.php b/app/code/core/Mage/Paypal/controllers/StandardController.php index c155e18b63..1bf36ab28c 100644 --- a/app/code/core/Mage/Paypal/controllers/StandardController.php +++ b/app/code/core/Mage/Paypal/controllers/StandardController.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,7 +34,7 @@ */ class Mage_Paypal_StandardController extends Mage_Core_Controller_Front_Action { - + /** * Order instance */ @@ -151,5 +151,5 @@ public function ipnAction() $this->getStandard()->setIpnFormData($this->getRequest()->getPost()); $this->getStandard()->ipnPostSubmit(); } - + } diff --git a/app/code/core/Mage/Paypal/etc/config.xml b/app/code/core/Mage/Paypal/etc/config.xml index 3c0d591d1f..b97c37b5e3 100644 --- a/app/code/core/Mage/Paypal/etc/config.xml +++ b/app/code/core/Mage/Paypal/etc/config.xml @@ -19,10 +19,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/etc/system.xml b/app/code/core/Mage/Paypal/etc/system.xml index 7e59060a1c..84ebb23236 100644 --- a/app/code/core/Mage/Paypal/etc/system.xml +++ b/app/code/core/Mage/Paypal/etc/system.xml @@ -19,10 +19,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -123,16 +123,33 @@ select adminhtml/system_config_source_yesno - 1 + 0 1 1 0 + + <label>Title</label> + <frontend_type>text</frontend_type> + <sort_order>10</sort_order> + <show_in_default>1</show_in_default> + <show_in_website>1</show_in_website> + <show_in_store>1</show_in_store> + + + + select + adminhtml/system_config_source_yesno + 20 + 1 + 1 + 0 + select adminhtml/system_config_source_order_status_processing - 2 + 30 1 1 0 @@ -141,28 +158,12 @@ select paypal/source_paymentAction - 2 + 40 1 1 0 - - - text - 100 - 1 - 1 - 0 - - - <label>Title</label> - <frontend_type>text</frontend_type> - <sort_order>2</sort_order> - <show_in_default>1</show_in_default> - <show_in_website>1</show_in_website> - <show_in_store>1</show_in_store> - - + allowspecific 50 @@ -174,12 +175,23 @@ multiselect - 51 + 60 adminhtml/system_config_source_country 1 1 0 + + + text + 70 + 1 + 1 + 0 + + + + diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php index 717a24998a..d293206b75 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php index 2a9d630d15..d7f92a6d5c 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; /* @var $installer Mage_Paypal_Model_Mysql4_Setup */ diff --git a/app/code/core/Mage/PaypalUk/Block/Direct/Form.php b/app/code/core/Mage/PaypalUk/Block/Direct/Form.php index a5c0d36d70..a83e08addb 100644 --- a/app/code/core/Mage/PaypalUk/Block/Direct/Form.php +++ b/app/code/core/Mage/PaypalUk/Block/Direct/Form.php @@ -18,10 +18,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -103,4 +103,4 @@ public function _beforeToHtml() ); return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Block/Direct/Info.php b/app/code/core/Mage/PaypalUk/Block/Direct/Info.php index 2ad26b24fb..20df77907f 100644 --- a/app/code/core/Mage/PaypalUk/Block/Direct/Info.php +++ b/app/code/core/Mage/PaypalUk/Block/Direct/Info.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,4 +71,4 @@ public function toPdf() $this->setTemplate('paypaluk/direct/pdf/info.phtml'); return $this->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Form.php b/app/code/core/Mage/PaypalUk/Block/Express/Form.php index 90035625f7..f3a965a24e 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Form.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Form.php @@ -18,10 +18,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ protected function _construct() $this->setTemplate('paypaluk/express/form.phtml'); parent::_construct(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Info.php b/app/code/core/Mage/PaypalUk/Block/Express/Info.php index 9ea082a7a7..d6f3dc6932 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Info.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Info.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function toPdf() $this->setTemplate('paypaluk/express/pdf/info.phtml'); return $this->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Review.php b/app/code/core/Mage/PaypalUk/Block/Express/Review.php index c3e7026808..15c1dfe511 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Review.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Review.php @@ -18,10 +18,10 @@ * 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_Checkout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -65,7 +65,7 @@ public function getAddress() public function getShippingRates() { if (empty($this->_rates)) { - #$this->getAddress()->collectShippingRates()->save(); + #$this->getAddress()->collectShippingRates()->save(); $groups = $this->getAddress()->getGroupedAllShippingRates(); /*if (!empty($groups)) { @@ -73,7 +73,7 @@ public function getShippingRates() $ratesFilter->addFilter(Mage::app()->getStore()->getPriceFilter(), 'price'); foreach ($groups as $code => $groupItems) { - $groups[$code] = $ratesFilter->filter($groupItems); + $groups[$code] = $ratesFilter->filter($groupItems); } }*/ return $this->_rates = $groups; @@ -113,4 +113,4 @@ public function isVirtual() { return $this->getReview()->getQuote()->getIsVirtual(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Review/Details.php b/app/code/core/Mage/PaypalUk/Block/Express/Review/Details.php index 316851b40e..c1c1ce5603 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Review/Details.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Review/Details.php @@ -18,8 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -70,4 +72,4 @@ public function getTotals() // return $totalsFilter->filter($totals); return $this->getReview()->getQuote()->getTotals(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Block/Link/Shortcut.php b/app/code/core/Mage/PaypalUk/Block/Link/Shortcut.php index 36e4a7593d..8da8f031b8 100644 --- a/app/code/core/Mage/PaypalUk/Block/Link/Shortcut.php +++ b/app/code/core/Mage/PaypalUk/Block/Link/Shortcut.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -57,4 +57,4 @@ public function _toHtml() return ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Helper/Data.php b/app/code/core/Mage/PaypalUk/Helper/Data.php index 4712763091..3efa49c186 100644 --- a/app/code/core/Mage/PaypalUk/Helper/Data.php +++ b/app/code/core/Mage/PaypalUk/Helper/Data.php @@ -18,10 +18,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Abstract.php b/app/code/core/Mage/PaypalUk/Model/Api/Abstract.php index 702ef860bc..34c7ecd6bf 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Abstract.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Abstract.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Debug.php b/app/code/core/Mage/PaypalUk/Model/Api/Debug.php index 7ff5bff8e9..4f11a8e1cf 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Debug.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Debug.php @@ -18,10 +18,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,4 +35,4 @@ protected function _construct() { $this->_init('paypaluk/api_debug'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Pro.php b/app/code/core/Mage/PaypalUk/Model/Api/Pro.php index 2d66d9d785..602080c1d4 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Pro.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Pro.php @@ -18,10 +18,10 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -459,7 +459,7 @@ public function postRequest(array $proArr) protected function _generateRequestId() { - return md5(microtime() . rand(0, time())); + return Mage::helper('core')->uniqHash(); } /** diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Result.php b/app/code/core/Mage/PaypalUk/Model/Api/Result.php index ba4dea9d05..a67f574fe3 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Result.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Result.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/Model/Direct.php b/app/code/core/Mage/PaypalUk/Model/Direct.php index f4ca91a1a8..982fcf84eb 100644 --- a/app/code/core/Mage/PaypalUk/Model/Direct.php +++ b/app/code/core/Mage/PaypalUk/Model/Direct.php @@ -18,10 +18,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -234,4 +234,4 @@ public function refund(Varien_Object $payment, $amount) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Model/Express.php b/app/code/core/Mage/PaypalUk/Model/Express.php index d83a2ef160..a39af9dca9 100644 --- a/app/code/core/Mage/PaypalUk/Model/Express.php +++ b/app/code/core/Mage/PaypalUk/Model/Express.php @@ -18,10 +18,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -479,4 +479,4 @@ public function isInitializeNeeded() { return is_object(Mage::registry('_singleton/checkout/type_onepage')); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Model/Express/Review.php b/app/code/core/Mage/PaypalUk/Model/Express/Review.php index c4993cfdca..39a8b891b2 100644 --- a/app/code/core/Mage/PaypalUk/Model/Express/Review.php +++ b/app/code/core/Mage/PaypalUk/Model/Express/Review.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -151,4 +151,4 @@ public function saveOrder() return $res; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/PaypalUk/Model/Mysql4/Api/Debug.php index a3b624c0f5..45d4ac48fc 100644 --- a/app/code/core/Mage/PaypalUk/Model/Mysql4/Api/Debug.php +++ b/app/code/core/Mage/PaypalUk/Model/Mysql4/Api/Debug.php @@ -18,17 +18,17 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_PaypalUk_Model_Mysql4_Api_Debug extends Mage_Core_Model_Mysql4_Abstract { - protected function _construct() - { - $this->_init('paypaluk/api_debug', 'debug_id'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('paypaluk/api_debug', 'debug_id'); + } +} diff --git a/app/code/core/Mage/PaypalUk/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/PaypalUk/Model/Mysql4/Api/Debug/Collection.php index 7c40dd6ee4..52d547476e 100644 --- a/app/code/core/Mage/PaypalUk/Model/Mysql4/Api/Debug/Collection.php +++ b/app/code/core/Mage/PaypalUk/Model/Mysql4/Api/Debug/Collection.php @@ -18,17 +18,17 @@ * 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_Paygate - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_PaypalUk_Model_Mysql4_Api_Debug_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract { - protected function _construct() - { - $this->_init('paypaluk/api_debug'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('paypaluk/api_debug'); + } +} diff --git a/app/code/core/Mage/PaypalUk/Model/Session.php b/app/code/core/Mage/PaypalUk/Model/Session.php index 838b48c2d6..5542d791ae 100644 --- a/app/code/core/Mage/PaypalUk/Model/Session.php +++ b/app/code/core/Mage/PaypalUk/Model/Session.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,4 +36,4 @@ public function __construct() { $this->init('paypaluk'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Model/Source/Cctype.php b/app/code/core/Mage/PaypalUk/Model/Source/Cctype.php index 530b22a0b2..4cae330054 100644 --- a/app/code/core/Mage/PaypalUk/Model/Source/Cctype.php +++ b/app/code/core/Mage/PaypalUk/Model/Source/Cctype.php @@ -18,10 +18,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_PaypalUk_Model_Source_Cctype extends Mage_Payment_Model_Source_Cctype @@ -30,4 +30,4 @@ public function getAllowedTypes() { return array('VI', 'MC', 'AE', 'DI', 'SS', 'OT'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/Model/Source/PaymentAction.php b/app/code/core/Mage/PaypalUk/Model/Source/PaymentAction.php index 50ddc2d6f6..41fb34788a 100644 --- a/app/code/core/Mage/PaypalUk/Model/Source/PaymentAction.php +++ b/app/code/core/Mage/PaypalUk/Model/Source/PaymentAction.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function toOptionArray() array('value' => Mage_PaypalUk_Model_Api_Abstract::PAYMENT_TYPE_SALE, 'label' => Mage::helper('paypalUk')->__('Sale')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/controllers/ExpressController.php b/app/code/core/Mage/PaypalUk/controllers/ExpressController.php index 858b27d311..852cf1625d 100644 --- a/app/code/core/Mage/PaypalUk/controllers/ExpressController.php +++ b/app/code/core/Mage/PaypalUk/controllers/ExpressController.php @@ -18,10 +18,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -328,4 +328,4 @@ public function updateOrderAction() { $this->_redirect('checkout/onepage/success'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/PaypalUk/etc/config.xml b/app/code/core/Mage/PaypalUk/etc/config.xml index b9ed29868d..2d52e978f2 100644 --- a/app/code/core/Mage/PaypalUk/etc/config.xml +++ b/app/code/core/Mage/PaypalUk/etc/config.xml @@ -19,10 +19,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PaypalUk/etc/system.xml b/app/code/core/Mage/PaypalUk/etc/system.xml index 54b5b7df23..f00808a546 100644 --- a/app/code/core/Mage/PaypalUk/etc/system.xml +++ b/app/code/core/Mage/PaypalUk/etc/system.xml @@ -19,10 +19,10 @@ * 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_PaypalUk - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -251,4 +251,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php index 1c0d367cb3..3cad7e8fa2 100644 --- a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Paypal - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Poll/Block/ActivePoll.php b/app/code/core/Mage/Poll/Block/ActivePoll.php index 90cdf4614c..16aff355b1 100755 --- a/app/code/core/Mage/Poll/Block/ActivePoll.php +++ b/app/code/core/Mage/Poll/Block/ActivePoll.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Poll/Block/Poll.php b/app/code/core/Mage/Poll/Block/Poll.php index e0ff9cfde6..6520935312 100644 --- a/app/code/core/Mage/Poll/Block/Poll.php +++ b/app/code/core/Mage/Poll/Block/Poll.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ public function __construct() parent::__construct(); $this->setTemplate('poll/poll.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/Helper/Data.php b/app/code/core/Mage/Poll/Helper/Data.php index 63c9e193ca..3bbea4a835 100644 --- a/app/code/core/Mage/Poll/Helper/Data.php +++ b/app/code/core/Mage/Poll/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll.php index 6253860433..8435846249 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -190,4 +190,4 @@ public function lookupStoreIds($id) ->where("{$this->getIdFieldName()} = ?", $id) ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php index 2cbd707ee6..628d8a2e6e 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,4 +53,4 @@ protected function _initUniqueFields() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php index 67e1cf6da1..debfa2cfd5 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,4 +53,4 @@ public function countPercent($pollObject) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php index 348fe775aa..a0131ee259 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -135,4 +135,4 @@ public function addSelectStores() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php index 403f9b2ce6..a7948cf838 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -63,4 +63,4 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) $this->_getWriteAdapter()->update($pollTable, $pollData, $condition); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/Model/Poll.php b/app/code/core/Mage/Poll/Model/Poll.php index 085f4e49dc..bb9c4227c3 100644 --- a/app/code/core/Mage/Poll/Model/Poll.php +++ b/app/code/core/Mage/Poll/Model/Poll.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -163,7 +163,7 @@ public function hasAnswer($answer) $answerId = $answer; } elseif ($answer instanceof Mage_Poll_Model_Poll_Answer) { - $answerId = $answer->getId(); + $answerId = $answer->getId(); } if ($answerId) { @@ -184,13 +184,13 @@ public function getVotedPollsIds() $idsArray = array(); foreach ($this->getCookie()->get() as $cookieName => $cookieValue) { - $pattern = '#^' . preg_quote($this->_pollCookieDefaultName, '#') . '(\d+)$#'; - $match = array(); - if (preg_match($pattern, $cookieName, $match)) { - if ($match[1] != Mage::getSingleton('core/session')->getJustVotedPoll()) { - $idsArray[$match[1]] = $match[1]; - } - } + $pattern = '#^' . preg_quote($this->_pollCookieDefaultName, '#') . '(\d+)$#'; + $match = array(); + if (preg_match($pattern, $cookieName, $match)) { + if ($match[1] != Mage::getSingleton('core/session')->getJustVotedPoll()) { + $idsArray[$match[1]] = $match[1]; + } + } } // load from db for this ip diff --git a/app/code/core/Mage/Poll/Model/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Poll/Answer.php index f7b8078070..f7548ae52e 100644 --- a/app/code/core/Mage/Poll/Model/Poll/Answer.php +++ b/app/code/core/Mage/Poll/Model/Poll/Answer.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -63,4 +63,4 @@ protected function _afterDelete() ->setId($this->getPollId()) ->resetVotesCount(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/Model/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Poll/Vote.php index 40b7e03da1..a26f96bee6 100644 --- a/app/code/core/Mage/Poll/Model/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Poll/Vote.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ protected function _beforeSave() } return parent::_beforeSave(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/controllers/VoteController.php b/app/code/core/Mage/Poll/controllers/VoteController.php index 3ffbcdb7a5..016793227e 100644 --- a/app/code/core/Mage/Poll/controllers/VoteController.php +++ b/app/code/core/Mage/Poll/controllers/VoteController.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -61,4 +61,4 @@ public function addAction() } $this->_redirectReferer(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Poll/etc/config.xml b/app/code/core/Mage/Poll/etc/config.xml index 33e531db77..157a21ad26 100644 --- a/app/code/core/Mage/Poll/etc/config.xml +++ b/app/code/core/Mage/Poll/etc/config.xml @@ -19,10 +19,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/etc/system.xml b/app/code/core/Mage/Poll/etc/system.xml index 28fa1947d6..b7edcf98db 100644 --- a/app/code/core/Mage/Poll/etc/system.xml +++ b/app/code/core/Mage/Poll/etc/system.xml @@ -19,10 +19,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -45,4 +45,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php index fe248a9ad2..8f41bebc82 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php index 02f5a83d74..8b24fe60f3 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $conn->dropForeignKey('poll_answer', 'FK_POLL_PARENT'); diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php index 2120f91a41..1d656bf2c8 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Poll - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,4 +62,4 @@ ON UPDATE CASCADE ON DELETE CASCADE; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php index 53bf666288..40564472db 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Price.php b/app/code/core/Mage/ProductAlert/Block/Email/Price.php index 0d77928a70..6eb79414bf 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Price.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Price.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php index b1964cda39..ea61a5247f 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Block/Price.php b/app/code/core/Mage/ProductAlert/Block/Price.php index ac714b6263..7b6f8f840a 100644 --- a/app/code/core/Mage/ProductAlert/Block/Price.php +++ b/app/code/core/Mage/ProductAlert/Block/Price.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,4 +53,4 @@ public function getUrl($route = '', $params = array()) { return Mage::helper('productalert')->getSaveUrl('price'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Block/Stock.php b/app/code/core/Mage/ProductAlert/Block/Stock.php index 0dfa4d5d6b..bb7f24a5a6 100644 --- a/app/code/core/Mage/ProductAlert/Block/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Stock.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,4 +58,4 @@ public function getUrl($route = '', $params = array()) { return Mage::helper('productalert')->getSaveUrl('stock'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Helper/Data.php b/app/code/core/Mage/ProductAlert/Helper/Data.php index a99cc7cce2..7d6f8e11ae 100644 --- a/app/code/core/Mage/ProductAlert/Helper/Data.php +++ b/app/code/core/Mage/ProductAlert/Helper/Data.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,4 +77,4 @@ public function createBlock($block) } return $block; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Model/Email.php b/app/code/core/Mage/ProductAlert/Model/Email.php index 062c719971..2a2daa0f61 100644 --- a/app/code/core/Mage/ProductAlert/Model/Email.php +++ b/app/code/core/Mage/ProductAlert/Model/Email.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php index 62f334888c..66c3a15160 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php index 4cbe935b27..e14809c15b 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,4 +77,4 @@ public function setCustomerOrder($sort = 'ASC') $this->getSelect()->order('customer_id ' . $sort); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php index a3636058c3..d1a9e029d1 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,4 +51,4 @@ public function join($productId, $websiteId) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php index c85134e9fd..65903633e0 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -86,4 +86,4 @@ public function deleteCustomer(Mage_Core_Model_Abstract $object, $customerId, $w $this->_getWriteAdapter()->delete($this->getMainTable(), $where); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php index 4180a7aa2d..7d4d9b8b94 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -84,4 +84,4 @@ public function setCustomerOrder($sort = 'ASC') $this->getSelect()->order('customer_id ' . $sort); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php index 0155deea87..2da5ffa130 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,4 +51,4 @@ public function join($productId, $websiteId) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Model/Observer.php b/app/code/core/Mage/ProductAlert/Model/Observer.php index 80e996603d..c2d55dca74 100644 --- a/app/code/core/Mage/ProductAlert/Model/Observer.php +++ b/app/code/core/Mage/ProductAlert/Model/Observer.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -314,4 +314,4 @@ public function process() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Model/Price.php b/app/code/core/Mage/ProductAlert/Model/Price.php index d345c4745b..22fd35b4f2 100644 --- a/app/code/core/Mage/ProductAlert/Model/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Price.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function deleteCustomer($customerId, $websiteId = 0) $this->getResource()->deleteCustomer($this, $customerId, $websiteId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/Model/Stock.php b/app/code/core/Mage/ProductAlert/Model/Stock.php index 5d391b27e0..a7f2031a30 100644 --- a/app/code/core/Mage/ProductAlert/Model/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Stock.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,4 +57,4 @@ public function deleteCustomer($customerId, $websiteId = 0) $this->getResource()->deleteCustomer($this, $customerId, $websiteId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/controllers/AddController.php b/app/code/core/Mage/ProductAlert/controllers/AddController.php index 17d0adef49..29f3504225 100644 --- a/app/code/core/Mage/ProductAlert/controllers/AddController.php +++ b/app/code/core/Mage/ProductAlert/controllers/AddController.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -116,4 +116,4 @@ public function stockAction() } $this->_redirectReferer(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php index 7446bd2d71..38782f306d 100644 --- a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php +++ b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -154,4 +154,4 @@ public function stockAllAction() } $this->_redirect('customer/account/'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/ProductAlert/etc/config.xml b/app/code/core/Mage/ProductAlert/etc/config.xml index 46e29306d9..abf9a2eeab 100644 --- a/app/code/core/Mage/ProductAlert/etc/config.xml +++ b/app/code/core/Mage/ProductAlert/etc/config.xml @@ -155,4 +155,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/ProductAlert/etc/system.xml b/app/code/core/Mage/ProductAlert/etc/system.xml index f64446ddab..8462f64d2d 100644 --- a/app/code/core/Mage/ProductAlert/etc/system.xml +++ b/app/code/core/Mage/ProductAlert/etc/system.xml @@ -19,10 +19,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -142,4 +142,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php index 8bb370c706..56f196c382 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -94,4 +94,4 @@ ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php index b95b547c1f..b3bb5d020e 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_ProductAlert - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Block/Entity/Detailed.php b/app/code/core/Mage/Rating/Block/Entity/Detailed.php index b6516c1b10..d50e8cddc1 100644 --- a/app/code/core/Mage/Rating/Block/Entity/Detailed.php +++ b/app/code/core/Mage/Rating/Block/Entity/Detailed.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,4 +69,4 @@ protected function _toHtml() $this->assign('collection', $ratingCollection); return parent::_toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rating/Helper/Data.php b/app/code/core/Mage/Rating/Helper/Data.php index c77d32caf0..ba8713d61a 100644 --- a/app/code/core/Mage/Rating/Helper/Data.php +++ b/app/code/core/Mage/Rating/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating.php index 983c56df37..89bb0cc413 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -305,4 +305,4 @@ public function getReviewSummary($object, $onlyForCurrentStore = true) return array_values($result); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php index 4d677751ce..0029a6d5b4 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -87,7 +87,7 @@ public function setStoreFilter($storeId) $storeId = array($storeId === null ? -1 : $storeId); } if (empty($storeId)) { - return $this; + return $this; } if (!$this->_isStoreJoined) { $this->getSelect()->join(array('store'=>$this->getTable('rating_store')), 'main_table.rating_id = store.rating_id') diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php index be8d853d7f..226adcb6f2 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ public function getIdByCode($entityCode) ->where('entity_code = ?', $entityCode); return $read->fetchOne($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php index c621feb3fc..4427e0cc82 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php index 71c65f96b8..f28a8e008b 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php index ccbdf0ab17..56104d710e 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ function _construct() { $this->_init('rating/rating_option_vote', 'vote_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php index 95750457af..0ab99b6b10 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -105,4 +105,4 @@ public function addRatingOptions() } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Value.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Value.php index 0a8156bbca..d130b42a75 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Value.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Value.php @@ -18,8 +18,8 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Rating.php b/app/code/core/Mage/Rating/Model/Rating.php index 2531645b25..606c135003 100644 --- a/app/code/core/Mage/Rating/Model/Rating.php +++ b/app/code/core/Mage/Rating/Model/Rating.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rating/Model/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Rating/Entity.php index 1add3e9e0f..2bf1c0dde0 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Rating/Entity.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function getIdByCode($entityCode) { return $this->_getResource()->getIdByCode($entityCode); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rating/Model/Rating/Option.php b/app/code/core/Mage/Rating/Model/Rating/Option.php index 08a25cc1d7..58f500b4b0 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php index caac7d1d35..bbd238ccfd 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ public function __construct() { $this->_init('rating/rating_option_vote'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rating/Model/Rating/Value.php b/app/code/core/Mage/Rating/Model/Rating/Value.php index 0a8156bbca..d130b42a75 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Value.php +++ b/app/code/core/Mage/Rating/Model/Rating/Value.php @@ -18,8 +18,8 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/etc/config.xml b/app/code/core/Mage/Rating/etc/config.xml index 4c5c828a13..1e1d0d7530 100644 --- a/app/code/core/Mage/Rating/etc/config.xml +++ b/app/code/core/Mage/Rating/etc/config.xml @@ -19,10 +19,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php index 4ad9a4c6d7..be8205d02c 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php index 0a8a85d9ff..7b117c7575 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,4 +58,4 @@ ON UPDATE CASCADE ON DELETE CASCADE; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php index d4b77f12c6..0f9d8252d6 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Reports/Block/Product/Abstract.php b/app/code/core/Mage/Reports/Block/Product/Abstract.php index 95dfeac5c2..6a2829be99 100644 --- a/app/code/core/Mage/Reports/Block/Product/Abstract.php +++ b/app/code/core/Mage/Reports/Block/Product/Abstract.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Block/Product/Compared.php b/app/code/core/Mage/Reports/Block/Product/Compared.php index 08e9d1d8eb..12332c2515 100644 --- a/app/code/core/Mage/Reports/Block/Product/Compared.php +++ b/app/code/core/Mage/Reports/Block/Product/Compared.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -71,4 +71,4 @@ protected function _toHtml() return parent::_toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Block/Product/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Viewed.php index 12fdb99946..6749f216d6 100644 --- a/app/code/core/Mage/Reports/Block/Product/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Viewed.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Exception.php b/app/code/core/Mage/Reports/Exception.php index 4525ee1148..6497b1db23 100644 --- a/app/code/core/Mage/Reports/Exception.php +++ b/app/code/core/Mage/Reports/Exception.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,4 +30,4 @@ class Mage_Reports_Exception extends Zend_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Helper/Data.php b/app/code/core/Mage/Reports/Helper/Data.php index 89fd2da7d2..0f7e9ea59c 100644 --- a/app/code/core/Mage/Reports/Helper/Data.php +++ b/app/code/core/Mage/Reports/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Model/Config.php b/app/code/core/Mage/Reports/Model/Config.php index b9c17f6150..29c8ed5d07 100644 --- a/app/code/core/Mage/Reports/Model/Config.php +++ b/app/code/core/Mage/Reports/Model/Config.php @@ -1,61 +1,61 @@ - - */ - - class Mage_Reports_Model_Config extends Varien_Object - { - public function getGlobalConfig( ) - { - $dom = new DOMDocument(); - $dom -> load( Mage::getModuleDir('etc','Mage_Reports').DS.'flexConfig.xml' ); - - $baseUrl = $dom -> createElement('baseUrl'); - $baseUrl -> nodeValue = Mage::getBaseUrl(); - - $dom -> documentElement -> appendChild( $baseUrl ); - - return $dom -> saveXML(); - } - - public function getLanguage( ) - { - return file_get_contents( Mage::getModuleDir('etc','Mage_Reports').DS.'flexLanguage.xml' ); - } - - public function getDashboard( ) - { - return file_get_contents( Mage::getModuleDir('etc','Mage_Reports').DS.'flexDashboard.xml' ); - } - } - \ No newline at end of file + + */ + + class Mage_Reports_Model_Config extends Varien_Object + { + public function getGlobalConfig( ) + { + $dom = new DOMDocument(); + $dom -> load( Mage::getModuleDir('etc','Mage_Reports').DS.'flexConfig.xml' ); + + $baseUrl = $dom -> createElement('baseUrl'); + $baseUrl -> nodeValue = Mage::getBaseUrl(); + + $dom -> documentElement -> appendChild( $baseUrl ); + + return $dom -> saveXML(); + } + + public function getLanguage( ) + { + return file_get_contents( Mage::getModuleDir('etc','Mage_Reports').DS.'flexLanguage.xml' ); + } + + public function getDashboard( ) + { + return file_get_contents( Mage::getModuleDir('etc','Mage_Reports').DS.'flexDashboard.xml' ); + } + } + diff --git a/app/code/core/Mage/Reports/Model/Event.php b/app/code/core/Mage/Reports/Model/Event.php index 0208fcafce..0ff822080e 100644 --- a/app/code/core/Mage/Reports/Model/Event.php +++ b/app/code/core/Mage/Reports/Model/Event.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Model/Event/Observer.php b/app/code/core/Mage/Reports/Model/Event/Observer.php index 5d8cf75698..3430f7f65b 100644 --- a/app/code/core/Mage/Reports/Model/Event/Observer.php +++ b/app/code/core/Mage/Reports/Model/Event/Observer.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Event/Type.php b/app/code/core/Mage/Reports/Model/Event/Type.php index 3cf1822e95..ce3d9c432b 100644 --- a/app/code/core/Mage/Reports/Model/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Event/Type.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ protected function _construct() { $this->_init('reports/event_type'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php index e50a8704b5..1de637660f 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ public function setStoreIds($storeIds) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php index 613594e225..e0646c8cbd 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -105,4 +105,4 @@ public function getSelectCountSql() $sql = $countSelect->__toString(); return $sql; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php index 4b53d79d19..735ad39b92 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -187,4 +187,4 @@ public function getSelectCountSql() $sql = $countSelect->__toString(); return $sql; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php index 133ab23ca9..7eccd92a98 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function setStoreIds($storeIds) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php index 152804bd1c..9c0d47079a 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function setStoreIds($storeIds) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php index 48d934aec8..43513f72b7 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event.php b/app/code/core/Mage/Reports/Model/Mysql4/Event.php index 59fc0590d3..00698fa03b 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -176,4 +176,4 @@ public function clean(Mage_Reports_Model_Event $object) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php index 9b095bfd57..3cf34a6cf4 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -88,4 +88,4 @@ public function addRecentlyFiler($typeId, $subjectId, $subtype = 0, $ignore = nu ->limit($limit); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php index ef510dd9cf..1ef8bcc80b 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,4 +38,4 @@ protected function _construct() { $this->_init('reports/event_type', 'event_type_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php index 14567880a7..fdea1a4dcb 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function toOptionArray() { return parent::_toOptionArray('event_type_id', 'event_name'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php index b5e1918789..503cf9655c 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php index 9be0a19800..9b1d979975 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php index f1dee9fa69..24176190ca 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -289,4 +289,4 @@ public function addViewsCount($from = '', $to = '') return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php index 269f65030a..aba1526e3c 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -98,4 +98,4 @@ public function addFieldToFilter($field, $condition=null) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php index 0521f07366..df86c37aef 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php @@ -19,7 +19,7 @@ * needs please refer to http://www.magentocommerce.com for more information. * * @category Mage - * @package Mage_Adminhtml + * @package Mage_Reports * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php index 0076358cd1..f5f250827f 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -57,4 +57,4 @@ public function setStoreIds($storeIds) $this->addStoreFilter($storeId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php index 57e1686d46..fb65f3b588 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php index 3923eec746..7eeb6f82a8 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,4 +55,4 @@ public function setStoreIds($storeIds) $this->addStoreFilter($storeId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php index aff458fe28..ec8fc0ced8 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php index a26b25dbb3..c058ceb57b 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php index a673a4e825..db6cdafaa2 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -124,7 +124,7 @@ public function getPeriods() return array( 'day'=>Mage::helper('reports')->__('Day'), 'month'=>Mage::helper('reports')->__('Month'), - 'year'=>Mage::helper('reports')->__('Year') + 'year'=>Mage::helper('reports')->__('Year') ); } diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php index 8a10f3720f..b9baff68c7 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php index a9b84f5b79..1773a232d8 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,4 +89,4 @@ public function getSelectCountSql() return $sql; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php index e9b2c7414d..22d0e3e778 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -68,4 +68,4 @@ public function addAttributeToSort($attribute, $dir='asc') return parent::addAttributeToSort($attribute, $dir); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php index 3c09f013b6..13668dd162 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php index 5d4abda395..e7e3376439 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ public function setDateRange($from, $to) $this->resetSelect(); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php index 5886509066..d7c46bf374 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php index 7cef3bda17..a3f4581ba1 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -70,4 +70,4 @@ public function setOrder($attribute, $dir='desc') } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php index aa008f8186..69c8418757 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php index 877f266769..9589bf3c30 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php index 3d4e654077..cd04f779b3 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php @@ -1,84 +1,84 @@ - - */ - -class Mage_Reports_Model_Mysql4_Wishlist_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract -{ - protected $wishlistTable; - - public function setWishlistTable($value) - { - $this->_wishlistTable = $value; - return $this; - } - - public function getWishlistTable() - { - return $this->_wishlistTable; - } - - protected function _construct() - { - $this->_init('wishlist/wishlist'); - - $this->setWishlistTable(Mage::getSingleton('core/resource')->getTableName('wishlist/wishlist')); - } - - public function getWishlistCustomerCount() - { - $collection = Mage::getResourceModel('customer/customer_collection'); - $collection->load(); - - $customers = $collection->count(); - - $collection = Mage::getResourceModel('customer/customer_collection'); - $collection->getSelect()->from(array('wt' => $this->getWishlistTable())) - ->where('wt.customer_id=e.entity_id') - ->group('wt.wishlist_id'); - $collection->load(); - $count = $collection->count(); - return array(($count*100)/$customers, $count); - } - - public function getSharedCount() - { - $collection = Mage::getResourceModel('customer/customer_collection'); - $collection->getSelect()->from(array('wt' => $this->getWishlistTable())) - ->where('wt.customer_id=e.entity_id') - ->where('wt.shared=1') - ->group('wt.wishlist_id'); - $collection->load(); - return $collection->count(); - } - -} \ No newline at end of file + + */ + +class Mage_Reports_Model_Mysql4_Wishlist_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract +{ + protected $wishlistTable; + + public function setWishlistTable($value) + { + $this->_wishlistTable = $value; + return $this; + } + + public function getWishlistTable() + { + return $this->_wishlistTable; + } + + protected function _construct() + { + $this->_init('wishlist/wishlist'); + + $this->setWishlistTable(Mage::getSingleton('core/resource')->getTableName('wishlist/wishlist')); + } + + public function getWishlistCustomerCount() + { + $collection = Mage::getResourceModel('customer/customer_collection'); + $collection->load(); + + $customers = $collection->count(); + + $collection = Mage::getResourceModel('customer/customer_collection'); + $collection->getSelect()->from(array('wt' => $this->getWishlistTable())) + ->where('wt.customer_id=e.entity_id') + ->group('wt.wishlist_id'); + $collection->load(); + $count = $collection->count(); + return array(($count*100)/$customers, $count); + } + + public function getSharedCount() + { + $collection = Mage::getResourceModel('customer/customer_collection'); + $collection->getSelect()->from(array('wt' => $this->getWishlistTable())) + ->where('wt.customer_id=e.entity_id') + ->where('wt.shared=1') + ->group('wt.wishlist_id'); + $collection->load(); + return $collection->count(); + } + +} diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php index 3cbd3bbbd6..4a5db39c36 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -31,27 +31,27 @@ * @package Mage_Reports * @author Magento Core Team */ - + class Mage_Reports_Model_Mysql4_Wishlist_Product_Collection extends Mage_Wishlist_Model_Mysql4_Product_Collection { protected function _construct() { $this->_init('wishlist/wishlist'); } - + public function addWishlistCount() { $wishlistItemTable = Mage::getSingleton('core/resource')->getTableName('wishlist/item'); - + $this->getSelect() ->from(array('wi' => $wishlistItemTable), 'count(wishlist_item_id) as wishlists') ->where('wi.product_id=e.entity_id') ->group('wi.product_id'); - + $this->getEntity()->setStore(0); return $this; } - + public function getCustomerCount() { $this->getSelect()->reset(); @@ -59,7 +59,7 @@ public function getCustomerCount() ->group("wishlist.customer_id"); return $this;//->getItems()->; } - + public function getSelectCountSql() { $countSelect = clone $this->getSelect(); @@ -69,24 +69,24 @@ public function getSelectCountSql() $countSelect->reset(Zend_Db_Select::GROUP); $sql = $countSelect->__toString(); - + $sql = preg_replace('/^select\s+.+?\s+from\s+/is', 'select count(*) from ', $sql); return $sql; } - + public function setOrder($attribute, $dir='desc') { switch ($attribute) { - case 'wishlists': - $this->getSelect()->order($attribute . ' ' . $dir); - break; - default: - parent::setOrder($attribute, $dir); + case 'wishlists': + $this->getSelect()->order($attribute . ' ' . $dir); + break; + default: + parent::setOrder($attribute, $dir); } - + return $this; } - + } diff --git a/app/code/core/Mage/Reports/Model/Report.php b/app/code/core/Mage/Reports/Model/Report.php index 17b995f048..eb944464a2 100644 --- a/app/code/core/Mage/Reports/Model/Report.php +++ b/app/code/core/Mage/Reports/Model/Report.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Reports_Model_Report extends Mage_Core_Model_Abstract @@ -50,4 +50,4 @@ public function getReport($from, $to) ->setPageSize($this->getPageSize()) ->setStoreIds($this->getStoreIds()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Reports/Model/Session.php b/app/code/core/Mage/Reports/Model/Session.php index eef34c9e15..87ae82fa99 100644 --- a/app/code/core/Mage/Reports/Model/Session.php +++ b/app/code/core/Mage/Reports/Model/Session.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Test.php b/app/code/core/Mage/Reports/Model/Test.php index 97db29b5b7..0909b0bc60 100644 --- a/app/code/core/Mage/Reports/Model/Test.php +++ b/app/code/core/Mage/Reports/Model/Test.php @@ -1,148 +1,148 @@ - - */ - -class Mage_Reports_Model_Test extends Varien_Object -{ - - public function getUsersCountries( ) - { - return file_get_contents( Mage::getModuleDir('etc','Mage_Reports').DS.'flexTestDataCountries.xml' ); - } - - public function getUsersCities( $countryId ) - { - $dom = new DOMDocument(); - $dom -> preserveWhiteSpace = false; - $dom -> load( Mage::getModuleDir('etc','Mage_Reports').DS.'flexTestDataCities.xml' ); - - $root = $dom -> documentElement; - $rows = $root -> getElementsByTagName( 'row' ); - - $childsToRemove = array(); - for( $i = 0; $i < $rows -> length; $i++) - { - for( $j = 0; $j < $rows -> item($i) -> childNodes -> length; $j ++ ) - if( - $rows -> item($i) -> childNodes -> item($j) -> nodeType == XML_ELEMENT_NODE - && - $rows -> item($i) -> childNodes -> item($j) -> nodeName == 'countryId' - && - $rows -> item($i) -> childNodes -> item($j) -> nodeValue != $countryId - ) - $childsToRemove[] = $rows -> item($i); - } - - foreach( $childsToRemove as $child ) - $root -> removeChild( $child ); - - return $dom -> saveXML(); - } - - public function getTimelineData( ) - { - return file_get_contents( Mage::getModuleDir('etc','Mage_Reports').DS.'flexTestDataTimeline.xml' ); - } - - public function getAllLinearExample( ) - { - $session = Mage::getModel('session_data/'); - - $startPoint = time() - 24*60*60; - - $allData = array(); - $countOfStartData = 12; - for($i = 1; $i<= $countOfStartData; $i++) - { - $allData[] = array( 'time'=>date("Y-m-d H:i",$startPoint), 'value'=>rand(1, 100) ); - $startPoint += 30*60; - } - - $allData[] = array( 'time'=>date("Y-m-d H:i",$startPoint+(90*60))); - - $session -> setData('startPoint', $startPoint); - - return $this -> returnAsDataSource( $allData ); - } - - public function getNewLinearData() - { - $session = Mage::getModel('session_data/'); - - - $startPoint = $session -> getData('startPoint'); - - $reset = 12; - - - $newData = array( - array( 'time'=> date("Y-m-d H:i", $startPoint), 'value'=>rand(1, 100) ) - ); - - $startPoint += 30*60; - $newData[] = array( 'time'=> date("Y-m-d H:i", $startPoint+(90*60)) ); - - $session -> setData('startPoint', $startPoint); - - return $this -> returnAsDataSource( $newData, $reset ); - } - - private function returnAsDataSource( &$array , $reset = 0) - { - $dom = new DOMDocument(); - $dom -> preserveWhiteSpace = false; - $dom -> loadXML( "<"."?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n" ); - $root = $dom ->documentElement; - if($reset) - { - $resetItem = $dom -> createElement("reset"); - $resetItem -> nodeValue = $reset; - $root->appendChild($resetItem); - } - foreach($array as $item ) - { - $row = $dom->createElement('row'); - foreach( $item as $key => $val) - { - $valItem = $dom->createElement( $key ); - $valItem->nodeValue = $val; - $row->appendChild($valItem); - } - - $root->appendChild($row); - } - - return $dom->saveXML(); - } -} + + */ + +class Mage_Reports_Model_Test extends Varien_Object +{ + + public function getUsersCountries( ) + { + return file_get_contents( Mage::getModuleDir('etc','Mage_Reports').DS.'flexTestDataCountries.xml' ); + } + + public function getUsersCities( $countryId ) + { + $dom = new DOMDocument(); + $dom -> preserveWhiteSpace = false; + $dom -> load( Mage::getModuleDir('etc','Mage_Reports').DS.'flexTestDataCities.xml' ); + + $root = $dom -> documentElement; + $rows = $root -> getElementsByTagName( 'row' ); + + $childsToRemove = array(); + for( $i = 0; $i < $rows -> length; $i++) + { + for( $j = 0; $j < $rows -> item($i) -> childNodes -> length; $j ++ ) + if( + $rows -> item($i) -> childNodes -> item($j) -> nodeType == XML_ELEMENT_NODE + && + $rows -> item($i) -> childNodes -> item($j) -> nodeName == 'countryId' + && + $rows -> item($i) -> childNodes -> item($j) -> nodeValue != $countryId + ) + $childsToRemove[] = $rows -> item($i); + } + + foreach( $childsToRemove as $child ) + $root -> removeChild( $child ); + + return $dom -> saveXML(); + } + + public function getTimelineData( ) + { + return file_get_contents( Mage::getModuleDir('etc','Mage_Reports').DS.'flexTestDataTimeline.xml' ); + } + + public function getAllLinearExample( ) + { + $session = Mage::getModel('session_data/'); + + $startPoint = time() - 24*60*60; + + $allData = array(); + $countOfStartData = 12; + for($i = 1; $i<= $countOfStartData; $i++) + { + $allData[] = array( 'time'=>date("Y-m-d H:i",$startPoint), 'value'=>rand(1, 100) ); + $startPoint += 30*60; + } + + $allData[] = array( 'time'=>date("Y-m-d H:i",$startPoint+(90*60))); + + $session -> setData('startPoint', $startPoint); + + return $this -> returnAsDataSource( $allData ); + } + + public function getNewLinearData() + { + $session = Mage::getModel('session_data/'); + + + $startPoint = $session -> getData('startPoint'); + + $reset = 12; + + + $newData = array( + array( 'time'=> date("Y-m-d H:i", $startPoint), 'value'=>rand(1, 100) ) + ); + + $startPoint += 30*60; + $newData[] = array( 'time'=> date("Y-m-d H:i", $startPoint+(90*60)) ); + + $session -> setData('startPoint', $startPoint); + + return $this -> returnAsDataSource( $newData, $reset ); + } + + private function returnAsDataSource( &$array , $reset = 0) + { + $dom = new DOMDocument(); + $dom -> preserveWhiteSpace = false; + $dom -> loadXML( "<"."?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n" ); + $root = $dom ->documentElement; + if($reset) + { + $resetItem = $dom -> createElement("reset"); + $resetItem -> nodeValue = $reset; + $root->appendChild($resetItem); + } + foreach($array as $item ) + { + $row = $dom->createElement('row'); + foreach( $item as $key => $val) + { + $valItem = $dom->createElement( $key ); + $valItem->nodeValue = $val; + $row->appendChild($valItem); + } + + $root->appendChild($row); + } + + return $dom->saveXML(); + } +} diff --git a/app/code/core/Mage/Reports/Model/Totals.php b/app/code/core/Mage/Reports/Model/Totals.php index ef0e630136..6c074903a8 100644 --- a/app/code/core/Mage/Reports/Model/Totals.php +++ b/app/code/core/Mage/Reports/Model/Totals.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml index 2ace0cb32f..46fd9c4cf5 100644 --- a/app/code/core/Mage/Reports/etc/config.xml +++ b/app/code/core/Mage/Reports/etc/config.xml @@ -19,10 +19,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/system.xml b/app/code/core/Mage/Reports/etc/system.xml index 5f9a6cf67e..98c6529f46 100644 --- a/app/code/core/Mage/Reports/etc/system.xml +++ b/app/code/core/Mage/Reports/etc/system.xml @@ -19,10 +19,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php index eed3660823..3bcbb70738 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php index c67dfc2841..696e4cc8fc 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php index d5f8d25f6b..0bf48fac17 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Reports - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php index cb7d989559..6fb46a3424 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -1,45 +1,45 @@ - - */ - -$installer = $this; -/* $installer Mage_Core_Model_Resource_Setup */ - -$installer->startSetup(); - -$installer->run(" -ALTER TABLE {$this->getTable('report_event')} CHANGE `sybtype` `subtype` tinyint(3) unsigned NOT NULL default '0' AFTER `subject_id`; -ALTER TABLE {$this->getTable('report_event')} DROP INDEX `sybtype`, ADD INDEX (`subtype`); -"); - -$installer->endSetup(); + + */ + +$installer = $this; +/* $installer Mage_Core_Model_Resource_Setup */ + +$installer->startSetup(); + +$installer->run(" +ALTER TABLE {$this->getTable('report_event')} CHANGE `sybtype` `subtype` tinyint(3) unsigned NOT NULL default '0' AFTER `subject_id`; +ALTER TABLE {$this->getTable('report_event')} DROP INDEX `sybtype`, ADD INDEX (`subtype`); +"); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php index 11864bad7a..84b4a08277 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ ON UPDATE CASCADE ON DELETE CASCADE; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php index a9b9572d2b..b7066cc18d 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,4 +47,4 @@ right.reports.product.compared -->') WHERE `identifier`='home'; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php index 2d68f6e011..dfc9539ef8 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php @@ -18,10 +18,10 @@ * 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_Rating - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/Block/Customer/List.php b/app/code/core/Mage/Review/Block/Customer/List.php index 9550ebf3e6..4f5bef1b67 100644 --- a/app/code/core/Mage/Review/Block/Customer/List.php +++ b/app/code/core/Mage/Review/Block/Customer/List.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,4 +98,4 @@ protected function _beforeToHtml() return parent::_beforeToHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Block/Customer/Recent.php b/app/code/core/Mage/Review/Block/Customer/Recent.php index 64900380c4..d225bc2ae1 100644 --- a/app/code/core/Mage/Review/Block/Customer/Recent.php +++ b/app/code/core/Mage/Review/Block/Customer/Recent.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -89,4 +89,4 @@ public function getReviewUrl($id) { return Mage::getUrl('review/customer/view', array('id' => $id)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Block/Customer/View.php b/app/code/core/Mage/Review/Block/Customer/View.php index c3a462b276..a130c76def 100644 --- a/app/code/core/Mage/Review/Block/Customer/View.php +++ b/app/code/core/Mage/Review/Block/Customer/View.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -102,4 +102,4 @@ public function dateFormat($date) { return $this->formatDate($date, Mage_Core_Model_Locale::FORMAT_TYPE_LONG); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Block/Form.php b/app/code/core/Mage/Review/Block/Form.php index 3676961078..1785c54285 100644 --- a/app/code/core/Mage/Review/Block/Form.php +++ b/app/code/core/Mage/Review/Block/Form.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/Block/Helper.php b/app/code/core/Mage/Review/Block/Helper.php index 737d3fc24d..7db00c179c 100644 --- a/app/code/core/Mage/Review/Block/Helper.php +++ b/app/code/core/Mage/Review/Block/Helper.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,56 +35,56 @@ class Mage_Review_Block_Helper extends Mage_Core_Block_Template { protected $_availableTemplates = array( 'default' => 'review/helper/summary.phtml', - 'short' => 'review/helper/summary_short.phtml' + 'short' => 'review/helper/summary_short.phtml' ); - public function getSummaryHtml($product, $templateType, $displayIfNoReviews) - { - // pick template among available - if (empty($this->_availableTemplates[$templateType])) { - $templateType = 'default'; - } - $this->setTemplate($this->_availableTemplates[$templateType]); + public function getSummaryHtml($product, $templateType, $displayIfNoReviews) + { + // pick template among available + if (empty($this->_availableTemplates[$templateType])) { + $templateType = 'default'; + } + $this->setTemplate($this->_availableTemplates[$templateType]); - $this->setDisplayIfEmpty($displayIfNoReviews); + $this->setDisplayIfEmpty($displayIfNoReviews); - if (!$product->getRatingSummary()) { - Mage::getModel('review/review') - ->getEntitySummary($product, Mage::app()->getStore()->getId()); - } - $this->setProduct($product); + if (!$product->getRatingSummary()) { + Mage::getModel('review/review') + ->getEntitySummary($product, Mage::app()->getStore()->getId()); + } + $this->setProduct($product); - return $this->toHtml(); - } + return $this->toHtml(); + } - public function getRatingSummary() - { - return $this->getProduct()->getRatingSummary()->getRatingSummary(); - } + public function getRatingSummary() + { + return $this->getProduct()->getRatingSummary()->getRatingSummary(); + } - public function getReviewsCount() - { - return $this->getProduct()->getRatingSummary()->getReviewsCount(); - } + public function getReviewsCount() + { + return $this->getProduct()->getRatingSummary()->getReviewsCount(); + } - public function getReviewsUrl() - { - return Mage::getUrl('review/product/list', array( - 'id' => $this->getProduct()->getId(), - 'category' => $this->getProduct()->getCategoryId() - )); - } + public function getReviewsUrl() + { + return Mage::getUrl('review/product/list', array( + 'id' => $this->getProduct()->getId(), + 'category' => $this->getProduct()->getCategoryId() + )); + } - /** - * Add an available template by type - * - * It should be called before getSummaryHtml() - * - * @param string $type - * @param string $template - */ - public function addTemplate($type, $template) - { + /** + * Add an available template by type + * + * It should be called before getSummaryHtml() + * + * @param string $type + * @param string $template + */ + public function addTemplate($type, $template) + { $this->_availableTemplates[$type] = $template; - } -} \ No newline at end of file + } +} diff --git a/app/code/core/Mage/Review/Block/Product/View.php b/app/code/core/Mage/Review/Block/Product/View.php index 9eacc2a419..af78d83f80 100644 --- a/app/code/core/Mage/Review/Block/Product/View.php +++ b/app/code/core/Mage/Review/Block/Product/View.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -85,4 +85,4 @@ public function hasOptions() { return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Block/Product/View/List.php b/app/code/core/Mage/Review/Block/Product/View/List.php index 85c707c840..d0fe5d0f8a 100644 --- a/app/code/core/Mage/Review/Block/Product/View/List.php +++ b/app/code/core/Mage/Review/Block/Product/View/List.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,4 +64,4 @@ public function getReviewUrl($id) { return Mage::getUrl('*/*/view', array('id' => $id)); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Block/View.php b/app/code/core/Mage/Review/Block/View.php index cc9c6e2ea5..4ec754dc13 100644 --- a/app/code/core/Mage/Review/Block/View.php +++ b/app/code/core/Mage/Review/Block/View.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,31 +38,43 @@ public function __construct() { parent::__construct(); $this->setTemplate('review/view.phtml'); - - $this->setReviewId($this->getRequest()->getParam('id', false)); } + /** + * Retrieve current product model from registry + * + * @return Mage_Catalog_Model_Product + */ public function getProductData() { - if( $this->getReviewId() && !$this->getProductCacheData() ) { - $this->setProductCacheData(Mage::getModel('catalog/product')->load($this->getReviewData()->getEntityPkValue())); - } - return $this->getProductCacheData(); + return Mage::registry('current_product'); } + /** + * Retrieve current review model from registry + * + * @return Mage_Review_Model_Review + */ public function getReviewData() { - if( $this->getReviewId() && !$this->getReviewCachedData() ) { - $this->setReviewCachedData(Mage::getModel('review/review')->load($this->getReviewId())); - } - return $this->getReviewCachedData(); + return Mage::registry('current_review'); } + /** + * Prepare link to review list for current product + * + * @return string + */ public function getBackUrl() { return Mage::getUrl('*/*/list', array('id' => $this->getProductData()->getId())); } + /** + * Retrieve collection of ratings + * + * @return Mage_Rating_Model_Mysql4_Rating_Option_Vote_Collection + */ public function getRating() { if( !$this->getRatingCollection() ) { @@ -77,6 +89,11 @@ public function getRating() return $this->getRatingCollection(); } + /** + * Retrieve rating summary for current product + * + * @return string + */ public function getRatingSummary() { if( !$this->getRatingSummaryCache() ) { @@ -85,6 +102,11 @@ public function getRatingSummary() return $this->getRatingSummaryCache(); } + /** + * Retrieve total review count for current product + * + * @return string + */ public function getTotalReviews() { if( !$this->getTotalReviewsCache() ) { @@ -93,8 +115,14 @@ public function getTotalReviews() return $this->getTotalReviewsCache(); } + /** + * Format date in long format + * + * @param string $date + * @return string + */ public function dateFormat($date) { return $this->formatDate($date, Mage_Core_Model_Locale::FORMAT_TYPE_LONG); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Helper/Data.php b/app/code/core/Mage/Review/Helper/Data.php index 7d53e709af..6b83817bd9 100644 --- a/app/code/core/Mage/Review/Helper/Data.php +++ b/app/code/core/Mage/Review/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review.php b/app/code/core/Mage/Review/Model/Mysql4/Review.php index 0f223cbe3c..9d2a59f397 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -312,4 +312,4 @@ public function reAggregateReview($reviewId, $entityPkValue) { $this->_aggregateRatings($this->_loadVotedRatingIds($reviewId), $entityPkValue); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php index 682cc20960..585b50a15c 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -221,4 +221,4 @@ protected function _addStoreData() } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Comment.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Comment.php index c36adc378b..0fb78bdc11 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Comment.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Comment.php @@ -18,8 +18,8 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php index f4a8ed6126..c182b8c6a1 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -236,9 +236,9 @@ public function addAttributeToFilter($attribute, $condition=null, $joinType='inn break; case 'type': if($condition == 1) { - $this->getSelect()->where('rdt.customer_id = 0'); + $this->getSelect()->where('rdt.customer_id = 0'); } elseif ($condition == 2) { - $this->getSelect()->where('rdt.customer_id > 0'); + $this->getSelect()->where('rdt.customer_id > 0'); } else { $this->getSelect()->where('rdt.customer_id IS NULL'); } @@ -263,10 +263,10 @@ public function getColumnValues($colName) protected function _afterLoad() { parent::_afterLoad(); - if ($this->_addStoreDataFlag) { - $this->_addStoreData(); - } - return $this; + if ($this->_addStoreDataFlag) { + $this->_addStoreData(); + } + return $this; } protected function _addStoreData() diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php index ca7f7cc74f..40a5604f37 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function toOptionArray() { return parent::_toOptionArray('status_id', 'status_code'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php index bb461a1285..6c941f203a 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,7 +42,7 @@ protected function _construct() protected function _getLoadSelect($field, $value, $object) { $select = parent::_getLoadSelect($field, $value, $object); - $select->where('store_id = ?', (int)$object->getStoreId()); + $select->where('store_id = ?', (int)$object->getStoreId()); return $select; } @@ -76,4 +76,4 @@ public function reAggregate($summary) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php index 3851dbf305..44066c8f08 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ public function addStoreFilter($storeId) $this->_select->where('store_id = ?', $storeId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/Model/Observer.php b/app/code/core/Mage/Review/Model/Observer.php index 8b5c566508..e6b9f335e3 100644 --- a/app/code/core/Mage/Review/Model/Observer.php +++ b/app/code/core/Mage/Review/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Review.php b/app/code/core/Mage/Review/Model/Review.php index 9453d14d3e..f1eb7928f5 100644 --- a/app/code/core/Mage/Review/Model/Review.php +++ b/app/code/core/Mage/Review/Model/Review.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -155,4 +155,30 @@ protected function _beforeDelete() $this->_protectFromNonAdmin(); return parent::_beforeDelete(); } -} \ No newline at end of file + + /** + * Check if current review approved or not + * + * @return bool + */ + public function isApproved() + { + return $this->getStatusId() == self::STATUS_APPROVED; + } + + /** + * Check if current review available on passed store + * + * @param int|Mage_Core_Model_Store $store + * @return bool + */ + public function isAvailableOnStore($store = null) + { + $store = Mage::app()->getStore($store); + if ($store) { + return in_array($store->getId(), (array)$this->getStores()); + } + + return false; + } +} diff --git a/app/code/core/Mage/Review/Model/Review/Comment.php b/app/code/core/Mage/Review/Model/Review/Comment.php index c36adc378b..0fb78bdc11 100644 --- a/app/code/core/Mage/Review/Model/Review/Comment.php +++ b/app/code/core/Mage/Review/Model/Review/Comment.php @@ -18,8 +18,8 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Review/Summary.php b/app/code/core/Mage/Review/Model/Review/Summary.php index cb4a423c8f..3cb91956df 100644 --- a/app/code/core/Mage/Review/Model/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Review/Summary.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/Model/Session.php b/app/code/core/Mage/Review/Model/Session.php index ddda215392..fd36232c50 100644 --- a/app/code/core/Mage/Review/Model/Session.php +++ b/app/code/core/Mage/Review/Model/Session.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ public function __construct() { $this->init('review'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/controllers/CustomerController.php b/app/code/core/Mage/Review/controllers/CustomerController.php index 46c20c96d4..63df0b9155 100644 --- a/app/code/core/Mage/Review/controllers/CustomerController.php +++ b/app/code/core/Mage/Review/controllers/CustomerController.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ public function viewAction() $this->getLayout()->getBlock('head')->setTitle($this->__('Review Details')); $this->renderLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Review/controllers/ProductController.php b/app/code/core/Mage/Review/controllers/ProductController.php index 87dd9231fb..f1c12cb3ee 100644 --- a/app/code/core/Mage/Review/controllers/ProductController.php +++ b/app/code/core/Mage/Review/controllers/ProductController.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -74,6 +74,33 @@ protected function _initProduct() $categoryId = (int) $this->getRequest()->getParam('category', false); $productId = (int) $this->getRequest()->getParam('id'); + $product = $this->_loadProduct($productId); + + if ($categoryId) { + $category = Mage::getModel('catalog/category')->load($categoryId); + Mage::register('current_category', $category); + } + + try { + Mage::dispatchEvent('review_controller_product_init', array('product'=>$product)); + Mage::dispatchEvent('review_controller_product_init_after', array('product'=>$product, 'controller_action' => $this)); + } catch (Mage_Core_Exception $e) { + Mage::logException($e); + return false; + } + + return $product; + } + + /** + * Load product model with data by passed id. + * Return false if product was not loaded or has incorrect status. + * + * @param int $productId + * @return bool|Mage_Catalog_Model_Product + */ + protected function _loadProduct($productId) + { if (!$productId) { return false; } @@ -85,24 +112,41 @@ protected function _initProduct() if (!$product->getId() || !$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility()) { return false; } - if ($categoryId) { - $category = Mage::getModel('catalog/category')->load($categoryId); - Mage::register('current_category', $category); - } + Mage::register('current_product', $product); Mage::register('product', $product); - try { - Mage::dispatchEvent('review_controller_product_init', array('product'=>$product)); - Mage::dispatchEvent('review_controller_product_init_after', array('product'=>$product, 'controller_action' => $this)); - } catch (Mage_Core_Exception $e) { - Mage::logException($e); + return $product; + } + + /** + * Load review model with data by passed id. + * Return false if review was not loaded or review is not approved. + * + * @param int $productId + * @return bool|Mage_Review_Model_Review + */ + protected function _loadReview($reviewId) + { + if (!$reviewId) { return false; } - return $product; + $review = Mage::getModel('review/review')->load($reviewId); + /* @var $review Mage_Review_Model_Review */ + if (!$review->getId() || !$review->isApproved() || !$review->isAvailableOnStore(Mage::app()->getStore())) { + return false; + } + + Mage::register('current_review', $review); + + return $review; } + /** + * Submit new review action + * + */ public function postAction() { if ($data = Mage::getSingleton('review/session')->getFormData(true)) { @@ -134,10 +178,10 @@ public function postAction() foreach ($rating as $ratingId => $optionId) { Mage::getModel('rating/rating') - ->setRatingId($ratingId) - ->setReviewId($review->getId()) - ->setCustomerId(Mage::getSingleton('customer/session')->getCustomerId()) - ->addOptionVote($optionId, $product->getId()); + ->setRatingId($ratingId) + ->setReviewId($review->getId()) + ->setCustomerId(Mage::getSingleton('customer/session')->getCustomerId()) + ->addOptionVote($optionId, $product->getId()); } $review->aggregate(); @@ -168,6 +212,10 @@ public function postAction() $this->_redirectReferer(); } + /** + * Show list of product's reviews + * + */ public function listAction() { if ($product = $this->_initProduct()) { @@ -191,14 +239,34 @@ public function listAction() } } + /** + * Show details of one review + * + */ public function viewAction() { + $review = $this->_loadReview((int) $this->getRequest()->getParam('id')); + if (!$review) { + $this->_forward('noroute'); + return; + } + + $product = $this->_loadProduct($review->getEntityPkValue()); + if (!$product) { + $this->_forward('noroute'); + return; + } + $this->loadLayout(); $this->_initLayoutMessages('review/session'); $this->_initLayoutMessages('catalog/session'); $this->renderLayout(); } + /** + * Load specific layout handles by product type id + * + */ protected function _initProductLayout($product) { $update = $this->getLayout()->getUpdate(); @@ -223,3 +291,4 @@ protected function _initProductLayout($product) $this->generateLayoutXml()->generateLayoutBlocks(); } } + diff --git a/app/code/core/Mage/Review/etc/config.xml b/app/code/core/Mage/Review/etc/config.xml index ca7b227191..06ebd4f66d 100644 --- a/app/code/core/Mage/Review/etc/config.xml +++ b/app/code/core/Mage/Review/etc/config.xml @@ -19,16 +19,16 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - 0.7.4 + 0.7.5 diff --git a/app/code/core/Mage/Review/etc/system.xml b/app/code/core/Mage/Review/etc/system.xml index b047c7c328..13b4433ca7 100644 --- a/app/code/core/Mage/Review/etc/system.xml +++ b/app/code/core/Mage/Review/etc/system.xml @@ -19,10 +19,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php index e2656d10bd..7e80faee07 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php index c3f207031a..aaf88406b6 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,4 +60,4 @@ ON UPDATE CASCADE ON DELETE CASCADE; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php index 56b93d0d89..d1bc7ad842 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php index 4bf0b34beb..f0da5e176f 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Review - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php index 0c6af1beac..017046865e 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Abstract.php b/app/code/core/Mage/Rss/Block/Abstract.php index 0a1ae02e08..e5a3c58df2 100644 --- a/app/code/core/Mage/Rss/Block/Abstract.php +++ b/app/code/core/Mage/Rss/Block/Abstract.php @@ -1,4 +1,28 @@ _addEntry($data); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php index 0c3340d146..214f091918 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php +++ b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -102,4 +102,4 @@ public function addNotifyItemXmlCallback($args) ); $rssObj->_addEntry($data); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/Catalog/Review.php b/app/code/core/Mage/Rss/Block/Catalog/Review.php index 8960393ce3..1f56dc2a76 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Review.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Review.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -101,4 +101,4 @@ public function addReviewItemXmlCallback($args) ); $rssObj->_addEntry($data); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php b/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php index 64b91513ea..a0fd06de29 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -95,4 +95,4 @@ protected function _toHtml() } return $rssObj->createRssXml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/Catalog/Special.php b/app/code/core/Mage/Rss/Block/Catalog/Special.php index 07eae45e0c..2723f9eab2 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Special.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Special.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -186,4 +186,4 @@ public function sortByStartDate($a, $b) { return $a['start_date']>$b['start_date'] ? -1 : ($a['start_date']<$b['start_date'] ? 1 : 0); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php index be79fdcaad..da63bb86c8 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -112,4 +112,4 @@ public function addTaggedItemXml($args) ); $rssObj->_addEntry($data); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/List.php b/app/code/core/Mage/Rss/Block/List.php index 44791608df..e19fa3256a 100644 --- a/app/code/core/Mage/Rss/Block/List.php +++ b/app/code/core/Mage/Rss/Block/List.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -189,4 +189,4 @@ public function CategoriesRssFeed() } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/Order/Details.php b/app/code/core/Mage/Rss/Block/Order/Details.php index 6795c46fed..8f4fbed7f3 100644 --- a/app/code/core/Mage/Rss/Block/Order/Details.php +++ b/app/code/core/Mage/Rss/Block/Order/Details.php @@ -1,5 +1,28 @@ setTemplate('rss/order/details.phtml'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/Order/New.php b/app/code/core/Mage/Rss/Block/Order/New.php index d2c34fd2ad..25e92fa2c6 100644 --- a/app/code/core/Mage/Rss/Block/Order/New.php +++ b/app/code/core/Mage/Rss/Block/Order/New.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rss/Block/Order/Status.php b/app/code/core/Mage/Rss/Block/Order/Status.php index bea297e02a..3fbebb30d7 100644 --- a/app/code/core/Mage/Rss/Block/Order/Status.php +++ b/app/code/core/Mage/Rss/Block/Order/Status.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -96,4 +96,4 @@ protected function _toHtml() $rssObj->_addEntry($data); return $rssObj->createRssXml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Block/Wishlist.php b/app/code/core/Mage/Rss/Block/Wishlist.php index 86bc51018c..bd9ba2d6e9 100644 --- a/app/code/core/Mage/Rss/Block/Wishlist.php +++ b/app/code/core/Mage/Rss/Block/Wishlist.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rss/Helper/Catalog.php b/app/code/core/Mage/Rss/Helper/Catalog.php index db227f6c59..6c6cc2b162 100644 --- a/app/code/core/Mage/Rss/Helper/Catalog.php +++ b/app/code/core/Mage/Rss/Helper/Catalog.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,4 +44,4 @@ public function getTagFeedUrl() return $url; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Helper/Data.php b/app/code/core/Mage/Rss/Helper/Data.php index 077c877328..e53504e332 100644 --- a/app/code/core/Mage/Rss/Helper/Data.php +++ b/app/code/core/Mage/Rss/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Helper/Order.php b/app/code/core/Mage/Rss/Helper/Order.php index c7c0803767..903d61b8a6 100644 --- a/app/code/core/Mage/Rss/Helper/Order.php +++ b/app/code/core/Mage/Rss/Helper/Order.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,4 +45,4 @@ public function getStatusHistoryRssUrl($order) return $this->_getUrl('rss/order/status', array('_secure' => true, '_query'=>array('data'=>Mage::helper('core')->encrypt($key)))); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Model/Mysql4/Order.php b/app/code/core/Mage/Rss/Model/Mysql4/Order.php index 9c3fa2a5eb..c750b7033c 100644 --- a/app/code/core/Mage/Rss/Model/Mysql4/Order.php +++ b/app/code/core/Mage/Rss/Model/Mysql4/Order.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order Rss @@ -56,13 +56,13 @@ public function getCoreResource() return Mage::getSingleton('core/resource'); } - public function getAllOrderEntityTypeIds() - { - $orderEntityTypes = array(); - $etypeIds = array(); + public function getAllOrderEntityTypeIds() + { + $orderEntityTypes = array(); + $etypeIds = array(); $oattrIds = array(); - $eav = Mage::getSingleton('eav/config'); - $oTable = ''; + $eav = Mage::getSingleton('eav/config'); + $oTable = ''; foreach (array( 'invoice'=>'sales/order_invoice', 'shipment'=>'sales/order_shipment', @@ -84,14 +84,14 @@ public function getAllOrderEntityTypeIds() 'orderAttrIds' => $oattrIds, 'order_table' => $oTable); return $orderEntityTypes; - } - - public function getAllOrderEntityIds($oid, $orderEntityTypes) - { - $etypeIdsArr = array_keys($orderEntityTypes['entityTypeIds']); - $res = $this->getCoreResource(); - $read = $res->getConnection('core_read'); - $select = $read->select() + } + + public function getAllOrderEntityIds($oid, $orderEntityTypes) + { + $etypeIdsArr = array_keys($orderEntityTypes['entityTypeIds']); + $res = $this->getCoreResource(); + $read = $res->getConnection('core_read'); + $select = $read->select() ->from(array('order' => $res->getTableName('sales/order')), array('entity_id')) ->join($orderEntityTypes['order_table'],"{$orderEntityTypes['order_table']}.entity_id=order.entity_id and {$orderEntityTypes['order_table']}.attribute_id in (".implode(',',$orderEntityTypes['orderAttrIds']).") @@ -104,14 +104,14 @@ public function getAllOrderEntityIds($oid, $orderEntityTypes) $eIds[] = $result['entity_id']; } return $eIds; - } - - public function getAllEntityIds($entityIds = array()) - { - $res = $this->getCoreResource(); - $read = $res->getConnection('core_read'); - $entityIdStr = implode(',', $entityIds); - $select = $read->select() + } + + public function getAllEntityIds($entityIds = array()) + { + $res = $this->getCoreResource(); + $read = $res->getConnection('core_read'); + $entityIdStr = implode(',', $entityIds); + $select = $read->select() ->from($res->getTableName('sales/order'), array('entity_id','increment_id')) ->where('parent_id in (' .$entityIdStr.')') ->orWhere('entity_id in (' .$entityIdStr.')'); @@ -124,11 +124,11 @@ public function getAllEntityIds($entityIds = array()) $eIds[] = $result['entity_id']; } return $eIds; - } + } - public function getAllEntityTypeCommentIds() - { - $entityTypes = array(); + public function getAllEntityTypeCommentIds() + { + $entityTypes = array(); $eav = Mage::getSingleton('eav/config'); $etypeIds = array(); $cattrIds = array(); @@ -177,31 +177,31 @@ public function getAllEntityTypeCommentIds() 'comment_table' => $cTable, 'notified_table' => $nTable); return $entityTypes; - } + } /* entity_type_id IN (order_status_history, invoice_comment, shipment_comment, creditmemo_comment) entity_id IN(order_id, credimemo_ids, invoice_ids, shipment_ids) attribute_id IN(order_status/comment_text, ....) */ - public function getAllCommentCollection($oid) - { - $orderEntityTypes = $this->getAllOrderEntityTypeIds(); - $entityIds = $this->getAllOrderEntityIds($oid, $orderEntityTypes); - $allEntityIds = $this->getAllEntityIds($entityIds); + public function getAllCommentCollection($oid) + { + $orderEntityTypes = $this->getAllOrderEntityTypeIds(); + $entityIds = $this->getAllOrderEntityIds($oid, $orderEntityTypes); + $allEntityIds = $this->getAllEntityIds($entityIds); - $eTypes = $this->getAllEntityTypeCommentIds(); - $etypeIds = implode(',',$eTypes['entityTypeIds']); + $eTypes = $this->getAllEntityTypeCommentIds(); + $etypeIds = implode(',',$eTypes['entityTypeIds']); - /*foreach($entityTypeIds as $eid=>$result){ + /*foreach($entityTypeIds as $eid=>$result){ $etIds[] = $eid; $attributeIds[] = $result['comment_attribute_id']; $attributeIds[] = $result['notified_attribute_id']; - }*/ + }*/ - $res = $this->getCoreResource(); - $read = $res->getConnection('core_read'); - $select = $read->select() + $res = $this->getCoreResource(); + $read = $res->getConnection('core_read'); + $select = $read->select() ->from(array('order' => $res->getTableName('sales/order')), array('entity_id','created_at','entity_type_id','parent_id')) ->where('order.entity_id in ('.implode(",", $allEntityIds).')') ->join($eTypes['comment_table'],"{$eTypes['comment_table']}.entity_id=order.entity_id @@ -216,6 +216,6 @@ public function getAllCommentCollection($oid) ; return $read->fetchAll($select); - } + } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Model/Rss.php b/app/code/core/Mage/Rss/Model/Rss.php index 3c6822bb1d..6aa3f40c1f 100644 --- a/app/code/core/Mage/Rss/Model/Rss.php +++ b/app/code/core/Mage/Rss/Model/Rss.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,4 +68,4 @@ public function createRssXml() return Mage::helper('rss')->__('Error in processing xml. %s',$e->getMessage()); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/Model/Session.php b/app/code/core/Mage/Rss/Model/Session.php index 11d23630a3..ef073a537f 100644 --- a/app/code/core/Mage/Rss/Model/Session.php +++ b/app/code/core/Mage/Rss/Model/Session.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,4 +48,4 @@ public function isCustomerLoggedIn() { return $this->getCustomer() && $this->getCustomer()->getId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/controllers/CatalogController.php b/app/code/core/Mage/Rss/controllers/CatalogController.php index f062a6cd9d..fa90c9e8a4 100644 --- a/app/code/core/Mage/Rss/controllers/CatalogController.php +++ b/app/code/core/Mage/Rss/controllers/CatalogController.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -112,4 +112,4 @@ public function categoryAction() $this->renderLayout(); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/controllers/IndexController.php b/app/code/core/Mage/Rss/controllers/IndexController.php index 59580fba9f..c10836e0b1 100644 --- a/app/code/core/Mage/Rss/controllers/IndexController.php +++ b/app/code/core/Mage/Rss/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,7 +37,7 @@ public function indexAction() { if (Mage::getStoreConfig('rss/config/active')) { $this->loadLayout(); - $this->renderLayout(); + $this->renderLayout(); } else { $this->getResponse()->setHeader('HTTP/1.1','404 Not Found'); $this->getResponse()->setHeader('Status','404 File not found'); @@ -49,8 +49,8 @@ public function nofeedAction() { $this->getResponse()->setHeader('HTTP/1.1','404 Not Found'); $this->getResponse()->setHeader('Status','404 File not found'); - $this->loadLayout(false); - $this->renderLayout(); + $this->loadLayout(false); + $this->renderLayout(); } public function wishlistAction() @@ -58,7 +58,7 @@ public function wishlistAction() if (Mage::getStoreConfig('rss/wishlist/active')) { $this->getResponse()->setHeader('Content-type', 'text/xml; charset=UTF-8'); $this->loadLayout(false); - $this->renderLayout(); + $this->renderLayout(); } else { $this->getResponse()->setHeader('HTTP/1.1','404 Not Found'); $this->getResponse()->setHeader('Status','404 File not found'); @@ -66,4 +66,4 @@ public function wishlistAction() return; } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rss/controllers/OrderController.php b/app/code/core/Mage/Rss/controllers/OrderController.php index 3ba14169c1..21ab799c01 100644 --- a/app/code/core/Mage/Rss/controllers/OrderController.php +++ b/app/code/core/Mage/Rss/controllers/OrderController.php @@ -18,10 +18,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rss/etc/config.xml b/app/code/core/Mage/Rss/etc/config.xml index d475a5db8b..f27c3303ae 100644 --- a/app/code/core/Mage/Rss/etc/config.xml +++ b/app/code/core/Mage/Rss/etc/config.xml @@ -19,10 +19,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -125,4 +125,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Rss/etc/system.xml b/app/code/core/Mage/Rss/etc/system.xml index 80422c5e99..4407d1d526 100644 --- a/app/code/core/Mage/Rss/etc/system.xml +++ b/app/code/core/Mage/Rss/etc/system.xml @@ -19,10 +19,10 @@ * 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_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -155,4 +155,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Rule/Block/Actions.php b/app/code/core/Mage/Rule/Block/Actions.php index 18b77f9fa6..a051c84a59 100644 --- a/app/code/core/Mage/Rule/Block/Actions.php +++ b/app/code/core/Mage/Rule/Block/Actions.php @@ -18,20 +18,20 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Rule_Block_Actions implements Varien_Data_Form_Element_Renderer_Interface { - public function render(Varien_Data_Form_Element_Abstract $element) - { - if ($element->getRule() && $element->getRule()->getActions()) { - return $element->getRule()->getActions()->asHtmlRecursive(); - } - return ''; - } -} \ No newline at end of file + public function render(Varien_Data_Form_Element_Abstract $element) + { + if ($element->getRule() && $element->getRule()->getActions()) { + return $element->getRule()->getActions()->asHtmlRecursive(); + } + return ''; + } +} diff --git a/app/code/core/Mage/Rule/Block/Conditions.php b/app/code/core/Mage/Rule/Block/Conditions.php index 8f341da961..0def00a422 100644 --- a/app/code/core/Mage/Rule/Block/Conditions.php +++ b/app/code/core/Mage/Rule/Block/Conditions.php @@ -18,20 +18,20 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Rule_Block_Conditions implements Varien_Data_Form_Element_Renderer_Interface { - public function render(Varien_Data_Form_Element_Abstract $element) - { - if ($element->getRule() && $element->getRule()->getConditions()) { - return $element->getRule()->getConditions()->asHtmlRecursive(); - } - return ''; - } -} \ No newline at end of file + public function render(Varien_Data_Form_Element_Abstract $element) + { + if ($element->getRule() && $element->getRule()->getConditions()) { + return $element->getRule()->getConditions()->asHtmlRecursive(); + } + return ''; + } +} diff --git a/app/code/core/Mage/Rule/Block/Editable.php b/app/code/core/Mage/Rule/Block/Editable.php index b3be739ba0..0745a2f28a 100644 --- a/app/code/core/Mage/Rule/Block/Editable.php +++ b/app/code/core/Mage/Rule/Block/Editable.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -61,4 +61,4 @@ public function render(Varien_Data_Form_Element_Abstract $element) } return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rule/Block/Newchild.php b/app/code/core/Mage/Rule/Block/Newchild.php index 180054a21d..c87efbbd79 100644 --- a/app/code/core/Mage/Rule/Block/Newchild.php +++ b/app/code/core/Mage/Rule/Block/Newchild.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function render(Varien_Data_Form_Element_Abstract $element) $html.= ' '; return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rule/Block/Rule.php b/app/code/core/Mage/Rule/Block/Rule.php index 31fec900e5..0cdde739e7 100644 --- a/app/code/core/Mage/Rule/Block/Rule.php +++ b/app/code/core/Mage/Rule/Block/Rule.php @@ -18,14 +18,14 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Rule_Block_Rule extends Mage_Core_Block_Abstract +class Mage_Rule_Block_Rule extends Mage_Core_Block_Abstract { - -} \ No newline at end of file + +} diff --git a/app/code/core/Mage/Rule/Helper/Data.php b/app/code/core/Mage/Rule/Helper/Data.php index 5cb5ba057b..9baa1f35d3 100644 --- a/app/code/core/Mage/Rule/Helper/Data.php +++ b/app/code/core/Mage/Rule/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rule/Model/Action/Abstract.php b/app/code/core/Mage/Rule/Model/Action/Abstract.php index 48319e851e..e9cae757d5 100644 --- a/app/code/core/Mage/Rule/Model/Action/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Action/Abstract.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,17 +85,17 @@ public function loadArray(array $arr) public function loadAttributeOptions() { - $this->setAttributeOption(array()); + $this->setAttributeOption(array()); return $this; } public function getAttributeSelectOptions() { - $opt = array(); - foreach ($this->getAttributeOption() as $k=>$v) { - $opt[] = array('value'=>$k, 'label'=>$v); - } - return $opt; + $opt = array(); + foreach ($this->getAttributeOption() as $k=>$v) { + $opt[] = array('value'=>$k, 'label'=>$v); + } + return $opt; } public function getAttributeName() @@ -114,11 +114,11 @@ public function loadOperatorOptions() public function getOperatorSelectOptions() { - $opt = array(); - foreach ($this->getOperatorOption() as $k=>$v) { - $opt[] = array('value'=>$k, 'label'=>$v); - } - return $opt; + $opt = array(); + foreach ($this->getOperatorOption() as $k=>$v) { + $opt[] = array('value'=>$k, 'label'=>$v); + } + return $opt; } public function getOperatorName() @@ -128,17 +128,17 @@ public function getOperatorName() public function loadValueOptions() { - $this->setValueOption(array()); + $this->setValueOption(array()); return $this; } public function getValueSelectOptions() { - $opt = array(); - foreach ($this->getValueOption() as $k=>$v) { - $opt[] = array('value'=>$k, 'label'=>$v); - } - return $opt; + $opt = array(); + foreach ($this->getValueOption() as $k=>$v) { + $opt[] = array('value'=>$k, 'label'=>$v); + } + return $opt; } public function getValueName() @@ -172,53 +172,53 @@ public function asHtmlRecursive() public function getTypeElement() { - return $this->getForm()->addField('action:'.$this->getId().':type', 'hidden', array( - 'name'=>'rule[actions]['.$this->getId().'][type]', - 'value'=>$this->getType(), - 'no_span'=>true, - )); + return $this->getForm()->addField('action:'.$this->getId().':type', 'hidden', array( + 'name'=>'rule[actions]['.$this->getId().'][type]', + 'value'=>$this->getType(), + 'no_span'=>true, + )); } public function getAttributeElement() { - return $this->getForm()->addField('action:'.$this->getId().':attribute', 'select', array( - 'name'=>'rule[actions]['.$this->getId().'][attribute]', - 'values'=>$this->getAttributeSelectOptions(), - 'value'=>$this->getAttribute(), - 'value_name'=>$this->getAttributeName(), - ))->setRenderer(Mage::getBlockSingleton('rule/editable')); + return $this->getForm()->addField('action:'.$this->getId().':attribute', 'select', array( + 'name'=>'rule[actions]['.$this->getId().'][attribute]', + 'values'=>$this->getAttributeSelectOptions(), + 'value'=>$this->getAttribute(), + 'value_name'=>$this->getAttributeName(), + ))->setRenderer(Mage::getBlockSingleton('rule/editable')); } public function getOperatorElement() { return $this->getForm()->addField('action:'.$this->getId().':operator', 'select', array( - 'name'=>'rule[actions]['.$this->getId().'][operator]', - 'values'=>$this->getOperatorSelectOptions(), - 'value'=>$this->getOperator(), - 'value_name'=>$this->getOperatorName(), - ))->setRenderer(Mage::getBlockSingleton('rule/editable')); + 'name'=>'rule[actions]['.$this->getId().'][operator]', + 'values'=>$this->getOperatorSelectOptions(), + 'value'=>$this->getOperator(), + 'value_name'=>$this->getOperatorName(), + ))->setRenderer(Mage::getBlockSingleton('rule/editable')); } public function getValueElement() { return $this->getForm()->addField('action:'.$this->getId().':value', 'text', array( - 'name'=>'rule[actions]['.$this->getId().'][value]', - 'value'=>$this->getValue(), - 'value_name'=>$this->getValueName(), - ))->setRenderer(Mage::getBlockSingleton('rule/editable')); + 'name'=>'rule[actions]['.$this->getId().'][value]', + 'value'=>$this->getValue(), + 'value_name'=>$this->getValueName(), + ))->setRenderer(Mage::getBlockSingleton('rule/editable')); } public function getAddLinkHtml() { - $src = Mage::getDesign()->getSkinUrl('images/rule_component_add.gif'); - $html = ''; + $src = Mage::getDesign()->getSkinUrl('images/rule_component_add.gif'); + $html = ''; return $html; } public function getRemoveLinkHtml() { - $src = Mage::getDesign()->getSkinUrl('images/rule_component_remove.gif'); + $src = Mage::getDesign()->getSkinUrl('images/rule_component_remove.gif'); $html = ''; return $html; } diff --git a/app/code/core/Mage/Rule/Model/Action/Collection.php b/app/code/core/Mage/Rule/Model/Action/Collection.php index d39a4a5e19..ac16432f3d 100644 --- a/app/code/core/Mage/Rule/Model/Action/Collection.php +++ b/app/code/core/Mage/Rule/Model/Action/Collection.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -87,10 +87,10 @@ public function addAction(Mage_Rule_Model_Action_Interface $action) public function asHtml() { - $html = $this->getTypeElement()->toHtml().'Perform following actions: '; - if ($this->getId()!='1') { - $html.= $this->getRemoveLinkHtml(); - } + $html = $this->getTypeElement()->toHtml().'Perform following actions: '; + if ($this->getId()!='1') { + $html.= $this->getRemoveLinkHtml(); + } return $html; } public function getNewChildElement() diff --git a/app/code/core/Mage/Rule/Model/Action/Interface.php b/app/code/core/Mage/Rule/Model/Action/Interface.php index fc81df3b77..0c52ea197a 100644 --- a/app/code/core/Mage/Rule/Model/Action/Interface.php +++ b/app/code/core/Mage/Rule/Model/Action/Interface.php @@ -18,14 +18,14 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ interface Mage_Rule_Model_Action_Interface { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php index 065f3133ad..c627d9e7b3 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,39 +44,18 @@ abstract class Mage_Rule_Model_Condition_Abstract * Default values for possible operator options * @var array */ - protected $_defaultOperatorOptions; + protected $_defaultOperatorOptions = null; /** * Default combinations of operator options, depending on input type * @var array */ - protected $_defaultOperatorInputByType = array( - 'string' => array('==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'), - 'numeric' => array('==', '!=', '>=', '>', '<=', '<', '()', '!()'), - 'date' => array('==', '>=', '<='), - 'select' => array('==', '!='), - 'multiselect' => array('==', '!=', '{}', '!{}'), - 'grid' => array('()', '!()'), - ); + protected $_defaultOperatorInputByType = null; public function __construct() { parent::__construct(); - $this->_defaultOperatorOptions = array( - '==' => Mage::helper('rule')->__('is'), - '!=' => Mage::helper('rule')->__('is not'), - '>=' => Mage::helper('rule')->__('equals or greater than'), - '<=' => Mage::helper('rule')->__('equals or less than'), - '>' => Mage::helper('rule')->__('greater than'), - '<' => Mage::helper('rule')->__('less than'), - '{}' => Mage::helper('rule')->__('contains'), - '!{}' => Mage::helper('rule')->__('does not contain'), - '!{}' => Mage::helper('rule')->__('does not contain'), - '()' => Mage::helper('rule')->__('is one of'), - '!()' => Mage::helper('rule')->__('is not one of'), - ); - $this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions(); if ($options = $this->getAttributeOptions()) { @@ -87,6 +66,52 @@ public function __construct() } } + /** + * Default operator input by type map getter + * + * @return array + */ + public function getDefaultOperatorInputByType() + { + if (null === $this->_defaultOperatorInputByType) { + $this->_defaultOperatorInputByType = array( + 'string' => array('==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'), + 'numeric' => array('==', '!=', '>=', '>', '<=', '<', '()', '!()'), + 'date' => array('==', '>=', '<='), + 'select' => array('==', '!='), + 'multiselect' => array('==', '!=', '{}', '!{}'), + 'grid' => array('()', '!()'), + ); + } + return $this->_defaultOperatorInputByType; + } + + /** + * Default operator options getter + * Provides all possible operator options + * + * @return array + */ + public function getDefaultOperatorOptions() + { + if (null === $this->_defaultOperatorOptions) { + $this->_defaultOperatorOptions = array( + '==' => Mage::helper('rule')->__('is'), + '!=' => Mage::helper('rule')->__('is not'), + '>=' => Mage::helper('rule')->__('equals or greater than'), + '<=' => Mage::helper('rule')->__('equals or less than'), + '>' => Mage::helper('rule')->__('greater than'), + '<' => Mage::helper('rule')->__('less than'), + '{}' => Mage::helper('rule')->__('contains'), + '!{}' => Mage::helper('rule')->__('does not contain'), + '!{}' => Mage::helper('rule')->__('does not contain'), + '()' => Mage::helper('rule')->__('is one of'), + '!()' => Mage::helper('rule')->__('is not one of'), + ); + } + return $this->_defaultOperatorOptions; + } + public function getForm() { return $this->getRule()->getForm(); @@ -163,8 +188,8 @@ public function getAttributeName() public function loadOperatorOptions() { - $this->setOperatorOption($this->_defaultOperatorOptions); - $this->setOperatorByInputType($this->_defaultOperatorInputByType); + $this->setOperatorOption($this->getDefaultOperatorOptions()); + $this->setOperatorByInputType($this->getDefaultOperatorInputByType()); return $this; } @@ -344,20 +369,33 @@ public function getAttributeElementHtml() return $this->getAttributeElement()->getHtml(); } + /** + * Retrieve Condition Operator element Instance + * If the operator value is empty - define first available operator value as default + * + * @return Varien_Data_Form_Element_Select + */ public function getOperatorElement() { + $options = $this->getOperatorSelectOptions(); if (is_null($this->getOperator())) { - foreach ($this->getOperatorOption() as $k=>$v) { - $this->setOperator($k); + foreach ($options as $option) { + $this->setOperator($option['value']); break; } } - return $this->getForm()->addField($this->getPrefix().'__'.$this->getId().'__operator', 'select', array( - 'name'=>'rule['.$this->getPrefix().']['.$this->getId().'][operator]', - 'values'=>$this->getOperatorSelectOptions(), - 'value'=>$this->getOperator(), - 'value_name'=>$this->getOperatorName(), - ))->setRenderer(Mage::getBlockSingleton('rule/editable')); + + $elementId = sprintf('%s__%s__operator', $this->getPrefix(), $this->getId()); + $elementName = sprintf('rule[%s][%s][operator]', $this->getPrefix(), $this->getId()); + $element = $this->getForm()->addField($elementId, 'select', array( + 'name' => $elementName, + 'values' => $options, + 'value' => $this->getOperator(), + 'value_name' => $this->getOperatorName(), + )); + $element->setRenderer(Mage::getBlockSingleton('rule/editable')); + + return $element; } public function getOperatorElementHtml() @@ -547,4 +585,4 @@ public function validate(Varien_Object $object) { return $this->validateAttribute($object->getData($this->getAttribute())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php index 4e1f7845c8..e5c9643aad 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Combine.php +++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Condition/Interface.php b/app/code/core/Mage/Rule/Model/Condition/Interface.php index bcdad12864..4f09ee22b2 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Interface.php +++ b/app/code/core/Mage/Rule/Model/Condition/Interface.php @@ -18,14 +18,14 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ interface Mage_Rule_Model_Condition_Interface { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rule/Model/Environment.php b/app/code/core/Mage/Rule/Model/Environment.php index fedcd5bcc0..6c80ef9533 100644 --- a/app/code/core/Mage/Rule/Model/Environment.php +++ b/app/code/core/Mage/Rule/Model/Environment.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,4 +41,4 @@ public function collect() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule.php index 4a6ec3cae0..69d449db62 100644 --- a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/Rule/Model/Mysql4/Rule.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,8 +34,8 @@ */ class Mage_Rule_Model_Mysql4_Rule extends Mage_Core_Model_Mysql4_Abstract { - protected function _construct() - { - $this->_init('rule/rule', 'rule_id'); - } -} \ No newline at end of file + protected function _construct() + { + $this->_init('rule/rule', 'rule_id'); + } +} diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php index bb327c4741..4966a041f2 100644 --- a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -146,4 +146,4 @@ protected function _afterLoad() { $this->walk('afterLoad'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Rule/Model/Renderer/Actions.php b/app/code/core/Mage/Rule/Model/Renderer/Actions.php index 8d02bc0a5d..3c03b42a7a 100644 --- a/app/code/core/Mage/Rule/Model/Renderer/Actions.php +++ b/app/code/core/Mage/Rule/Model/Renderer/Actions.php @@ -18,20 +18,20 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Rule_Model_Renderer_Actions implements Varien_Data_Form_Element_Renderer_Interface { - public function render(Varien_Data_Form_Element_Abstract $element) - { - if ($element->getRule() && $element->getRule()->getActions()) { - return $element->getRule()->getActions()->asHtmlRecursive(); - } - return ''; - } -} \ No newline at end of file + public function render(Varien_Data_Form_Element_Abstract $element) + { + if ($element->getRule() && $element->getRule()->getActions()) { + return $element->getRule()->getActions()->asHtmlRecursive(); + } + return ''; + } +} diff --git a/app/code/core/Mage/Rule/Model/Renderer/Conditions.php b/app/code/core/Mage/Rule/Model/Renderer/Conditions.php index 45a387dbc7..f91a86f30a 100644 --- a/app/code/core/Mage/Rule/Model/Renderer/Conditions.php +++ b/app/code/core/Mage/Rule/Model/Renderer/Conditions.php @@ -18,20 +18,20 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Rule_Model_Renderer_Conditions implements Varien_Data_Form_Element_Renderer_Interface { - public function render(Varien_Data_Form_Element_Abstract $element) - { - if ($element->getRule() && $element->getRule()->getConditions()) { - return $element->getRule()->getConditions()->asHtmlRecursive(); - } - return ''; - } -} \ No newline at end of file + public function render(Varien_Data_Form_Element_Abstract $element) + { + if ($element->getRule() && $element->getRule()->getConditions()) { + return $element->getRule()->getConditions()->asHtmlRecursive(); + } + return ''; + } +} diff --git a/app/code/core/Mage/Rule/Model/Rule.php b/app/code/core/Mage/Rule/Model/Rule.php index 0eda1c8516..2d4c1517c6 100644 --- a/app/code/core/Mage/Rule/Model/Rule.php +++ b/app/code/core/Mage/Rule/Model/Rule.php @@ -18,10 +18,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Rule_Model_Rule extends Mage_Core_Model_Abstract diff --git a/app/code/core/Mage/Rule/etc/config.xml b/app/code/core/Mage/Rule/etc/config.xml index 22d5600949..ac76d115ec 100644 --- a/app/code/core/Mage/Rule/etc/config.xml +++ b/app/code/core/Mage/Rule/etc/config.xml @@ -19,10 +19,10 @@ * 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_Rule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Sales/Block/Items/Abstract.php b/app/code/core/Mage/Sales/Block/Items/Abstract.php index 589dfa4a53..5c5c05570f 100644 --- a/app/code/core/Mage/Sales/Block/Items/Abstract.php +++ b/app/code/core/Mage/Sales/Block/Items/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -124,4 +124,4 @@ public function getItemHtml(Varien_Object $item) $this->_prepareItem($block); return $block->toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php index 000cec8a28..294247bc20 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -92,4 +92,4 @@ public function getPrintCreditmemoUrl($creditmemo){ public function getPrintAllCreditmemosUrl($order){ return Mage::getUrl('*/*/printCreditmemo', array('order_id' => $order->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php index 2bf085999b..f0aea8c769 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,4 +69,4 @@ public function getTotalsHtml($creditmemo) } return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Details.php b/app/code/core/Mage/Sales/Block/Order/Details.php index a9fda9a0da..63786905bc 100644 --- a/app/code/core/Mage/Sales/Block/Order/Details.php +++ b/app/code/core/Mage/Sales/Block/Order/Details.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php index bb69f6b759..36a37e4c62 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) $renderer->getItem()->setOrder($this->getOrder()); $renderer->getItem()->setSource($this->getCreditmemo()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php index 5b74c2de26..ffab5fc23c 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) $renderer->getItem()->setOrder($this->getOrder()); $renderer->getItem()->setSource($this->getInvoice()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Items.php index 4f21af38a4..5f49c30e26 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ class Mage_Sales_Block_Order_Email_Items extends Mage_Sales_Block_Items_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php index cf36ede650..5cf6f6f520 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,4 +78,4 @@ public function getSku($item) else return $item->getSku(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php index 63f7497165..be264707da 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,4 +78,4 @@ public function getSku($item) else return $item->getSku(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php index aad8884370..b1962b9f09 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,4 +54,4 @@ protected function _toHtml() } return parent::_toHtml(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php index 01706df6de..bccddd122c 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ protected function _prepareItem(Mage_Core_Block_Abstract $renderer) $renderer->getItem()->setOrder($this->getOrder()); $renderer->getItem()->setSource($this->getShipment()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/History.php b/app/code/core/Mage/Sales/Block/Order/History.php index c081813159..6a0fe0dace 100644 --- a/app/code/core/Mage/Sales/Block/Order/History.php +++ b/app/code/core/Mage/Sales/Block/Order/History.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Info.php b/app/code/core/Mage/Sales/Block/Order/Info.php index 5db61b6489..cce47cdd95 100644 --- a/app/code/core/Mage/Sales/Block/Order/Info.php +++ b/app/code/core/Mage/Sales/Block/Order/Info.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -88,13 +88,13 @@ private function checkLinks() { $order = $this->getOrder(); if (!$order->hasInvoices()) { - unset($this->_links['invoice']); + unset($this->_links['invoice']); } if (!$order->hasShipments()) { - unset($this->_links['shipment']); + unset($this->_links['shipment']); } if (!$order->hasCreditmemos()) { - unset($this->_links['creditmemo']); + unset($this->_links['creditmemo']); } } diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Invoice.php index 2c73146049..2a8b844361 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -92,4 +92,4 @@ public function getPrintInvoiceUrl($invoice){ public function getPrintAllInvoicesUrl($order){ return Mage::getUrl('*/*/printInvoice', array('order_id' => $order->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php b/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php index 9b7ba601b5..3e240e4b0e 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,4 +69,4 @@ public function getInvoiceTotalsHtml($invoice) } return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php index e0548905ec..20100c4729 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -165,4 +165,4 @@ public function getSku() } return $this->getItem()->getSku(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php index 2f26b3bd7b..5fe5d6de00 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php @@ -1,57 +1,57 @@ - - */ -class Mage_Sales_Block_Order_Item_Renderer_Grouped extends Mage_Sales_Block_Order_Item_Renderer_Default -{ - /** - * Prepare item html - * - * This method uses renderer for real product type - * - * @return string - */ - protected function _toHtml() - { - if ($this->getItem()->getOrderItem()) { - $item = $this->getItem()->getOrderItem(); - } else { - $item = $this->getItem(); - } - if ($productType = $item->getRealProductType()) { - $renderer = $this->getRenderedBlock()->getItemRenderer($productType); - $renderer->setItem($this->getItem()); - return $renderer->toHtml(); - } - return parent::_toHtml(); - } -} \ No newline at end of file + + */ +class Mage_Sales_Block_Order_Item_Renderer_Grouped extends Mage_Sales_Block_Order_Item_Renderer_Default +{ + /** + * Prepare item html + * + * This method uses renderer for real product type + * + * @return string + */ + protected function _toHtml() + { + if ($this->getItem()->getOrderItem()) { + $item = $this->getItem()->getOrderItem(); + } else { + $item = $this->getItem(); + } + if ($productType = $item->getRealProductType()) { + $renderer = $this->getRenderedBlock()->getItemRenderer($productType); + $renderer->setItem($this->getItem()); + return $renderer->toHtml(); + } + return parent::_toHtml(); + } +} diff --git a/app/code/core/Mage/Sales/Block/Order/Items.php b/app/code/core/Mage/Sales/Block/Order/Items.php index 6444a9d2d5..d363bdbb30 100644 --- a/app/code/core/Mage/Sales/Block/Order/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Items.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function getOrder() { return Mage::registry('current_order'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Print.php b/app/code/core/Mage/Sales/Block/Order/Print.php index add98b5354..99a6a769f6 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print.php +++ b/app/code/core/Mage/Sales/Block/Order/Print.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php index b674df12d7..6193319327 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -92,4 +92,4 @@ public function getTotalsHtml($creditmemo) } return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php index 3e983abfdf..25ed59a06a 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php index c9a84c3002..f9228cfc64 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Recent.php b/app/code/core/Mage/Sales/Block/Order/Recent.php index 24e6d1dc92..e203e594bd 100644 --- a/app/code/core/Mage/Sales/Block/Order/Recent.php +++ b/app/code/core/Mage/Sales/Block/Order/Recent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Shipment.php index 5f7cdd6b61..348d374383 100644 --- a/app/code/core/Mage/Sales/Block/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Shipment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -93,4 +93,4 @@ public function getPrintShipmentUrl($shipment){ public function getPrintAllShipmentsUrl($order){ return Mage::getUrl('*/*/printShipment', array('order_id' => $order->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php b/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php index f4324898a8..aa017cff25 100644 --- a/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function getPrintShipmentUrl($shipment){ public function getPrintAllShipmentsUrl($order){ return Mage::getUrl('*/*/printShipment', array('order_id' => $order->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/Tax.php b/app/code/core/Mage/Sales/Block/Order/Tax.php index 1c5fa765cc..723b83faba 100644 --- a/app/code/core/Mage/Sales/Block/Order/Tax.php +++ b/app/code/core/Mage/Sales/Block/Order/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function getOrder() { return Mage::registry('current_order'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Order/View.php b/app/code/core/Mage/Sales/Block/Order/View.php index be2674c0a2..0521a3d053 100644 --- a/app/code/core/Mage/Sales/Block/Order/View.php +++ b/app/code/core/Mage/Sales/Block/Order/View.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -85,4 +85,4 @@ public function getCreditmemoUrl($order) return Mage::getUrl('*/*/creditmemo', array('order_id' => $order->getId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php index 89ef543317..7d50b624cb 100644 --- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php +++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -79,4 +79,4 @@ protected function _toHtml() } return ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Exception.php b/app/code/core/Mage/Sales/Exception.php index 790b517e66..8f950ff1fa 100644 --- a/app/code/core/Mage/Sales/Exception.php +++ b/app/code/core/Mage/Sales/Exception.php @@ -18,14 +18,14 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Exception extends Zend_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Helper/Data.php b/app/code/core/Mage/Sales/Helper/Data.php index 520cb3ef6f..a0ec4af7c4 100644 --- a/app/code/core/Mage/Sales/Helper/Data.php +++ b/app/code/core/Mage/Sales/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -89,4 +89,4 @@ public function canSendCreditmemoCommentEmail($store = null) return Mage::getStoreConfigFlag(Mage_Sales_Model_Order_Creditmemo::XML_PATH_UPDATE_EMAIL_ENABLED, $store); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Helper/Reorder.php b/app/code/core/Mage/Sales/Helper/Reorder.php index f35dbeccf3..94d238ee70 100644 --- a/app/code/core/Mage/Sales/Helper/Reorder.php +++ b/app/code/core/Mage/Sales/Helper/Reorder.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ public function canReorder(Mage_Sales_Model_Order $order) } return $order->canReorder(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Abstract.php b/app/code/core/Mage/Sales/Model/Abstract.php index 8e536e1e61..3dc7da327c 100644 --- a/app/code/core/Mage/Sales/Model/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Abstract.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Api/Resource.php b/app/code/core/Mage/Sales/Model/Api/Resource.php index 61ecce8d0a..d6ccdb942a 100644 --- a/app/code/core/Mage/Sales/Model/Api/Resource.php +++ b/app/code/core/Mage/Sales/Model/Api/Resource.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -131,4 +131,4 @@ protected function _isAllowedAttribute($attributeCode, $type, array $attributes return true; } -} // Class Mage_Sales_Model_Api_Resource End \ No newline at end of file +} // Class Mage_Sales_Model_Api_Resource End diff --git a/app/code/core/Mage/Sales/Model/Config.php b/app/code/core/Mage/Sales/Model/Config.php index 0d2ead12fc..93649a8b07 100644 --- a/app/code/core/Mage/Sales/Model/Config.php +++ b/app/code/core/Mage/Sales/Model/Config.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function getQuoteRuleActionInstance($type) { return Mage::getConfig()->getNodeClassInstance("global/sales/quote/rule/actions/$type"); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Convert/Order.php b/app/code/core/Mage/Sales/Model/Convert/Order.php index a21b18bba5..c1f22a9a95 100644 --- a/app/code/core/Mage/Sales/Model/Convert/Order.php +++ b/app/code/core/Mage/Sales/Model/Convert/Order.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Convert/Quote.php b/app/code/core/Mage/Sales/Model/Convert/Quote.php index 8a5b9ced04..38ede9c523 100644 --- a/app/code/core/Mage/Sales/Model/Convert/Quote.php +++ b/app/code/core/Mage/Sales/Model/Convert/Quote.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Email/Template.php b/app/code/core/Mage/Sales/Model/Email/Template.php index c3f97132dd..5f8b1b833b 100644 --- a/app/code/core/Mage/Sales/Model/Email/Template.php +++ b/app/code/core/Mage/Sales/Model/Email/Template.php @@ -18,24 +18,24 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Sales_Model_Email_Template extends Mage_Core_Model_Email_Template +class Mage_Sales_Model_Email_Template extends Mage_Core_Model_Email_Template { - public function getInclude($template, array $variables) - { - $filename = Mage::getDesign()->getTemplateFilename($template); - if (!$filename) { - return ''; - } - extract($variables); - ob_start(); - include $filename; - return ob_get_clean(); - } -} \ No newline at end of file + public function getInclude($template, array $variables) + { + $filename = Mage::getDesign()->getTemplateFilename($template); + if (!$filename) { + return ''; + } + extract($variables); + ob_start(); + include $filename; + return ob_get_clean(); + } +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order.php b/app/code/core/Mage/Sales/Model/Entity/Order.php index 284fa2c484..4023176d65 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() $write = $resource->getConnection('sales_write'); $this->setConnection($read, $write); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address.php index 41f4da9997..1d09b13582 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,7 +37,7 @@ class Mage_Sales_Model_Entity_Order_Address extends Mage_Eav_Model_Entity_Abstra public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('order_address')->setConnection( + $this->setType('order_address')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php index 3aac90d609..fece40c18b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php index bdd28f56c6..58a9adb51f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php index e9afd23feb..9689c6fc42 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function beforeSave($object) parent::beforeSave($object); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php index a5b52ee6d4..36688ac023 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,20 +33,20 @@ public function afterSave($object) parent::afterSave($object); foreach ($object->getAddressesCollection() as $item) { - $item->save(); + $item->save(); } foreach ($object->getItemsCollection() as $item) { - $item->save(); + $item->save(); } foreach ($object->getPaymentsCollection() as $item) { - $item->save(); + $item->save(); } foreach ($object->getStatusHistoryCollection() as $item) { - $item->save(); + $item->save(); } foreach ($object->getRelatedObjects() as $object) { - $object->save(); + $object->save(); } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php index 5f0d3f397c..7575599e2a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,9 +47,9 @@ public function afterSave($object) { $shippingAddressId = false; foreach ($object->getAddressesCollection() as $address) { - if ('shipping' == $address->getAddressType()) { - $shippingAddressId = $address->getId(); - } + if ('shipping' == $address->getAddressType()) { + $shippingAddressId = $address->getId(); + } } if ($shippingAddressId) { $object->setShippingAddressId($shippingAddressId); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php index c0f127e76b..d547768ccf 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php index d9c68f9ec4..f864a49278 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php index 59030f5da5..ff7ed62266 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function beforeSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php index 3b8f007b2b..4cb1184b68 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function afterSave($object) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php index 5994ace585..b5f1bf6404 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function setOrderFilter($order) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php index c1161ac8e7..878b45d702 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php @@ -1,45 +1,45 @@ - - */ -class Mage_Sales_Model_Entity_Order_Creditmemo_Comment extends Mage_Eav_Model_Entity_Abstract -{ - public function __construct() - { - $resource = Mage::getSingleton('core/resource'); - $this->setType('creditmemo_comment')->setConnection( - $resource->getConnection('sales_read'), - $resource->getConnection('sales_write') - ); - } - -} \ No newline at end of file + + */ +class Mage_Sales_Model_Entity_Order_Creditmemo_Comment extends Mage_Eav_Model_Entity_Abstract +{ + public function __construct() + { + $resource = Mage::getSingleton('core/resource'); + $this->setType('creditmemo_comment')->setConnection( + $resource->getConnection('sales_read'), + $resource->getConnection('sales_write') + ); + } + +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php index 15315eab79..05fddf86a4 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php @@ -1,53 +1,53 @@ - - */ -class Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract -{ - protected function _construct() - { - $this->_init('sales/order_creditmemo_comment'); - } - - public function setCreditmemoFilter($creditmemoId) - { - $this->addAttributeToFilter('parent_id', $creditmemoId); - return $this; - } - - public function setCreatedAtOrder($order='desc') - { - $this->setOrder('created_at', $order); - return $this; - } -} \ No newline at end of file + + */ +class Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract +{ + protected function _construct() + { + $this->_init('sales/order_creditmemo_comment'); + } + + public function setCreditmemoFilter($creditmemoId) + { + $this->addAttributeToFilter('parent_id', $creditmemoId); + return $this; + } + + public function setCreatedAtOrder($order='desc') + { + $this->setOrder('created_at', $order); + return $this; + } +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php index f8128e1ef7..96dd1bb7b6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php index e3847a72a0..d787c305b0 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setCreditmemoFilter($creditmemoId) $this->addAttributeToFilter('parent_id', $creditmemoId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php index c981319868..0167376f7c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php index dafc6ca463..2abfe01c40 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function beforeSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php index 2c65987a31..9b2b9bff91 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function afterSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php index c40f4ff468..7e8ecaec30 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function beforeSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php index 86c9969b62..37ccf332f8 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function afterSave($object) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php index 5b45c046e3..e80e106859 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php index 1c17db4b95..78338df717 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php @@ -1,45 +1,45 @@ - - */ -class Mage_Sales_Model_Entity_Order_Invoice_Comment extends Mage_Eav_Model_Entity_Abstract -{ - public function __construct() - { - $resource = Mage::getSingleton('core/resource'); - $this->setType('invoice_comment')->setConnection( - $resource->getConnection('sales_read'), - $resource->getConnection('sales_write') - ); - } - -} \ No newline at end of file + + */ +class Mage_Sales_Model_Entity_Order_Invoice_Comment extends Mage_Eav_Model_Entity_Abstract +{ + public function __construct() + { + $resource = Mage::getSingleton('core/resource'); + $this->setType('invoice_comment')->setConnection( + $resource->getConnection('sales_read'), + $resource->getConnection('sales_write') + ); + } + +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php index 15a08ee08e..b49b49d2c4 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php @@ -1,53 +1,53 @@ - - */ -class Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract -{ - protected function _construct() - { - $this->_init('sales/order_invoice_comment'); - } - - public function setInvoiceFilter($invoiceId) - { - $this->addAttributeToFilter('parent_id', $invoiceId); - return $this; - } - - public function setCreatedAtOrder($order='desc') - { - $this->setOrder('created_at', $order); - return $this; - } -} \ No newline at end of file + + */ +class Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract +{ + protected function _construct() + { + $this->_init('sales/order_invoice_comment'); + } + + public function setInvoiceFilter($invoiceId) + { + $this->addAttributeToFilter('parent_id', $invoiceId); + return $this; + } + + public function setCreatedAtOrder($order='desc') + { + $this->setOrder('created_at', $order); + return $this; + } +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php index 8eb9b3f77f..3aa9a5733d 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function __construct() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php index 139fb94a71..e0d0c7c860 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,4 +44,4 @@ public function setInvoiceFilter($invoiceId) $this->addAttributeToFilter('parent_id', $invoiceId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Item.php index 0696460565..1d5bf0e473 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,7 +38,7 @@ class Mage_Sales_Model_Entity_Order_Item extends Mage_Eav_Model_Entity_Abstract public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('order_item')->setConnection( + $this->setType('order_item')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php index 1e010b2258..6b0a854f1e 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,4 +44,4 @@ public function setOrderFilter($orderId) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php index 91efe5c26f..87f7697af0 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,7 +38,7 @@ class Mage_Sales_Model_Entity_Order_Payment extends Mage_Eav_Model_Entity_Abstra public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('order_payment')->setConnection( + $this->setType('order_payment')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php index b4511da9d2..71912c7951 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function setOrderFilter($orderId) $this->addAttributeToFilter('parent_id', $orderId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php index aa3715b743..23681d8093 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php index 045d013c04..5cfc6aa50a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function beforeSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php index 124e26a0da..7daadb6d7e 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,4 +51,4 @@ public function afterSave($object) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php index ff794fe59c..f2575b00c6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function setOrderFilter($order) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php index 13c791cb0c..9b253632ce 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php @@ -1,45 +1,45 @@ - - */ -class Mage_Sales_Model_Entity_Order_Shipment_Comment extends Mage_Eav_Model_Entity_Abstract -{ - public function __construct() - { - $resource = Mage::getSingleton('core/resource'); - $this->setType('shipment_comment')->setConnection( - $resource->getConnection('sales_read'), - $resource->getConnection('sales_write') - ); - } - -} \ No newline at end of file + + */ +class Mage_Sales_Model_Entity_Order_Shipment_Comment extends Mage_Eav_Model_Entity_Abstract +{ + public function __construct() + { + $resource = Mage::getSingleton('core/resource'); + $this->setType('shipment_comment')->setConnection( + $resource->getConnection('sales_read'), + $resource->getConnection('sales_write') + ); + } + +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php index 476ee1a263..79d59f5945 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php @@ -1,53 +1,53 @@ - - */ -class Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract -{ - protected function _construct() - { - $this->_init('sales/order_shipment_comment'); - } - - public function setShipmentFilter($shipmentId) - { - $this->addAttributeToFilter('parent_id', $shipmentId); - return $this; - } - - public function setCreatedAtOrder($order='desc') - { - $this->setOrder('created_at', $order); - return $this; - } -} \ No newline at end of file + + */ +class Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract +{ + protected function _construct() + { + $this->_init('sales/order_shipment_comment'); + } + + public function setShipmentFilter($shipmentId) + { + $this->addAttributeToFilter('parent_id', $shipmentId); + return $this; + } + + public function setCreatedAtOrder($order='desc') + { + $this->setOrder('created_at', $order); + return $this; + } +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php index 0bdd3e3841..0c6fde018a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php index 0b409a1bea..64191a759c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setShipmentFilter($shipmentId) $this->addAttributeToFilter('parent_id', $shipmentId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php index 256a0ee932..032ea7514d 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php @@ -1,44 +1,44 @@ - - */ -class Mage_Sales_Model_Entity_Order_Shipment_Track extends Mage_Eav_Model_Entity_Abstract -{ - public function __construct() - { - $resource = Mage::getSingleton('core/resource'); - $this->setType('shipment_track')->setConnection( - $resource->getConnection('sales_read'), - $resource->getConnection('sales_write') - ); - } -} + + */ +class Mage_Sales_Model_Entity_Order_Shipment_Track extends Mage_Eav_Model_Entity_Abstract +{ + public function __construct() + { + $resource = Mage::getSingleton('core/resource'); + $this->setType('shipment_track')->setConnection( + $resource->getConnection('sales_read'), + $resource->getConnection('sales_write') + ); + } +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php index 24354d80ef..86ead88a81 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,4 +51,4 @@ public function setOrderFilter($orderId) $this->addAttributeToFilter('order_id', $orderId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php index c3f49ca702..cc52a96153 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php index 04df864ee6..be7055ee71 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ public function setOrderFilter($orderId) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote.php b/app/code/core/Mage/Sales/Model/Entity/Quote.php index 07d6c1b8a1..66317e7a5b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,7 +37,7 @@ class Mage_Sales_Model_Entity_Quote extends Mage_Eav_Model_Entity_Abstract public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('quote')->setConnection( + $this->setType('quote')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); @@ -82,8 +82,8 @@ public function loadByCustomerId($quote, $customerId) if ($collection->getSize()) { foreach ($collection as $item) { - $this->load($quote, $item->getId()); - return $this; + $this->load($quote, $item->getId()); + return $this; } } return $this; @@ -93,4 +93,4 @@ public function getReservedOrderId($quote) { return Mage::getSingleton('eav/config')->getEntityType('order')->fetchNewIncrementId($quote->getStoreId()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php index 621fcf4e5e..64e9423c5e 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,7 +36,7 @@ class Mage_Sales_Model_Entity_Quote_Address extends Mage_Eav_Model_Entity_Abstra public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('quote_address')->setConnection( + $this->setType('quote_address')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); @@ -53,7 +53,7 @@ public function collectTotals(Mage_Sales_Model_Quote_Address $address) } return $this; } - + public function fetchTotals(Mage_Sales_Model_Quote_Address $address) { $attributes = $this->loadAllAttributes()->getAttributesByCode(); @@ -66,4 +66,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php index 4d44ca0793..b3c227e800 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ public function collectTotals(Mage_Sales_Model_Quote_Address $address) { return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php index 169c54d619..d29484d4e8 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function beforeSave($object) parent::beforeSave($object); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php index 95eead9ca8..b5dcea32c2 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function afterSave($object) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php index 781e29beda..dc06c07b53 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ public function beforeSave($object) } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php index e6400082a5..af896bbfb8 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php index 750c667fcc..2ed54db047 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php index cb0a388d43..3edcec8a52 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,17 +32,17 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) { $amount = $address->getDiscountAmount(); if ($amount!=0) { - $title = Mage::helper('sales')->__('Discount'); - if ($address->getQuote()->getCouponCode()) { - $title .= ' ('.$address->getQuote()->getCouponCode().')'; - } + $title = Mage::helper('sales')->__('Discount'); + if ($address->getQuote()->getCouponCode()) { + $title .= ' ('.$address->getQuote()->getCouponCode().')'; + } $address->addTotal(array( - 'code'=>'discount', - 'title'=>$title, + 'code'=>'discount', + 'title'=>$title, 'value'=>-$amount )); } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php index 62eadda5ce..163a41990b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) )); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php index 5f8d149270..73be6febb8 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,4 +41,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php index 7065bb0753..b9d5ef0827 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php index 8c3113b424..5d06d5fb7a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,4 +40,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php index e1f7b62766..8619e36b05 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setQuoteFilter($quoteId) $this->addAttributeToFilter('parent_id', $quoteId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php index a7ec03d168..7d8cd4dba0 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,9 +36,9 @@ class Mage_Sales_Model_Entity_Quote_Address_Item extends Mage_Eav_Model_Entity_A public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('quote_address_item')->setConnection( + $this->setType('quote_address_item')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php index 4f28598757..cf345b325a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setAddressFilter($addressId) $this->addAttributeToFilter('parent_id', $addressId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php index eff870725a..4f5d10e75b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,9 +36,9 @@ class Mage_Sales_Model_Entity_Quote_Address_Rate extends Mage_Eav_Model_Entity_A public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('quote_address_rate')->setConnection( + $this->setType('quote_address_rate')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php index 4a59988292..ce1f3f87c1 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setAddressFilter($addressId) $this->addAttributeToFilter('parent_id', $addressId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php index ba9e5d648d..c01b9216b1 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('sales/quote'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php index 3cf88ebda5..d8b6e1ade2 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,10 +36,10 @@ class Mage_Sales_Model_Entity_Quote_Item extends Mage_Eav_Model_Entity_Abstract public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('quote_item')->setConnection( + $this->setType('quote_item')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php index a766901449..034242efa3 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php index b9a0e44271..8fca357ab1 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,10 +36,10 @@ class Mage_Sales_Model_Entity_Quote_Payment extends Mage_Eav_Model_Entity_Abstra public function __construct() { $resource = Mage::getSingleton('core/resource'); - $this->setType('quote_payment')->setConnection( + $this->setType('quote_payment')->setConnection( $resource->getConnection('sales_read'), $resource->getConnection('sales_write') ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php index 908e2dff3a..a451a113c6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setQuoteFilter($quoteId) $this->addAttributeToFilter('parent_id', $quoteId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php index fdc11d4ff5..e42ec4cd01 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Setup.php b/app/code/core/Mage/Sales/Model/Entity/Setup.php index 1f166bb471..651436d4b7 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Setup.php +++ b/app/code/core/Mage/Sales/Model/Entity/Setup.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php index c7cb7c4254..a135db283e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,4 +48,4 @@ protected function _prepareDataForSave(Mage_Core_Model_Abstract $object) $data = parent::_prepareDataForSave($object); return $data; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order.php index 7d9d2a533b..618cf920cd 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php index 4267a53c5e..878fb44e93 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php index 1e511a5189..493702118f 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php index 20537995ec..05cc02aae2 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php index d2fb5c73b2..56dc243415 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function beforeSave($object) parent::beforeSave($object); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php index 6895067e4b..1d50fd28ec 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,4 +49,4 @@ public function afterSave($object) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php index b069f9549d..6d84b40ddf 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php index 72753173a5..eeb906f7b4 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php index 6147314501..50402a1b23 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php index 86a75d5d34..b58ee6dccf 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function beforeSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php index eac0b5cc53..fdad846879 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function afterSave($object) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php index d6c737a929..87bcd508c1 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function setOrderFilter($order) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php index b8dbcb8998..fb48344542 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php @@ -1,45 +1,45 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment extends Mage_Eav_Model_Entity_Abstract -{ - public function __construct() - { - $resource = Mage::getSingleton('core/resource'); - $this->setType('creditmemo_comment')->setConnection( - $resource->getConnection('sales_read'), - $resource->getConnection('sales_write') - ); - } - -} \ No newline at end of file + + */ +class Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment extends Mage_Eav_Model_Entity_Abstract +{ + public function __construct() + { + $resource = Mage::getSingleton('core/resource'); + $this->setType('creditmemo_comment')->setConnection( + $resource->getConnection('sales_read'), + $resource->getConnection('sales_write') + ); + } + +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php index f83202605a..936c63a813 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php @@ -1,53 +1,53 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract -{ - protected function _construct() - { - $this->_init('sales/order_creditmemo_comment'); - } - - public function setCreditmemoFilter($creditmemoId) - { - $this->addAttributeToFilter('parent_id', $creditmemoId); - return $this; - } - - public function setCreatedAtOrder($order='desc') - { - $this->setOrder('created_at', $order); - return $this; - } -} \ No newline at end of file + + */ +class Mage_Sales_Model_Mysql4_Order_Creditmemo_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract +{ + protected function _construct() + { + $this->_init('sales/order_creditmemo_comment'); + } + + public function setCreditmemoFilter($creditmemoId) + { + $this->addAttributeToFilter('parent_id', $creditmemoId); + return $this; + } + + public function setCreatedAtOrder($order='desc') + { + $this->setOrder('created_at', $order); + return $this; + } +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php index 73f5abb4cb..4537415adc 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php index 1cebb31fc7..9185ff7c98 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setCreditmemoFilter($creditmemoId) $this->addAttributeToFilter('parent_id', $creditmemoId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php index b54d24d898..29cf18e498 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function __construct() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php index fb4f9b3347..1d9262b335 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function beforeSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php index 3fd2db0181..9469a309c8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function afterSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php index 48645617b3..c270a98aa3 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function beforeSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php index 2e810b9e95..c3db6beebf 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function afterSave($object) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php index 325c3d5eec..08543a1423 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php index 5d446ebf3d..6b7c0e3dee 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php @@ -1,45 +1,45 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Comment extends Mage_Eav_Model_Entity_Abstract -{ - public function __construct() - { - $resource = Mage::getSingleton('core/resource'); - $this->setType('invoice_comment')->setConnection( - $resource->getConnection('sales_read'), - $resource->getConnection('sales_write') - ); - } - -} \ No newline at end of file + + */ +class Mage_Sales_Model_Mysql4_Order_Invoice_Comment extends Mage_Eav_Model_Entity_Abstract +{ + public function __construct() + { + $resource = Mage::getSingleton('core/resource'); + $this->setType('invoice_comment')->setConnection( + $resource->getConnection('sales_read'), + $resource->getConnection('sales_write') + ); + } + +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php index 32d459052a..b45b7d1c0f 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php @@ -1,53 +1,53 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Invoice_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract -{ - protected function _construct() - { - $this->_init('sales/order_invoice_comment'); - } - - public function setInvoiceFilter($invoiceId) - { - $this->addAttributeToFilter('parent_id', $invoiceId); - return $this; - } - - public function setCreatedAtOrder($order='desc') - { - $this->setOrder('created_at', $order); - return $this; - } -} \ No newline at end of file + + */ +class Mage_Sales_Model_Mysql4_Order_Invoice_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract +{ + protected function _construct() + { + $this->_init('sales/order_invoice_comment'); + } + + public function setInvoiceFilter($invoiceId) + { + $this->addAttributeToFilter('parent_id', $invoiceId); + return $this; + } + + public function setCreatedAtOrder($order='desc') + { + $this->setOrder('created_at', $order); + return $this; + } +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php index 62f8571ba4..bf22d77713 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,4 +42,4 @@ public function __construct() ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php index 04e08a2f28..e0e497303a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,4 +44,4 @@ public function setInvoiceFilter($invoiceId) $this->addAttributeToFilter('parent_id', $invoiceId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php index 832c56c334..903ede2f91 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,4 +41,4 @@ protected function _construct() { $this->_init('sales/order_item', 'item_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php index 1305a1bd65..43155b5f69 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,9 +45,9 @@ protected function _afterLoad() * Assign parent items */ foreach ($this as $item) { - if ($item->getParentItemId()) { - $item->setParentItem($this->getItemById($item->getParentItemId())); - } + if ($item->getParentItemId()) { + $item->setParentItem($this->getItemById($item->getParentItemId())); + } } return $this; } @@ -122,4 +122,4 @@ public function filterByParent($parentId = null) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php index 0b3cf57109..d47e2c6ba4 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php index 7a6ab42552..ac399975b2 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function setOrderFilter($orderId) $this->addAttributeToFilter('parent_id', $orderId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php index 885f26183c..beea1d42db 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php index 969d3736c0..44193ad338 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function beforeSave($object) } return parent::beforeSave($object); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php index 4a80dbc923..704934bd09 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,4 +51,4 @@ public function afterSave($object) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php index 4deaceaa2e..e3c03dd593 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,4 +50,4 @@ public function setOrderFilter($order) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php index 57dfc54b18..afe7c4b495 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php @@ -1,45 +1,45 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Comment extends Mage_Eav_Model_Entity_Abstract -{ - public function __construct() - { - $resource = Mage::getSingleton('core/resource'); - $this->setType('shipment_comment')->setConnection( - $resource->getConnection('sales_read'), - $resource->getConnection('sales_write') - ); - } - -} \ No newline at end of file + + */ +class Mage_Sales_Model_Mysql4_Order_Shipment_Comment extends Mage_Eav_Model_Entity_Abstract +{ + public function __construct() + { + $resource = Mage::getSingleton('core/resource'); + $this->setType('shipment_comment')->setConnection( + $resource->getConnection('sales_read'), + $resource->getConnection('sales_write') + ); + } + +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php index 78b442fd66..59a3021e5f 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php @@ -1,53 +1,53 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract -{ - protected function _construct() - { - $this->_init('sales/order_shipment_comment'); - } - - public function setShipmentFilter($shipmentId) - { - $this->addAttributeToFilter('parent_id', $shipmentId); - return $this; - } - - public function setCreatedAtOrder($order='desc') - { - $this->setOrder('created_at', $order); - return $this; - } -} \ No newline at end of file + + */ +class Mage_Sales_Model_Mysql4_Order_Shipment_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract +{ + protected function _construct() + { + $this->_init('sales/order_shipment_comment'); + } + + public function setShipmentFilter($shipmentId) + { + $this->addAttributeToFilter('parent_id', $shipmentId); + return $this; + } + + public function setCreatedAtOrder($order='desc') + { + $this->setOrder('created_at', $order); + return $this; + } +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php index 9438b429d1..6acc739647 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php index b9df88e94f..b77e48c55d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setShipmentFilter($shipmentId) $this->addAttributeToFilter('parent_id', $shipmentId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php index fc38d07515..11a8d214aa 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php @@ -1,44 +1,44 @@ - - */ -class Mage_Sales_Model_Mysql4_Order_Shipment_Track extends Mage_Eav_Model_Entity_Abstract -{ - public function __construct() - { - $resource = Mage::getSingleton('core/resource'); - $this->setType('shipment_track')->setConnection( - $resource->getConnection('sales_read'), - $resource->getConnection('sales_write') - ); - } -} + + */ +class Mage_Sales_Model_Mysql4_Order_Shipment_Track extends Mage_Eav_Model_Entity_Abstract +{ + public function __construct() + { + $resource = Mage::getSingleton('core/resource'); + $this->setType('shipment_track')->setConnection( + $resource->getConnection('sales_read'), + $resource->getConnection('sales_write') + ); + } +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php index 1cc18962e2..f18bd446ba 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,4 +51,4 @@ public function setOrderFilter($orderId) $this->addAttributeToFilter('order_id', $orderId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php index c988b0dbbf..cb578c5cce 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php index b332097ab8..441cae2401 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ public function setOrderFilter($orderId) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php index 766e73d843..b1e5bc3f4d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Model_Mysql4_Order_Tax extends Mage_Core_Model_Mysql4_Abstract @@ -30,4 +30,4 @@ protected function _construct() { $this->_init('sales/order_tax', 'tax_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php index 3a5181c739..1d11b838de 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function loadByOrder($order) ->order('process'); return $this->load(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote.php index d0c1d90684..1d8e17ad93 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -148,7 +148,7 @@ public function substractProductFromQuotes($product) * @param array|int $productIds * @return Mage_Sales_Model_Mysql4_Quote */ - public function markQuotesRecollect($productIds) + public function markQuotesRecollect($productIds) { $this->_getWriteAdapter()->query(" UPDATE `{$this->getTable('sales/quote')}` SET `trigger_recollect` = 1 @@ -159,6 +159,6 @@ public function markQuotesRecollect($productIds) )", $productIds ); - return $this; + return $this; } } diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php index 34e554f4ea..ef2a9ef69e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('sales/quote_address', 'address_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php index d9a9ab5cba..d943b61a97 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ public function collectTotals(Mage_Sales_Model_Quote_Address $address) { return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php index 4f121c78a9..49d7cb04f0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function beforeSave($object) parent::beforeSave($object); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php index 14e8030095..14e6e00fc8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function afterSave($object) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php index b343debcba..5241e5d5c6 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ public function beforeSave($object) } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php index f3f65d4802..3698759a2c 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,4 +34,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php index de9defeb1b..01ee6bb39b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php index 62acef128e..f23adeb121 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php index c63f0edbd1..1c61722bf5 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) )); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php index 30038896d3..cdc8ba55c9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,4 +41,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php index 1e065485d7..ee07e1db37 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php index 5e55d44323..5b2328f910 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,4 +40,4 @@ public function fetchTotals(Mage_Sales_Model_Quote_Address $address) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php index 37878deae2..b420ee987b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,4 +52,4 @@ public function setQuoteFilter($quoteId) $this->addFieldToFilter('quote_id', $quoteId ? $quoteId : array('null' => 1)); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php index dacd7974b7..9b56749e84 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('sales/quote_address_item', 'address_item_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php index b126fbf40d..ebd86498e1 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,9 +47,9 @@ protected function _afterLoad() * Assign parent items */ foreach ($this as $item) { - if ($item->getParentItemId()) { - $item->setParentItem($this->getItemById($item->getParentItemId())); - } + if ($item->getParentItemId()) { + $item->setParentItem($this->getItemById($item->getParentItemId())); + } } return $this; @@ -60,4 +60,4 @@ public function setAddressFilter($addressId) $this->addFieldToFilter('quote_address_id', $addressId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php index ac68bb24fe..d50a35637a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('sales/quote_address_shipping_rate', 'rate_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php index 602f54a257..06a9aa67ad 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setAddressFilter($addressId) $this->addFieldToFilter('address_id', $addressId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php index 980363938c..cf67b626f0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('sales/quote'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php index 9d12f7c291..11e464a6f4 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('sales/quote_item', 'item_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php index b52a16b4b2..f039c128e9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('sales/quote_item_option', 'option_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php index 278901c02e..12aca4aaa4 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,7 +53,7 @@ public function addItemFilter($item) $this->addFieldToFilter('item_id', array('in'=>$item)); } elseif ($item instanceof Mage_Sales_Model_Quote_Item) { - $this->addFieldToFilter('item_id', $item->getId()); + $this->addFieldToFilter('item_id', $item->getId()); } else { $this->addFieldToFilter('item_id', $item); @@ -70,7 +70,7 @@ public function getProductIds() { $ids = array(); foreach ($this as $item) { - $ids[] = $item->getProductId(); + $ids[] = $item->getProductId(); } return array_unique($ids); } @@ -92,9 +92,9 @@ public function getOptionsByItem($item) $options = array(); foreach ($this as $option) { - if ($option->getItemId() == $itemId) { - $options[] = $option; - } + if ($option->getItemId() == $itemId) { + $options[] = $option; + } } return $options; } @@ -116,10 +116,10 @@ public function getOptionsByProduct($product) $options = array(); foreach ($this as $option) { - if ($option->getProductId() == $productId) { - $options[] = $option; - } + if ($option->getProductId() == $productId) { + $options[] = $option; + } } return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php index 80811d7cf0..edec3276f4 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ protected function _construct() { $this->_init('sales/quote_payment', 'payment_id'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php index 00a9e5e368..ece1950f23 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function setQuoteFilter($quoteId) $this->addFieldToFilter('quote_id', $quoteId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php index b7c17d5fb2..5c27107dfb 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php index fd92965ae4..d0e7d3a395 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php index 69639d826c..4ecd901385 100644 --- a/app/code/core/Mage/Sales/Model/Observer.php +++ b/app/code/core/Mage/Sales/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php index b61400258d..d7c7c0db29 100644 --- a/app/code/core/Mage/Sales/Model/Order.php +++ b/app/code/core/Mage/Sales/Model/Order.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Address.php b/app/code/core/Mage/Sales/Model/Order/Address.php index 399e830576..84b5861ee2 100644 --- a/app/code/core/Mage/Sales/Model/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Order/Address.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,4 +44,4 @@ public function getOrder() { return $this->_order; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Api.php b/app/code/core/Mage/Sales/Model/Order/Api.php index 7b0f7d4be1..9b6bebb56a 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Api.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -237,4 +237,4 @@ public function cancel($orderIncrementId) return true; } -} // Class Mage_Sales_Model_Order_Api End \ No newline at end of file +} // Class Mage_Sales_Model_Order_Api End diff --git a/app/code/core/Mage/Sales/Model/Order/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Api/V2.php index a733e5a1f0..5383a4acd8 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Api/V2.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -92,4 +92,4 @@ public function items($filters = null) return $result; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php index a0589593d3..42b9a87f63 100644 --- a/app/code/core/Mage/Sales/Model/Order/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Config.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php index 4b3a2b2137..bba769b1de 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -715,4 +715,4 @@ protected function _beforeDelete() $this->_protectFromNonAdmin(); return parent::_beforeDelete(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php index cd11bab2a2..23102f5267 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php index 346c53b308..1daa8ec14c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php @@ -1,62 +1,62 @@ - - */ -class Mage_Sales_Model_Order_Creditmemo_Config extends Mage_Core_Model_Config_Base -{ - protected $_totalModels = null; - - public function __construct() - { - parent::__construct(Mage::getConfig()->getNode('global/sales/order_creditmemo')); - } - - /** - * Retrieve invoice total calculation models - * - * @return array - */ - public function getTotalModels() - { - if (is_null($this->_totalModels)) { - $this->_totalModels = array(); - $totalsConfig = $this->getNode('totals'); - foreach ($totalsConfig->children() as $totalCode=>$totalConfig) { - $class = $totalConfig->getClassName(); - if ($class && ($model = Mage::getModel($class))) { - $this->_totalModels[] = $model; - } - } - } - return $this->_totalModels; - } -} \ No newline at end of file + + */ +class Mage_Sales_Model_Order_Creditmemo_Config extends Mage_Core_Model_Config_Base +{ + protected $_totalModels = null; + + public function __construct() + { + parent::__construct(Mage::getConfig()->getNode('global/sales/order_creditmemo')); + } + + /** + * Retrieve invoice total calculation models + * + * @return array + */ + public function getTotalModels() + { + if (is_null($this->_totalModels)) { + $this->_totalModels = array(); + $totalsConfig = $this->getNode('totals'); + foreach ($totalsConfig->children() as $totalCode=>$totalConfig) { + $class = $totalConfig->getClassName(); + if ($class && ($model = Mage::getModel($class))) { + $this->_totalModels[] = $model; + } + } + } + return $this->_totalModels; + } +} diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php index 2d71a340f5..495171fd06 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Model_Order_Creditmemo_Item extends Mage_Core_Model_Abstract @@ -186,4 +186,4 @@ public function isLast() return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php index 54cb96101e..c2272bd312 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $invoice) { return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php index 7fef736b30..ec7b4f4e9c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,4 +64,4 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() - $baseTotalDiscountAmount); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php index 3a74009440..9039538bb3 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,4 +46,4 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php index 9457c3ca50..7a77acf7e2 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,4 +62,4 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $baseSubtotal); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php index 68b29cc03a..34f825054c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -109,4 +109,4 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $baseTotalTax); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php index 8c9acdda33..9f72b16e08 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -727,4 +727,4 @@ protected function _beforeDelete() $this->_protectFromNonAdmin(); return parent::_beforeDelete(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php index d4889afab3..69a0d802aa 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -318,4 +318,4 @@ public function cancel($invoiceIncrementId) return true; } -} // Class Mage_Sales_Model_Order_Invoice_Api End \ No newline at end of file +} // Class Mage_Sales_Model_Order_Invoice_Api End diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php index c7474ddae8..45cfc9bb04 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -159,4 +159,4 @@ public function create($orderIncrementId, $itemsQty, $comment = null, $email = f return $invoice->getIncrementId(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php index 79c3cda031..5642214221 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php index 9898521c55..3cac8113b1 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -59,4 +59,4 @@ public function getTotalModels() } return $this->_totalModels; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php index 68dac8f56d..584ac5ba2a 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -208,4 +208,4 @@ public function isLast() } return false; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php index cf4819a9c7..3764391ad3 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,4 +31,4 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) { return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php index 866606501a..a7b36c1ccc 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,4 +74,4 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() - $baseTotalDiscountAmount); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php index 80ec1ada86..b7776f523e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,4 +37,4 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php index 3c955053b2..fafca2ee3e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,9 +45,9 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) * Check shipping amount in previus invoices */ foreach ($invoice->getOrder()->getInvoiceCollection() as $previusInvoice) { - if ($previusInvoice->getShippingAmount() && !$previusInvoice->isCanceled()) { - return $this; - } + if ($previusInvoice->getShippingAmount() && !$previusInvoice->isCanceled()) { + return $this; + } } $invoice->setShippingAmount($orderShippingAmount); $invoice->setBaseShippingAmount($baseOrderShippingAmount); @@ -57,4 +57,4 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php index 36b9b4882c..911d337d9c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,4 +62,4 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $baseSubtotal); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php index 10af5688ab..522c024a9a 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,4 +96,4 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Item.php b/app/code/core/Mage/Sales/Model/Order/Item.php index a0bb4b8268..c96dc22f1c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Item.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php index 9c36b06aff..ba14a6e7b3 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -340,4 +340,4 @@ public function cancel() return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php index 4b1a899e19..10c30ecc80 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php index 046906e7b1..06c86ab833 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -160,4 +160,4 @@ public function newPage(array $settings = array()) return $page; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php index 67d61ba463..904cc4bb92 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -150,4 +150,4 @@ public function newPage(array $settings = array()) return $page; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php index 602e915296..e9e5c18d94 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -285,4 +285,4 @@ public function getSku($item) else return $item->getSku(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php index 3cfc6bfbd0..48ad454541 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php index a862512d9b..575353abc7 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function draw() $renderer->draw(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php index 15efaed163..fef3de3f59 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -120,4 +120,4 @@ public function draw() $page = $pdf->drawLineBlocks($page, array($lineBlock), array('table_header' => true)); $this->setPage($page); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php index d9098daca7..6d33dcfe46 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,4 +45,4 @@ public function draw() $renderer->draw(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php index 719d920d3c..e887c548ef 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,4 +96,4 @@ public function draw() $page = $pdf->drawLineBlocks($page, array($lineBlock), array('table_header' => true)); $this->setPage($page); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php index f5fe0ed97a..b0feceb36a 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -138,4 +138,4 @@ public function newPage(array $settings = array()) return $page; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php index 4cf2ac59dc..c0f44ad69d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php index 767d61b48d..13098eedb4 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -198,7 +198,7 @@ public function addTrack($shipmentIncrementId, $carrier, $title, $trackNumber) } $track = Mage::getModel('sales/order_shipment_track') - ->setNumber($trackNumber) + ->setNumber($trackNumber) ->setCarrierCode($carrier) ->setTitle($title); diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php index a7a7eff646..4748bc393b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php index 784650101d..1692153d94 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php index c1add60c17..7d92ffbe34 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Model_Order_Shipment_Item extends Mage_Core_Model_Abstract diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php index f00507e7cf..3d7b9c3a70 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Model_Order_Shipment_Track extends Mage_Sales_Model_Abstract @@ -116,4 +116,4 @@ public function getStore() } return Mage::app()->getStore(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Status.php b/app/code/core/Mage/Sales/Model/Order/Status.php index 49108d9c88..f64917661a 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Order/Status.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Order/Status/History.php index 7e2f9a9339..98f143d003 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Order/Status/History.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Tax.php b/app/code/core/Mage/Sales/Model/Order/Tax.php index c2a059dd40..a5400d31a0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Tax.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Model_Order_Tax extends Mage_Core_Model_Abstract @@ -30,4 +30,4 @@ protected function _construct() { $this->_init('sales/order_tax'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Order/Total.php b/app/code/core/Mage/Sales/Model/Order/Total.php index 17d9b10f7d..fad91dd9d2 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total.php +++ b/app/code/core/Mage/Sales/Model/Order/Total.php @@ -18,14 +18,14 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sales_Model_Order_Total extends Varien_Object { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php index c1d28afc05..8659d3fca1 100644 --- a/app/code/core/Mage/Sales/Model/Quote.php +++ b/app/code/core/Mage/Sales/Model/Quote.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -992,23 +992,18 @@ public function getTotals() return $this->getBillingAddress()->getTotals(); } - $totals = null; - // Going through all quote addresses and sum their totals + $shippingAddress = $this->getShippingAddress(); + $totals = $shippingAddress->getTotals(); + // Going through all quote addresses and merge their totals foreach ($this->getAddressesCollection() as $address) { - if ($address->isDeleted()) { + if ($address->isDeleted() || $address === $shippingAddress) { continue; } - if (!$totals) { - $totals = $address->getTotals(); - } else { - foreach ($address->getTotals() as $code => $total) { - if (isset($totals[$code])) { - $totals[$code]->setValue($totals[$code]->getValue()+$total->getValue()); - $totals[$code]->setValueExclTax($totals[$code]->getValueExclTax()+$total->getValueExclTax()); - $totals[$code]->setValueInclTax($totals[$code]->getValueInclTax()+$total->getValueInclTax()); - } else { - $totals[$code] = $total; - } + foreach ($address->getTotals() as $code => $total) { + if (isset($totals[$code])) { + $totals[$code]->merge($total); + } else { + $totals[$code] = $total; } } } diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php index 8bb04bbd9d..2d708f66e1 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,6 +39,9 @@ class Mage_Sales_Model_Quote_Address extends Mage_Customer_Model_Address_Abstrac const RATES_FETCH = 1; const RATES_RECALCULATE = 2; + protected $_eventPrefix = 'sales_quote_address'; + protected $_eventObject = 'quote_address'; + /** * Quote object * @@ -245,7 +248,7 @@ public function getAllItems() if (!$aItem->getQuoteItemImported()) { $qItem = $this->getQuote()->getItemById($aItem->getQuoteItemId()); if ($qItem) { - $this->addItem($aItem); + //$this->addItem($aItem); $aItem->importQuoteItem($qItem); } } @@ -329,7 +332,7 @@ public function hasItems() } /** - * Retrieve Item object by id + * Get address item object by id without * * @param int $itemId * @return Mage_Sales_Model_Quote_Address_Item @@ -344,6 +347,22 @@ public function getItemById($itemId) return false; } + /** + * Get prepared not deleted item + * + * @param $itemId + * @return Mage_Sales_Model_Quote_Address_Item + */ + public function getValidItemById($itemId) + { + foreach ($this->getAllItems() as $item) { + if ($item->getId()==$itemId) { + return $item; + } + } + return false; + } + /** * Retrieve item object by quote item Id * @@ -586,8 +605,32 @@ public function collectShippingRates() $request->setDestStreet($this->getStreet(-1)); $request->setDestCity($this->getCity()); $request->setDestPostcode($this->getPostcode()); - $request->setPackageValue($this->getBaseSubtotal()); - $request->setPackageValueWithDiscount($this->getBaseSubtotalWithDiscount()); + + /** + * Count total amount and total discount for shipping. Only not virtual quote items. + * Fix bug #15971 + */ + $quoteItems = $this->getAllItems(); + $subtotal = 0; + $discountAmount = 0; + foreach ($quoteItems as $quoteItem) { + if (!$quoteItem->getParentItem() && !$quoteItem->getProduct()->isVirtual()) { + $subtotal += $quoteItem->getRowTotal(); + $discountAmount += $quoteItem->getDiscountAmount(); + if ($quoteItem->getHasChildren()) { + foreach ($quoteItem->getChildren() as $child) { + $discountAmount += $child->getDiscountAmount(); + } + } + } + } + + $request->setPackageValue($subtotal); + $request->setPackageValueWithDiscount($subtotal - $discountAmount); + /** + * End fix + */ + $request->setPackageWeight($this->getWeight()); $request->setPackageQty($this->getItemQty()); @@ -927,7 +970,7 @@ public function getAllBaseTotalAmounts() */ public function getBaseSubtotalWithDiscount() { - return $this->getBaseSubtotal()-$this->getBaseDiscountAmount(); + return $this->getBaseSubtotal()+$this->getBaseDiscountAmount(); } /** @@ -937,6 +980,6 @@ public function getBaseSubtotalWithDiscount() */ public function getSubtotalWithDiscount() { - return $this->getSubtotal()-$this->getDiscountAmount(); + return $this->getSubtotal()+$this->getDiscountAmount(); } } diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php index 8c887ef320..7a2f703319 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -103,12 +103,12 @@ public function importQuoteItem(Mage_Sales_Model_Quote_Item $quoteItem) $this->setQuoteItemImported(true); return $this; } - + public function getOptionBycode($code) { if ($this->getQuoteItem()) { - return $this->getQuoteItem()->getOptionBycode($code); + return $this->getQuoteItem()->getOptionBycode($code); } return null; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php index 735e814719..d40e4b2aa5 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,4 +76,4 @@ public function importShippingRate(Mage_Shipping_Model_Rate_Result_Abstract $rat } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php index da042c5447..11d22f9071 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php @@ -18,14 +18,29 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class Mage_Sales_Model_Quote_Address_Total extends Varien_Object +class Mage_Sales_Model_Quote_Address_Total extends Varien_Object { - -} \ No newline at end of file + /** + * Merge numeric total values + * + * @param Mage_Sales_Model_Quote_Address_Total $total + * @return Mage_Sales_Model_Quote_Address_Total + */ + public function merge(Mage_Sales_Model_Quote_Address_Total $total) + { + $newData = $total->getData(); + foreach ($newData as $key => $value) { + if (is_numeric($value)) { + $this->setData($key, $this->_getData($key)+$value); + } + } + return $this; + } +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php index 95fd306e06..7810f172cd 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php index af4c66ce3f..2e256541e0 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php index 9f620f6400..0a40b12883 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php @@ -18,12 +18,10 @@ * 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_Sales - * @deprecated Moved to SalesRule Module - * @deprecated after 1.3.2.2, functionality moved to salesRule module - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -153,4 +151,4 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php index 515c9d7462..32e11e4af1 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,4 +62,4 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) )); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php index 622358db48..de45376250 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php @@ -1,195 +1,195 @@ -setCode('shipping'); - } - - /** - * Collect totals information about shipping - * - * @param Mage_Sales_Model_Quote_Address $address - * @return Mage_Sales_Model_Quote_Address_Total_Shipping - */ - public function collect(Mage_Sales_Model_Quote_Address $address) - { - parent::collect($address); - - $oldWeight = $address->getWeight(); - $address->setWeight(0); - $address->setFreeMethodWeight(0); - $this->_setAmount(0) - ->_setBaseAmount(0); - - $items = $address->getAllItems(); - if (!count($items)) { - return $this; - } - - $method = $address->getShippingMethod(); - $freeAddress= $address->getFreeShipping(); - - $addressWeight = $address->getWeight(); - $freeMethodWeight = $address->getFreeMethodWeight(); - - $addressQty = 0; - - foreach ($items as $item) { - /** - * Skip if this item is virtual - */ - if ($item->getProduct()->isVirtual()) { - continue; - } - - /** - * Children weight we calculate for parent - */ - if ($item->getParentItem()) { - continue; - } - - if ($item->getHasChildren() && $item->isShipSeparately()) { - foreach ($item->getChildren() as $child) { - if ($child->getProduct()->isVirtual()) { - continue; - } - $addressQty += $child->getTotalQty(); - - if (!$item->getProduct()->getWeightType()) { - $itemWeight = $child->getWeight(); - $itemQty = $child->getTotalQty(); - $rowWeight = $itemWeight*$itemQty; - $addressWeight += $rowWeight; - if ($freeAddress || $child->getFreeShipping()===true) { - $rowWeight = 0; - } elseif (is_numeric($child->getFreeShipping())) { - $freeQty = $child->getFreeShipping(); - if ($itemQty>$freeQty) { - $rowWeight = $itemWeight*($itemQty-$freeQty); - } - else { - $rowWeight = 0; - } - } - $freeMethodWeight += $rowWeight; - $item->setRowWeight($rowWeight); - } - } - if ($item->getProduct()->getWeightType()) { - $itemWeight = $item->getWeight(); - $rowWeight = $itemWeight*$item->getQty(); - $addressWeight+= $rowWeight; - if ($freeAddress || $item->getFreeShipping()===true) { - $rowWeight = 0; - } elseif (is_numeric($item->getFreeShipping())) { - $freeQty = $item->getFreeShipping(); - if ($item->getQty()>$freeQty) { - $rowWeight = $itemWeight*($item->getQty()-$freeQty); - } - else { - $rowWeight = 0; - } - } - $freeMethodWeight+= $rowWeight; - $item->setRowWeight($rowWeight); - } - } - else { - if (!$item->getProduct()->isVirtual()) { - $addressQty += $item->getQty(); - } - $itemWeight = $item->getWeight(); - $rowWeight = $itemWeight*$item->getQty(); - $addressWeight+= $rowWeight; - if ($freeAddress || $item->getFreeShipping()===true) { - $rowWeight = 0; - } elseif (is_numeric($item->getFreeShipping())) { - $freeQty = $item->getFreeShipping(); - if ($item->getQty()>$freeQty) { - $rowWeight = $itemWeight*($item->getQty()-$freeQty); - } - else { - $rowWeight = 0; - } - } - $freeMethodWeight+= $rowWeight; - $item->setRowWeight($rowWeight); - } - } - - if (isset($addressQty)) { - $address->setItemQty($addressQty); - } - - $address->setWeight($addressWeight); - $address->setFreeMethodWeight($freeMethodWeight); - - $address->collectShippingRates(); - - $this->_setAmount(0) - ->_setBaseAmount(0); - - $method = $address->getShippingMethod(); - - if ($method) { - foreach ($address->getAllShippingRates() as $rate) { - if ($rate->getCode()==$method) { - $amountPrice = $address->getQuote()->getStore()->convertPrice($rate->getPrice(), false); - $this->_setAmount($amountPrice); - $this->_setBaseAmount($rate->getPrice()); - $address->setShippingDescription($rate->getCarrierTitle().' - '.$rate->getMethodTitle()); - break; - } - } - } - - return $this; - } - - /** - * Add shipping totals information to address object - * - * @param Mage_Sales_Model_Quote_Address $address - * @return Mage_Sales_Model_Quote_Address_Total_Shipping - */ - public function fetch(Mage_Sales_Model_Quote_Address $address) - { - $amount = $address->getShippingAmount(); - if ($amount!=0 || $address->getShippingDescription()) { - $address->addTotal(array( - 'code'=>$this->getCode(), - 'title'=>Mage::helper('sales')->__('Shipping & Handling').' ('.$address->getShippingDescription().')', - 'value'=>$address->getShippingAmount() - )); - } - return $this; - } -} +setCode('shipping'); + } + + /** + * Collect totals information about shipping + * + * @param Mage_Sales_Model_Quote_Address $address + * @return Mage_Sales_Model_Quote_Address_Total_Shipping + */ + public function collect(Mage_Sales_Model_Quote_Address $address) + { + parent::collect($address); + + $oldWeight = $address->getWeight(); + $address->setWeight(0); + $address->setFreeMethodWeight(0); + $this->_setAmount(0) + ->_setBaseAmount(0); + + $items = $address->getAllItems(); + if (!count($items)) { + return $this; + } + + $method = $address->getShippingMethod(); + $freeAddress= $address->getFreeShipping(); + + $addressWeight = $address->getWeight(); + $freeMethodWeight = $address->getFreeMethodWeight(); + + $addressQty = 0; + + foreach ($items as $item) { + /** + * Skip if this item is virtual + */ + if ($item->getProduct()->isVirtual()) { + continue; + } + + /** + * Children weight we calculate for parent + */ + if ($item->getParentItem()) { + continue; + } + + if ($item->getHasChildren() && $item->isShipSeparately()) { + foreach ($item->getChildren() as $child) { + if ($child->getProduct()->isVirtual()) { + continue; + } + $addressQty += $child->getTotalQty(); + + if (!$item->getProduct()->getWeightType()) { + $itemWeight = $child->getWeight(); + $itemQty = $child->getTotalQty(); + $rowWeight = $itemWeight*$itemQty; + $addressWeight += $rowWeight; + if ($freeAddress || $child->getFreeShipping()===true) { + $rowWeight = 0; + } elseif (is_numeric($child->getFreeShipping())) { + $freeQty = $child->getFreeShipping(); + if ($itemQty>$freeQty) { + $rowWeight = $itemWeight*($itemQty-$freeQty); + } + else { + $rowWeight = 0; + } + } + $freeMethodWeight += $rowWeight; + $item->setRowWeight($rowWeight); + } + } + if ($item->getProduct()->getWeightType()) { + $itemWeight = $item->getWeight(); + $rowWeight = $itemWeight*$item->getQty(); + $addressWeight+= $rowWeight; + if ($freeAddress || $item->getFreeShipping()===true) { + $rowWeight = 0; + } elseif (is_numeric($item->getFreeShipping())) { + $freeQty = $item->getFreeShipping(); + if ($item->getQty()>$freeQty) { + $rowWeight = $itemWeight*($item->getQty()-$freeQty); + } + else { + $rowWeight = 0; + } + } + $freeMethodWeight+= $rowWeight; + $item->setRowWeight($rowWeight); + } + } + else { + if (!$item->getProduct()->isVirtual()) { + $addressQty += $item->getQty(); + } + $itemWeight = $item->getWeight(); + $rowWeight = $itemWeight*$item->getQty(); + $addressWeight+= $rowWeight; + if ($freeAddress || $item->getFreeShipping()===true) { + $rowWeight = 0; + } elseif (is_numeric($item->getFreeShipping())) { + $freeQty = $item->getFreeShipping(); + if ($item->getQty()>$freeQty) { + $rowWeight = $itemWeight*($item->getQty()-$freeQty); + } + else { + $rowWeight = 0; + } + } + $freeMethodWeight+= $rowWeight; + $item->setRowWeight($rowWeight); + } + } + + if (isset($addressQty)) { + $address->setItemQty($addressQty); + } + + $address->setWeight($addressWeight); + $address->setFreeMethodWeight($freeMethodWeight); + + $address->collectShippingRates(); + + $this->_setAmount(0) + ->_setBaseAmount(0); + + $method = $address->getShippingMethod(); + + if ($method) { + foreach ($address->getAllShippingRates() as $rate) { + if ($rate->getCode()==$method) { + $amountPrice = $address->getQuote()->getStore()->convertPrice($rate->getPrice(), false); + $this->_setAmount($amountPrice); + $this->_setBaseAmount($rate->getPrice()); + $address->setShippingDescription($rate->getCarrierTitle().' - '.$rate->getMethodTitle()); + break; + } + } + } + + return $this; + } + + /** + * Add shipping totals information to address object + * + * @param Mage_Sales_Model_Quote_Address $address + * @return Mage_Sales_Model_Quote_Address_Total_Shipping + */ + public function fetch(Mage_Sales_Model_Quote_Address $address) + { + $amount = $address->getShippingAmount(); + if ($amount!=0 || $address->getShippingDescription()) { + $address->addTotal(array( + 'code'=>$this->getCode(), + 'title'=>Mage::helper('sales')->__('Shipping & Handling').' ('.$address->getShippingDescription().')', + 'value'=>$address->getShippingAmount() + )); + } + return $this; + } +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php index ad4ff6e3a7..bf3c6bc938 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -149,4 +149,4 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) )); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php index 37325ba362..f9f45c6972 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php @@ -18,11 +18,10 @@ * 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_Sales - * @deprecated after 1.3.2.2, functionality moved to tax module - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -222,4 +221,4 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Config.php b/app/code/core/Mage/Sales/Model/Quote/Config.php index 6c18a98c5f..fbfd71df4e 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Config.php +++ b/app/code/core/Mage/Sales/Model/Quote/Config.php @@ -20,7 +20,7 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,4 +39,4 @@ public function getTotalModels() { } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php index 6091f7c26b..9b0f5ca1b3 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php index f59dc2d213..722c7989bd 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Quote/Item/Option.php index 1fe81e4ab4..c233955ab8 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item/Option.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item/Option.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -114,4 +114,4 @@ public function __clone() $this->_item = null; return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/Model/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Quote/Payment.php index f1dbf5a901..a739edc07c 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Quote/Payment.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/controllers/DownloadController.php b/app/code/core/Mage/Sales/controllers/DownloadController.php index f63d3930ad..c5d7f02b6b 100644 --- a/app/code/core/Mage/Sales/controllers/DownloadController.php +++ b/app/code/core/Mage/Sales/controllers/DownloadController.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -85,4 +85,4 @@ public function downloadCustomOptionAction () $this->_forward('noRoute'); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/controllers/OrderController.php b/app/code/core/Mage/Sales/controllers/OrderController.php index c98a57cc74..336615e991 100644 --- a/app/code/core/Mage/Sales/controllers/OrderController.php +++ b/app/code/core/Mage/Sales/controllers/OrderController.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -252,7 +252,7 @@ public function printInvoiceAction() if ($this->_canViewOrder($order)) { Mage::register('current_order', $order); if (isset($invoice)) { - Mage::register('current_invoice', $invoice); + Mage::register('current_invoice', $invoice); } $this->loadLayout('print'); $this->renderLayout(); @@ -274,7 +274,7 @@ public function printShipmentAction() if ($this->_canViewOrder($order)) { Mage::register('current_order', $order); if (isset($shipment)) { - Mage::register('current_shipment', $shipment); + Mage::register('current_shipment', $shipment); } $this->loadLayout('print'); $this->renderLayout(); @@ -297,7 +297,7 @@ public function printCreditmemoAction() if ($this->_canViewOrder($order)) { Mage::register('current_order', $order); if (isset($creditmemo)) { - Mage::register('current_creditmemo', $creditmemo); + Mage::register('current_creditmemo', $creditmemo); } $this->loadLayout('print'); $this->renderLayout(); @@ -305,4 +305,4 @@ public function printCreditmemoAction() $this->_redirect('*/*/history'); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/doc/test.php b/app/code/core/Mage/Sales/doc/test.php index 6a04787d2b..088da4d5bd 100644 --- a/app/code/core/Mage/Sales/doc/test.php +++ b/app/code/core/Mage/Sales/doc/test.php @@ -1,282 +1,305 @@ -_order = new Varien_Object; - #echo ""; - echo "
OrderPaymentShippingRefundReturnAdmin StatusFrontend StatusActions
"; - foreach (array('new', 'onhold', 'processing', 'complete', 'closed', 'cancelled', 'void') as $orderStatus) { - $this->getOrder()->setOrderStatus($orderStatus); - foreach (array('not_authorized', 'pending', 'authorized', 'partial', 'paid') as $paymentStatus) { - $this->getOrder()->setPaymentStatus($paymentStatus); - foreach (array('pending', 'partial', 'shipped') as $shippingStatus) { - $this->getOrder()->setShippingStatus($shippingStatus); - foreach (array('not_refunded', 'partial', 'refunded') as $refundStatus) { - $this->getOrder()->setRefundStatus($refundStatus); -// foreach (array('not_returned', 'partial', 'returned') as $returnStatus) { -// $this->getOrder()->setReturnStatus($returnStatus); - if (!$this->validateOrderStatus()) { - continue; - } - $adminStatus = $this->getAdminStatus(); - $frontendStatus = $this->getFrontendStatus(); - $actions = $this->getOrderActions(); - $actions = join(', ', array_keys($actions)); - #echo ""; - echo ""; -// } - } - } - } - } - echo "
OrderPaymentRefundShippingActions
$orderStatus$paymentStatus$shippingStatus$refundStatus$returnStatus$adminStatus$frontendStatus$actions
$orderStatus$paymentStatus$refundStatus$shippingStatus$actions
"; - } - - public function getOrder() - { - return $this->_order; - } - - /** - * Check if type and status matches for the order - * - * @param string $type order, payment, shipment - * @param string $status comma separated - * - order - * - new - * - onhold - * - processing - * - complete - * - closed - * - cancelled - * - void - * - * - payment - * - not_authorized - * - pending - * - authorized - * - partial - * - paid - * - * - shipping - * - pending - * - partial - * - shipped - * - * - refund - * - not_refunded - * - pending - * - partial - * - refunded - * - * - return - * - not_returned - * - partial - * - returned - - */ - function matchOrderStatus($type, $status) { - $statuses = explode(',', $status); - $value = $this->getOrder()->getData($type.'_status'); - foreach ($statuses as $status) { - if ($value==$status) { - return true; - } - } - return false; - } - - function validateOrderStatus() - { - if ($this->matchOrderStatus('order', 'new')) { - if (!$this->matchOrderStatus('shipping', 'pending') -// || !$this->matchOrderStatus('return', 'not_returned') - || !$this->matchOrderStatus('refund', 'not_refunded') - ) { - return false; - } - if ($this->matchOrderStatus('payment', 'partial')) { - return false; - } - } - - if ($this->matchOrderStatus('order', 'onhold')) { - if (!$this->matchOrderStatus('shipping', 'pending') - || !$this->matchOrderStatus('payment', 'pending') - || !$this->matchOrderStatus('refund', 'not_refunded') -// || !$this->matchOrderStatus('return', 'not_returned') - ) { - return false; - } - } - - if ($this->matchOrderStatus('order', 'cancelled')) { - if (!$this->matchOrderStatus('shipping', 'pending') - || !$this->matchOrderStatus('payment', 'pending,not_authorized') - || !$this->matchOrderStatus('refund', 'not_refunded') -// || !$this->matchOrderStatus('return', 'not_returned') - ) { - return false; - } - } - - if ($this->matchOrderStatus('order', 'complete,closed')) { - if (!$this->matchOrderStatus('payment', 'paid') - || !$this->matchOrderStatus('shipping', 'shipped') - ) { - return false; - } - } - - if ($this->matchOrderStatus('order', 'void')) { - if ($this->matchOrderStatus('payment', 'pending,not_authorized')) { - return false; - } - if (!$this->matchOrderStatus('refund', 'not_refunded')) { - return false; - } - } - - if ($this->matchOrderStatus('payment', 'pending,not_authorized') - && !$this->matchOrderStatus('refund', 'not_refunded') - ) { - return false; - } - - if ($this->matchOrderStatus('payment', 'authorized') - && !$this->matchOrderStatus('refund', 'not_refunded') - ) { - return false; - } - - if ($this->matchOrderStatus('payment', 'partial') - && $this->matchOrderStatus('refund', 'refunded') - ) { - return false; - } - -// if ($this->matchOrderStatus('shipping', 'pending') -// && !$this->matchOrderStatus('return', 'not_returned') -// ) { -// return false; -// } -// -// if ($this->matchOrderStatus('shipping', 'partial') && $this->matchOrderStatus('return', 'returned')) { -// return false; -// } - - return true; - } - - /** - * Available actions for admin user - * - * @return array available actions array - * - cancel - * - authorize - * - capture - * - invoice - * - creditmemo - * - hold - * - unhold - * - ship - * - edit - * - comment - * - status - * - reorder - */ - function getOrderActions() - { - $actions = array(); - - $actions['comment'] = 1; - - if ($this->matchOrderStatus('order', 'cancelled')) { - $actions['reorder'] = 1; - return $actions; - } - - if ($this->matchOrderStatus('order', 'closed')) { - $actions['reorder'] = 1; - if (!$this->matchOrderStatus('refund', 'refunded')) { - $actions['creditmemo'] = 1; - } - return $actions; - } - - if ($this->matchOrderStatus('order', 'onhold')) { - $actions['unhold'] = 1; - return $actions; - } - - $actions['edit'] = 1; - - $actions['hold'] = 1; - - if (!$this->matchOrderStatus('order', 'void')) { - $actions['cancel'] = 1; - } - - if ($this->matchOrderStatus('payment', 'not_authorized')) { - $actions['authorize'] = 1; - $actions['capture'] = 1; - } - - if (!$this->matchOrderStatus('payment', 'not_authorized,pending,paid')) { - $actions['invoice'] = 1; - } - - - if (!$this->matchOrderStatus('shipping', 'shipped')) { - $actions['ship'] = 1; - } - - if ($this->matchOrderStatus('payment', 'partial,paid') && !$this->matchOrderStatus('refund', 'refunded')) { - $actions['creditmemo'] = 1; - } - - if ($this->matchOrderStatus('order', 'void')) { - unset($actions['ship'], $actions['invoice'], $actions['ship'], $actions['hold']); - } - - return $actions; - } - - /** - * Order status for admin - * - * @return array - * - new - * - pending - * - processing - * - complete - * - cancelled - */ - function getAdminStatus() - { - return $this->getOrder()->getOrderStatus(); - } - - /** - * Order status for customers - * - * @return array - * - new - * - pending - * - processing - * - complete - * - cancelled - */ - function getFrontendStatus() - { - return $this->getOrder()->getOrderStatus(); - } -} - -$test = new Test; -$test->runTest(); \ No newline at end of file +_order = new Varien_Object; + #echo ""; + echo "
OrderPaymentShippingRefundReturnAdmin StatusFrontend StatusActions
"; + foreach (array('new', 'onhold', 'processing', 'complete', 'closed', 'cancelled', 'void') as $orderStatus) { + $this->getOrder()->setOrderStatus($orderStatus); + foreach (array('not_authorized', 'pending', 'authorized', 'partial', 'paid') as $paymentStatus) { + $this->getOrder()->setPaymentStatus($paymentStatus); + foreach (array('pending', 'partial', 'shipped') as $shippingStatus) { + $this->getOrder()->setShippingStatus($shippingStatus); + foreach (array('not_refunded', 'partial', 'refunded') as $refundStatus) { + $this->getOrder()->setRefundStatus($refundStatus); +// foreach (array('not_returned', 'partial', 'returned') as $returnStatus) { +// $this->getOrder()->setReturnStatus($returnStatus); + if (!$this->validateOrderStatus()) { + continue; + } + $adminStatus = $this->getAdminStatus(); + $frontendStatus = $this->getFrontendStatus(); + $actions = $this->getOrderActions(); + $actions = join(', ', array_keys($actions)); + #echo ""; + echo ""; +// } + } + } + } + } + echo "
OrderPaymentRefundShippingActions
$orderStatus$paymentStatus$shippingStatus$refundStatus$returnStatus$adminStatus$frontendStatus$actions
$orderStatus$paymentStatus$refundStatus$shippingStatus$actions
"; + } + + public function getOrder() + { + return $this->_order; + } + + /** + * Check if type and status matches for the order + * + * @param string $type order, payment, shipment + * @param string $status comma separated + * - order + * - new + * - onhold + * - processing + * - complete + * - closed + * - cancelled + * - void + * + * - payment + * - not_authorized + * - pending + * - authorized + * - partial + * - paid + * + * - shipping + * - pending + * - partial + * - shipped + * + * - refund + * - not_refunded + * - pending + * - partial + * - refunded + * + * - return + * - not_returned + * - partial + * - returned + + */ + function matchOrderStatus($type, $status) { + $statuses = explode(',', $status); + $value = $this->getOrder()->getData($type.'_status'); + foreach ($statuses as $status) { + if ($value==$status) { + return true; + } + } + return false; + } + + function validateOrderStatus() + { + if ($this->matchOrderStatus('order', 'new')) { + if (!$this->matchOrderStatus('shipping', 'pending') +// || !$this->matchOrderStatus('return', 'not_returned') + || !$this->matchOrderStatus('refund', 'not_refunded') + ) { + return false; + } + if ($this->matchOrderStatus('payment', 'partial')) { + return false; + } + } + + if ($this->matchOrderStatus('order', 'onhold')) { + if (!$this->matchOrderStatus('shipping', 'pending') + || !$this->matchOrderStatus('payment', 'pending') + || !$this->matchOrderStatus('refund', 'not_refunded') +// || !$this->matchOrderStatus('return', 'not_returned') + ) { + return false; + } + } + + if ($this->matchOrderStatus('order', 'cancelled')) { + if (!$this->matchOrderStatus('shipping', 'pending') + || !$this->matchOrderStatus('payment', 'pending,not_authorized') + || !$this->matchOrderStatus('refund', 'not_refunded') +// || !$this->matchOrderStatus('return', 'not_returned') + ) { + return false; + } + } + + if ($this->matchOrderStatus('order', 'complete,closed')) { + if (!$this->matchOrderStatus('payment', 'paid') + || !$this->matchOrderStatus('shipping', 'shipped') + ) { + return false; + } + } + + if ($this->matchOrderStatus('order', 'void')) { + if ($this->matchOrderStatus('payment', 'pending,not_authorized')) { + return false; + } + if (!$this->matchOrderStatus('refund', 'not_refunded')) { + return false; + } + } + + if ($this->matchOrderStatus('payment', 'pending,not_authorized') + && !$this->matchOrderStatus('refund', 'not_refunded') + ) { + return false; + } + + if ($this->matchOrderStatus('payment', 'authorized') + && !$this->matchOrderStatus('refund', 'not_refunded') + ) { + return false; + } + + if ($this->matchOrderStatus('payment', 'partial') + && $this->matchOrderStatus('refund', 'refunded') + ) { + return false; + } + +// if ($this->matchOrderStatus('shipping', 'pending') +// && !$this->matchOrderStatus('return', 'not_returned') +// ) { +// return false; +// } +// +// if ($this->matchOrderStatus('shipping', 'partial') && $this->matchOrderStatus('return', 'returned')) { +// return false; +// } + + return true; + } + + /** + * Available actions for admin user + * + * @return array available actions array + * - cancel + * - authorize + * - capture + * - invoice + * - creditmemo + * - hold + * - unhold + * - ship + * - edit + * - comment + * - status + * - reorder + */ + function getOrderActions() + { + $actions = array(); + + $actions['comment'] = 1; + + if ($this->matchOrderStatus('order', 'cancelled')) { + $actions['reorder'] = 1; + return $actions; + } + + if ($this->matchOrderStatus('order', 'closed')) { + $actions['reorder'] = 1; + if (!$this->matchOrderStatus('refund', 'refunded')) { + $actions['creditmemo'] = 1; + } + return $actions; + } + + if ($this->matchOrderStatus('order', 'onhold')) { + $actions['unhold'] = 1; + return $actions; + } + + $actions['edit'] = 1; + + $actions['hold'] = 1; + + if (!$this->matchOrderStatus('order', 'void')) { + $actions['cancel'] = 1; + } + + if ($this->matchOrderStatus('payment', 'not_authorized')) { + $actions['authorize'] = 1; + $actions['capture'] = 1; + } + + if (!$this->matchOrderStatus('payment', 'not_authorized,pending,paid')) { + $actions['invoice'] = 1; + } + + + if (!$this->matchOrderStatus('shipping', 'shipped')) { + $actions['ship'] = 1; + } + + if ($this->matchOrderStatus('payment', 'partial,paid') && !$this->matchOrderStatus('refund', 'refunded')) { + $actions['creditmemo'] = 1; + } + + if ($this->matchOrderStatus('order', 'void')) { + unset($actions['ship'], $actions['invoice'], $actions['ship'], $actions['hold']); + } + + return $actions; + } + + /** + * Order status for admin + * + * @return array + * - new + * - pending + * - processing + * - complete + * - cancelled + */ + function getAdminStatus() + { + return $this->getOrder()->getOrderStatus(); + } + + /** + * Order status for customers + * + * @return array + * - new + * - pending + * - processing + * - complete + * - cancelled + */ + function getFrontendStatus() + { + return $this->getOrder()->getOrderStatus(); + } +} + +$test = new Test; +$test->runTest(); diff --git a/app/code/core/Mage/Sales/etc/api.xml b/app/code/core/Mage/Sales/etc/api.xml index 8330605c06..349819932e 100644 --- a/app/code/core/Mage/Sales/etc/api.xml +++ b/app/code/core/Mage/Sales/etc/api.xml @@ -21,8 +21,8 @@ * * @category Mage * @package Mage_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -264,4 +264,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Sales/etc/system.xml b/app/code/core/Mage/Sales/etc/system.xml index bfe15434c7..2245731228 100644 --- a/app/code/core/Mage/Sales/etc/system.xml +++ b/app/code/core/Mage/Sales/etc/system.xml @@ -19,10 +19,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -822,4 +822,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php index 1a9583158d..39b98244ec 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php index 374bda5e4f..96d6e7bdee 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -380,4 +380,4 @@ "); $installer->endSetup(); -$installer->installEntities(); \ No newline at end of file +$installer->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php index 7778662198..2f1b52d30f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -508,4 +508,4 @@ "); $installer->installEntities(); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php index cdef4132f7..7af0a06148 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php index 259763d1da..9d5bb72e75 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,14 +18,14 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; /* @var $installer Mage_Sales_Model_Entity_Setup */ $installer->installEntities(); $installer->removeEntityType('invoice_address'); -$installer->removeEntityType('invoice_payment'); \ No newline at end of file +$installer->removeEntityType('invoice_payment'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php index b301447291..517d04cf7e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php index 966ee2356a..bfd16d116c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php index cccba4ed99..24e6a992c5 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -1,31 +1,31 @@ -installEntities(); -$installer->startSetup(); -$installer->endSetup(); \ No newline at end of file +installEntities(); +$installer->startSetup(); +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php index 44aad47346..a265361c59 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -1,29 +1,29 @@ -installEntities(); +installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php index 933f838e60..5b252d1ac5 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -1,57 +1,57 @@ -startSetup(); - -try { - $installer->run(" - ALTER TABLE {$this->getTable('sales_order_entity_varchar')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_varchar_store`, DROP FOREIGN KEY `FK_sales_order_entity_varchar_store`; - ALTER TABLE {$this->getTable('sales_order_entity_text')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_text_store`, DROP FOREIGN KEY `FK_sales_order_entity_text_store`; - ALTER TABLE {$this->getTable('sales_order_entity_int')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_int_store`, DROP FOREIGN KEY `FK_sales_order_entity_int_store`; - ALTER TABLE {$this->getTable('sales_order_entity_decimal')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_decimal_store`, DROP FOREIGN KEY `FK_sales_order_entity_decimal_store`; - ALTER TABLE {$this->getTable('sales_order_entity_datetime')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_datetime_store`, DROP FOREIGN KEY `FK_sales_order_entity_datetime_store`; - - ALTER TABLE {$this->getTable('sales_quote_entity_varchar')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_varchar_store`, DROP FOREIGN KEY `FK_sales_quote_entity_varchar_store`; - ALTER TABLE {$this->getTable('sales_quote_entity_text')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_text_store`, DROP FOREIGN KEY `FK_sales_quote_entity_text_store`; - ALTER TABLE {$this->getTable('sales_quote_entity_int')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_int_store`, DROP FOREIGN KEY `FK_sales_quote_entity_int_store`; - ALTER TABLE {$this->getTable('sales_quote_entity_decimal')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_decimal_store`, DROP FOREIGN KEY `FK_sales_quote_entity_decimal_store`; - ALTER TABLE {$this->getTable('sales_quote_entity_datetime')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_datetime_store`, DROP FOREIGN KEY `FK_sales_quote_entity_datetime_store`; - - ALTER TABLE {$this->getTable('sales_quote_temp_varchar')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_varchar_store`, DROP FOREIGN KEY `FK_sales_quote_temp_varchar_store`; - ALTER TABLE {$this->getTable('sales_quote_temp_text')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_text_store`, DROP FOREIGN KEY `FK_sales_quote_temp_text_store`; - ALTER TABLE {$this->getTable('sales_quote_temp_int')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_int_store`, DROP FOREIGN KEY `FK_sales_quote_temp_int_store`; - ALTER TABLE {$this->getTable('sales_quote_temp_decimal')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_decimal_store`, DROP FOREIGN KEY `FK_sales_quote_temp_decimal_store`; - ALTER TABLE {$this->getTable('sales_quote_temp_datetime')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_datetime_store`, DROP FOREIGN KEY `FK_sales_quote_temp_datetime_store`; - "); -} -catch (Exception $e) { -} - -$installer->installEntities(); -$installer->endSetup(); +startSetup(); + +try { + $installer->run(" + ALTER TABLE {$this->getTable('sales_order_entity_varchar')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_varchar_store`, DROP FOREIGN KEY `FK_sales_order_entity_varchar_store`; + ALTER TABLE {$this->getTable('sales_order_entity_text')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_text_store`, DROP FOREIGN KEY `FK_sales_order_entity_text_store`; + ALTER TABLE {$this->getTable('sales_order_entity_int')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_int_store`, DROP FOREIGN KEY `FK_sales_order_entity_int_store`; + ALTER TABLE {$this->getTable('sales_order_entity_decimal')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_decimal_store`, DROP FOREIGN KEY `FK_sales_order_entity_decimal_store`; + ALTER TABLE {$this->getTable('sales_order_entity_datetime')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_order_entity_datetime_store`, DROP FOREIGN KEY `FK_sales_order_entity_datetime_store`; + + ALTER TABLE {$this->getTable('sales_quote_entity_varchar')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_varchar_store`, DROP FOREIGN KEY `FK_sales_quote_entity_varchar_store`; + ALTER TABLE {$this->getTable('sales_quote_entity_text')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_text_store`, DROP FOREIGN KEY `FK_sales_quote_entity_text_store`; + ALTER TABLE {$this->getTable('sales_quote_entity_int')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_int_store`, DROP FOREIGN KEY `FK_sales_quote_entity_int_store`; + ALTER TABLE {$this->getTable('sales_quote_entity_decimal')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_decimal_store`, DROP FOREIGN KEY `FK_sales_quote_entity_decimal_store`; + ALTER TABLE {$this->getTable('sales_quote_entity_datetime')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_entity_datetime_store`, DROP FOREIGN KEY `FK_sales_quote_entity_datetime_store`; + + ALTER TABLE {$this->getTable('sales_quote_temp_varchar')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_varchar_store`, DROP FOREIGN KEY `FK_sales_quote_temp_varchar_store`; + ALTER TABLE {$this->getTable('sales_quote_temp_text')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_text_store`, DROP FOREIGN KEY `FK_sales_quote_temp_text_store`; + ALTER TABLE {$this->getTable('sales_quote_temp_int')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_int_store`, DROP FOREIGN KEY `FK_sales_quote_temp_int_store`; + ALTER TABLE {$this->getTable('sales_quote_temp_decimal')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_decimal_store`, DROP FOREIGN KEY `FK_sales_quote_temp_decimal_store`; + ALTER TABLE {$this->getTable('sales_quote_temp_datetime')} DROP COLUMN `store_id`, DROP INDEX `FK_sales_quote_temp_datetime_store`, DROP FOREIGN KEY `FK_sales_quote_temp_datetime_store`; + "); +} +catch (Exception $e) { +} + +$installer->installEntities(); +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php index 049a033416..5b3440fe95 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php @@ -1,30 +1,30 @@ -startSetup(); -$installer->installEntities(); -$installer->endSetup(); \ No newline at end of file +startSetup(); +$installer->installEntities(); +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php index af83201fbe..05f422e369 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php @@ -1,27 +1,27 @@ -installEntities(); \ No newline at end of file +installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php index 9bccd26233..e42c478c1c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php index 05111f5873..c1ab4ed596 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -388,4 +388,4 @@ DROP TABLE IF EXISTS `{$installer->getTable('sales_quote_temp_varchar')}`; "); $this->endSetup(); -$this->installEntities(); \ No newline at end of file +$this->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php index da75d3c107..f389a679b7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -30,4 +30,4 @@ $installer->getConnection()->addColumn($this->getTable('sales_quote_item'), 'custom_price', 'decimal(12,4) NULL AFTER `price`'); $this->endSetup(); -$this->installEntities(); \ No newline at end of file +$this->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php index 9c961e2a50..b7e9ab4ece 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php @@ -1,42 +1,42 @@ -startSetup(); -$this->run(" -ALTER TABLE `{$installer->getTable('sales_quote_item')}` - MODIFY COLUMN `weight` DECIMAL(12,4) DEFAULT '0.0000', - MODIFY COLUMN `discount_percent` DECIMAL(12,4) DEFAULT '0.0000', - MODIFY COLUMN `discount_amount` DECIMAL(12,4) DEFAULT '0.0000', - MODIFY COLUMN `tax_percent` DECIMAL(12,4) DEFAULT '0.0000', - MODIFY COLUMN `tax_amount` DECIMAL(12,4) DEFAULT '0.0000', - MODIFY COLUMN `row_total_with_discount` DECIMAL(12,4) DEFAULT '0.0000', - MODIFY COLUMN `base_discount_amount` DECIMAL(12,4) DEFAULT '0.0000', - MODIFY COLUMN `base_tax_amount` DECIMAL(12,4) DEFAULT '0.0000', - MODIFY COLUMN `row_weight` DECIMAL(12,4) DEFAULT '0.0000'; -"); -$this->endSetup(); -$this->installEntities(); \ No newline at end of file +startSetup(); +$this->run(" +ALTER TABLE `{$installer->getTable('sales_quote_item')}` + MODIFY COLUMN `weight` DECIMAL(12,4) DEFAULT '0.0000', + MODIFY COLUMN `discount_percent` DECIMAL(12,4) DEFAULT '0.0000', + MODIFY COLUMN `discount_amount` DECIMAL(12,4) DEFAULT '0.0000', + MODIFY COLUMN `tax_percent` DECIMAL(12,4) DEFAULT '0.0000', + MODIFY COLUMN `tax_amount` DECIMAL(12,4) DEFAULT '0.0000', + MODIFY COLUMN `row_total_with_discount` DECIMAL(12,4) DEFAULT '0.0000', + MODIFY COLUMN `base_discount_amount` DECIMAL(12,4) DEFAULT '0.0000', + MODIFY COLUMN `base_tax_amount` DECIMAL(12,4) DEFAULT '0.0000', + MODIFY COLUMN `row_weight` DECIMAL(12,4) DEFAULT '0.0000'; +"); +$this->endSetup(); +$this->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php index d6d565013f..d05f3d34aa 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php @@ -1,64 +1,64 @@ -startSetup(); -$this->run(" -ALTER TABLE `{$installer->getTable('sales_quote')}` - change `is_active` `is_active` tinyint (1)UNSIGNED DEFAULT '1' NULL , - change `is_virtual` `is_virtual` tinyint (1)UNSIGNED DEFAULT '0' NULL , - change `is_multi_shipping` `is_multi_shipping` tinyint (1)UNSIGNED DEFAULT '0' NULL , - change `is_multi_payment` `is_multi_payment` tinyint (1)UNSIGNED DEFAULT '0' NULL , - change `customer_note_notify` `customer_note_notify` tinyint (1)UNSIGNED DEFAULT '1' NULL , - change `customer_is_guest` `customer_is_guest` tinyint (1)UNSIGNED DEFAULT '0' NULL , - change `quote_status_id` `quote_status_id` int (10)UNSIGNED DEFAULT '0' NULL , - change `billing_address_id` `billing_address_id` int (10)UNSIGNED DEFAULT '0' NULL , - change `orig_order_id` `orig_order_id` int (10)UNSIGNED DEFAULT '0' NULL , - change `customer_id` `customer_id` int (10)UNSIGNED DEFAULT '0' NULL , - change `customer_tax_class_id` `customer_tax_class_id` int (10)UNSIGNED DEFAULT '0' NULL , - change `customer_group_id` `customer_group_id` int (10)UNSIGNED DEFAULT '0' NULL , - change `items_count` `items_count` int (10)UNSIGNED DEFAULT '0' NULL , - change `items_qty` `items_qty` decimal (12,4) DEFAULT '0.0000' NULL , - change `store_to_base_rate` `store_to_base_rate` decimal (12,4) DEFAULT '0.0000' NULL , - change `store_to_quote_rate` `store_to_quote_rate` decimal (12,4) DEFAULT '0.0000' NULL , - change `grand_total` `grand_total` decimal (12,4) DEFAULT '0.0000' NULL , - change `base_grand_total` `base_grand_total` decimal (12,4) DEFAULT '0.0000' NULL , - change `custbalance_amount` `custbalance_amount` decimal (12,4) DEFAULT '0.0000' NULL , - change `checkout_method` `checkout_method` varchar (255) NULL COLLATE utf8_general_ci , - change `password_hash` `password_hash` varchar (255) NULL COLLATE utf8_general_ci , - change `coupon_code` `coupon_code` varchar (255) NULL COLLATE utf8_general_ci , - change `base_currency_code` `base_currency_code` varchar (255) NULL COLLATE utf8_general_ci , - change `store_currency_code` `store_currency_code` varchar (255) NULL COLLATE utf8_general_ci , - change `quote_currency_code` `quote_currency_code` varchar (255) NULL COLLATE utf8_general_ci , - change `customer_email` `customer_email` varchar (255) NULL COLLATE utf8_general_ci , - change `customer_firstname` `customer_firstname` varchar (255) NULL COLLATE utf8_general_ci , - change `customer_lastname` `customer_lastname` varchar (255) NULL COLLATE utf8_general_ci , - change `customer_note` `customer_note` varchar (255) NULL COLLATE utf8_general_ci , - change `remote_ip` `remote_ip` varchar (255) NULL COLLATE utf8_general_ci , - change `applied_rule_ids` `applied_rule_ids` varchar (255) NULL COLLATE utf8_general_ci -"); -$this->endSetup(); -$this->installEntities(); \ No newline at end of file +startSetup(); +$this->run(" +ALTER TABLE `{$installer->getTable('sales_quote')}` + change `is_active` `is_active` tinyint (1)UNSIGNED DEFAULT '1' NULL , + change `is_virtual` `is_virtual` tinyint (1)UNSIGNED DEFAULT '0' NULL , + change `is_multi_shipping` `is_multi_shipping` tinyint (1)UNSIGNED DEFAULT '0' NULL , + change `is_multi_payment` `is_multi_payment` tinyint (1)UNSIGNED DEFAULT '0' NULL , + change `customer_note_notify` `customer_note_notify` tinyint (1)UNSIGNED DEFAULT '1' NULL , + change `customer_is_guest` `customer_is_guest` tinyint (1)UNSIGNED DEFAULT '0' NULL , + change `quote_status_id` `quote_status_id` int (10)UNSIGNED DEFAULT '0' NULL , + change `billing_address_id` `billing_address_id` int (10)UNSIGNED DEFAULT '0' NULL , + change `orig_order_id` `orig_order_id` int (10)UNSIGNED DEFAULT '0' NULL , + change `customer_id` `customer_id` int (10)UNSIGNED DEFAULT '0' NULL , + change `customer_tax_class_id` `customer_tax_class_id` int (10)UNSIGNED DEFAULT '0' NULL , + change `customer_group_id` `customer_group_id` int (10)UNSIGNED DEFAULT '0' NULL , + change `items_count` `items_count` int (10)UNSIGNED DEFAULT '0' NULL , + change `items_qty` `items_qty` decimal (12,4) DEFAULT '0.0000' NULL , + change `store_to_base_rate` `store_to_base_rate` decimal (12,4) DEFAULT '0.0000' NULL , + change `store_to_quote_rate` `store_to_quote_rate` decimal (12,4) DEFAULT '0.0000' NULL , + change `grand_total` `grand_total` decimal (12,4) DEFAULT '0.0000' NULL , + change `base_grand_total` `base_grand_total` decimal (12,4) DEFAULT '0.0000' NULL , + change `custbalance_amount` `custbalance_amount` decimal (12,4) DEFAULT '0.0000' NULL , + change `checkout_method` `checkout_method` varchar (255) NULL COLLATE utf8_general_ci , + change `password_hash` `password_hash` varchar (255) NULL COLLATE utf8_general_ci , + change `coupon_code` `coupon_code` varchar (255) NULL COLLATE utf8_general_ci , + change `base_currency_code` `base_currency_code` varchar (255) NULL COLLATE utf8_general_ci , + change `store_currency_code` `store_currency_code` varchar (255) NULL COLLATE utf8_general_ci , + change `quote_currency_code` `quote_currency_code` varchar (255) NULL COLLATE utf8_general_ci , + change `customer_email` `customer_email` varchar (255) NULL COLLATE utf8_general_ci , + change `customer_firstname` `customer_firstname` varchar (255) NULL COLLATE utf8_general_ci , + change `customer_lastname` `customer_lastname` varchar (255) NULL COLLATE utf8_general_ci , + change `customer_note` `customer_note` varchar (255) NULL COLLATE utf8_general_ci , + change `remote_ip` `remote_ip` varchar (255) NULL COLLATE utf8_general_ci , + change `applied_rule_ids` `applied_rule_ids` varchar (255) NULL COLLATE utf8_general_ci +"); +$this->endSetup(); +$this->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php index cefb7eee34..8ba5a2667a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php @@ -18,14 +18,14 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; /* @var $installer Mage_Sales_Model_Entity_Setup */ $installer->addAttribute('order', 'edit_increment', array('type'=>'int')); -$installer->addAttribute('order', 'original_increment_id', array('type'=>'varchar')); \ No newline at end of file +$installer->addAttribute('order', 'original_increment_id', array('type'=>'varchar')); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php index cb7a35b4a7..6abbda5e12 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php index 068d4188c8..bc56571847 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -1,32 +1,32 @@ -startSetup(); -$installer->installEntities(); -$installer->endSetup(); +startSetup(); +$installer->installEntities(); +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php index 018fcb682e..15a24cf77c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php index b846551587..46beee4d93 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('sales_quote_address'), 'save_in_address_book', 'tinyint(1) default 0 after `customer_id`'); $installer->addAttribute('quote_address', 'save_in_address_book', array('type'=>'static')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php index b8956562d9..1fb5ddeb9c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php @@ -1,30 +1,30 @@ -getConnection()->addColumn($installer->getTable('sales_quote'), 'reserved_order_id', 'varchar(64) default \'\''); -$installer->addAttribute('quote', 'reserved_order_id', array('type'=>'static')); \ No newline at end of file +getConnection()->addColumn($installer->getTable('sales_quote'), 'reserved_order_id', 'varchar(64) default \'\''); +$installer->addAttribute('quote', 'reserved_order_id', array('type'=>'static')); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php index 510864e3bd..61626ae4a2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php @@ -1,29 +1,29 @@ -addAttribute('order_payment', 'last_trans_id', array()); \ No newline at end of file +addAttribute('order_payment', 'last_trans_id', array()); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php index 5f21010526..2b07a12b66 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php @@ -1,47 +1,47 @@ -getConnection()->addColumn($this->getTable('sales_quote_address'), 'shipping_tax_amount', 'decimal(12,4) NULL'); -$installer->getConnection()->addColumn($this->getTable('sales_quote_address'), 'base_shipping_tax_amount', 'decimal(12,4) NULL'); - -$installer->getConnection()->addColumn($this->getTable('sales_order'), 'shipping_tax_amount', 'decimal(12,4) NULL'); -$installer->getConnection()->addColumn($this->getTable('sales_order'), 'base_shipping_tax_amount', 'decimal(12,4) NULL'); - - -$installer->addAttribute('quote_address', 'shipping_tax_amount', array('type'=>'static')); -$installer->addAttribute('quote_address', 'base_shipping_tax_amount', array('type'=>'static')); - -$installer->addAttribute('order', 'shipping_tax_amount', array('type'=>'static')); -$installer->addAttribute('order', 'base_shipping_tax_amount', array('type'=>'static')); - -$installer->addAttribute('invoice', 'shipping_tax_amount', array('type'=>'decimal')); -$installer->addAttribute('invoice', 'base_shipping_tax_amount', array('type'=>'decimal')); - -$installer->addAttribute('creditmemo', 'shipping_tax_amount', array('type'=>'decimal')); -$installer->addAttribute('creditmemo', 'base_shipping_tax_amount', array('type'=>'decimal')); +getConnection()->addColumn($this->getTable('sales_quote_address'), 'shipping_tax_amount', 'decimal(12,4) NULL'); +$installer->getConnection()->addColumn($this->getTable('sales_quote_address'), 'base_shipping_tax_amount', 'decimal(12,4) NULL'); + +$installer->getConnection()->addColumn($this->getTable('sales_order'), 'shipping_tax_amount', 'decimal(12,4) NULL'); +$installer->getConnection()->addColumn($this->getTable('sales_order'), 'base_shipping_tax_amount', 'decimal(12,4) NULL'); + + +$installer->addAttribute('quote_address', 'shipping_tax_amount', array('type'=>'static')); +$installer->addAttribute('quote_address', 'base_shipping_tax_amount', array('type'=>'static')); + +$installer->addAttribute('order', 'shipping_tax_amount', array('type'=>'static')); +$installer->addAttribute('order', 'base_shipping_tax_amount', array('type'=>'static')); + +$installer->addAttribute('invoice', 'shipping_tax_amount', array('type'=>'decimal')); +$installer->addAttribute('invoice', 'base_shipping_tax_amount', array('type'=>'decimal')); + +$installer->addAttribute('creditmemo', 'shipping_tax_amount', array('type'=>'decimal')); +$installer->addAttribute('creditmemo', 'base_shipping_tax_amount', array('type'=>'decimal')); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php index 03b340cd42..b2f9ebe6e2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -29,4 +29,4 @@ /* @var $installer Mage_Sales_Model_Entity_Setup */ $installer->run(" ALTER TABLE `{$this->getTable('sales_order')}` ADD INDEX `IDX_CUSTOMER` (`customer_id`); -"); \ No newline at end of file +"); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php index 0e6d0c0539..ab302bf321 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php index 916d183d98..e14ef90f67 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php index a5af8a179d..9785597237 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php index f05839bd0d..9869f1564b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -297,13 +297,13 @@ unset($quoteInfo['entity_id']); $quoteData = array(); - foreach ($quoteFields as $field) { - if (isset($quoteInfo[$field])) { - $quoteData[$field] = $quoteInfo[$field]; - } - } + foreach ($quoteFields as $field) { + if (isset($quoteInfo[$field])) { + $quoteData[$field] = $quoteInfo[$field]; + } + } - $installer->getConnection()->insert($installer->getTable('sales_flat_quote'), $quoteData); + $installer->getConnection()->insert($installer->getTable('sales_flat_quote'), $quoteData); $quoteId = $installer->getConnection()->lastInsertId(); foreach ($quoteItems as $itemInfo) { @@ -312,12 +312,12 @@ ); foreach ($itemFields as $field) { - if (isset($itemInfo[$field])) { - $itemData[$field] = $itemInfo[$field]; - } - } + if (isset($itemInfo[$field])) { + $itemData[$field] = $itemInfo[$field]; + } + } $installer->getConnection()->insert($installer->getTable('sales_flat_quote_item'), $itemData); - } + } } } @@ -350,4 +350,4 @@ DROP TABLE IF EXISTS {$this->getTable('sales_counter')}; DROP TABLE IF EXISTS {$this->getTable('sales_discount_coupon')}; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php index 47941e3d3f..d87af27aa8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -1,36 +1,36 @@ -startSetup(); - -$installer->run(" -UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"Magento\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@magentocommerce.com or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; -"); - -$installer->endSetup(); +startSetup(); + +$installer->run(" +UPDATE {$this->getTable('core_email_template')} set template_text='\r\n\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n \r\n
\r\n \"Magento\"
\r\n\r\n \r\n \r\n \r\n \r\n \r\n
\r\n

Hello {{var billing.name}},
\r\n Thank you for your order from Magento Demo Store. Once your package ships we will send an email with a link to track your order.{{depend order.getCustomerId()}} You can check the status of your order by logging into your account.{{/depend}} If you have any questions about your order please contact us at dummyemail@magentocommerce.com or call us at (555) 555-0123 Monday - Friday, 8am - 5pm PST.

\r\n

Your order confirmation is below. Thank you again for your business.

\r\n \r\n

Your Order #{{var order.increment_id}} (placed on {{var order.getCreatedAtFormated(\'long\')}})

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Billing \r\n Information:Payment \r\n Method:
{{var order.billing_address.format(\'html\')}}  {{var payment_html}}

\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
Shipping \r\n Information:Shipping \r\n Method:
{{var order.shipping_address.format(\'html\')}} {{var order.shipping_description}}

\r\n\r\n{{var items_html}}
\r\n {{var order.getEmailCustomerNote()}} \r\n

Thank you again,
Magento Demo Store

\r\n\r\n\r\n
\r\n \r\n
\r\n
\r\n' WHERE template_code='New order (HTML)'; +"); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php index 068d4188c8..bc56571847 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -1,32 +1,32 @@ -startSetup(); -$installer->installEntities(); -$installer->endSetup(); +startSetup(); +$installer->installEntities(); +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php index 83d775d044..5a474d30db 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ ON UPDATE CASCADE ON DELETE CASCADE; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php index cf5ae22029..a3c3dcc2c3 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; /* @var $installer Mage_Sales_Model_Entity_Setup */ @@ -58,4 +58,4 @@ ON UPDATE CASCADE; "); $installer->installEntities(); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php index 97afd74fb0..b5c4615835 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php index d9bfdf7f25..b51b1e0ac7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php index 975d9e9540..1fdcdbaf70 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -29,4 +29,4 @@ $installer->run(" ALTER TABLE `{$installer->getTable('sales_order_tax')}` ADD `base_real_amount` DECIMAL( 12, 4 ) NOT NULL; -"); \ No newline at end of file +"); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php index 6c485d4cb0..3be08d9624 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php index 87d8256081..4872c24118 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->addAttribute('quote', 'base_subtotal', array('type'=>'decimal')); $installer->addAttribute('quote', 'subtotal_with_discount', array('type'=>'decimal')); -$installer->addAttribute('quote', 'base_subtotal_with_discount', array('type'=>'decimal')); \ No newline at end of file +$installer->addAttribute('quote', 'base_subtotal_with_discount', array('type'=>'decimal')); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php index f5b9d41a57..c87acdd5f3 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -39,4 +39,4 @@ // add customer_taxvat $installer->addAttribute('order', 'customer_taxvat', array('type' => 'varchar', 'visible' => false)); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php index 8e093d7f66..6dc839d440 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -36,4 +36,4 @@ $installer->getTable('sales_flat_quote_item'), 'item_id' ); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php index a8bbd03d7c..288190ece9 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->addAttribute('quote', 'is_changed', array('type' => 'int')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php index 932e479340..b2834847a0 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->addAttribute('quote_address_rate', 'method_title', array('type' => 'text')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php index f94c4fe349..fa36b1837b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->addAttribute('order', 'shipping_tax_amount', array('type'=>'static')); $installer->addAttribute('order', 'base_shipping_tax_amount', array('type'=>'static')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php index 4f48495e37..e619fcd122 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -29,4 +29,4 @@ $installer->run(" ALTER TABLE `{$this->getTable('sales_order')}` ADD INDEX `IDX_INCREMENT_ID` (`increment_id`); -"); \ No newline at end of file +"); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php index df6b01ad22..e40bdccbd5 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->addAttribute('order', 'can_ship_partially', array('type'=>'int')); $installer->addAttribute('order', 'can_ship_partially_item', array('type'=>'int')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php index 6bad80587c..4ed917e798 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php index dcb9f0f4fc..131bc1e5c9 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php index b49f75ebf1..88cdc0e998 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->addAttribute('order', 'payment_authorization_amount', array('type'=>'decimal')); $installer->addAttribute('order', 'payment_authorization_expiration', array('type'=>'int')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php index dc4556c711..8ee6b3afea 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php index 7af50c96dc..a5cc22f329 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php @@ -1,31 +1,31 @@ -addAttribute('invoice', 'email_sent', array('type'=>'int')); -$installer->addAttribute('shipment', 'email_sent', array('type'=>'int')); \ No newline at end of file +addAttribute('invoice', 'email_sent', array('type'=>'int')); +$installer->addAttribute('shipment', 'email_sent', array('type'=>'int')); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php index cf92212065..45e778ccb2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php @@ -1,34 +1,34 @@ -getConnection()->addColumn($this->getTable('sales_order'), 'shipping_tax_refunded', 'decimal(12,4) NULL'); -$installer->getConnection()->addColumn($this->getTable('sales_order'), 'base_shipping_tax_refunded', 'decimal(12,4) NULL'); - -$installer->addAttribute('order', 'shipping_tax_refunded', array('type'=>'static')); -$installer->addAttribute('order', 'base_shipping_tax_refunded', array('type'=>'static')); \ No newline at end of file +getConnection()->addColumn($this->getTable('sales_order'), 'shipping_tax_refunded', 'decimal(12,4) NULL'); +$installer->getConnection()->addColumn($this->getTable('sales_order'), 'base_shipping_tax_refunded', 'decimal(12,4) NULL'); + +$installer->addAttribute('order', 'shipping_tax_refunded', array('type'=>'static')); +$installer->addAttribute('order', 'base_shipping_tax_refunded', array('type'=>'static')); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php index cad2f50a66..fbe468839a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php @@ -1,41 +1,41 @@ -run(" -DELETE FROM `{$this->getTable('sales_order_tax')}` -WHERE `order_id` NOT IN ( - SELECT `entity_id` FROM `{$this->getTable('sales_order')}` -) -"); - -$installer->getConnection()->addConstraint( - 'FK_SALES_ORDER_TAX_ORDER', - $this->getTable('sales_order_tax'), 'order_id', - $this->getTable('sales_order'), 'entity_id' -); +run(" +DELETE FROM `{$this->getTable('sales_order_tax')}` +WHERE `order_id` NOT IN ( + SELECT `entity_id` FROM `{$this->getTable('sales_order')}` +) +"); + +$installer->getConnection()->addConstraint( + 'FK_SALES_ORDER_TAX_ORDER', + $this->getTable('sales_order_tax'), 'order_id', + $this->getTable('sales_order'), 'entity_id' +); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php index 196c2ffc30..08406573a7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php @@ -1,36 +1,36 @@ -getConnection()->beginTransaction(); - + $installer->getConnection()->addColumn($this->getTable('sales/quote'), 'global_currency_code', 'varchar(255) NULL AFTER `store_to_quote_rate`'); $installer->getConnection()->addColumn($this->getTable('sales/quote'), 'base_to_quote_rate', 'decimal(12,4) NULL AFTER `store_to_quote_rate`'); $installer->getConnection()->addColumn($this->getTable('sales/quote'), 'base_to_global_rate', 'decimal(12,4) NULL AFTER `store_to_quote_rate`'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php index 6951bba34c..367df8fd04 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php @@ -1,44 +1,44 @@ -startSetup(); - -$installer->run(" -DELETE `{$installer->getTable('sales_flat_quote')}`.* FROM `{$installer->getTable('sales_flat_quote')}` - LEFT JOIN `{$installer->getTable('core_store')}` - ON `{$installer->getTable('sales_flat_quote')}`.`store_id`=`{$installer->getTable('core_store')}`.`store_id` - WHERE `{$installer->getTable('core_store')}`.`store_id` IS NULL; -"); - -$installer->getConnection()->addConstraint('FK_SALES_QUOTE_STORE', - $installer->getTable('sales_flat_quote'), 'store_id', - $installer->getTable('core_store'), 'store_id' -); - -$installer->endSetup(); +startSetup(); + +$installer->run(" +DELETE `{$installer->getTable('sales_flat_quote')}`.* FROM `{$installer->getTable('sales_flat_quote')}` + LEFT JOIN `{$installer->getTable('core_store')}` + ON `{$installer->getTable('sales_flat_quote')}`.`store_id`=`{$installer->getTable('core_store')}`.`store_id` + WHERE `{$installer->getTable('core_store')}`.`store_id` IS NULL; +"); + +$installer->getConnection()->addConstraint('FK_SALES_QUOTE_STORE', + $installer->getTable('sales_flat_quote'), 'store_id', + $installer->getTable('core_store'), 'store_id' +); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php index 02dbf36cb0..3035fae26d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -142,4 +142,4 @@ `base_discount_canceled`=`base_discount_amount`-`base_discount_invoiced` WHERE `entity_id`='{$entityId}' "); -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php index 7da3ec4071..a55837e808 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php index 0869a024bf..9232ab42c8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -85,9 +85,9 @@ `base_row_invoiced` decimal(12,4) NOT NULL default '0.0000', `row_weight` decimal(12,4) default '0.0000', - - `gift_message_id` int(10) default NULL, - `gift_message_available` int(10) default NULL, + + `gift_message_id` int(10) default NULL, + `gift_message_available` int(10) default NULL, PRIMARY KEY (`item_id`), KEY `IDX_ORDER` (`order_id`) @@ -160,10 +160,10 @@ ); foreach ($itemData as $key => $value) { - if (isset($itemFields[$key])) { - $newItemData[$key] = $value; - } + if (isset($itemFields[$key])) { + $newItemData[$key] = $value; + } } $installer->getConnection()->insert($installer->getTable('sales_flat_order_item'), $newItemData); -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php index 4d3184be89..a36e1f47ce 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php index 3d845b0928..4d5cb52d9d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php index c6e5a7dd0f..0b8edd2bff 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php index 723b148380..12efeba8ac 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php index 61b1273c95..5a6a8dfabe 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php index e7cf04548f..7c982c5b89 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $installer Mage_Sales_Model_Mysql4_Setup */ @@ -31,4 +31,4 @@ $installer->addAttribute('order', 'forced_do_shipment_with_invoice', array('type'=>'int', 'default' => 0)); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php index aaa76a25d4..2ff75e30f1 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $installer Mage_Sales_Model_Mysql4_Setup */ @@ -32,4 +32,4 @@ $installer->addAttribute('order_item', 'locked_do_invoice', array('type'=>'int', 'default' => 0)); $installer->addAttribute('order_item', 'locked_do_ship', array('type'=>'int', 'default' => 0)); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php index 9e13f175d8..1cee3dccb7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php index 1edda272cb..2a68479129 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -34,4 +34,4 @@ $installer->getTable('sales_flat_quote_item'), 'parent_item_id', $installer->getTable('sales_flat_quote_item'), 'item_id' ); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php index 189352aac3..5d378e814d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php @@ -1,36 +1,36 @@ -run(" -ALTER TABLE `{$installer->getTable('sales_flat_quote_address_item')}` ADD COLUMN `parent_item_id` INTEGER UNSIGNED AFTER `address_item_id`, - ADD CONSTRAINT `FK_SALES_FLAT_QUOTE_ADDRESS_ITEM_PARENT` FOREIGN KEY `FK_SALES_FLAT_QUOTE_ADDRESS_ITEM_PARENT` (`parent_item_id`) - REFERENCES `{$installer->getTable('sales_flat_quote_address_item')}` (`address_item_id`) - ON DELETE CASCADE - ON UPDATE CASCADE; -"); +run(" +ALTER TABLE `{$installer->getTable('sales_flat_quote_address_item')}` ADD COLUMN `parent_item_id` INTEGER UNSIGNED AFTER `address_item_id`, + ADD CONSTRAINT `FK_SALES_FLAT_QUOTE_ADDRESS_ITEM_PARENT` FOREIGN KEY `FK_SALES_FLAT_QUOTE_ADDRESS_ITEM_PARENT` (`parent_item_id`) + REFERENCES `{$installer->getTable('sales_flat_quote_address_item')}` (`address_item_id`) + ON DELETE CASCADE + ON UPDATE CASCADE; +"); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php index 5a7a53548c..beebef61fd 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php index 2b8bc51c9f..3b1c932447 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -29,4 +29,4 @@ $installer->run(" ALTER TABLE `{$installer->getTable('sales_order_tax')}` ADD `base_amount` DECIMAL( 12, 4 ) NOT NULL, ADD `process` SMALLINT NOT NULL; -"); \ No newline at end of file +"); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php index 14a234a520..473cae27c8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php index 552ca7ee72..7c2449ae38 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/SalesRule/Exception.php b/app/code/core/Mage/SalesRule/Exception.php index 893ce392d0..0a7ce3a6d4 100644 --- a/app/code/core/Mage/SalesRule/Exception.php +++ b/app/code/core/Mage/SalesRule/Exception.php @@ -18,14 +18,14 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_SalesRule_Exception extends Zend_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Helper/Data.php b/app/code/core/Mage/SalesRule/Helper/Data.php index bffe4f4cb3..a5d941ce66 100644 --- a/app/code/core/Mage/SalesRule/Helper/Data.php +++ b/app/code/core/Mage/SalesRule/Helper/Data.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php index 4adb97a875..7ac65dd5ef 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -127,4 +127,4 @@ public function getStoreLabel($ruleId, $storeId) ->order('store_id DESC'); return $this->_getReadAdapter()->fetchOne($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php index f50abc7089..816cbb94d7 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,9 +51,9 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode='' } $this->getSelect()->where('from_date is null or from_date<=?', $now); $this->getSelect()->where('to_date is null or to_date>=?', $now); - $this->getSelect()->order('sort_order'); + $this->getSelect()->order('sort_order'); - return $this; + return $this; } /** @@ -76,4 +76,4 @@ public function addWebsiteFilter($websiteIds) } return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php index 56a20b5c1e..3c2d3b3e6b 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php index 2d4eca8e19..beb70171b0 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ protected function _construct() parent::_construct(); $this->_init('salesrule/rule_customer'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php index 8f9eab84ac..1b0a720dc3 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php @@ -1,35 +1,35 @@ -_init('salesrule/rule_product', 'product_rule_id'); - } -} \ No newline at end of file +_init('salesrule/rule_product', 'product_rule_id'); + } +} diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php index 12b8c4c490..c5a555ea9a 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ protected function _construct() parent::_construct(); $this->_init('salesrule/rule_product'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php index 310394a297..4657b7dd26 100644 --- a/app/code/core/Mage/SalesRule/Model/Observer.php +++ b/app/code/core/Mage/SalesRule/Model/Observer.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -101,4 +101,4 @@ public function sales_order_afterPlace($observer) } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Model/Rule.php b/app/code/core/Mage/SalesRule/Model/Rule.php index b2fee2b90e..d2c63637a4 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Rule.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -130,7 +130,7 @@ public function loadPost(array $rule) if (isset($rule['store_labels'])) { $this->setStoreLabels($rule['store_labels']); } - return $this; + return $this; } /** diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php b/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php index 02d32becdd..be69ca9ffb 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php index ecd945c90d..d3c368d7cb 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,4 +52,4 @@ public function asHtml() $html.= $this->getRemoveLinkHtml(); return $html; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php index 1299a9e5e2..93ae721900 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php index aaa06e3899..395affef89 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php index ebcdc25a64..adc9ef83f1 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php index 9e79a59f61..d4f451e206 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php index 0e8130b35f..03c7391acc 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,22 +36,22 @@ public function __construct() public function loadValueOptions() { - $this->setValueOption(array( - 1=>'FOUND', - 0=>'NOT FOUND', - )); - return $this; + $this->setValueOption(array( + 1=>'FOUND', + 0=>'NOT FOUND', + )); + return $this; } public function asHtml() { - $html = $this->getTypeElement()->getHtml(). - Mage::helper('salesrule')->__("If an item is %s in the cart with %s of these conditions true:", - $this->getValueElement()->getHtml(), $this->getAggregatorElement()->getHtml()); - if ($this->getId()!='1') { - $html.= $this->getRemoveLinkHtml(); - } - return $html; + $html = $this->getTypeElement()->getHtml(). + Mage::helper('salesrule')->__("If an item is %s in the cart with %s of these conditions true:", + $this->getValueElement()->getHtml(), $this->getAggregatorElement()->getHtml()); + if ($this->getId()!='1') { + $html.= $this->getRemoveLinkHtml(); + } + return $html; } /** diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php index 61bba4c773..2a5e18cc7d 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php index bdad2c9fc9..eadee6b176 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,4 +38,4 @@ public function loadByCustomerRule($customerId, $ruleId) $this->_getResource()->loadByCustomerRule($this, $customerId, $ruleId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Product.php index 29558c4a76..97f774bac8 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Product.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,4 +32,4 @@ protected function _construct() parent::_construct(); $this->_init('salesrule/rule_product'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index 8cc9bcd69b..a37e06c203 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml index 13d5e14ff7..12be2f6011 100644 --- a/app/code/core/Mage/SalesRule/etc/config.xml +++ b/app/code/core/Mage/SalesRule/etc/config.xml @@ -19,10 +19,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php index 13e54b95d6..3383fe7ae1 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_SalesRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php index 3539f51cf9..95fdfdeb52 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php index cbe737a5bd..4395216e49 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php index d4d4065ed8..8187b0dc05 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php index a42997130f..dc4ef8a20a 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php index 6032b654e6..36ab405574 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -52,4 +52,4 @@ } $conn->dropColumn($this->getTable('salesrule'), 'store_ids'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php index f57f5f7481..31091c2d31 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $conn = $installer->getConnection(); $conn->addColumn($this->getTable('salesrule'), 'discount_step', 'int unsigned not null after discount_qty'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php index 7341785404..c349fdad3a 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -18,10 +18,10 @@ * 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_CatalogRule - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sendfriend/Helper/Data.php b/app/code/core/Mage/Sendfriend/Helper/Data.php index 1328ad3da7..fc0bb6fb0e 100644 --- a/app/code/core/Mage/Sendfriend/Helper/Data.php +++ b/app/code/core/Mage/Sendfriend/Helper/Data.php @@ -19,7 +19,7 @@ * needs please refer to http://www.magentocommerce.com for more information. * * @category Mage - * @package Mage_Sedfriend + * @package Mage_Sendfriend * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php index 530e0bd899..a189dfec40 100644 --- a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php @@ -18,10 +18,10 @@ * 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_Sendfriend - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Sendfriend_Model_Sendfriend extends Mage_Core_Model_Abstract @@ -229,7 +229,6 @@ public function getCookie() */ public function setRemoteAddr($ipAddr) { - Mage::log(array(__METHOD__, $ipAddr)); $this->setData('_remote_addr', $ipAddr); return $this; } @@ -241,7 +240,6 @@ public function setRemoteAddr($ipAddr) */ public function getRemoteAddr() { - Mage::log(array(__METHOD__, $this->_getData('_remote_addr'))); return $this->_getData('_remote_addr'); } diff --git a/app/code/core/Mage/Sendfriend/controllers/ProductController.php b/app/code/core/Mage/Sendfriend/controllers/ProductController.php index 32e08876ba..d5ec66ffd1 100644 --- a/app/code/core/Mage/Sendfriend/controllers/ProductController.php +++ b/app/code/core/Mage/Sendfriend/controllers/ProductController.php @@ -18,10 +18,10 @@ * 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_Sendfriend - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sendfriend/etc/config.xml b/app/code/core/Mage/Sendfriend/etc/config.xml index 9d525bd546..683fcb1645 100644 --- a/app/code/core/Mage/Sendfriend/etc/config.xml +++ b/app/code/core/Mage/Sendfriend/etc/config.xml @@ -19,10 +19,10 @@ * 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_Sendfriend - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sendfriend/etc/system.xml b/app/code/core/Mage/Sendfriend/etc/system.xml index 089e6e7d37..ad0b90082a 100644 --- a/app/code/core/Mage/Sendfriend/etc/system.xml +++ b/app/code/core/Mage/Sendfriend/etc/system.xml @@ -19,10 +19,10 @@ * 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_Sendfriend - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php index b77d56bf68..21e1035936 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Sendfriend - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php index d6c1cdf833..e4fd37f8a7 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Sendfriend - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php b/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php index 076ef09d84..7b0c1e2180 100644 --- a/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php +++ b/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Shipping_Block_Tracking_Ajax extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Shipping/Block/Tracking/Popup.php b/app/code/core/Mage/Shipping/Block/Tracking/Popup.php index 54496c3872..2823a659d4 100644 --- a/app/code/core/Mage/Shipping/Block/Tracking/Popup.php +++ b/app/code/core/Mage/Shipping/Block/Tracking/Popup.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Shipping_Block_Tracking_Popup extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Shipping/Exception.php b/app/code/core/Mage/Shipping/Exception.php index 55e43bb7bf..834c4301e1 100644 --- a/app/code/core/Mage/Shipping/Exception.php +++ b/app/code/core/Mage/Shipping/Exception.php @@ -18,14 +18,14 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Shipping_Exception extends Zend_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Shipping/Helper/Data.php b/app/code/core/Mage/Shipping/Helper/Data.php index e5aaa1e105..099e7799ef 100644 --- a/app/code/core/Mage/Shipping/Helper/Data.php +++ b/app/code/core/Mage/Shipping/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php index d00a18ad6a..4f5242c48b 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php index 078b29ea5f..267fa8b0bd 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php index a3e2467989..b2363964fd 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Interface.php b/app/code/core/Mage/Shipping/Model/Carrier/Interface.php index 73ccd846b7..d67af79d05 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Interface.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Interface.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php b/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php index 50545a405d..d9d9e4f704 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php index fb6b8fa5e6..db40a20663 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Config.php b/app/code/core/Mage/Shipping/Model/Config.php index 86eb003519..06664cd395 100644 --- a/app/code/core/Mage/Shipping/Model/Config.php +++ b/app/code/core/Mage/Shipping/Model/Config.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -104,9 +104,7 @@ protected function _getCarrier($code, $config, $store=null) throw Mage::exception('Mage_Shipping', 'Invalid model for shipping method: '.$code); } $modelName = $config['model']; - if ($modelName == 'usa/shipping_carrier_ups') { - $modelName.= '_test'; - } + /** * Added protection from not existing models usage. * Related with module uninstall process diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php index c1e2a9ff91..a829a6e28c 100644 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php index 3c6bb092dd..8d4f81f48f 100644 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php +++ b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php @@ -1,74 +1,74 @@ - - */ -class Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection extends Varien_Data_Collection_Db -{ - protected $_shipTable; - protected $_countryTable; - protected $_regionTable; - - public function __construct() - { - parent::__construct(Mage::getSingleton('core/resource')->getConnection('shipping_read')); - $this->_shipTable = Mage::getSingleton('core/resource')->getTableName('shipping/tablerate'); - $this->_countryTable = Mage::getSingleton('core/resource')->getTableName('directory/country'); - $this->_regionTable = Mage::getSingleton('core/resource')->getTableName('directory/country_region'); - $this->_select->from(array("s" => $this->_shipTable)) - ->joinLeft(array("c" => $this->_countryTable), 'c.country_id = s.dest_country_id', 'iso3_code AS dest_country') - ->joinLeft(array("r" => $this->_regionTable), 'r.region_id = s.dest_region_id', 'code AS dest_region') - ->order(array("dest_country", "dest_region", "dest_zip")); - $this->_setIdFieldName('pk'); - return $this; - } - - public function setWebsiteFilter($websiteId) - { - $this->_select->where("website_id = ?", $websiteId); - - return $this; - } - - public function setConditionFilter($conditionName) - { - $this->_select->where("condition_name = ?", $conditionName); - - return $this; - } - - public function setCountryFilter($countryId) - { - $this->_select->where("dest_country_id = ?", $countryId); - - return $this; - } -} \ No newline at end of file + + */ +class Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection extends Varien_Data_Collection_Db +{ + protected $_shipTable; + protected $_countryTable; + protected $_regionTable; + + public function __construct() + { + parent::__construct(Mage::getSingleton('core/resource')->getConnection('shipping_read')); + $this->_shipTable = Mage::getSingleton('core/resource')->getTableName('shipping/tablerate'); + $this->_countryTable = Mage::getSingleton('core/resource')->getTableName('directory/country'); + $this->_regionTable = Mage::getSingleton('core/resource')->getTableName('directory/country_region'); + $this->_select->from(array("s" => $this->_shipTable)) + ->joinLeft(array("c" => $this->_countryTable), 'c.country_id = s.dest_country_id', 'iso3_code AS dest_country') + ->joinLeft(array("r" => $this->_regionTable), 'r.region_id = s.dest_region_id', 'code AS dest_region') + ->order(array("dest_country", "dest_region", "dest_zip")); + $this->_setIdFieldName('pk'); + return $this; + } + + public function setWebsiteFilter($websiteId) + { + $this->_select->where("website_id = ?", $websiteId); + + return $this; + } + + public function setConditionFilter($conditionName) + { + $this->_select->where("condition_name = ?", $conditionName); + + return $this; + } + + public function setCountryFilter($countryId) + { + $this->_select->where("dest_country_id = ?", $countryId); + + return $this; + } +} diff --git a/app/code/core/Mage/Shipping/Model/Rate/Abstract.php b/app/code/core/Mage/Shipping/Model/Rate/Abstract.php index 962ad9a5e2..909873c4b0 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Abstract.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Request.php b/app/code/core/Mage/Shipping/Model/Rate/Request.php index 3b90a0654e..124fc52940 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Request.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Request.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result.php b/app/code/core/Mage/Shipping/Model/Rate/Result.php index 34f88b0568..a704f18ede 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result.php @@ -18,44 +18,44 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Shipping_Model_Rate_Result { - protected $_rates = array(); - protected $_error = null; + protected $_rates = array(); + protected $_error = null; - /** - * Reset result - */ - public function reset() - { - $this->_rates = array(); - return $this; - } + /** + * Reset result + */ + public function reset() + { + $this->_rates = array(); + return $this; + } - public function setError($error) - { - $this->_error = $error; - } + public function setError($error) + { + $this->_error = $error; + } - public function getError() - { - return $this->_error; - } + public function getError() + { + return $this->_error; + } - /** - * Add a rate to the result - * - * @param Mage_Shipping_Model_Rate_Result_Abstract|Mage_Shipping_Model_Rate_Result $result - */ - public function append($result) - { + /** + * Add a rate to the result + * + * @param Mage_Shipping_Model_Rate_Result_Abstract|Mage_Shipping_Model_Rate_Result $result + */ + public function append($result) + { if ($result instanceof Mage_Shipping_Model_Rate_Result_Abstract) { $this->_rates[] = $result; } @@ -68,40 +68,40 @@ public function append($result) return $this; } - /** - * Return all quotes in the result - */ - public function getAllRates() - { - return $this->_rates; - } + /** + * Return all quotes in the result + */ + public function getAllRates() + { + return $this->_rates; + } - /** - * Return rate by id in array - */ - public function getRateById($id) - { - return isset($this->_rates[$id]) ? $this->_rates[$id] : null; - } + /** + * Return rate by id in array + */ + public function getRateById($id) + { + return isset($this->_rates[$id]) ? $this->_rates[$id] : null; + } - /** - * Return quotes for specified type - * - * @param string $type - */ - public function getRatesByCarrier($carrier) - { - $result = array(); - foreach ($this->_rates as $rate) { - if ($rate->getCarrier()===$carrier) { - $result[] = $rate; - } - } - return $result; - } + /** + * Return quotes for specified type + * + * @param string $type + */ + public function getRatesByCarrier($carrier) + { + $result = array(); + foreach ($this->_rates as $rate) { + if ($rate->getCarrier()===$carrier) { + $result[] = $rate; + } + } + return $result; + } - public function asArray() - { + public function asArray() + { $currencyFilter = Mage::app()->getStore()->getPriceFilter(); $rates = array(); $allRates = $this->getAllRates(); @@ -114,44 +114,44 @@ public function asArray() ); } return $rates; - } + } - public function getCheapestRate() - { - $cheapest = null; - $minPrice = 100000; - foreach ($this->getAllRates() as $rate) { - if (is_numeric($rate->getPrice()) && $rate->getPrice()<$minPrice) { - $cheapest = $rate; - $minPrice = $rate->getPrice(); - } - } - return $cheapest; - } + public function getCheapestRate() + { + $cheapest = null; + $minPrice = 100000; + foreach ($this->getAllRates() as $rate) { + if (is_numeric($rate->getPrice()) && $rate->getPrice()<$minPrice) { + $cheapest = $rate; + $minPrice = $rate->getPrice(); + } + } + return $cheapest; + } - /** - * Sort rates by price from min to max - * - * @return Mage_Shipping_Model_Rate_Result - */ - public function sortRatesByPrice () - { - if (!is_array($this->_rates) || !count($this->_rates)) { - return $this; - } - /* @var $rate Mage_Shipping_Model_Rate_Result_Method */ - foreach ($this->_rates as $i => $rate) { - $tmp[$i] = $rate->getPrice(); - } + /** + * Sort rates by price from min to max + * + * @return Mage_Shipping_Model_Rate_Result + */ + public function sortRatesByPrice () + { + if (!is_array($this->_rates) || !count($this->_rates)) { + return $this; + } + /* @var $rate Mage_Shipping_Model_Rate_Result_Method */ + foreach ($this->_rates as $i => $rate) { + $tmp[$i] = $rate->getPrice(); + } - natsort($tmp); + natsort($tmp); - foreach ($tmp as $i => $price) { - $result[] = $this->_rates[$i]; - } + foreach ($tmp as $i => $price) { + $result[] = $this->_rates[$i]; + } - $this->reset(); - $this->_rates = $result; - return $this; - } + $this->reset(); + $this->_rates = $result; + return $this; + } } diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php index ca63261552..dc616f6ab3 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php index 72a51ebc9d..76398b5097 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,4 +35,4 @@ public function getErrorMessage() } return $this->getData('error_message'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php index 1937f2494f..6dfe6ea4f2 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rule/Abstract.php b/app/code/core/Mage/Shipping/Model/Rule/Abstract.php index 9453f75cbd..f164959932 100644 --- a/app/code/core/Mage/Shipping/Model/Rule/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Rule/Abstract.php @@ -1,31 +1,31 @@ - Mage_Shipping_Model_Carrier_Abstract::HANDLING_ACTION_PERPACKAGE , 'label' => Mage::helper('shipping')->__('Per Package')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Shipping/Model/Source/HandlingType.php b/app/code/core/Mage/Shipping/Model/Source/HandlingType.php index 22166133f4..077f4ef78e 100644 --- a/app/code/core/Mage/Shipping/Model/Source/HandlingType.php +++ b/app/code/core/Mage/Shipping/Model/Source/HandlingType.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Shipping_Model_Source_HandlingType { @@ -32,4 +32,4 @@ public function toOptionArray() array('value' => Mage_Shipping_Model_Carrier_Abstract::HANDLING_TYPE_PERCENT, 'label' => Mage::helper('shipping')->__('Percent')), ); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result.php b/app/code/core/Mage/Shipping/Model/Tracking/Result.php index 915873c568..c61cc92e5e 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result.php @@ -18,58 +18,58 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Shipping_Model_Tracking_Result { - protected $_trackings = array(); - protected $_error = null; + protected $_trackings = array(); + protected $_error = null; - /** - * Reset tracking - */ - public function reset() - { - $this->_trackings = array(); - return $this; - } + /** + * Reset tracking + */ + public function reset() + { + $this->_trackings = array(); + return $this; + } - public function setError($error) - { - $this->_error = $error; - } + public function setError($error) + { + $this->_error = $error; + } - public function getError() - { - return $this->_error; - } - /** - * Add a tracking to the result - */ - public function append($result) - { - if ($result instanceof Mage_Shipping_Model_Tracking_Result_Abstract) { - $this->_trackings[] = $result; - } elseif ($result instanceof Mage_Shipping_Model_Rate_Result) { - $trackings = $result->getAllTrackings(); - foreach ($trackings as $track) { - $this->append($track); - } - } - return $this; - } + public function getError() + { + return $this->_error; + } + /** + * Add a tracking to the result + */ + public function append($result) + { + if ($result instanceof Mage_Shipping_Model_Tracking_Result_Abstract) { + $this->_trackings[] = $result; + } elseif ($result instanceof Mage_Shipping_Model_Rate_Result) { + $trackings = $result->getAllTrackings(); + foreach ($trackings as $track) { + $this->append($track); + } + } + return $this; + } - /** - * Return all trackings in the result - */ - public function getAllTrackings() - { - return $this->_trackings; - } + /** + * Return all trackings in the result + */ + public function getAllTrackings() + { + return $this->_trackings; + } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php index aff6183c0b..ed99932ba6 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php index 89369fa29e..76b726cfbb 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,11 +29,11 @@ class Mage_Shipping_Model_Tracking_Result_Error extends Mage_Shipping_Model_Trac { public function getAllData() { - return $this->_data; - } + return $this->_data; + } - public function getErrorMessage() - { - return Mage::helper('shipping')->__('Tracking information is currently unavailable.'); - } -} \ No newline at end of file + public function getErrorMessage() + { + return Mage::helper('shipping')->__('Tracking information is currently unavailable.'); + } +} diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php index 93e7de819d..88ec0b0d95 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +48,7 @@ */ class Mage_Shipping_Model_Tracking_Result_Status extends Mage_Shipping_Model_Tracking_Result_Abstract { - public function getAllData(){ - return $this->_data; - } + public function getAllData(){ + return $this->_data; + } } diff --git a/app/code/core/Mage/Shipping/controllers/ShippingController.php b/app/code/core/Mage/Shipping/controllers/ShippingController.php index 12629c9cbe..9fdec90ba2 100644 --- a/app/code/core/Mage/Shipping/controllers/ShippingController.php +++ b/app/code/core/Mage/Shipping/controllers/ShippingController.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Shipping/controllers/TrackingController.php b/app/code/core/Mage/Shipping/controllers/TrackingController.php index 28333f6125..1fc9e13c75 100644 --- a/app/code/core/Mage/Shipping/controllers/TrackingController.php +++ b/app/code/core/Mage/Shipping/controllers/TrackingController.php @@ -18,10 +18,10 @@ * 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_Sales - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Shipping/etc/config.xml b/app/code/core/Mage/Shipping/etc/config.xml index ea8b04369d..57d736464a 100644 --- a/app/code/core/Mage/Shipping/etc/config.xml +++ b/app/code/core/Mage/Shipping/etc/config.xml @@ -19,10 +19,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/etc/system.xml b/app/code/core/Mage/Shipping/etc/system.xml index 655880ee4f..69843c564c 100644 --- a/app/code/core/Mage/Shipping/etc/system.xml +++ b/app/code/core/Mage/Shipping/etc/system.xml @@ -19,10 +19,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php index 5323196987..4cc4b7f986 100644 --- a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Shipping - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sitemap/Helper/Data.php b/app/code/core/Mage/Sitemap/Helper/Data.php index b054cee3ca..163c68d15f 100644 --- a/app/code/core/Mage/Sitemap/Helper/Data.php +++ b/app/code/core/Mage/Sitemap/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php index f30ba493a8..b68ae5d1f4 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -116,10 +116,10 @@ public function getCollection($storeId) protected function _prepareCategory(array $categoryRow) { $category = new Varien_Object(); - $category->setId($categoryRow[$this->getIdFieldName()]); - $categoryUrl = !empty($categoryRow['url']) ? $categoryRow['url'] : 'catalog/category/view/id/' . $category->getId(); - $category->setUrl($categoryUrl); - return $category; + $category->setId($categoryRow[$this->getIdFieldName()]); + $categoryUrl = !empty($categoryRow['url']) ? $categoryRow['url'] : 'catalog/category/view/id/' . $category->getId(); + $category->setUrl($categoryUrl); + return $category; } /** @@ -190,4 +190,4 @@ protected function _addFilter($storeId, $attributeCode, $value, $type = '=') return $this->_select; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php index 7346f5f57a..29e4ddaeab 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -189,4 +189,4 @@ protected function _prepareProduct(array $productRow) $product->setUrl($productUrl); return $product; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php index 73120fbd42..f35c5ae92f 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -86,4 +86,4 @@ protected function _prepareObject(array $data) return $object; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php index 22581c805b..5751c5e7f8 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php index 65576b6a81..1b53d15a54 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Observer.php b/app/code/core/Mage/Sitemap/Model/Observer.php index 737822acea..f5da0e8c3d 100644 --- a/app/code/core/Mage/Sitemap/Model/Observer.php +++ b/app/code/core/Mage/Sitemap/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -106,4 +106,4 @@ public function scheduledGenerateSitemaps($schedule) $translate->setTranslateInline(true); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php index 1e1f2207b4..b1702332c5 100644 --- a/app/code/core/Mage/Sitemap/Model/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Sitemap.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/etc/config.xml b/app/code/core/Mage/Sitemap/etc/config.xml index e8ff985a66..98e84ad470 100644 --- a/app/code/core/Mage/Sitemap/etc/config.xml +++ b/app/code/core/Mage/Sitemap/etc/config.xml @@ -19,10 +19,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -105,4 +105,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Sitemap/etc/system.xml b/app/code/core/Mage/Sitemap/etc/system.xml index 646b40f44f..8b320cf302 100644 --- a/app/code/core/Mage/Sitemap/etc/system.xml +++ b/app/code/core/Mage/Sitemap/etc/system.xml @@ -19,10 +19,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -189,4 +189,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php index 53559fb807..ab88a499d7 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php index a9da553f26..ed9e45531d 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php index 28d24cbfda..629255ff74 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,11 +18,11 @@ * 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_Sitemap - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; -/* @var $installer Mage_Core_Model_Resource_Setup */ \ No newline at end of file +/* @var $installer Mage_Core_Model_Resource_Setup */ diff --git a/app/code/core/Mage/Tag/Block/All.php b/app/code/core/Mage/Tag/Block/All.php index 685b26d8f9..8c21892e5e 100644 --- a/app/code/core/Mage/Tag/Block/All.php +++ b/app/code/core/Mage/Tag/Block/All.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,9 +58,6 @@ protected function _loadTags() $range = $this->_maxPopularity - $this->_minPopularity; $range = ( $range == 0 ) ? 1 : $range; foreach ($tags as $tag) { - if( !$tag->getPopularity() ) { - continue; - } $tag->setRatio(($tag->getPopularity()-$this->_minPopularity)/$range); $this->_tags[$tag->getName()] = $tag; } diff --git a/app/code/core/Mage/Tag/Block/Customer/Edit.php b/app/code/core/Mage/Tag/Block/Customer/Edit.php index 78e6c542c7..a332ef3d44 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Edit.php +++ b/app/code/core/Mage/Tag/Block/Customer/Edit.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function getBackUrl() { return $this->getUrl('*/*/view', array('tagId' => $this->getTag()->getTagId())); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/Block/Customer/Recent.php b/app/code/core/Mage/Tag/Block/Customer/Recent.php index 5b417cc8e2..d32c31adcb 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Recent.php +++ b/app/code/core/Mage/Tag/Block/Customer/Recent.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -87,4 +87,4 @@ protected function _toHtml() return ''; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/Block/Customer/Tags.php b/app/code/core/Mage/Tag/Block/Customer/Tags.php index 01fa76fbb1..0d9328ca78 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Tags.php +++ b/app/code/core/Mage/Tag/Block/Customer/Tags.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -85,4 +85,4 @@ public function getMinPopularity() { return $this->_minPopularity; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/Block/Customer/View.php b/app/code/core/Mage/Tag/Block/Customer/View.php index a35b5cbfd9..f5e4c8f1c6 100644 --- a/app/code/core/Mage/Tag/Block/Customer/View.php +++ b/app/code/core/Mage/Tag/Block/Customer/View.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Popular.php b/app/code/core/Mage/Tag/Block/Popular.php index 71d6df9e55..b38affbee3 100644 --- a/app/code/core/Mage/Tag/Block/Popular.php +++ b/app/code/core/Mage/Tag/Block/Popular.php @@ -1,97 +1,94 @@ - - */ - -class Mage_Tag_Block_Popular extends Mage_Core_Block_Template -{ - - protected $_tags; - protected $_minPopularity; - protected $_maxPopularity; - - protected function _loadTags() - { - if (empty($this->_tags)) { - $this->_tags = array(); - - $tags = Mage::getModel('tag/tag')->getPopularCollection() - ->joinFields(Mage::app()->getStore()->getId()) - ->limit(20) - ->load() - ->getItems(); - - if( count($tags) == 0 ) { - return $this; - } - - - $this->_maxPopularity = reset($tags)->getPopularity(); - $this->_minPopularity = end($tags)->getPopularity(); - $range = $this->_maxPopularity - $this->_minPopularity; - $range = ( $range == 0 ) ? 1 : $range; - foreach ($tags as $tag) { - if( !$tag->getPopularity() ) { - continue; - } - $tag->setRatio(($tag->getPopularity()-$this->_minPopularity)/$range); - $this->_tags[$tag->getName()] = $tag; - } - ksort($this->_tags); - } - return $this; - } - - public function getTags() - { - $this->_loadTags(); - return $this->_tags; - } - - public function getMaxPopularity() - { - return $this->_maxPopularity; - } - - public function getMinPopularity() - { - return $this->_minPopularity; - } - - protected function _toHtml() - { - if (count($this->getTags()) > 0) { - return parent::_toHtml(); - } - return ''; - } -} \ No newline at end of file + + */ + +class Mage_Tag_Block_Popular extends Mage_Core_Block_Template +{ + + protected $_tags; + protected $_minPopularity; + protected $_maxPopularity; + + protected function _loadTags() + { + if (empty($this->_tags)) { + $this->_tags = array(); + + $tags = Mage::getModel('tag/tag')->getPopularCollection() + ->joinFields(Mage::app()->getStore()->getId()) + ->limit(20) + ->load() + ->getItems(); + + if( count($tags) == 0 ) { + return $this; + } + + + $this->_maxPopularity = reset($tags)->getPopularity(); + $this->_minPopularity = end($tags)->getPopularity(); + $range = $this->_maxPopularity - $this->_minPopularity; + $range = ($range == 0) ? 1 : $range; + foreach ($tags as $tag) { + $tag->setRatio(($tag->getPopularity()-$this->_minPopularity)/$range); + $this->_tags[$tag->getName()] = $tag; + } + ksort($this->_tags); + } + return $this; + } + + public function getTags() + { + $this->_loadTags(); + return $this->_tags; + } + + public function getMaxPopularity() + { + return $this->_maxPopularity; + } + + public function getMinPopularity() + { + return $this->_minPopularity; + } + + protected function _toHtml() + { + if (count($this->getTags()) > 0) { + return parent::_toHtml(); + } + return ''; + } +} diff --git a/app/code/core/Mage/Tag/Block/Product/List.php b/app/code/core/Mage/Tag/Block/Product/List.php index e8e9e6f334..b0f411fff0 100644 --- a/app/code/core/Mage/Tag/Block/Product/List.php +++ b/app/code/core/Mage/Tag/Block/Product/List.php @@ -18,15 +18,15 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Tag_Block_Product_List extends Mage_Core_Block_Template { - protected $_collection; + protected $_collection; public function getCount() { @@ -52,11 +52,12 @@ protected function _getCollection() $model = Mage::getModel('tag/tag'); $this->_collection = $model->getResourceCollection() - ->addPopularity(null, Mage::app()->getStore()->getId()) + ->addPopularity() ->addStatusFilter($model->getApprovedStatus()) ->addProductFilter($this->getProductId()) ->addStoreFilter(Mage::app()->getStore()->getId()) ->setActiveFilter() + ->setFlag('relation', true) ->load(); } return $this->_collection; @@ -78,4 +79,4 @@ public function getFormAction() Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => Mage::helper('core/url')->getEncodedUrl() )); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/Block/Product/Result.php b/app/code/core/Mage/Tag/Block/Product/Result.php index c1a8275268..6279f8b115 100644 --- a/app/code/core/Mage/Tag/Block/Product/Result.php +++ b/app/code/core/Mage/Tag/Block/Product/Result.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -83,7 +83,7 @@ protected function _getProductCollection() $this->_productCollection = $tagModel->getEntityCollection() ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes()) ->addTagFilter($this->getTag()->getId()) - ->addStoreFilter() + ->addStoreFilter(Mage::app()->getStore()->getId()) ->addMinimalPrice() ->addUrlRewrite() ->setActiveFilter(); diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php index bc7cddd94e..a974f41406 100644 --- a/app/code/core/Mage/Tag/Helper/Data.php +++ b/app/code/core/Mage/Tag/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php index 7caa83a203..fa2cfde013 100644 --- a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -109,4 +109,4 @@ protected function _loadTags($printQuery = false, $logQuery = false) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php index 7062039883..7645b80cd4 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php index 2fd1344230..8306fc12b3 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php @@ -1,82 +1,84 @@ - - */ - -class Mage_Tag_Model_Mysql4_Popular_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract -{ - - protected function _construct() - { - $this->_init('tag/tag'); - } - - /** - * Replacing popularity by sum of popularity and base_popularity - * - * @param int $storeId - * @return Mage_Tag_Model_Mysql4_Popular_Collection - */ - public function joinFields($storeId = 0) - { - $this->getSelect() - ->reset() - ->from( - array('main_table' => $this->getTable('tag/summary')), - array( - 'tag_id', - 'popularity' => '(main_table.popularity + main_table.base_popularity)' - ) - ) - ->join( - array('tag' => $this->getTable('tag/tag')), - 'tag.tag_id = main_table.tag_id AND tag.status = '.Mage_Tag_Model_Tag::STATUS_APPROVED) - ->where('main_table.store_id = ?', $storeId) - ->order('popularity desc'); - return $this; - } - - public function load($printQuery = false, $logQuery = false) - { - if ($this->isLoaded()) { - return $this; - } - parent::load($printQuery, $logQuery); - return $this; - } - - public function limit($limit) - { - $this->getSelect()->limit($limit); - return $this; - } -} \ No newline at end of file + + */ + +class Mage_Tag_Model_Mysql4_Popular_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract +{ + + protected function _construct() + { + $this->_init('tag/tag'); + } + + /** + * Replacing popularity by sum of popularity and base_popularity + * + * @param int $storeId + * @return Mage_Tag_Model_Mysql4_Popular_Collection + */ + public function joinFields($storeId = 0) + { + $this->getSelect() + ->reset() + ->from( + array('tag_summary' => $this->getTable('tag/summary')), + array( + 'tag_id', + 'popularity' => '(tag_summary.popularity + tag_summary.base_popularity)' + ) + ) + ->joinInner( + array('tag' => $this->getTable('tag/tag')), + 'tag.tag_id = tag_summary.tag_id AND tag.status = '.Mage_Tag_Model_Tag::STATUS_APPROVED + ) + ->where('tag_summary.store_id = ?', $storeId) + ->where('tag_summary.products > 0') + ->order('popularity desc'); + return $this; + } + + public function load($printQuery = false, $logQuery = false) + { + if ($this->isLoaded()) { + return $this; + } + parent::load($printQuery, $logQuery); + return $this; + } + + public function limit($limit) + { + $this->getSelect()->limit($limit); + return $this; + } +} diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php index cf7e9413c1..e2c8873e9f 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php index 2bab2bf8da..1be9d1ce55 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -144,7 +144,6 @@ protected function _getAggregationPerStoreView($tagId) ) ->where('main.tag_id = ?', $tagId) ->where('main.active') - ->where('main.customer_id IS NOT NULL') ->group('main.store_id'); $selectLocalResult = $this->_getWriteAdapter()->fetchAll($selectLocal); @@ -164,7 +163,6 @@ protected function _getAggregationPerStoreView($tagId) array() ) ->group('main.store_id') - ->where('main.customer_id IS NOT NULL') ->where('main.tag_id = ?', $tagId); $selectHistoricalResult = $this->_getWriteAdapter()->fetchAll($selectHistorical); @@ -209,7 +207,6 @@ protected function _getGlobalAggregation($tagId) array() ) ->where('main.tag_id = ?', $tagId) - ->where('main.customer_id IS NOT NULL') ->where('main.active'); $result = $this->_getWriteAdapter()->fetchRow($selectGlobal); if (!$result) { @@ -230,8 +227,7 @@ protected function _getGlobalAggregation($tagId) 'product_website.website_id=store.website_id AND product_website.product_id=main.product_id', array() ) - ->where('main.tag_id = ?', $tagId) - ->where('main.customer_id IS NOT NULL'); + ->where('main.tag_id = ?', $tagId); $result['historical_uses'] = (int)$this->_getWriteAdapter()->fetchOne($selectHistoricalGlobal); return $result; @@ -247,7 +243,7 @@ protected function _getGlobalAggregation($tagId) public function aggregate($object) { $tagId = (int)$object->getId(); - $storeId = (int)$object->getStoreId(); + $storeId = (int)$object->getStore(); // create final summary from existing data and add specified base popularity $finalSummary = $this->_getExistingBasePopularity($tagId); diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php index dc426bf605..575db8fa56 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -132,7 +132,7 @@ public function addPopularity($limit = null) ) ->group('main_table.tag_id'); - if (! is_null($limit)) { + if (!is_null($limit)) { $this->getSelect()->limit($limit); } @@ -235,26 +235,31 @@ public function getSelectCountSql() return $sql; } + /** + * Add filter by store + * + * @param array | int $storeId + * @param bool $allFilter + * @return Mage_Tag_Model_Mysql4_Tag_Collection + */ public function addStoreFilter($storeId, $allFilter = true) { if (!$this->getFlag('store_filter')) { - if (!is_array($storeId)) { - $storeId = array($storeId); - } - $this->getSelect()->join(array( - 'summary_store'=>$this->getTable('summary')), - 'main_table.tag_id = summary_store.tag_id - AND summary_store.store_id IN (' . implode(',', $storeId) . ')', - array()); + + $this->getSelect()->join( + array('summary_store'=>$this->getTable('summary')), + 'main_table.tag_id = summary_store.tag_id' . $this->getConnection()->quoteInto( + ' AND summary.store_id IN (?)', $storeId + ) + ); $this->getSelect()->group('summary_store.tag_id'); if($this->getFlag('relation') && $allFilter) { - $this->getSelect()->where('relation.store_id IN (' . implode(',', $storeId) . ')'); + $this->getSelect()->where('relation.store_id IN (?)', $storeId); } - if($this->getFlag('prelation') && $allFilter) { - $this->getSelect()->where('prelation.store_id IN (' . implode(',', $storeId) . ')'); + $this->getSelect()->where('prelation.store_id IN (?)', $storeId); } $this->setFlag('store_filter', true); diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php index 8d89f666c4..8fe5b13c6f 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tag/Model/Session.php b/app/code/core/Mage/Tag/Model/Session.php index 78a492ea49..240d0a0cde 100644 --- a/app/code/core/Mage/Tag/Model/Session.php +++ b/app/code/core/Mage/Tag/Model/Session.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,4 +37,4 @@ public function __construct() { $this->init('tag'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php index 47e8ab8c85..a45c461303 100644 --- a/app/code/core/Mage/Tag/Model/Tag.php +++ b/app/code/core/Mage/Tag/Model/Tag.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -163,9 +163,21 @@ public function getRelatedProductIds() ->getProductIds(); } + /** + * Checks is available current tag in specified store + * + * @param int $storeId + * @return bool + */ + public function isAvailableInStore($storeId = null) + { + $storeId = (is_null($storeId)) ? Mage::app()->getStore()->getId() : $storeId; + return in_array($storeId, $this->getVisibleInStoreIds()); + } + protected function _beforeDelete() { $this->_protectFromNonAdmin(); return parent::_beforeDelete(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/Model/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Tag/Relation.php index 192d16e564..f1afcdcfac 100644 --- a/app/code/core/Mage/Tag/Model/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Tag/Relation.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/controllers/CustomerController.php b/app/code/core/Mage/Tag/controllers/CustomerController.php index ced84adf2d..57fab10801 100644 --- a/app/code/core/Mage/Tag/controllers/CustomerController.php +++ b/app/code/core/Mage/Tag/controllers/CustomerController.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tag/controllers/IndexController.php b/app/code/core/Mage/Tag/controllers/IndexController.php index 37f19d209d..915f9a052f 100644 --- a/app/code/core/Mage/Tag/controllers/IndexController.php +++ b/app/code/core/Mage/Tag/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,7 +51,6 @@ public function saveAction() } else { try { $customerId = Mage::getSingleton('customer/session')->getCustomerId(); - $tagName = urldecode($tagName); $tagNamesArr = explode("\n", preg_replace("/(\'(.*?)\')|(\s+)/i", "$1\n", $tagName)); foreach( $tagNamesArr as $key => $tagName ) { diff --git a/app/code/core/Mage/Tag/controllers/ListController.php b/app/code/core/Mage/Tag/controllers/ListController.php index 71975d2c1b..0b45ad8e27 100644 --- a/app/code/core/Mage/Tag/controllers/ListController.php +++ b/app/code/core/Mage/Tag/controllers/ListController.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,4 +39,4 @@ public function indexAction() $this->loadLayout(); $this->renderLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/controllers/ProductController.php b/app/code/core/Mage/Tag/controllers/ProductController.php index 51dbe57431..5391be7fd0 100644 --- a/app/code/core/Mage/Tag/controllers/ProductController.php +++ b/app/code/core/Mage/Tag/controllers/ProductController.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -39,8 +39,8 @@ public function listAction() $tagId = $this->getRequest()->getParam('tagId'); $tag = Mage::getModel('tag/tag')->load($tagId); - if(!$tag->getId()) { - $this->_redirectReferer(); + if(!$tag->getId() || !$tag->isAvailableInStore()) { + $this->_forward('404'); return; } Mage::register('current_tag', $tag); @@ -50,4 +50,4 @@ public function listAction() $this->_initLayoutMessages('tag/session'); $this->renderLayout(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tag/etc/config.xml b/app/code/core/Mage/Tag/etc/config.xml index 841aee1ac4..27624b8e73 100644 --- a/app/code/core/Mage/Tag/etc/config.xml +++ b/app/code/core/Mage/Tag/etc/config.xml @@ -19,10 +19,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php index 65a414baa2..3f1227268a 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php index 0775c545ea..5ba3b79b50 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Tag - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,4 +44,4 @@ ON UPDATE CASCADE ON DELETE CASCADE; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php index 3adfe36376..683230f2e3 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Core - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php index 07efcb2dcd..8c22f51949 100644 --- a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Tax_Block_Adminhtml_Frontend_Region_Updater diff --git a/app/code/core/Mage/Tax/Exception.php b/app/code/core/Mage/Tax/Exception.php index 86ec0ad865..cef46c18d8 100644 --- a/app/code/core/Mage/Tax/Exception.php +++ b/app/code/core/Mage/Tax/Exception.php @@ -18,14 +18,14 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Tax_Exception extends Mage_Core_Exception { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php index 9b09cecf54..e3b7042744 100644 --- a/app/code/core/Mage/Tax/Helper/Data.php +++ b/app/code/core/Mage/Tax/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -112,7 +112,7 @@ public function getProductPrice($product, $format=null) catch (Exception $e){ $value = $e->getMessage(); } - return $value; + return $value; } /** @@ -381,9 +381,12 @@ public function getTaxRatesByProductClass() */ public function getPrice($product, $price, $includingTax = null, $shippingAddress = null, $billingAddress = null, $ctc = null, $store = null, $priceIncludesTax = null) { + if (!$price) { + return $price; + } $store = Mage::app()->getStore($store); if (!$this->needPriceConversion($store)) { - return $store->roundPrice($price); + return $store->roundPrice($price); } if (is_null($priceIncludesTax)) { $priceIncludesTax = $this->priceIncludesTax($store); @@ -420,8 +423,13 @@ public function getPrice($product, $price, $includingTax = null, $shippingAddres */ if ($includingPercent != $percent) { $price = $this->_calculatePrice($price, $includingPercent, false); - $price = $this->getCalculator()->roundUp($price); - $price = $this->_calculatePrice($price, $percent, true); + /** + * Round up price excluding tax if customer tax rate !=0 + */ + if ($percent != 0) { + $price = $this->getCalculator()->roundUp($price); + $price = $this->_calculatePrice($price, $percent, true); + } } } else { $price = $this->_calculatePrice($price, $includingPercent, false); diff --git a/app/code/core/Mage/Tax/Model/Calculation.php b/app/code/core/Mage/Tax/Model/Calculation.php index c2d78d735a..2d39d3dbb3 100644 --- a/app/code/core/Mage/Tax/Model/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Calculation.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -171,7 +171,7 @@ protected function _formCalculationProcess() /** * Get calculation tax rate by specific request - * + * * @param Varien_Object $request * @return float */ @@ -256,7 +256,7 @@ public function getRateRequest($shippingAddress = null, $billingAddress = null, $address = new Varien_Object(); $customer = $this->getCustomer(); $basedOn = Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_BASED_ON, $store); - + if (($shippingAddress === false && $basedOn == 'shipping') || ($billingAddress === false && $basedOn == 'billing')) { $basedOn = 'default'; @@ -302,7 +302,7 @@ public function getRateRequest($shippingAddress = null, $billingAddress = null, } elseif (($customerTaxClass === false) || !$customer) { $customerTaxClass = $this->getDefaultCustomerTaxClass($store); } - + $request = new Varien_Object(); $request ->setCountryId($address->getCountryId()) @@ -393,7 +393,7 @@ public function getRatesByCustomerAndProductTaxClasses($customerTaxClass, $produ * $taxRate can't be more than 1 (if it is not percent) * * @param float $price - * @param float $taxRate + * @param float $taxRate * @param boolean $priceIncludeTax * @return float */ @@ -411,7 +411,7 @@ public function calcTaxAmount($price, $taxRate, $priceIncludeTax=false, $round=t } else { $amount = $price*$taxRate; } - + if ($round) { return $this->round($amount); } else { @@ -454,4 +454,4 @@ public function roundUp($price) { return ceil($price*100)/100; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Calculation/Rate.php index d9c9d0189b..c916d9db7f 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rate.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rate.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -136,9 +136,9 @@ public function getTitles() public function deleteAllRates() { - $this->_getResource()->deleteAllRates(); - Mage::dispatchEvent('tax_settings_change_after'); - return $this; + $this->_getResource()->deleteAllRates(); + Mage::dispatchEvent('tax_settings_change_after'); + return $this; } /** diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php index 6b507eeac9..05388c8c1b 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,4 +42,4 @@ public function deleteByRateId($rateId) $this->getResource()->deleteByRateId($rateId); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Calculation/Rule.php index c25febedf8..e3768dd75a 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rule.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rule.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -119,4 +119,4 @@ public function getProductTaxClasses() { return $this->getCalculationModel()->getProductTaxClasses($this->getId()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Class.php b/app/code/core/Mage/Tax/Model/Class.php index cdc810d138..260009c047 100644 --- a/app/code/core/Mage/Tax/Model/Class.php +++ b/app/code/core/Mage/Tax/Model/Class.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -79,4 +79,4 @@ public function _construct() // { // return $this->getResource()->itemExists($this); // } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php index dc608a9d0e..0b7371de4c 100644 --- a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php +++ b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php @@ -18,27 +18,27 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Tax_Model_Class_Source_Customer extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { - public function getAllOptions() - { - if (!$this->_options) { - $this->_options = Mage::getResourceModel('tax/class_collection') - ->addFieldToFilter('class_type', 'CUSTOMER') - ->load()->toOptionArray(); - } - return $this->_options; - } - - public function toOptionArray() - { - return $this->getAllOptions(); - } -} \ No newline at end of file + public function getAllOptions() + { + if (!$this->_options) { + $this->_options = Mage::getResourceModel('tax/class_collection') + ->addFieldToFilter('class_type', 'CUSTOMER') + ->load()->toOptionArray(); + } + return $this->_options; + } + + public function toOptionArray() + { + return $this->getAllOptions(); + } +} diff --git a/app/code/core/Mage/Tax/Model/Class/Source/Product.php b/app/code/core/Mage/Tax/Model/Class/Source/Product.php index d0795e4162..3604339def 100644 --- a/app/code/core/Mage/Tax/Model/Class/Source/Product.php +++ b/app/code/core/Mage/Tax/Model/Class/Source/Product.php @@ -18,33 +18,33 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Tax_Model_Class_Source_Product extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { - public function getAllOptions($withEmpty = false) - { - if (is_null($this->_options)) { - $this->_options = Mage::getResourceModel('tax/class_collection') - ->addFieldToFilter('class_type', 'PRODUCT') - ->load() - ->toOptionArray(); - } + public function getAllOptions($withEmpty = false) + { + if (is_null($this->_options)) { + $this->_options = Mage::getResourceModel('tax/class_collection') + ->addFieldToFilter('class_type', 'PRODUCT') + ->load() + ->toOptionArray(); + } - $options = $this->_options; + $options = $this->_options; array_unshift($options, array('value'=>'0', 'label'=>Mage::helper('tax')->__('None'))); if ($withEmpty) { array_unshift($options, array('value'=>'', 'label'=>Mage::helper('tax')->__('-- Please Select --'))); } return $options; - } + } - /** + /** * Get a text for option value * * @param string|integer $value @@ -62,10 +62,10 @@ public function getOptionText($value) return false; } - public function toOptionArray() - { - return $this->getAllOptions(); - } + public function toOptionArray() + { + return $this->getAllOptions(); + } /** * Get Column(s) names for flat data building @@ -96,4 +96,4 @@ public function getFlatUpdateSelect($store) return Mage::getResourceModel('eav/entity_attribute_option') ->getFlatUpdateSelect($this->getAttribute(), $store, false); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Config.php b/app/code/core/Mage/Tax/Model/Config.php index 71e0f29aa5..5e797851d3 100644 --- a/app/code/core/Mage/Tax/Model/Config.php +++ b/app/code/core/Mage/Tax/Model/Config.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tax/Model/Config/Price/Include.php b/app/code/core/Mage/Tax/Model/Config/Price/Include.php index dba3181d97..9d2facb68c 100644 --- a/app/code/core/Mage/Tax/Model/Config/Price/Include.php +++ b/app/code/core/Mage/Tax/Model/Config/Price/Include.php @@ -1,5 +1,28 @@ cleanCache('checkout_quote'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php index 5f30280be4..f85c5a4a3d 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php index 89bc9edf07..a0ef33e000 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,4 +35,4 @@ protected function _construct() { $this->_init('tax/calculation'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php index 250623371d..36c07229e0 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,4 +56,4 @@ public function deleteAllRates() { $this->_getWriteAdapter()->delete($this->getMainTable()); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php index d950b06012..ef18996d50 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -119,4 +119,4 @@ public function toOptionHash() return $this->_toOptionHash('tax_calculation_rate_id', 'code'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php index 239e969dba..dc909e33cf 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,4 +43,4 @@ public function deleteByRateId($rateId) $where = $conn->quoteInto('tax_calculation_rate_id = ?', $rateId); $conn->delete($this->getMainTable(), $where); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php index 4284c0d4d1..c22455906f 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,4 +42,4 @@ public function loadByRateId($rateId) $this->getSelect()->where('main_table.tax_calculation_rate_id = ?', $rateId); return $this->load(); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php index 42ab02fa8c..5a508046af 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,4 +51,4 @@ protected function _initUniqueFields() )); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php index b98667a6e3..f63b9759db 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -69,10 +69,10 @@ protected function _add($itemTable, $primaryJoinField, $secondaryJoinField, $tit $data = $this->getConnection()->fetchAll($select); foreach ($data as $row) { - $children[$row['tax_calculation_rule_id']][$row[$secondaryJoinField]] = $row[$titleField]; + $children[$row['tax_calculation_rule_id']][$row[$secondaryJoinField]] = $row[$titleField]; } } - + foreach ($this as $rule) { if (isset($children[$rule->getId()])) { $rule->setData($dataField, array_keys($children[$rule->getId()])); @@ -111,4 +111,4 @@ public function setClassTypeFilter($type, $id) $this->addFieldToFilter($field, $id); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class.php b/app/code/core/Mage/Tax/Model/Mysql4/Class.php index 636aaeb83e..f4b4a66550 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Class.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Class.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,4 +52,4 @@ protected function _initUniqueFields() )); return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php index 755f28ab34..56df72babe 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -54,4 +54,4 @@ public function toOptionHash() { return $this->_toOptionHash('class_id', 'class_name'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/Observer.php b/app/code/core/Mage/Tax/Model/Observer.php index 7ba83f9bd3..7affc767f6 100644 --- a/app/code/core/Mage/Tax/Model/Observer.php +++ b/app/code/core/Mage/Tax/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php index 3b47ed7a85..e9c5eb2039 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,4 +43,4 @@ public function toOptionArray($noEmpty=false) return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php index 8afe44142b..5031063f03 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,4 +43,4 @@ public function toOptionArray() } return $this->_options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php index 6aae16cc8c..c6c4540567 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,4 +48,4 @@ public function toOptionArray($noEmpty=false, $country = null) return $options; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml index 948cec90c1..0ce0bb70ea 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -19,10 +19,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/etc/system.xml b/app/code/core/Mage/Tax/etc/system.xml index 6f95c9c35d..7124f8cfc5 100644 --- a/app/code/core/Mage/Tax/etc/system.xml +++ b/app/code/core/Mage/Tax/etc/system.xml @@ -19,10 +19,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php index 4e68afd2bd..a97f40acc3 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php index 3d435348d1..8688901262 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php index f3f44967bc..726f682640 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php index 96eb8e685d..d4551a75ea 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php index 7e4d3c826d..a648ec3088 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php index 07fbcb4c03..1e0b4f4c69 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -18,10 +18,10 @@ * 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_Tax - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php index 40563223ee..6a7ea1523a 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -1,46 +1,46 @@ -startSetup(); - -$customerTaxClassIds = $installer->getConnection()->fetchCol( - "SELECT class_id FROM {$installer->getTable('tax_class')} - WHERE class_type = 'CUSTOMER' - ORDER BY class_id ASC" -); - -if (count($customerTaxClassIds) > 0) { - $installer->run( - "UPDATE {$installer->getTable('customer_group')} - SET tax_class_id = {$customerTaxClassIds[0]} - WHERE tax_class_id NOT IN (".implode(',', $customerTaxClassIds).")" - ); -} - -$installer->endSetup(); \ No newline at end of file +startSetup(); + +$customerTaxClassIds = $installer->getConnection()->fetchCol( + "SELECT class_id FROM {$installer->getTable('tax_class')} + WHERE class_type = 'CUSTOMER' + ORDER BY class_id ASC" +); + +if (count($customerTaxClassIds) > 0) { + $installer->run( + "UPDATE {$installer->getTable('customer_group')} + SET tax_class_id = {$customerTaxClassIds[0]} + WHERE tax_class_id NOT IN (".implode(',', $customerTaxClassIds).")" + ); +} + +$installer->endSetup(); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php index 7e311a2692..53857e5209 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -1,38 +1,38 @@ -startSetup(); -$table = $installer->getTable('tax_rule'); - -$installer->run(" -ALTER TABLE `{$table}` ADD `priority` SMALLINT( 5 ) NOT NULL; -ALTER TABLE `{$table}` ADD INDEX `IDX_PRIORITY` (`priority`); -"); - -$installer->endSetup(); \ No newline at end of file +startSetup(); +$table = $installer->getTable('tax_rule'); + +$installer->run(" +ALTER TABLE `{$table}` ADD `priority` SMALLINT( 5 ) NOT NULL; +ALTER TABLE `{$table}` ADD INDEX `IDX_PRIORITY` (`priority`); +"); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php index 65cf8e1db7..7ecd4063da 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -18,10 +18,10 @@ * 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_Customer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @var $installer Mage_Tax_Model_Mysql4_Setup */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php index 4064046bd0..d7a21120d9 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -1,33 +1,33 @@ -startSetup(); - -$installer->getConnection()->addColumn($installer->getTable('sales_order_tax'), 'hidden', "smallint (5) unsigned not null default 0"); - -$installer->endSetup(); \ No newline at end of file +startSetup(); + +$installer->getConnection()->addColumn($installer->getTable('sales_order_tax'), 'hidden', "smallint (5) unsigned not null default 0"); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Usa/Helper/Data.php b/app/code/core/Mage/Usa/Helper/Data.php index 30b7c3cd86..311fb92621 100644 --- a/app/code/core/Mage/Usa/Helper/Data.php +++ b/app/code/core/Mage/Usa/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,4 +32,4 @@ class Mage_Usa_Helper_Data extends Mage_Core_Helper_Abstract { -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php index 6c073f9e95..4b9f518dbb 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php index d812fb12b4..96b737f33d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php index c71c96ac0e..6d7a080700 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php index 92805b9459..6f5000d443 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ public function toOptionArray() array_unshift($arr, array('value'=>'', 'label'=>Mage::helper('shipping')->__('None'))); return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php index 165fd98f08..6b79d30ffb 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php index 1f5fc26b2e..b6a844c704 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php index 70b8014903..2c6651c4ec 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php index 6aaaad2e59..ccbdfc67e2 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php index d854d5aec9..d46e3a9952 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -480,14 +480,19 @@ protected function _parseXmlResponse($response) return $result; } - public function _parseXml($xmlContent) + /** + * Parse XML string and return XML document object or false + * + * @param string $xmlContent + * @return SimpleXMLElement|bool + */ + protected function _parseXml($xmlContent) { try { try { - $xml = simplexml_load_string($xmlContent); - return $xml; + return simplexml_load_string($xmlContent); } catch (Exception $e) { - throw new Exception('Invalid XML document "' . $xmlContent . '"'); + throw new Exception(Mage::helper('usa')->__('Failed to parse xml document: %s', $xmlContent)); } } catch (Exception $e) { Mage::logException($e); diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php index d8d5af8ca5..658d367fcd 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php index 6a77d912b4..f9062f25dd 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ public function toOptionArray() array_unshift($arr, array('value'=>'', 'label'=>Mage::helper('shipping')->__('None'))); return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php index 1f26cdaaf6..db656df7de 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php index 8f65a8d71b..4fe3ba76e4 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php index 9507eb51e5..2f09b289ec 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php index 4bba8b89eb..3408940a11 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function toOptionArray() } return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php index 49d3314a74..beabc852d9 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function toOptionArray() } return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php index 1b65aba83b..af91bed931 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php index a69ac17e4c..5ba9a400ac 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php index bee05ddfea..f08be74984 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php index 06bf1866b1..3ebabccc7d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,4 +36,4 @@ public function toOptionArray() } return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php index 2b91ebdeea..31a012e5c6 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php index 77954ff77c..4abe6f2de4 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,10 +30,10 @@ class Mage_Usa_Model_Shipping_Carrier_Ups_Source_Unitofmeasure public function toOptionArray() { $unitArr = Mage::getSingleton('usa/shipping_carrier_ups')->getCode('unit_of_measure'); - $returnArr = array(); - foreach ($unitArr as $key => $val){ - $returnArr[] = array('value'=>$key,'label'=>$key); - } - return $returnArr; + $returnArr = array(); + foreach ($unitArr as $key => $val){ + $returnArr[] = array('value'=>$key,'label'=>$key); + } + return $returnArr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php index de9982aa20..ebbfe59d74 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php index 34cb32d1f5..9475375ad5 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php index 235faa650f..562d571798 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,4 +33,4 @@ public function toOptionArray() array_unshift($arr, array('value'=>'', 'label'=>Mage::helper('shipping')->__('None'))); return $arr; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php index 277e938162..c31c8bbd72 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php index 35ef98989e..9ceb7eec10 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php index bb9d51a9cf..59735d467c 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php @@ -18,10 +18,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Tax/Uszip.php b/app/code/core/Mage/Usa/Model/Tax/Uszip.php index e2b9ff97cd..13330626d2 100644 --- a/app/code/core/Mage/Usa/Model/Tax/Uszip.php +++ b/app/code/core/Mage/Usa/Model/Tax/Uszip.php @@ -1,31 +1,31 @@ - diff --git a/app/code/core/Mage/Usa/etc/system.xml b/app/code/core/Mage/Usa/etc/system.xml index 2673165c71..399998ae6c 100644 --- a/app/code/core/Mage/Usa/etc/system.xml +++ b/app/code/core/Mage/Usa/etc/system.xml @@ -19,10 +19,10 @@ * 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_Usa - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -1005,4 +1005,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php index e9aac16914..66273f56c5 100644 --- a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php @@ -1,29 +1,29 @@ -getChildHtml('add_button'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php index 55250f0f82..8e57300bc8 100644 --- a/app/code/core/Mage/Weee/Helper/Data.php +++ b/app/code/core/Mage/Weee/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php index 86e8741813..ba2b843ac5 100644 --- a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * 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_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Weee_Model_Attribute_Backend_Weee_Tax extends Mage_Catalog_Model_Product_Attribute_Backend_Price @@ -138,4 +144,4 @@ public function getTable() { return $this->_getResource()->getTable('weee/tax'); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Weee/Model/Config/Source/Display.php b/app/code/core/Mage/Weee/Model/Config/Source/Display.php index 4268711729..d097ea9762 100644 --- a/app/code/core/Mage/Weee/Model/Config/Source/Display.php +++ b/app/code/core/Mage/Weee/Model/Config/Source/Display.php @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Weee_Model_Config_Source_Display { diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php index 45193e01c9..11169f529a 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php index 3352b44e7c..7a4c03ec27 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php @@ -18,10 +18,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php index 814a4ed005..e2429e31c1 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php @@ -12,10 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@magentocommerce.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * 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_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Weee_Model_Mysql4_Tax extends Mage_Core_Model_Mysql4_Abstract @@ -130,4 +136,4 @@ public function getProductDiscountPercent($product, $website, $group) return $this->_getReadAdapter()->fetchOne($select); } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Weee/Model/Observer.php b/app/code/core/Mage/Weee/Model/Observer.php index ce545e2f26..3d6c3e2d4e 100644 --- a/app/code/core/Mage/Weee/Model/Observer.php +++ b/app/code/core/Mage/Weee/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Weee_Model_Observer extends Mage_Core_Model_Abstract @@ -314,4 +314,4 @@ public function updateBundleProductOptions(Varien_Event_Observer $observer) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Weee/Model/Tax.php b/app/code/core/Mage/Weee/Model/Tax.php index c0327fee8f..087c4e45ab 100644 --- a/app/code/core/Mage/Weee/Model/Tax.php +++ b/app/code/core/Mage/Weee/Model/Tax.php @@ -1,206 +1,212 @@ -_init('weee/tax', 'weee/tax'); - } - - - public function getWeeeAmount($product, $shipping = null, $billing = null, $website = null, $calculateTax = false, $ignoreDiscount = false) - { - $amount = 0; - $attributes = $this->getProductWeeeAttributes($product, $shipping, $billing, $website, $calculateTax, $ignoreDiscount); - foreach ($attributes as $attribute) { - $amount += $attribute->getAmount(); - } - return $amount; - } - - public function getWeeeAttributeCodes($forceEnabled = false) - { - return $this->getWeeeTaxAttributeCodes($forceEnabled); - } - - public function getWeeeTaxAttributeCodes($forceEnabled = false) - { - if (!$forceEnabled && !Mage::helper('weee')->isEnabled()) { - return array(); - } - - if (is_null($this->_allAttributes)) { - $this->_allAttributes = Mage::getModel('eav/entity_attribute')->getAttributeCodesByFrontendType('weee'); - } - return $this->_allAttributes; - } - - public function getProductWeeeAttributes($product, $shipping = null, $billing = null, $website = null, $calculateTax = null, $ignoreDiscount = false) - { - $result = array(); - $allWeee = $this->getWeeeTaxAttributeCodes(); - if (!$allWeee) { - return $result; - } - - $websiteId = Mage::app()->getWebsite($website)->getId(); - $store = Mage::app()->getWebsite($website)->getDefaultGroup()->getDefaultStore(); - - $customer = null; - if ($shipping) { - $customerTaxClass = $shipping->getQuote()->getCustomerTaxClassId(); - $customer = $shipping->getQuote()->getCustomer(); - } else { - $customerTaxClass = null; - } - - $calculator = Mage::getModel('tax/calculation'); - if ($customer) { - $calculator->setCustomer($customer); - } - $rateRequest = $calculator->getRateRequest($shipping, $billing, $customerTaxClass, $store); - $defaultRateRequest = $calculator->getRateRequest(false, false, false, $store); - - $discountPercent = 0; - if (!$ignoreDiscount && Mage::helper('weee')->isDiscounted($store)) { - $discountPercent = $this->_getDiscountPercentForProduct($product); - } - - $productAttributes = $product->getTypeInstance(true)->getSetAttributes($product); - foreach ($productAttributes as $code=>$attribute) { - if (in_array($code, $allWeee)) { - $attributeId = $attribute->getId(); - - $attributeSelect = $this->getResource()->getReadConnection()->select(); - $attributeSelect->from($this->getResource()->getTable('weee/tax'), 'value'); - - $on = array(); - $on[] = "attribute_id = '{$attributeId}'"; - $on[] = "(website_id in ('{$websiteId}', 0))"; - - $country = $rateRequest->getCountryId(); - $on[] = "(country = '{$country}')"; - - $region = $rateRequest->getRegionId(); - $on[] = "(state in ('{$region}', '*'))"; - - foreach ($on as $one) { - $attributeSelect->where($one); - } - $attributeSelect->where('entity_id = ?', $product->getId()); - $attributeSelect->limit(1); - - $order = array('state DESC', 'website_id DESC'); - - $attributeSelect->order($order); - $value = $this->getResource()->getReadConnection()->fetchOne($attributeSelect); - if ($value) { - if ($discountPercent) { - $value = Mage::app()->getStore()->roundPrice($value-($value*$discountPercent/100)); - } - - $taxAmount = $amount = 0; - $amount = $value; - /** - * We can't use FPT imcluding/excluding tax - */ -// if ($calculateTax && Mage::helper('weee')->isTaxable($store)) { -// $defaultPercent = Mage::getModel('tax/calculation')->getRate($defaultRateRequest->setProductClassId($product->getTaxClassId())); -// $currentPercent = $product->getTaxPercent(); -// -// $taxAmount = Mage::app()->getStore()->roundPrice($value/(100+$defaultPercent)*$currentPercent); -// $amount = $value - $taxAmount; -// } - - $one = new Varien_Object(); - $one->setName(Mage::helper('catalog')->__($attribute->getFrontend()->getLabel())) - ->setAmount($amount) - ->setTaxAmount($taxAmount) - ->setCode($attribute->getAttributeCode()); - - $result[] = $one; - } - } - } - return $result; - } - - protected function _getDiscountPercentForProduct($product) - { - $website = Mage::app()->getStore()->getWebsiteId(); - $group = Mage::getSingleton('customer/session')->getCustomerGroupId(); - $key = implode('-', array($website, $group, $product->getId())); - if (!isset($this->_productDiscounts[$key])) { - $this->_productDiscounts[$key] = (int) $this->getResource()->getProductDiscountPercent($product->getId(), $website, $group); - } - if ($value = $this->_productDiscounts[$key]) { - return 100-min(100, max(0, $value)); - } else { - return 0; - } - } - - /** - * Update discounts for FPT amounts of all products - * - * @return Mage_Weee_Model_Tax - */ - public function updateDiscountPercents() - { - $this->getResource()->updateDiscountPercents(); - return $this; - } - - /** - * Update discounts for FPT amounts base on products condiotion - * - * @param mixed $products - * @return Mage_Weee_Model_Tax - */ - public function updateProductsDiscountPercent($products) - { - $this->getResource()->updateProductsDiscountPercent($products); - return $this; - } -} +_init('weee/tax', 'weee/tax'); + } + + + public function getWeeeAmount($product, $shipping = null, $billing = null, $website = null, $calculateTax = false, $ignoreDiscount = false) + { + $amount = 0; + $attributes = $this->getProductWeeeAttributes($product, $shipping, $billing, $website, $calculateTax, $ignoreDiscount); + foreach ($attributes as $attribute) { + $amount += $attribute->getAmount(); + } + return $amount; + } + + public function getWeeeAttributeCodes($forceEnabled = false) + { + return $this->getWeeeTaxAttributeCodes($forceEnabled); + } + + public function getWeeeTaxAttributeCodes($forceEnabled = false) + { + if (!$forceEnabled && !Mage::helper('weee')->isEnabled()) { + return array(); + } + + if (is_null($this->_allAttributes)) { + $this->_allAttributes = Mage::getModel('eav/entity_attribute')->getAttributeCodesByFrontendType('weee'); + } + return $this->_allAttributes; + } + + public function getProductWeeeAttributes($product, $shipping = null, $billing = null, $website = null, $calculateTax = null, $ignoreDiscount = false) + { + $result = array(); + $allWeee = $this->getWeeeTaxAttributeCodes(); + if (!$allWeee) { + return $result; + } + + $websiteId = Mage::app()->getWebsite($website)->getId(); + $store = Mage::app()->getWebsite($website)->getDefaultGroup()->getDefaultStore(); + + $customer = null; + if ($shipping) { + $customerTaxClass = $shipping->getQuote()->getCustomerTaxClassId(); + $customer = $shipping->getQuote()->getCustomer(); + } else { + $customerTaxClass = null; + } + + $calculator = Mage::getModel('tax/calculation'); + if ($customer) { + $calculator->setCustomer($customer); + } + $rateRequest = $calculator->getRateRequest($shipping, $billing, $customerTaxClass, $store); + $defaultRateRequest = $calculator->getRateRequest(false, false, false, $store); + + $discountPercent = 0; + if (!$ignoreDiscount && Mage::helper('weee')->isDiscounted($store)) { + $discountPercent = $this->_getDiscountPercentForProduct($product); + } + + $productAttributes = $product->getTypeInstance(true)->getSetAttributes($product); + foreach ($productAttributes as $code=>$attribute) { + if (in_array($code, $allWeee)) { + $attributeId = $attribute->getId(); + + $attributeSelect = $this->getResource()->getReadConnection()->select(); + $attributeSelect->from($this->getResource()->getTable('weee/tax'), 'value'); + + $on = array(); + $on[] = "attribute_id = '{$attributeId}'"; + $on[] = "(website_id in ('{$websiteId}', 0))"; + + $country = $rateRequest->getCountryId(); + $on[] = "(country = '{$country}')"; + + $region = $rateRequest->getRegionId(); + $on[] = "(state in ('{$region}', '*'))"; + + foreach ($on as $one) { + $attributeSelect->where($one); + } + $attributeSelect->where('entity_id = ?', $product->getId()); + $attributeSelect->limit(1); + + $order = array('state DESC', 'website_id DESC'); + + $attributeSelect->order($order); + $value = $this->getResource()->getReadConnection()->fetchOne($attributeSelect); + if ($value) { + if ($discountPercent) { + $value = Mage::app()->getStore()->roundPrice($value-($value*$discountPercent/100)); + } + + $taxAmount = $amount = 0; + $amount = $value; + /** + * We can't use FPT imcluding/excluding tax + */ +// if ($calculateTax && Mage::helper('weee')->isTaxable($store)) { +// $defaultPercent = Mage::getModel('tax/calculation')->getRate($defaultRateRequest->setProductClassId($product->getTaxClassId())); +// $currentPercent = $product->getTaxPercent(); +// +// $taxAmount = Mage::app()->getStore()->roundPrice($value/(100+$defaultPercent)*$currentPercent); +// $amount = $value - $taxAmount; +// } + + $one = new Varien_Object(); + $one->setName(Mage::helper('catalog')->__($attribute->getFrontend()->getLabel())) + ->setAmount($amount) + ->setTaxAmount($taxAmount) + ->setCode($attribute->getAttributeCode()); + + $result[] = $one; + } + } + } + return $result; + } + + protected function _getDiscountPercentForProduct($product) + { + $website = Mage::app()->getStore()->getWebsiteId(); + $group = Mage::getSingleton('customer/session')->getCustomerGroupId(); + $key = implode('-', array($website, $group, $product->getId())); + if (!isset($this->_productDiscounts[$key])) { + $this->_productDiscounts[$key] = (int) $this->getResource()->getProductDiscountPercent($product->getId(), $website, $group); + } + if ($value = $this->_productDiscounts[$key]) { + return 100-min(100, max(0, $value)); + } else { + return 0; + } + } + + /** + * Update discounts for FPT amounts of all products + * + * @return Mage_Weee_Model_Tax + */ + public function updateDiscountPercents() + { + $this->getResource()->updateDiscountPercents(); + return $this; + } + + /** + * Update discounts for FPT amounts base on products condiotion + * + * @param mixed $products + * @return Mage_Weee_Model_Tax + */ + public function updateProductsDiscountPercent($products) + { + $this->getResource()->updateProductsDiscountPercent($products); + return $this; + } +} diff --git a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php index ba0c817e3f..7f4d59fdfc 100644 --- a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php @@ -18,10 +18,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,4 +72,4 @@ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php index e8d0ec0d71..c81846e2ef 100644 --- a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php @@ -18,10 +18,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php index 98f9c34f04..922f4b2cb0 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php @@ -18,10 +18,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -498,4 +498,4 @@ protected function _processItem(Mage_Sales_Model_Quote_Address $address, $item, ); } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml index f33a4ba8b1..37d3252e10 100644 --- a/app/code/core/Mage/Weee/etc/config.xml +++ b/app/code/core/Mage/Weee/etc/config.xml @@ -19,10 +19,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -57,22 +57,6 @@ Mage_Weee_Block - - - - weee/observer - setWeeeRendererInForm - - - - - - - weee/observer - updateExcludedFieldList - - - @@ -82,16 +66,6 @@ - - - - - model - weee/observer - addWeeeTaxAttributeType - - - @@ -101,16 +75,6 @@ - - - - - weee/observer - updateElementTypes - - - - @@ -119,7 +83,6 @@ - @@ -239,6 +202,43 @@ + + + + + + weee/observer + setWeeeRendererInForm + + + + + + + weee/observer + updateExcludedFieldList + + + + + + + model + weee/observer + addWeeeTaxAttributeType + + + + + + + weee/observer + updateElementTypes + + + + + @@ -267,4 +267,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Weee/etc/system.xml b/app/code/core/Mage/Weee/etc/system.xml index b5afd54822..ba1ce30a6b 100644 --- a/app/code/core/Mage/Weee/etc/system.xml +++ b/app/code/core/Mage/Weee/etc/system.xml @@ -19,10 +19,10 @@ * 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_GiftMessage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -129,4 +129,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php index 8b8432a0d7..ebba92c35a 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -46,4 +46,4 @@ ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php index 0d513be91d..cbde40e6a3 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->getConnection()->addColumn($installer->getTable('weee_tax'), 'state', "varchar (255) not null default '*'"); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php index 9d44592031..7fba070f81 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -44,4 +44,4 @@ ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php index 2728b2c4db..367432549b 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -44,4 +44,4 @@ ); "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php index a33cfad4f6..eafefa9626 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php @@ -18,10 +18,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php index b7e1de02ed..b5524dbc73 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->getConnection()->addColumn($installer->getTable('weee_tax'), 'attribute_id', "smallint (5) unsigned not null"); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php index 786e65f6d8..15fb59b79d 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->addAttribute('quote_item', 'weee_tax_applied', array('type'=>'text')); $installer->addAttribute('order_item', 'weee_tax_applied', array('type'=>'text')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php index 24b022b4fa..dc27d45add 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -35,4 +35,4 @@ $installer->addAttribute('order_item', 'weee_tax_applied_amount', array('type'=>'decimal')); $installer->addAttribute('order_item', 'weee_tax_applied_row_amount', array('type'=>'decimal')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php index 9f13bdd4ea..b144ffc765 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php index 179704c147..3a8c9c34be 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -32,4 +32,4 @@ $installer->addAttribute('invoice_item', 'weee_tax_applied', array('type'=>'text')); $installer->addAttribute('creditmemo_item', 'weee_tax_applied', array('type'=>'text')); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php index d615f959b3..7f50c90cce 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -31,4 +31,4 @@ $installer->getConnection()->addConstraint('FK_WEEE_TAX_ATTRIBUTE_ID', $installer->getTable('weee_tax'), 'attribute_id', $installer->getTable('eav_attribute'), 'attribute_id'); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php index aa17ce6f80..3c017c4274 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; @@ -38,4 +38,4 @@ 'text CHARACTER SET utf8' ); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php index 953357e619..5798af4e16 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php @@ -18,10 +18,10 @@ * 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_Catalog - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php index 415e9bd92a..fd31aceeb6 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php index 82ea5b01c9..f6aa8e3c0e 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php index 346f24fd57..aec2dbc15a 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Links.php b/app/code/core/Mage/Wishlist/Block/Links.php index 05314c47a5..952adf702c 100644 --- a/app/code/core/Mage/Wishlist/Block/Links.php +++ b/app/code/core/Mage/Wishlist/Block/Links.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php index 4a426f73e8..466076838b 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php index d82541adcf..596d37e077 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php index 48c5f32de0..083fd6e277 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php index 3c9c5d7eab..e386303d9b 100644 --- a/app/code/core/Mage/Wishlist/Helper/Data.php +++ b/app/code/core/Mage/Wishlist/Helper/Data.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -316,7 +316,8 @@ public function defaultCommentString() } /** - * Calculate count of wishlist items + * Calculate count of wishlist items and put value to customer session. + * Method called after wishlist modifications and trigger 'wishlist_items_renewed' event. * * @return Mage_Wishlist_Helper_Data */ @@ -330,7 +331,7 @@ public function calculate() ->getSize(); } Mage::getSingleton('customer/session')->setWishlistItemCount($count); - + Mage::dispatchEvent('wishlist_items_renewed'); return $this; } } diff --git a/app/code/core/Mage/Wishlist/Model/Item.php b/app/code/core/Mage/Wishlist/Model/Item.php index 06611e1584..ad0cfc2507 100644 --- a/app/code/core/Mage/Wishlist/Model/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Item.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php index be990e4da6..bb9ea27cca 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php index 234cdd25b8..2f454531b6 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php index c046d6f413..da0d271f3d 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php index adadc9bbbd..a8957e5a05 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php index 047a41a117..2ab4ef24fb 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Observer.php b/app/code/core/Mage/Wishlist/Model/Observer.php index b47808adab..3361e4da4f 100644 --- a/app/code/core/Mage/Wishlist/Model/Observer.php +++ b/app/code/core/Mage/Wishlist/Model/Observer.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -160,4 +160,4 @@ public function customerLogout(Varien_Event_Observer $observer) return $this; } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Wishlist/Model/Session.php b/app/code/core/Mage/Wishlist/Model/Session.php index f8d510615a..7c4b3d0fdd 100644 --- a/app/code/core/Mage/Wishlist/Model/Session.php +++ b/app/code/core/Mage/Wishlist/Model/Session.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php index bb13f8ba4a..088b62b610 100644 --- a/app/code/core/Mage/Wishlist/Model/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -110,7 +110,7 @@ public function loadByCode($code) */ protected function _getSharingRandomCode() { - return md5(microtime() . rand()); + return Mage::helper('core')->uniqHash(); } /** diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php index 6ebc181d69..76a1c11008 100644 --- a/app/code/core/Mage/Wishlist/controllers/IndexController.php +++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php index dfc88bcefa..6f8145146b 100644 --- a/app/code/core/Mage/Wishlist/controllers/SharedController.php +++ b/app/code/core/Mage/Wishlist/controllers/SharedController.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -113,4 +113,4 @@ public function allcartAction() } } } -} \ No newline at end of file +} diff --git a/app/code/core/Mage/Wishlist/etc/config.xml b/app/code/core/Mage/Wishlist/etc/config.xml index ffa0ee9f28..67fce016a5 100644 --- a/app/code/core/Mage/Wishlist/etc/config.xml +++ b/app/code/core/Mage/Wishlist/etc/config.xml @@ -19,10 +19,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Wishlist/etc/system.xml b/app/code/core/Mage/Wishlist/etc/system.xml index 6c221c0c07..a613a4f75e 100644 --- a/app/code/core/Mage/Wishlist/etc/system.xml +++ b/app/code/core/Mage/Wishlist/etc/system.xml @@ -19,10 +19,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -86,4 +86,4 @@ - \ No newline at end of file + diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php index 6f2b1359d8..cd8a31c9e6 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php index 62d05a28c4..d463cf9f2a 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php index 517a4cca58..fd782badb2 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,4 +46,4 @@ ON UPDATE CASCADE ON DELETE CASCADE; "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php index 60a65ee23b..c211e19640 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php @@ -18,10 +18,10 @@ * 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_Wishlist - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/layout/admin.xml b/app/design/adminhtml/default/default/layout/admin.xml index bcd17ce35e..9af42c5e13 100644 --- a/app/design/adminhtml/default/default/layout/admin.xml +++ b/app/design/adminhtml/default/default/layout/admin.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/bundle.xml b/app/design/adminhtml/default/default/layout/bundle.xml index 354c8b143a..3b335a8ada 100644 --- a/app/design/adminhtml/default/default/layout/bundle.xml +++ b/app/design/adminhtml/default/default/layout/bundle.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/catalog.xml b/app/design/adminhtml/default/default/layout/catalog.xml index db703154fb..e624d8687f 100644 --- a/app/design/adminhtml/default/default/layout/catalog.xml +++ b/app/design/adminhtml/default/default/layout/catalog.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -73,6 +73,9 @@ links[related] products_related + + position + @@ -95,6 +98,9 @@ links[upsell] products_upsell + + position + @@ -117,6 +123,9 @@ links[crosssell] products_crosssell + + position + @@ -153,6 +162,10 @@ Layout handle for grouped products links[grouped] products_grouped + + qty + position + @@ -207,4 +220,4 @@ Layout handle for configurable products - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/layout/compiler.xml b/app/design/adminhtml/default/default/layout/compiler.xml index b72bec1793..f28e2162bb 100644 --- a/app/design/adminhtml/default/default/layout/compiler.xml +++ b/app/design/adminhtml/default/default/layout/compiler.xml @@ -1,35 +1,35 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/app/design/adminhtml/default/default/layout/customer.xml b/app/design/adminhtml/default/default/layout/customer.xml index 0e80a1f000..0eef4faf6e 100644 --- a/app/design/adminhtml/default/default/layout/customer.xml +++ b/app/design/adminhtml/default/default/layout/customer.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/downloadable.xml b/app/design/adminhtml/default/default/layout/downloadable.xml index 1bca5838ad..e8734a1061 100644 --- a/app/design/adminhtml/default/default/layout/downloadable.xml +++ b/app/design/adminhtml/default/default/layout/downloadable.xml @@ -19,9 +19,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/googleoptimizer.xml b/app/design/adminhtml/default/default/layout/googleoptimizer.xml index abf070185c..982c3b11c5 100644 --- a/app/design/adminhtml/default/default/layout/googleoptimizer.xml +++ b/app/design/adminhtml/default/default/layout/googleoptimizer.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/default/default/layout/main.xml index 48d553ca12..0b26996c76 100644 --- a/app/design/adminhtml/default/default/layout/main.xml +++ b/app/design/adminhtml/default/default/layout/main.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/layout/rss.xml b/app/design/adminhtml/default/default/layout/rss.xml index 37c9789fb6..1e4412b3b8 100644 --- a/app/design/adminhtml/default/default/layout/rss.xml +++ b/app/design/adminhtml/default/default/layout/rss.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/sales.xml b/app/design/adminhtml/default/default/layout/sales.xml index a472352e6d..51b50fad14 100644 --- a/app/design/adminhtml/default/default/layout/sales.xml +++ b/app/design/adminhtml/default/default/layout/sales.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -699,4 +699,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/access_denied.phtml b/app/design/adminhtml/default/default/template/access_denied.phtml index bac8dce66a..d37e0149d7 100644 --- a/app/design/adminhtml/default/default/template/access_denied.phtml +++ b/app/design/adminhtml/default/default/template/access_denied.phtml @@ -4,10 +4,10 @@ * * NOTICE OF LICENSE * - * This source file is subject to the Open Software License (OSL 3.0) - * that is bundled with this package in the file LICENSE.txt. + * 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/osl-3.0.php + * 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. @@ -18,10 +18,10 @@ * 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 - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

helper('adminhtml')->__('Access denied.') ?>

- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml b/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml index d46d9d2e79..3120563800 100644 --- a/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml +++ b/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml @@ -1,3 +1,29 @@ + \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/api/roleinfo.phtml b/app/design/adminhtml/default/default/template/api/roleinfo.phtml index 9d9a7b6bca..7dfeea52d3 100644 --- a/app/design/adminhtml/default/default/template/api/roleinfo.phtml +++ b/app/design/adminhtml/default/default/template/api/roleinfo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -42,4 +42,4 @@ \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/api/roles.phtml b/app/design/adminhtml/default/default/template/api/roles.phtml index 6335d6d4f8..4e4e66283a 100644 --- a/app/design/adminhtml/default/default/template/api/roles.phtml +++ b/app/design/adminhtml/default/default/template/api/roles.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/api/rolesedit.phtml b/app/design/adminhtml/default/default/template/api/rolesedit.phtml index 2f5e23043b..4845a086ee 100644 --- a/app/design/adminhtml/default/default/template/api/rolesedit.phtml +++ b/app/design/adminhtml/default/default/template/api/rolesedit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -140,4 +140,4 @@ function processChildren(node, state) } return true; } - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/api/rolesusers.phtml b/app/design/adminhtml/default/default/template/api/rolesusers.phtml index b7e700bc6c..f0dc349688 100644 --- a/app/design/adminhtml/default/default/template/api/rolesusers.phtml +++ b/app/design/adminhtml/default/default/template/api/rolesusers.phtml @@ -18,11 +18,11 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

__('Role Users') ?>

-_getGridHtml() ?> \ No newline at end of file +_getGridHtml() ?> diff --git a/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml b/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml index 3d200c1bd7..5e2a6e6ef4 100644 --- a/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml +++ b/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml @@ -1,3 +1,29 @@ + \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/api/userinfo.phtml b/app/design/adminhtml/default/default/template/api/userinfo.phtml index 764ba0d18c..26e7f4d122 100644 --- a/app/design/adminhtml/default/default/template/api/userinfo.phtml +++ b/app/design/adminhtml/default/default/template/api/userinfo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -49,4 +49,4 @@ \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/api/usernroles.phtml b/app/design/adminhtml/default/default/template/api/usernroles.phtml index eed389cf82..fa8e99bf39 100644 --- a/app/design/adminhtml/default/default/template/api/usernroles.phtml +++ b/app/design/adminhtml/default/default/template/api/usernroles.phtml @@ -18,14 +18,14 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/api/userroles.phtml b/app/design/adminhtml/default/default/template/api/userroles.phtml index f60979d51c..185ebbc92b 100644 --- a/app/design/adminhtml/default/default/template/api/userroles.phtml +++ b/app/design/adminhtml/default/default/template/api/userroles.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -30,7 +30,7 @@
- getItems() as $user_role ) { @@ -41,5 +41,5 @@ ?> name="roles[]" id="_getRoleId(); ?>" />
-
-
\ No newline at end of file + +
diff --git a/app/design/adminhtml/default/default/template/api/users.phtml b/app/design/adminhtml/default/default/template/api/users.phtml index 3db7c2d8d8..21848419fa 100644 --- a/app/design/adminhtml/default/default/template/api/users.phtml +++ b/app/design/adminhtml/default/default/template/api/users.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/backup/left.phtml b/app/design/adminhtml/default/default/template/backup/left.phtml index 7d939990fb..30f40fe3ab 100644 --- a/app/design/adminhtml/default/default/template/backup/left.phtml +++ b/app/design/adminhtml/default/default/template/backup/left.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

__('Create Backup') ?>

diff --git a/app/design/adminhtml/default/default/template/backup/list.phtml b/app/design/adminhtml/default/default/template/backup/list.phtml index b4f28da7b8..c0ed9a8324 100644 --- a/app/design/adminhtml/default/default/template/backup/list.phtml +++ b/app/design/adminhtml/default/default/template/backup/list.phtml @@ -18,18 +18,18 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - + + + +

__('Backups') ?>

getCreateButtonHtml(); ?>

__('Backups') ?>

getCreateButtonHtml(); ?>
getGridHtml() ?> diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml index 360e03943f..22deec844d 100644 --- a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml +++ b/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -getChildHtml('googleoptimizer_js') ?> \ No newline at end of file +getChildHtml('googleoptimizer_js') ?> diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml index b9bfc23e12..c196e83735 100644 --- a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml +++ b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -245,4 +245,4 @@ updateTopButtonToolbarToggle(); //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/category/tree.phtml b/app/design/adminhtml/default/default/template/catalog/category/tree.phtml index 5399171534..dfe9e598c5 100644 --- a/app/design/adminhtml/default/default/template/catalog/category/tree.phtml +++ b/app/design/adminhtml/default/default/template/catalog/category/tree.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml index 3c1263182d..92764a0bd9 100644 --- a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml +++ b/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getElement() ?> diff --git a/app/design/adminhtml/default/default/template/catalog/form/renderer/googleoptimizer/import.phtml b/app/design/adminhtml/default/default/template/catalog/form/renderer/googleoptimizer/import.phtml index 00b5b26dce..54c8e6a99d 100644 --- a/app/design/adminhtml/default/default/template/catalog/form/renderer/googleoptimizer/import.phtml +++ b/app/design/adminhtml/default/default/template/catalog/form/renderer/googleoptimizer/import.phtml @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml index d37e8b1e7c..c0aa33b884 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml @@ -1,4 +1,4 @@ -
getCloseButtonHtml() ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml index 7b5d836a70..621c557663 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> __('Manage Titles (Size, Color, etc.)') ?>
-
- - - getStores() as $_store): ?> - - - - - getLabelValues() ?> - getStores() as $_store): ?> - - - -
getName() ?>
- -
-
+
+ + + getStores() as $_store): ?> + + + + + getLabelValues() ?> + getStores() as $_store): ?> + + + +
getName() ?>
+ +
+

@@ -71,30 +71,30 @@

__('Manage Options (values of your attribute)') ?>

-
- - - getStores() as $_store): ?> - - - - - - - - getStores() as $_store): ?> - - - - - - -
getName() ?>__('Position') ?>__('Is Default') ?>getAddNewButtonHtml() ?>
- - getDeleteButtonHtml() ?> -
-
- +
+ + + getStores() as $_store): ?> + + + + + + + + getStores() as $_store): ?> + + + + + + +
getName() ?>__('Position') ?>__('Is Default') ?>getAddNewButtonHtml() ?>
+ + getDeleteButtonHtml() ?> +
+
+
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml index ac7c7b8e12..a242086da5 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml @@ -18,23 +18,23 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - + + - + +

_getHeader() ?>

 +

_getHeader() ?>

 getBackButtonHtml() ?> getResetButtonHtml() ?> getDeleteButtonHtml() ?> getSaveButtonHtml() ?> -
@@ -73,7 +73,7 @@
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml index f4b8da433e..03becf2287 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml @@ -18,9 +18,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml index 40462dac61..930ee8de1d 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml index fb95c21fec..31c069a07a 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml @@ -18,24 +18,24 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - + + - + +

_getHeader() ?>

 +

_getHeader() ?>

 getBackButtonHtml() ?> getSaveButtonHtml() ?> -
getFormHtml() ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml index f071771f61..1a703a0f25 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml @@ -18,19 +18,19 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - + + - + +

_getHeader() ?>

 +

_getHeader() ?>

 getNewButtonHtml() ?> -
-
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/created.phtml b/app/design/adminhtml/default/default/template/catalog/product/created.phtml index cddce360c2..32be5c1fd2 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/created.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/created.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
getCloseButtonHtml() ?> -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit.phtml index 915b511112..b4a0b2696b 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -41,4 +41,4 @@ \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml index 5b430df62f..ee73759777 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml index 4985c0a0fc..781c242429 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -66,20 +66,20 @@ Ext.EventManager.onDocumentReady(function() { loader: categoryLoader, enableDD:false, containerScroll: true, - rootUIProvider: Ext.tree.CheckboxNodeUI, - selModel: new Ext.tree.CheckNodeMultiSelectionModel(), - rootVisible: 'getRootNode()->getIsVisible() ?>' - }); + rootUIProvider: Ext.tree.CheckboxNodeUI, + selModel: new Ext.tree.CheckNodeMultiSelectionModel(), + rootVisible: 'getRootNode()->getIsVisible() ?>' + }); - tree.on('check', function(node) { - if(node.attributes.checked) { + tree.on('check', function(node) { + if(node.attributes.checked) { categoryAdd(node.id); - } else { + } else { categoryRemove(node.id); - } - }, tree); + } + }, tree); - // set the root node + // set the root node var root = new Ext.tree.TreeNode({ text: 'getRootNode()->getName() ?>', draggable:false, @@ -89,8 +89,8 @@ Ext.EventManager.onDocumentReady(function() { uiProvider: Ext.tree.CheckboxNodeUI }); - tree.setRootNode(root); - bildCategoryTree(root, getTreeJson() ?>); + tree.setRootNode(root); + bildCategoryTree(root, getTreeJson() ?>); tree.addListener('click', categoryClick.createDelegate(this)); // render the tree diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml index f8e0146dbf..ec792f8d56 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml index dc0899ad02..a3d60c5152 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getTemplatesHtml() ?> diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml index 9fc7ca8afe..83f0efb2d1 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml index be6b9f1e75..82257e16f4 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml index b7348fdd22..5ba4b6710b 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -85,27 +85,27 @@ selectOptionType = { Element.insert($(this.div+'_'+data.id), {'bottom':this.template.evaluate(data)}); - if (data.checkboxScopeTitle) { + if (data.checkboxScopeTitle) { //set disabled if ($('product_option_'+data.id+'_select_'+data.select_id+'_title') && data.scopeTitleDisabled) { $('product_option_'+data.id+'_select_'+data.select_id+'_title').disable(); } - } - if (data.checkboxScopePrice) { + } + if (data.checkboxScopePrice) { //set disabled if ($('product_option_'+data.id+'_select_'+data.select_id+'_price') && data.scopePriceDisabled) { $('product_option_'+data.id+'_select_'+data.select_id+'_price').disable(); $('product_option_'+data.id+'_select_'+data.select_id+'_price_type').disable(); } - } + } - if (data.price_type) { + if (data.price_type) { $A($('product_option_'+data.id+'_select_'+data.select_id+'_price_type').options).each(function(option){ if (option.value==data.price_type) option.selected = true; }); - } + } - this.itemCount++; + this.itemCount++; this.bindRemoveButtons(); }, remove : function(event){ @@ -163,4 +163,4 @@ if($('add_select_row_button')){ Event.observe('add_select_row_button', 'click', selectOptionType.add.bind(selectOptionType)); } //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml index 9df9639b06..23876cf00d 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml index 56f36bc534..dbbf785b61 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier */ ?> @@ -80,7 +80,7 @@ var tierPriceRowTemplate = '' + '' + ' __("and above")?><'+'/small><'+'/td>' + '<'+'/td>' - + '' + + '' + '
diff --git a/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml b/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml index a6f0b6a3e1..319fdfdd3e 100644 --- a/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

@@ -73,4 +73,4 @@ setLocation('getSwitchUrl() ?>'+storeParam+periodParam); } //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml index c9832a39f3..6a15e66d43 100644 --- a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getTotals()) > 0 ): ?> @@ -39,4 +39,4 @@

- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml index 0b263ef177..aecd512777 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml @@ -18,9 +18,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml index b0f684f7ac..bfbdc492a2 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml @@ -18,9 +18,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -372,4 +372,4 @@ Validation.addAllThese([ }] ]); //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml index b06a215ca2..6d4865f934 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml @@ -18,9 +18,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -213,4 +213,4 @@ if($('add_sample_item')){ //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml index e88d03e2c3..c7cf0a9bd5 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -59,4 +59,4 @@ getDescription() ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml index a3f3ff9fcc..561389825c 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -59,4 +59,4 @@ getDescription() ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml index 9db6f78a93..fec8e02d9b 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -59,4 +59,4 @@ getDescription() ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml index a9ae3f61eb..60a6c57400 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -89,7 +89,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('row_total') ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml index 7e8e98b1f8..292c0b1473 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -31,7 +31,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('price') ?> @@ -73,7 +73,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('row_total') ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml index bfdbb8406a..b7fe44485e 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -31,7 +31,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('price') ?> @@ -80,7 +80,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('row_total') ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml index 46650fe5c6..9c4282268d 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -31,7 +31,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('price') ?> @@ -73,7 +73,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('row_total') ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml index ede78424f5..d2438b7cc3 100644 --- a/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -77,7 +77,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('price') ?> @@ -120,7 +120,7 @@ helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> - helper('tax')->displayCartBothPrices()): ?> + helper('tax')->displayCartBothPrices()): ?> helper('tax')->__('Excl. Tax'); ?>: displayPriceAttribute('row_total') ?> @@ -160,7 +160,7 @@ - - - - -
- -
-

Today is: June 01, 2007|Minu Oh (Administrator)|Logout

-
- -
-
-
+ + <?php echo Mage::helper('adminhtml')->__('Magento Commerce - Administrative Panel') ?> + + + + + + + +
+ +
+

Today is: June 01, 2007|Minu Oh (Administrator)|Logout

+
+ +
+
+
- getLayout()->createBlock('adminhtml/page_menu')->toHtml() ?> + getLayout()->createBlock('adminhtml/page_menu')->toHtml() ?> -
-
- -
-
-
-
-
- - - - - -

Minu Oh - Customer View

Save
-
-
-

Personal Information

-
-

Last Logged in: June, 16, 2007 ( Currently OFFLINE )

-

Account Created: April 1, 2001

-
- Contact Information
Minu Oh ( minu@varien.com)
- 3402 Motor Ave Suite B
- Los Angeles, CA 90034
- United States
- T | (310) 123-1234
-
-
-
-

Sales Tally

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Lifetime SalesAverage Sale
Total$9000.82$400.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
-
-
-
-
-

Sales Stat

-
-
Last 5 Orders
-
-
Wishlist (5 items)
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Product IDProduct NamePrice
Total$400.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
-
Gift Registries (0 items)
-
-
Shopping Cart (1 item)
-
-
+
+
+ +
+
+
+
+
+ + + + + +

Minu Oh - Customer View

Save
+
+
+

Personal Information

+
+

Last Logged in: June, 16, 2007 ( Currently OFFLINE )

+

Account Created: April 1, 2001

+
+ Contact Information
Minu Oh ( minu@varien.com)
+ 3402 Motor Ave Suite B
+ Los Angeles, CA 90034
+ United States
+ T | (310) 123-1234
+
+
+
+

Sales Tally

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Lifetime SalesAverage Sale
Total$9000.82$400.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
+
+
+
+
+

Sales Stat

+
+
Last 5 Orders
+
+
Wishlist (5 items)
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Product IDProduct NamePrice
Total$400.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
+
Gift Registries (0 items)
+
+
Shopping Cart (1 item)
+
+
-

+

-
- - - - - -

Minu Oh - Addresses

 - Delete - Save - New Address -
-
-
-

Customer Addresses

-
    -
  • -
    Minu Oh
    - 3402 Motor Ave Suite B
    - Los Angeles, CA 90034
    - T | 310-123-1234 -
    -
    • -
  • -
    Minu Oh
    - 3402 Motor Ave Suite B
    - Los Angeles, CA 90034
    - T | 310-123-1234 -
    -
    • -
  • -
    Minu Oh
    - 3402 Motor Ave Suite B
    - Los Angeles, CA 90034
    - T | 310-123-1234 -
    -
    • -
  • -
    Minu Oh
    - 3402 Motor Ave Suite B
    - Los Angeles, CA 90034
    - T | 310-123-1234 -
    -
    • -
-
-
-

Edit Address Entry

-
-
-
    -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
-
+
+ + + + + +

Minu Oh - Addresses

 + Delete + Save + New Address +
+
+
+

Customer Addresses

+
    +
  • +
    Minu Oh
    + 3402 Motor Ave Suite B
    + Los Angeles, CA 90034
    + T | 310-123-1234 +
    +
    • +
  • +
    Minu Oh
    + 3402 Motor Ave Suite B
    + Los Angeles, CA 90034
    + T | 310-123-1234 +
    +
    • +
  • +
    Minu Oh
    + 3402 Motor Ave Suite B
    + Los Angeles, CA 90034
    + T | 310-123-1234 +
    +
    • +
  • +
    Minu Oh
    + 3402 Motor Ave Suite B
    + Los Angeles, CA 90034
    + T | 310-123-1234 +
    +
    • +
+
+
+

Edit Address Entry

+
+
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
+
-
-
- +
+
+ -
-

Customer Insight

- -
-
+
+

Customer Insight

+ +
+
-
-
-
+
+
+
-
-

Copyright © 2008 Magento Commerce. All Right Reserved.
- Version 1.0 | Powered by Varien

-
+
+

Copyright © 2008 Magento Commerce. All Right Reserved.
+ Version 1.0 | Powered by Varien

+
diff --git a/app/design/adminhtml/default/default/template/extensions/console/form.phtml b/app/design/adminhtml/default/default/template/extensions/console/form.phtml index cccc377ed3..fdb5ed46c5 100644 --- a/app/design/adminhtml/default/default/template/extensions/console/form.phtml +++ b/app/design/adminhtml/default/default/template/extensions/console/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - -

getTitle() ?>

getBackButtonHtml() ?>
+ + + + +

getTitle() ?>

getBackButtonHtml() ?>
@@ -76,4 +76,4 @@ function install(type)
-
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/extensions/local/actions.phtml b/app/design/adminhtml/default/default/template/extensions/local/actions.phtml index 7de758ae28..bdb52ce60f 100644 --- a/app/design/adminhtml/default/default/template/extensions/local/actions.phtml +++ b/app/design/adminhtml/default/default/template/extensions/local/actions.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - -

getTitle() ?>

getBackButtonHtml() ?>
+ + + + +

getTitle() ?>

getBackButtonHtml() ?>
@@ -49,4 +49,4 @@ function upgradeAll() -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/extensions/mass/install.phtml b/app/design/adminhtml/default/default/template/extensions/mass/install.phtml index 0683e9ad19..d470fdc9ad 100644 --- a/app/design/adminhtml/default/default/template/extensions/mass/install.phtml +++ b/app/design/adminhtml/default/default/template/extensions/mass/install.phtml @@ -18,18 +18,18 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - -

getTitle() ?>

getBackButtonHtml() ?>
+ + + + +

getTitle() ?>

getBackButtonHtml() ?>
@@ -38,4 +38,4 @@ -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/extensions/mass/uninstall.phtml b/app/design/adminhtml/default/default/template/extensions/mass/uninstall.phtml index 7b8bb5ac6d..daeb1e66b6 100644 --- a/app/design/adminhtml/default/default/template/extensions/mass/uninstall.phtml +++ b/app/design/adminhtml/default/default/template/extensions/mass/uninstall.phtml @@ -18,18 +18,18 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - -

getTitle() ?>

getBackButtonHtml() ?>
+ + + + +

getTitle() ?>

getBackButtonHtml() ?>
@@ -38,4 +38,4 @@ -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/extensions/mass/upgrade.phtml b/app/design/adminhtml/default/default/template/extensions/mass/upgrade.phtml index 415e928f44..cbb9a92aab 100644 --- a/app/design/adminhtml/default/default/template/extensions/mass/upgrade.phtml +++ b/app/design/adminhtml/default/default/template/extensions/mass/upgrade.phtml @@ -18,18 +18,18 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - -

getTitle() ?>

getBackButtonHtml() ?>
+ + + + +

getTitle() ?>

getBackButtonHtml() ?>
@@ -38,4 +38,4 @@ -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/extensions/remote/actions.phtml b/app/design/adminhtml/default/default/template/extensions/remote/actions.phtml index c9b4636895..a4210040ba 100644 --- a/app/design/adminhtml/default/default/template/extensions/remote/actions.phtml +++ b/app/design/adminhtml/default/default/template/extensions/remote/actions.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/giftmessage/helper.phtml b/app/design/adminhtml/default/default/template/giftmessage/helper.phtml index 47b88f9433..937eb38157 100644 --- a/app/design/adminhtml/default/default/template/giftmessage/helper.phtml +++ b/app/design/adminhtml/default/default/template/giftmessage/helper.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getType()!== 'main' && !$this->getScriptIncluded() && $this->getCanDisplayContainer()): ?> @@ -101,4 +101,4 @@ var getJsObjectName() ?> = new GiftMessage('getId() ?>'); getJsObjectName() ?>.url = 'getEditUrl() ?>'; - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/googlebase/captcha.phtml b/app/design/adminhtml/default/default/template/googlebase/captcha.phtml index cf4ca11244..87073be550 100644 --- a/app/design/adminhtml/default/default/template/googlebase/captcha.phtml +++ b/app/design/adminhtml/default/default/template/googlebase/captcha.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getGbaseCaptchaToken() && $this->getGbaseCaptchaUrl()): ?> diff --git a/app/design/adminhtml/default/default/template/googlebase/items.phtml b/app/design/adminhtml/default/default/template/googlebase/items.phtml index ae3f76cf4c..267ee6b69e 100644 --- a/app/design/adminhtml/default/default/template/googlebase/items.phtml +++ b/app/design/adminhtml/default/default/template/googlebase/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -52,4 +52,4 @@ $('products_grid_button').observe('click', function (event) { var element = event.element(); productsGridElement.visible() ? productsGridElement.hide() : productsGridElement.show(); }); - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml b/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml index fbd55b7528..e5c0c114d8 100644 --- a/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml +++ b/app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_GoogleBase - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/googleoptimizer/cms/edit/renderer/conversion.phtml b/app/design/adminhtml/default/default/template/googleoptimizer/cms/edit/renderer/conversion.phtml index aab80cc57d..80fe9d494a 100644 --- a/app/design/adminhtml/default/default/template/googleoptimizer/cms/edit/renderer/conversion.phtml +++ b/app/design/adminhtml/default/default/template/googleoptimizer/cms/edit/renderer/conversion.phtml @@ -18,10 +18,10 @@ * 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_GoogleOptimizer - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/googleoptimizer/js.phtml b/app/design/adminhtml/default/default/template/googleoptimizer/js.phtml index 3159ab4d39..0157684e43 100644 --- a/app/design/adminhtml/default/default/template/googleoptimizer/js.phtml +++ b/app/design/adminhtml/default/default/template/googleoptimizer/js.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/default/default/template/login.phtml index eaa00298af..ae2516bd20 100644 --- a/app/design/adminhtml/default/default/template/login.phtml +++ b/app/design/adminhtml/default/default/template/login.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/media/editor.phtml b/app/design/adminhtml/default/default/template/media/editor.phtml index f5b8851299..25ba3c5f50 100644 --- a/app/design/adminhtml/default/default/template/media/editor.phtml +++ b/app/design/adminhtml/default/default/template/media/editor.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> helper('adminhtml/media_js')->includeScript('lib/flex.js') ?> @@ -43,4 +43,4 @@ \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/media/uploader.phtml b/app/design/adminhtml/default/default/template/media/uploader.phtml index eba74548ee..d08b5479b4 100644 --- a/app/design/adminhtml/default/default/template/media/uploader.phtml +++ b/app/design/adminhtml/default/default/template/media/uploader.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml b/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml index 6d3cd695f2..e82f240283 100644 --- a/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml @@ -18,77 +18,77 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - + +

__('Newsletter Problem Reports') ?>

 + + + + - -

__('Newsletter Problem Reports') ?>

 -
+
getChildHtml('grid') ?>
getShowButtons()): ?>
- getUnsubscribeButtonHtml(); ?> - getDeleteButtonHtml(); ?> + getUnsubscribeButtonHtml(); ?> + getDeleteButtonHtml(); ?>
diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml index ae6166edad..775e7dd72c 100644 --- a/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -65,4 +65,4 @@ var queueControl = { } }; //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml b/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml index 9a00a4fdfc..7dbc4e56f2 100644 --- a/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml @@ -18,21 +18,21 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - - -

__('Newsletter Queue') ?>

 - -
+ + + + + +

__('Newsletter Queue') ?>

 + +
getChildHtml('grid') ?> diff --git a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml b/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml index 95150374e7..9017081f5c 100644 --- a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml @@ -18,65 +18,65 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - -

__('Newsletter Subscribers') ?>

+ + + + +

__('Newsletter Subscribers') ?>

getChildHtml('grid') ?>
getQueueAsOptions())>0 && $this->getShowQueueAdd()): ?>
- - + +
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml b/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml index 2c215abbac..b906876ad0 100644 --- a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -68,16 +68,16 @@ templateName: false, isEditor: false, init: function () { - if ($('convert_button_back')) { - $('convert_button_back').hide(); - } + if ($('convert_button_back')) { + $('convert_button_back').hide(); + } }, stripTags: function () { if(!window.confirm("__('Are you sure that you want to strip all tags?') ?>")) { return false; } if(this.isEditor) { - tinyMCE.execCommand('mceRemoveControl', false, 'text'); + tinyMCE.execCommand('mceRemoveControl', false, 'text'); } this.unconvertedText = $('text').value; $('convert_button').hide(); @@ -99,7 +99,7 @@ $('change_flag_element').value = '1'; } if(this.isEditor) { - tinyMCE.triggerSave(); + tinyMCE.triggerSave(); } templateForm.submit(); return false; @@ -125,7 +125,7 @@ $('save_as_flag').value = '1'; if(this.isEditor) { - tinyMCE.triggerSave(); + tinyMCE.triggerSave(); } templateForm.submit(); return false; @@ -147,7 +147,7 @@ deleteTemplate: function() { if(window.confirm("__('Are you sure that you want to delete this template?') ?>")) { - window.location.href = 'getDeleteUrl() ?>'; + window.location.href = 'getDeleteUrl() ?>'; } } }; diff --git a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml b/app/design/adminhtml/default/default/template/newsletter/template/list.phtml index 2418871aab..a99748aa69 100644 --- a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/template/list.phtml @@ -18,22 +18,22 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - - -

getHeaderText() ?>

 - -
+ + + + + +

getHeaderText() ?>

 + +
getChildHtml('grid') ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml index 81827ac793..887f8137c6 100644 --- a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml +++ b/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/notification/toolbar.phtml b/app/design/adminhtml/default/default/template/notification/toolbar.phtml index f13ca54bdb..cb9067d7f6 100644 --- a/app/design/adminhtml/default/default/template/notification/toolbar.phtml +++ b/app/design/adminhtml/default/default/template/notification/toolbar.phtml @@ -18,10 +18,10 @@ * 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 design_default - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> __('Latest Message:') ?> getLatestNotice() ?> __('Read details') ?>
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/notification/window.phtml b/app/design/adminhtml/default/default/template/notification/window.phtml index 0f2983e443..4714c00dfa 100644 --- a/app/design/adminhtml/default/default/template/notification/window.phtml +++ b/app/design/adminhtml/default/default/template/notification/window.phtml @@ -18,10 +18,10 @@ * 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 design_default - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> canShow()): ?> - - - - getChildHtml('js') ?> - getChildHtml('profiler') ?> + getChildHtml('profiler') ?> diff --git a/app/design/adminhtml/default/default/template/page/footer.phtml b/app/design/adminhtml/default/default/template/page/footer.phtml index a8c308f6f2..71208e733e 100644 --- a/app/design/adminhtml/default/default/template/page/footer.phtml +++ b/app/design/adminhtml/default/default/template/page/footer.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

diff --git a/app/design/adminhtml/default/default/template/page/head.phtml b/app/design/adminhtml/default/default/template/page/head.phtml index 24d099d9f6..744adf3ae3 100644 --- a/app/design/adminhtml/default/default/template/page/head.phtml +++ b/app/design/adminhtml/default/default/template/page/head.phtml @@ -32,4 +32,4 @@ helper('core/js')->getTranslatorScript() ?> getChildHtml('calendar'); ?> -getChildHtml('optional_zip_countries'); ?> \ No newline at end of file +getChildHtml('optional_zip_countries'); ?> diff --git a/app/design/adminhtml/default/default/template/page/header.phtml b/app/design/adminhtml/default/default/template/page/header.phtml index 342f0274b3..7cd9ea3dd2 100644 --- a/app/design/adminhtml/default/default/template/page/header.phtml +++ b/app/design/adminhtml/default/default/template/page/header.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

diff --git a/app/design/adminhtml/default/default/template/page/js/calendar.phtml b/app/design/adminhtml/default/default/template/page/js/calendar.phtml index 829fc3e7ea..eeb5b2794b 100644 --- a/app/design/adminhtml/default/default/template/page/js/calendar.phtml +++ b/app/design/adminhtml/default/default/template/page/js/calendar.phtml @@ -1,4 +1,28 @@ diff --git a/app/design/adminhtml/default/default/template/page/js/translate.phtml b/app/design/adminhtml/default/default/template/page/js/translate.phtml index fe5ca97f1e..51b5d366ea 100644 --- a/app/design/adminhtml/default/default/template/page/js/translate.phtml +++ b/app/design/adminhtml/default/default/template/page/js/translate.phtml @@ -18,10 +18,10 @@ * 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_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ $_data = array( diff --git a/app/design/adminhtml/default/default/template/page/menu.phtml b/app/design/adminhtml/default/default/template/page/menu.phtml index aa6506871b..0c1bed984b 100644 --- a/app/design/adminhtml/default/default/template/page/menu.phtml +++ b/app/design/adminhtml/default/default/template/page/menu.phtml @@ -1,49 +1,49 @@ - - - - - -
-getMenuArray()); ?> - -
    id="nav"> - -
  • onmouseover="Element.addClassName(this,'over')" onmouseout="Element.removeClassName(this,'over')" class=" level"> title="" onclick="" class=""> - - - -
    • - -
- - - __('Get help for this page') ?> - - -
- + + + + + +
+getMenuArray()); ?> + +
    id="nav"> + +
  • onmouseover="Element.addClassName(this,'over')" onmouseout="Element.removeClassName(this,'over')" class=" level"> title="" onclick="" class=""> + + + +
    • + +
+ + + __('Get help for this page') ?> + + +
+ diff --git a/app/design/adminhtml/default/default/template/page/notices.phtml b/app/design/adminhtml/default/default/template/page/notices.phtml index 05b670089f..11ebf7b0b8 100644 --- a/app/design/adminhtml/default/default/template/page/notices.phtml +++ b/app/design/adminhtml/default/default/template/page/notices.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethodCode() ?> @@ -75,4 +75,4 @@
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml index 860d6b14e1..052ceaf8d1 100644 --- a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethodCode() ?> @@ -75,4 +75,4 @@
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml index 2aceba0ae1..a3f3c95591 100644 --- a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml index 2abd3baa85..2469c526af 100644 --- a/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/payment/info/cc.phtml b/app/design/adminhtml/default/default/template/payment/info/cc.phtml index 4922172c3b..f0471c4167 100644 --- a/app/design/adminhtml/default/default/template/payment/info/cc.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/cc.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/info/ccsave.phtml index f2262c7418..7dbb01bc10 100644 --- a/app/design/adminhtml/default/default/template/payment/info/ccsave.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/ccsave.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> __('Name on the Card: %s', $this->htmlEscape($this->getInfo()->getCcOwner())) ?>
@@ -31,4 +31,4 @@ __('Credit Card Number: %s', $this->htmlEscape($this->getInfo()->getCcNumber())) ?>
-__('Expiration Date: %s/%s', $this->htmlEscape($this->getCcExpMonth()), $this->htmlEscape($this->getInfo()->getCcExpYear())) ?> \ No newline at end of file +__('Expiration Date: %s/%s', $this->htmlEscape($this->getCcExpMonth()), $this->htmlEscape($this->getInfo()->getCcExpYear())) ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml index 1b6a5d3991..053524aaab 100644 --- a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethod()->getTitle() ?> @@ -33,4 +33,4 @@ htmlEscape($this->getMailingAddress())) ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/payment/info/default.phtml b/app/design/adminhtml/default/default/template/payment/info/default.phtml index d8790ac6c3..6333c19084 100644 --- a/app/design/adminhtml/default/default/template/payment/info/default.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -htmlEscape($this->getMethod()->getTitle()) ?> \ No newline at end of file +htmlEscape($this->getMethod()->getTitle()) ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml index dedb7b548d..d28b5ecd68 100644 --- a/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/pdf/cc.phtml @@ -18,14 +18,14 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> __('Name on the Card: %s', $this->htmlEscape($this->getInfo()->getCcOwner())) ?> {{pdf_row_separator}} __('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?> {{pdf_row_separator}} -__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> \ No newline at end of file +__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml index dedb7b548d..d28b5ecd68 100644 --- a/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/pdf/ccsave.phtml @@ -18,14 +18,14 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> __('Name on the Card: %s', $this->htmlEscape($this->getInfo()->getCcOwner())) ?> {{pdf_row_separator}} __('Credit Card Type: %s', $this->htmlEscape($this->getCcTypeName())) ?> {{pdf_row_separator}} -__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> \ No newline at end of file +__('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml index 9b75ecfd7c..88bf79a7a6 100644 --- a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethod()->getTitle() ?> @@ -38,4 +38,4 @@ htmlEscape($this->getMailingAddress())) ?> {{pdf_row_separator}} - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml index 58aff33869..e556588dc7 100644 --- a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml @@ -18,11 +18,11 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> htmlEscape($this->getMethod()->getTitle()) ?> - {{pdf_row_separator}} \ No newline at end of file + {{pdf_row_separator}} diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml index deabe2ca4c..a6812bfc91 100644 --- a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> __('Purchase Order Number: %s', $this->htmlEscape($this->getInfo()->getPoNumber())) ?> diff --git a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml b/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml index 50470d7b0d..74cf24d6e0 100644 --- a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml +++ b/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

getMethod()->getTitle() ?>

diff --git a/app/design/adminhtml/default/default/template/paypal/express/info.phtml b/app/design/adminhtml/default/default/template/paypal/express/info.phtml index e03d900c27..f42a502617 100644 --- a/app/design/adminhtml/default/default/template/paypal/express/info.phtml +++ b/app/design/adminhtml/default/default/template/paypal/express/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

getMethod()->getTitle() ?>
diff --git a/app/design/adminhtml/default/default/template/paypal/express/pdf/info.phtml b/app/design/adminhtml/default/default/template/paypal/express/pdf/info.phtml index c83d6a0135..4df2173d30 100644 --- a/app/design/adminhtml/default/default/template/paypal/express/pdf/info.phtml +++ b/app/design/adminhtml/default/default/template/paypal/express/pdf/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethod()->getTitle() ?> diff --git a/app/design/adminhtml/default/default/template/paypaluk/direct/form.phtml b/app/design/adminhtml/default/default/template/paypaluk/direct/form.phtml index 28d9eb2be9..b607d4599a 100644 --- a/app/design/adminhtml/default/default/template/paypaluk/direct/form.phtml +++ b/app/design/adminhtml/default/default/template/paypaluk/direct/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethodCode() ?> @@ -162,4 +162,4 @@ Validation.addAllThese([ }] ]); - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/paypaluk/direct/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/direct/info.phtml index 9e99138117..b1f75d5ab3 100644 --- a/app/design/adminhtml/default/default/template/paypaluk/direct/info.phtml +++ b/app/design/adminhtml/default/default/template/paypaluk/direct/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getInfo()): ?> @@ -35,4 +35,4 @@ getInfo()->getCcSsStartYear()): ?> __('Switch/Solo card start Date: %s/%s', $this->getCcStartMonth(), $this->getInfo()->getCcSsStartYear()) ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml index 38041d6808..cf7539025c 100644 --- a/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml +++ b/app/design/adminhtml/default/default/template/paypaluk/direct/pdf/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getInfo()): ?> @@ -38,4 +38,4 @@ getInfo()->getCcSsStartYear()): ?> __('Switch/Solo card start Date: %s/%s', $this->getCcStartMonth(), $this->getInfo()->getCcSsStartYear()) ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/paypaluk/express/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/express/info.phtml index e03d900c27..f42a502617 100644 --- a/app/design/adminhtml/default/default/template/paypaluk/express/info.phtml +++ b/app/design/adminhtml/default/default/template/paypaluk/express/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

getMethod()->getTitle() ?>
diff --git a/app/design/adminhtml/default/default/template/paypaluk/express/pdf/info.phtml b/app/design/adminhtml/default/default/template/paypaluk/express/pdf/info.phtml index c83d6a0135..4df2173d30 100644 --- a/app/design/adminhtml/default/default/template/paypaluk/express/pdf/info.phtml +++ b/app/design/adminhtml/default/default/template/paypaluk/express/pdf/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethod()->getTitle() ?> diff --git a/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml b/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml index c78277a0af..effaadd99e 100644 --- a/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml +++ b/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml @@ -12,9 +12,9 @@ function registerUserRole(grid, element, checked) { if (checked) { - checkBoxes.set(element.value, 0); + checkBoxes.set(element.value, 0); } else { - checkBoxes.unset(element.value); + checkBoxes.unset(element.value); } $('in_role_user').value = checkBoxes.toQueryString(); grid.reloadParams = {'in_role_user[]':checkBoxes.keys()}; @@ -30,13 +30,13 @@ var checked = isInput ? checkbox[0].checked : !checkbox[0].checked; if (checked) { if ( confirm("__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) { - checkBoxes.set(checkbox[0].value, checked); + checkBoxes.set(checkbox[0].value, checked); } else { - checkbox[0].checked = false; + checkbox[0].checked = false; } warning = false; } else { - checkBoxes.unset(checkbox[0].value); + checkBoxes.unset(checkbox[0].value); } $('in_role_user').value = checkBoxes.toQueryString(); @@ -52,7 +52,7 @@ if (checkbox.checked) { checkBoxes.set(checkbox.value, checkbox.checked); } else { - checkBoxes.unset(checkbox.value); + checkBoxes.unset(checkbox.value); } $('in_role_user').value = checkBoxes.toQueryString(); @@ -66,7 +66,7 @@ if (!confirm("__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) { o.checked = !o.checked; } else { - checkBoxes.each(function(el){ + checkBoxes.each(function(el){ el.checked = o.checked; }); return false; @@ -85,4 +85,4 @@ getJsObjectName() ?>.rows.each(function(row){roleUsersRowInit(getJsObjectName() ?>, row)}); //--> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml b/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml index 6b4a146308..281a96d0d2 100644 --- a/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml +++ b/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

@@ -42,4 +42,4 @@ \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/permissions/roles.phtml b/app/design/adminhtml/default/default/template/permissions/roles.phtml index 6335d6d4f8..4e4e66283a 100644 --- a/app/design/adminhtml/default/default/template/permissions/roles.phtml +++ b/app/design/adminhtml/default/default/template/permissions/roles.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml b/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml index 9888979336..0b2af95972 100644 --- a/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml +++ b/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -149,4 +149,4 @@ function processChildren(node, state) } return true; } - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml b/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml index b7e700bc6c..f0dc349688 100644 --- a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml +++ b/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml @@ -18,11 +18,11 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

__('Role Users') ?>

-_getGridHtml() ?> \ No newline at end of file +_getGridHtml() ?> diff --git a/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml b/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml index 3d200c1bd7..f1f4c82456 100644 --- a/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml +++ b/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml @@ -56,4 +56,4 @@ getJsObjectName() ?>.rows.each(function(row){rolesRowInit(getJsObjectName() ?>, row)}); //--> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/permissions/userinfo.phtml b/app/design/adminhtml/default/default/template/permissions/userinfo.phtml index 764ba0d18c..26e7f4d122 100644 --- a/app/design/adminhtml/default/default/template/permissions/userinfo.phtml +++ b/app/design/adminhtml/default/default/template/permissions/userinfo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -49,4 +49,4 @@ \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/permissions/usernroles.phtml b/app/design/adminhtml/default/default/template/permissions/usernroles.phtml index eed389cf82..fa8e99bf39 100644 --- a/app/design/adminhtml/default/default/template/permissions/usernroles.phtml +++ b/app/design/adminhtml/default/default/template/permissions/usernroles.phtml @@ -18,14 +18,14 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/permissions/userroles.phtml b/app/design/adminhtml/default/default/template/permissions/userroles.phtml index f60979d51c..185ebbc92b 100644 --- a/app/design/adminhtml/default/default/template/permissions/userroles.phtml +++ b/app/design/adminhtml/default/default/template/permissions/userroles.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -30,7 +30,7 @@
- getItems() as $user_role ) { @@ -41,5 +41,5 @@ ?> name="roles[]" id="_getRoleId(); ?>" />
-
-
\ No newline at end of file + +
diff --git a/app/design/adminhtml/default/default/template/permissions/users.phtml b/app/design/adminhtml/default/default/template/permissions/users.phtml index 3db7c2d8d8..21848419fa 100644 --- a/app/design/adminhtml/default/default/template/permissions/users.phtml +++ b/app/design/adminhtml/default/default/template/permissions/users.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/poll/answers/list.phtml b/app/design/adminhtml/default/default/template/poll/answers/list.phtml index dd44192a53..b12f8c9690 100644 --- a/app/design/adminhtml/default/default/template/poll/answers/list.phtml +++ b/app/design/adminhtml/default/default/template/poll/answers/list.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/popup.phtml b/app/design/adminhtml/default/default/template/popup.phtml index 5ab2a1069c..4fe46859f4 100644 --- a/app/design/adminhtml/default/default/template/popup.phtml +++ b/app/design/adminhtml/default/default/template/popup.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getChildHtml('before_body_end') ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/promo/fieldset.phtml b/app/design/adminhtml/default/default/template/promo/fieldset.phtml index 4086269514..816af191a0 100644 --- a/app/design/adminhtml/default/default/template/promo/fieldset.phtml +++ b/app/design/adminhtml/default/default/template/promo/fieldset.phtml @@ -18,10 +18,10 @@ * 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) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getElement() ?> @@ -35,4 +35,4 @@
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/promo/form.phtml b/app/design/adminhtml/default/default/template/promo/form.phtml index 8277f6fd18..9d557a74ff 100644 --- a/app/design/adminhtml/default/default/template/promo/form.phtml +++ b/app/design/adminhtml/default/default/template/promo/form.phtml @@ -18,20 +18,20 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
getFormHtml() ?>
\ No newline at end of file + if ($('rule_conditions_fieldset')) { + var conditionsForm = new VarienRulesForm('rule_conditions_fieldset', 'getNewConditionChildUrl() ?>'); + } + if ($('rule_actions_fieldset')) { + var actionsForm = new VarienRulesForm('rule_actions_fieldset', 'getNewActionChildUrl() ?>'); + } +*/ diff --git a/app/design/adminhtml/default/default/template/rating/detailed.phtml b/app/design/adminhtml/default/default/template/rating/detailed.phtml index c152765175..ce2b4893f0 100644 --- a/app/design/adminhtml/default/default/template/rating/detailed.phtml +++ b/app/design/adminhtml/default/default/template/rating/detailed.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getRating() && $this->getRating()->getSize()): ?> @@ -57,9 +57,9 @@
__("Rating isn't Available") ?> diff --git a/app/design/adminhtml/default/default/template/rating/options.phtml b/app/design/adminhtml/default/default/template/rating/options.phtml index 1796e01d11..206e949a88 100644 --- a/app/design/adminhtml/default/default/template/rating/options.phtml +++ b/app/design/adminhtml/default/default/template/rating/options.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml b/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml index e3ab57b05d..8518198043 100644 --- a/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml +++ b/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml @@ -18,22 +18,22 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getRating() && $this->getRating()->getSize()): ?>
getRating() as $_rating): ?> getPercent()): ?> -
- getRatingCode() ?> -
-
-
-
+
+ getRatingCode() ?> +
+
+
+
diff --git a/app/design/adminhtml/default/default/template/rating/stars/summary.phtml b/app/design/adminhtml/default/default/template/rating/stars/summary.phtml index c84b4fbd8a..03474c8476 100644 --- a/app/design/adminhtml/default/default/template/rating/stars/summary.phtml +++ b/app/design/adminhtml/default/default/template/rating/stars/summary.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getRatingSummary()->getCount()): ?> diff --git a/app/design/adminhtml/default/default/template/report/grid.phtml b/app/design/adminhtml/default/default/template/report/grid.phtml index fe59fd6903..1a25552958 100644 --- a/app/design/adminhtml/default/default/template/report/grid.phtml +++ b/app/design/adminhtml/default/default/template/report/grid.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getColumns()); } } - /* Overwrite function from switcher.phtml widget*/ + /* Overwrite function from switcher.phtml widget*/ function switchStore(obj){ if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') { var selectionType = 'website'; @@ -224,8 +224,8 @@ $numColumns = sizeof($this->getColumns()); var switchURL = 'getAbsoluteGridUrl(array('_current' => false)); ?>'.replace(/(store|group|website)\/\d+\//,''); for(var i=0;igetColumns()); //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/report/store/switcher.phtml b/app/design/adminhtml/default/default/template/report/store/switcher.phtml index bd3e7242b1..bb89d6c84f 100644 --- a/app/design/adminhtml/default/default/template/report/store/switcher.phtml +++ b/app/design/adminhtml/default/default/template/report/store/switcher.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/review/add.phtml b/app/design/adminhtml/default/default/template/review/add.phtml index 784c92a1dd..09d583fc90 100644 --- a/app/design/adminhtml/default/default/template/review/add.phtml +++ b/app/design/adminhtml/default/default/template/review/add.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -44,4 +44,4 @@
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml b/app/design/adminhtml/default/default/template/sales/items/column/name.phtml index 39f18efb6a..f9f50b1d93 100644 --- a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml +++ b/app/design/adminhtml/default/default/template/sales/items/column/name.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getDescription() ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml b/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml index b5181d0385..4dfbfabbc6 100644 --- a/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml +++ b/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem()): ?> @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml index a2284959e8..fb7d6ab322 100644 --- a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -42,4 +42,4 @@ -getItem()->getDescription() ?> \ No newline at end of file +getItem()->getDescription() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml b/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml index 0bbc0bbaa2..9c7f39930b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getEntity()): ?> @@ -68,4 +68,4 @@ if ($('submit_comment_button')) { }
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml b/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml index b38f866f28..529386530a 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -32,4 +32,4 @@
getChildHtml('', true, true) ?>
-
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml index b1def9a9db..798bbe0406 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> hasMethods()): ?> @@ -50,4 +50,4 @@ __('No Payment Methods') ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml b/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml index b07b851e80..0754c59942 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml @@ -18,13 +18,13 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category adminhtml - * @package default_default - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml index 1236382b13..2657e243ff 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getCouponCode() ?> [__('Remove') ?>] - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml b/app/design/adminhtml/default/default/template/sales/order/create/data.phtml index f57020f3e6..cef3e262d6 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/data.phtml @@ -18,10 +18,10 @@ * 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 default_default - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/create/form.phtml index bc5d222ed8..29929b79f7 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml b/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml index 49d7cd077b..a163869ee9 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml @@ -1,4 +1,29 @@ -getIsShipping()): +getIsShipping()): $_fieldsContainerId = 'order-shipping_address_fields'; ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml b/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml index b3c0174e0c..471ff528c7 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml @@ -18,10 +18,10 @@ * 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 default_default - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItems(); ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items.phtml index d9a9832dd2..b3e0e2f06e 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -30,4 +30,4 @@
getButtonsHtml() ?>
getChildHtml() ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml index a9d54a7121..9c71d87815 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml b/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml index 900b8e3807..cc45295173 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

helper('sales')->__('Customer\'s Current Activities') ?>

@@ -38,4 +38,4 @@ getChildHtml('bottom_button'); ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml b/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml index d19c9a5321..3f3a79e8d0 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml b/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml index b0ca8f004c..af01f719c7 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getWebsiteCollection() as $_website): ?> @@ -45,4 +45,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml index 6c04c2005c..6933d83699 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -43,4 +43,4 @@

getButtonHtml(Mage::helper('sales')->__('Submit Order'),'order.submit()'); ?>

- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml index b1f2362b5b..4e70f8a323 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -35,4 +35,4 @@ formatPrice($this->getTotal()->getValue()) ?> getRenderingArea() == $this->getTotal()->getArea()): ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml b/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml index 2d099d3f31..3b04a4b134 100644 --- a/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -50,7 +50,7 @@ - + @@ -64,4 +64,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml index 5c75ad9fb2..aaae7fea82 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -85,4 +85,4 @@
getChildHtml('order_items') ?>
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml index 95dc28276a..70c35887ea 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getCreditmemo()->getAllItems() ?> @@ -176,4 +176,4 @@ function bindSendEmail() } } //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml index 018d4718cf..93224b8d12 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml index 77e6e79af0..96112ea670 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml index 7e46f17a63..d10f7e9ddc 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml @@ -18,34 +18,25 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getSource() ?> - - - - + - - - - + - - - - + - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml index a963ab9c24..e9003f9baa 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getCreditmemo()->getOrder() ?> @@ -94,4 +94,4 @@

__('Credit Memo Totals') ?>

getChildHtml('creditmemo_totals') ?>
-
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml index 849bf0cde7..c7405edd5b 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getCreditmemo()->getAllItems() ?> @@ -55,4 +55,4 @@
formatPrice($this->getTotal()->getValue()) ?>
helper('sales')->__('Refund Shipping') ?>
helper('sales')->__('Adjustment Refund') ?>
helper('sales')->__('Adjustment Fee') ?>
-
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml index 26a2b03a93..bc158c17f6 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml index d0437f10ed..45a91da116 100644 --- a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml index 3e49fc7464..200623c010 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -105,4 +105,4 @@ shipmentElement.disabled = true; document.getElementById('tracking').style.display = 'block'; } - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml index 20ea53c905..fc56042f79 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -192,4 +192,4 @@ function bindSendEmail() } } //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml index f2dcb3b733..ff65b37e9d 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml index 7590e96da0..0c7a46fdf5 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml b/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml index cc8771e3cd..3b7bf625e6 100644 --- a/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml b/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml index d4a923d235..aa53947a06 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getTotals()) > 0 ): ?> @@ -41,4 +41,4 @@
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/totals.phtml b/app/design/adminhtml/default/default/template/sales/order/totals.phtml index 80fb935b97..c73792784d 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getSource(); ?> @@ -33,6 +33,8 @@ + + getTotals('')?> @@ -81,4 +83,4 @@ -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml index 3774c56151..84f032d11f 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getSource() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml index 7385562e25..31c727938e 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml @@ -1,32 +1,32 @@ - -getCanDisplayTotalDue()): ?> - - __('Total Due', true) ?> - displayPriceAttribute('total_due', true) ?> - - \ No newline at end of file + +getCanDisplayTotalDue()): ?> + + __('Total Due', true) ?> + displayPriceAttribute('total_due', true) ?> + + diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml index 0753c08a07..7b6963c26f 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml index 04a72b39b5..2b157dcbc5 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getSource() ?> @@ -38,4 +38,4 @@ displayPriceAttribute('grand_total', true) ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml index f47e8f1036..d3e2c29f8c 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getSource() ?> @@ -32,4 +32,4 @@ __($this->getLabel()) ?> getHtmlClass() ? ('class="' . $this->getHtmlClass() . '"') : '';?>>displayPriceAttribute($this->getSourceField()) ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml index b33c74924f..ff76f49410 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml index 64f7a48507..66f6e06d27 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml @@ -1,33 +1,33 @@ - -getCanDisplayTotalPaid()): ?> - - __('Total Paid') ?> - displayPriceAttribute('total_paid', true) ?> - - - \ No newline at end of file + +getCanDisplayTotalPaid()): ?> + + __('Total Paid') ?> + displayPriceAttribute('total_paid', true) ?> + + + diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml index 7bd70d6b8d..18d217eda0 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml @@ -1,32 +1,32 @@ - -getCanDisplayTotalRefunded()): ?> - - __('Total Refunded') ?> - displayPriceAttribute('total_refunded', true) ?> - - + +getCanDisplayTotalRefunded()): ?> + + __('Total Refunded') ?> + displayPriceAttribute('total_refunded', true) ?> + + diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml index 2c5d7f1a89..cb6647337c 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getSource() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml b/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml index a942590261..65871705e6 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml b/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml index b270acef1f..a5e899f017 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> canDisplayGiftmessage()): ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/history.phtml b/app/design/adminhtml/default/default/template/sales/order/view/history.phtml index db294651a3..e6b6cf72fc 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/history.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/history.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category default - * @package default_default - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -75,4 +75,4 @@ -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml index 95d66a66d0..dcc2ad9249 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -175,4 +175,4 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items.phtml b/app/design/adminhtml/default/default/template/sales/order/view/items.phtml index e2cf464a67..aa80d36ba9 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/items.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -62,4 +62,4 @@ -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml b/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml index 45e1c8f405..5916761b6c 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -278,4 +278,4 @@ $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() ); ?> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml index 6b90ff5f64..a787bde7eb 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -49,4 +49,4 @@ -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml index 34849295a0..8355a828ee 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml b/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml index a68ef923fc..338f4750e1 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder()->getShippingCarrier()->isTrackingAvailable()) : ?> @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/store/switcher.phtml b/app/design/adminhtml/default/default/template/store/switcher.phtml index 2b2a51cca0..0e126bcb9d 100644 --- a/app/design/adminhtml/default/default/template/store/switcher.phtml +++ b/app/design/adminhtml/default/default/template/store/switcher.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getWebsites()): ?> @@ -72,4 +72,4 @@ } - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml b/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml index 95aaa305d7..e2e92e8fc2 100644 --- a/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml +++ b/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getWebsiteCollection() ?> @@ -114,4 +114,4 @@ varienStore.prototype = { var varienStoreSwitcher = new varienStore('store_switcher_container', 'store_switcher', 'getSwitchUrl() ?>', getUseAjax() ?>, getUseConfirm() ?>); //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/system/autocomplete.phtml b/app/design/adminhtml/default/default/template/system/autocomplete.phtml index da0c6cb93a..eb4b51cdbb 100644 --- a/app/design/adminhtml/default/default/template/system/autocomplete.phtml +++ b/app/design/adminhtml/default/default/template/system/autocomplete.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -32,4 +32,4 @@ htmlEscape($item['description']) ?> -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/system/cache/edit.phtml b/app/design/adminhtml/default/default/template/system/cache/edit.phtml index d4c98b30a1..6ad0a492a5 100644 --- a/app/design/adminhtml/default/default/template/system/cache/edit.phtml +++ b/app/design/adminhtml/default/default/template/system/cache/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/config/js.phtml b/app/design/adminhtml/default/default/template/system/config/js.phtml index e125ad160d..017d5c3825 100644 --- a/app/design/adminhtml/default/default/template/system/config/js.phtml +++ b/app/design/adminhtml/default/default/template/system/config/js.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/config/switcher.phtml b/app/design/adminhtml/default/default/template/system/config/switcher.phtml index 02e0c7e5d6..ef35ed5f41 100644 --- a/app/design/adminhtml/default/default/template/system/config/switcher.phtml +++ b/app/design/adminhtml/default/default/template/system/config/switcher.phtml @@ -18,4 +18,4 @@

__('Manage Stores') ?>

- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/system/config/tabs.phtml b/app/design/adminhtml/default/default/template/system/config/tabs.phtml index ee7ec086e0..412553b28c 100644 --- a/app/design/adminhtml/default/default/template/system/config/tabs.phtml +++ b/app/design/adminhtml/default/default/template/system/config/tabs.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getTitle()): ?> diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml index 20e070a9f2..19a4c847da 100644 --- a/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml +++ b/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml @@ -3,8 +3,8 @@ function runProfile(popup) { var url = 'getUrl('*/*/run', array('id'=>$this->getProfileId())) ?>'; if ($('profile_direction') != undefined - && $('profile_data_transfer') != undefined - && getDirection() == 'import' && getTransferType() == 'interactive') { + && $('profile_data_transfer') != undefined + && getDirection() == 'import' && getTransferType() == 'interactive') { var file = getSelectedFiles(); if (file == '') { alert('Please select imported files'); @@ -57,4 +57,4 @@ function getTransferType() getRunButtonHtml() ?>
- \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml index 9409dd6353..848a02a431 100755 --- a/app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml +++ b/app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml index 5a3a2691e3..e6ad9926e7 100644 --- a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml +++ b/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -71,4 +71,4 @@ $_rates = ( $_newRates ) ? $_newRates : $_oldRates;
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/system/currency/rates.phtml b/app/design/adminhtml/default/default/template/system/currency/rates.phtml index c099db5ad8..189db7f658 100644 --- a/app/design/adminhtml/default/default/template/system/currency/rates.phtml +++ b/app/design/adminhtml/default/default/template/system/currency/rates.phtml @@ -18,10 +18,15 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + */ +?> +
@@ -31,7 +36,6 @@
getBlockHtml('formkey')?> - __('Import Service') ?> getServicesHtml() ?> getImportButtonHtml() ?>
@@ -41,4 +45,4 @@
-getRatesMatrixHtml() ?> \ No newline at end of file +getRatesMatrixHtml() ?> diff --git a/app/design/adminhtml/default/default/template/system/design/edit.phtml b/app/design/adminhtml/default/default/template/system/design/edit.phtml index aaa3172ebe..236448cf5b 100644 --- a/app/design/adminhtml/default/default/template/system/design/edit.phtml +++ b/app/design/adminhtml/default/default/template/system/design/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/system/design/index.phtml b/app/design/adminhtml/default/default/template/system/design/index.phtml index bd349793a8..dcb94be27d 100644 --- a/app/design/adminhtml/default/default/template/system/design/index.phtml +++ b/app/design/adminhtml/default/default/template/system/design/index.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -36,4 +36,4 @@
getChildHtml('grid') ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml index a4aa38797c..6cf745bf3e 100644 --- a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml +++ b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -122,9 +122,9 @@ unconvertedText: '', typeChange: false, init: function () { - if ($('convert_button_back')) { - $('convert_button_back').hide(); - } + if ($('convert_button_back')) { + $('convert_button_back').hide(); + } }, stripTags: function () { if(!window.confirm("__('Are you sure that you want to strip tags?') ?>")) { @@ -170,7 +170,7 @@ deleteTemplate: function() { if(window.confirm("__('Are you sure that you want to delete this template?') ?>")) { - window.location.href = 'getDeleteUrl() ?>'; + window.location.href = 'getDeleteUrl() ?>'; } }, diff --git a/app/design/adminhtml/default/default/template/system/email/template/list.phtml b/app/design/adminhtml/default/default/template/system/email/template/list.phtml index f3f9b1f1a9..2ef60db821 100644 --- a/app/design/adminhtml/default/default/template/system/email/template/list.phtml +++ b/app/design/adminhtml/default/default/template/system/email/template/list.phtml @@ -18,22 +18,22 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - - -
- -
+ + + + + +
+ getChildHtml('add_button') ?> +
getChildHtml('grid') ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml index f3088007d4..ce07c3a604 100644 --- a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml +++ b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/system/info.phtml b/app/design/adminhtml/default/default/template/system/info.phtml index 7766ab4f16..87bcb269a6 100644 --- a/app/design/adminhtml/default/default/template/system/info.phtml +++ b/app/design/adminhtml/default/default/template/system/info.phtml @@ -18,124 +18,124 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -
-

__('Personal Information') ?>

-
-

Last Logged in: June, 16, 2007 ( Currently OFFLINE )
- Account Created on: April 01, 2001
- Account Created in: Magento Store

-
- Primary Billing Address
- Yoav Kutner
- 3402 Motor Ave Suite B
- Los Angeles, CA 90034
- United States
- T | (310) 123-1234
-
-
-
-
-
Sales Statistics
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
StoreLifetime SaleAverage Sale
Total$2076.97$116.74
Magento Store (EN)$1875.99$89.99
Varien Store (EN)$200.98$26.75
-
-
-
-
-
-
-
Last 5 Orders
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Order #DateShip ToOrder TotalBought From
2DRF23406/15/2007Yoav Kutner$65.50Magento Store (EN)View
Z1234124701/12/2007Yoav Kutner$98.75Varien Store (EN)View
Z987614507/30/2006Yoav Kutner$124.99Magento Store (EN)View
Z012312303/26/2006Yoav Kutner$70.99Magento Store (EN)View
S1230K8901/17/2006Yoav Kutner$54.65Magento Store (EN)View
-
Shopping Cart (3 items)
-
-
Wishlist (1 item)
-
-
+
+

__('Personal Information') ?>

+
+

Last Logged in: June, 16, 2007 ( Currently OFFLINE )
+ Account Created on: April 01, 2001
+ Account Created in: Magento Store

+
+ Primary Billing Address
+ Yoav Kutner
+ 3402 Motor Ave Suite B
+ Los Angeles, CA 90034
+ United States
+ T | (310) 123-1234
+
+
+
+
+
Sales Statistics
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
StoreLifetime SaleAverage Sale
Total$2076.97$116.74
Magento Store (EN)$1875.99$89.99
Varien Store (EN)$200.98$26.75
+
+
+
+
+
+
+
Last 5 Orders
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Order #DateShip ToOrder TotalBought From
2DRF23406/15/2007Yoav Kutner$65.50Magento Store (EN)View
Z1234124701/12/2007Yoav Kutner$98.75Varien Store (EN)View
Z987614507/30/2006Yoav Kutner$124.99Magento Store (EN)View
Z012312303/26/2006Yoav Kutner$70.99Magento Store (EN)View
S1230K8901/17/2006Yoav Kutner$54.65Magento Store (EN)View
+
Shopping Cart (3 items)
+
+
Wishlist (1 item)
+
+
diff --git a/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml b/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml index b435eb026f..9d071ac1b3 100644 --- a/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml +++ b/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/tag/index.phtml b/app/design/adminhtml/default/default/template/tag/index.phtml index 19d5510d75..93b857fd78 100644 --- a/app/design/adminhtml/default/default/template/tag/index.phtml +++ b/app/design/adminhtml/default/default/template/tag/index.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -34,4 +34,4 @@
getGridHtml() ?> -
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml b/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml index 5340a4b434..f1a23fd8d5 100644 --- a/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml +++ b/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml @@ -18,26 +18,26 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - + + - + +

_getHeader() ?>

 +

_getHeader() ?>

 getBackButtonHtml(); ?> getResetButtonHtml(); ?> getDeleteButtonHtml(); ?> getSaveButtonHtml(); ?> -
_getRenameFormHtml(); ?> \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/tax/importExport.phtml b/app/design/adminhtml/default/default/template/tax/importExport.phtml index e299631928..567024e0b7 100644 --- a/app/design/adminhtml/default/default/template/tax/importExport.phtml +++ b/app/design/adminhtml/default/default/template/tax/importExport.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/tax/rate/form.phtml b/app/design/adminhtml/default/default/template/tax/rate/form.phtml index f513c721ed..09bb7bfdf6 100644 --- a/app/design/adminhtml/default/default/template/tax/rate/form.phtml +++ b/app/design/adminhtml/default/default/template/tax/rate/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/tax/rate/title.phtml b/app/design/adminhtml/default/default/template/tax/rate/title.phtml index c950044523..835b3596fe 100644 --- a/app/design/adminhtml/default/default/template/tax/rate/title.phtml +++ b/app/design/adminhtml/default/default/template/tax/rate/title.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> */ ?> diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml index 7e74a7df02..3b4b764107 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml @@ -18,19 +18,19 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - + + + +

- -

+ +
-
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml index 966277840a..e7dc20df21 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml @@ -18,22 +18,22 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - + + - + +

+

getBackButtonHtml() ?> getResetButtonHtml() ?> getSaveButtonHtml() ?> -
@@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml index 515f94b68c..05b75ad7c5 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml @@ -18,19 +18,19 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - + + + +

- -

+ +
-
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml index 51e4b11341..db2f28b95f 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml @@ -18,23 +18,23 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - + + - + +

+

getBackButtonHtml(); ?> getResetButtonHtml(); ?> getDeleteButtonHtml(); ?> getSaveButtonHtml(); ?> -
@@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml index 7941e654a2..e70da9b623 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml @@ -18,19 +18,19 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - - + + + +

- -

+ +
-
\ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml index 9b4ab44a4f..bb6a535e55 100644 --- a/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml +++ b/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml @@ -18,23 +18,23 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
- - - + + - + +

+

getBackButtonHtml(); ?> getResetButtonHtml(); ?> getSaveButtonHtml(); ?> getDeleteButtonHtml(); ?> -
@@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml b/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml index 4a553ae1a3..0774c429ac 100644 --- a/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml +++ b/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml b/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml index 0db3c7dd10..e483f296a7 100644 --- a/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml +++ b/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml b/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml index 8788513267..f1e343313c 100644 --- a/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml +++ b/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml b/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml index 3a4814b677..c1201c720b 100644 --- a/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml +++ b/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getElement()->getHtmlId() ?> @@ -193,4 +193,4 @@ //]]> - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/widget/accordion.phtml b/app/design/adminhtml/default/default/template/widget/accordion.phtml index 2aa3ae3475..7efc9a9439 100644 --- a/app/design/adminhtml/default/default/template/widget/accordion.phtml +++ b/app/design/adminhtml/default/default/template/widget/accordion.phtml @@ -1,39 +1,39 @@ - - -
-getItems() as $_item): ?> - getChildHtml($_item->getId()) ?> - -
- \ No newline at end of file + + +
+getItems() as $_item): ?> + getChildHtml($_item->getId()) ?> + +
+ diff --git a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml b/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml index f5a9c7a7eb..c0398a4f2d 100644 --- a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml +++ b/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml @@ -1,47 +1,47 @@ - - - - \ No newline at end of file + + + + diff --git a/app/design/adminhtml/default/default/template/widget/form.phtml b/app/design/adminhtml/default/default/template/widget/form.phtml index afca5f6bec..4becf8f0e6 100644 --- a/app/design/adminhtml/default/default/template/widget/form.phtml +++ b/app/design/adminhtml/default/default/template/widget/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -29,9 +29,9 @@ getUseContainer() === true ): ?>
getFormEnctype() ) ? 'enctype="' . $this->getForm()->getFormEnctype() . '"' : '' ?> > - getElements() as $_element): ?> - drawElement($_element) ?> - + getElements() as $_element): ?> + drawElement($_element) ?> + getUseContainer() === true ): ?>
diff --git a/app/design/adminhtml/default/default/template/widget/form/container.phtml b/app/design/adminhtml/default/default/template/widget/form/container.phtml index f157ef7596..ae6ebb423b 100644 --- a/app/design/adminhtml/default/default/template/widget/form/container.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/container.phtml @@ -1,46 +1,46 @@ - - -getFormInitScripts() ?> -
- getHeaderHtml() ?> -

getButtonsHtml('header') ?>

-
-getFormHtml() ?> -hasFooterButtons()): ?> -
-

getButtonsHtml('footer') ?>

-
- - -getFormScripts() ?> + + +getFormInitScripts() ?> +
+ getHeaderHtml() ?> +

getButtonsHtml('header') ?>

+
+getFormHtml() ?> +hasFooterButtons()): ?> +
+

getButtonsHtml('footer') ?>

+
+ + +getFormScripts() ?> diff --git a/app/design/adminhtml/default/default/template/widget/form/element.phtml b/app/design/adminhtml/default/default/template/widget/form/element.phtml index 8f5a81c8a0..9ff1b89a9f 100644 --- a/app/design/adminhtml/default/default/template/widget/form/element.phtml +++ b/app/design/adminhtml/default/default/template/widget/form/element.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getType()){ @@ -70,48 +70,48 @@ case 'radios': ?> - getRadios() as $_radio): ?> - getValue() == $element->getChecked() ) ? 'checked="true"' : '' ?> > getLabel() ?> - + getRadios() as $_radio): ?> + getValue() == $element->getChecked() ) ? 'checked="true"' : '' ?> > getLabel() ?> + + case 'wysiwyg': ?> - - - + - + }); + //]]> + + - - - - - + + + + + @@ -65,7 +65,7 @@ - + - \ No newline at end of file + diff --git a/app/design/adminhtml/default/default/template/widget/grid/container.phtml b/app/design/adminhtml/default/default/template/widget/grid/container.phtml index 21fa99fca5..f4504269a0 100644 --- a/app/design/adminhtml/default/default/template/widget/grid/container.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid/container.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -34,4 +34,4 @@
getGridHtml() ?> -
\ No newline at end of file +
diff --git a/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml b/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml index 58c4b61be2..e520b80b17 100644 --- a/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
diff --git a/app/design/adminhtml/default/default/template/widget/tabs.phtml b/app/design/adminhtml/default/default/template/widget/tabs.phtml index c6ef141abb..7b541413cc 100644 --- a/app/design/adminhtml/default/default/template/widget/tabs.phtml +++ b/app/design/adminhtml/default/default/template/widget/tabs.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getTitle()): ?> diff --git a/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml b/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml index 78e1aa887b..501c0d6c54 100644 --- a/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml +++ b/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -58,4 +58,4 @@ Shopping cart - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/bundle.xml b/app/design/frontend/default/default/layout/bundle.xml index 6fe9f3a5d9..6f2dfb7736 100644 --- a/app/design/frontend/default/default/layout/bundle.xml +++ b/app/design/frontend/default/default/layout/bundle.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -294,4 +294,4 @@ Emails - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/catalog.xml b/app/design/frontend/default/default/layout/catalog.xml index 69e819235d..2a7719c341 100644 --- a/app/design/frontend/default/default/layout/catalog.xml +++ b/app/design/frontend/default/default/layout/catalog.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ Supported layout update handles (action): diff --git a/app/design/frontend/default/default/layout/catalogsearch.xml b/app/design/frontend/default/default/layout/catalogsearch.xml index 1ce0774bc9..36d61a8696 100644 --- a/app/design/frontend/default/default/layout/catalogsearch.xml +++ b/app/design/frontend/default/default/layout/catalogsearch.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -117,4 +117,4 @@ Advanced search results - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/checkout.xml b/app/design/frontend/default/default/layout/checkout.xml index f6be52be0a..9a2508e393 100644 --- a/app/design/frontend/default/default/layout/checkout.xml +++ b/app/design/frontend/default/default/layout/checkout.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -271,8 +271,10 @@ One page checkout main layout - - + + checkout-progress-wrapper + + diff --git a/app/design/frontend/default/default/layout/cms.xml b/app/design/frontend/default/default/layout/cms.xml index cc14ded970..a27047027f 100644 --- a/app/design/frontend/default/default/layout/cms.xml +++ b/app/design/frontend/default/default/layout/cms.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/default/layout/contacts.xml b/app/design/frontend/default/default/layout/contacts.xml index 123d61e442..2c026b0b82 100644 --- a/app/design/frontend/default/default/layout/contacts.xml +++ b/app/design/frontend/default/default/layout/contacts.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/default/layout/core.xml b/app/design/frontend/default/default/layout/core.xml index bc3ec0c389..b9fe727305 100644 --- a/app/design/frontend/default/default/layout/core.xml +++ b/app/design/frontend/default/default/layout/core.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/default/layout/customer.xml b/app/design/frontend/default/default/layout/customer.xml index 320ee93024..674d767e20 100644 --- a/app/design/frontend/default/default/layout/customer.xml +++ b/app/design/frontend/default/default/layout/customer.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ Supported layout update handles (action): @@ -187,14 +187,14 @@ Customer account pages, rendered for all tabs in dashboard account_editcustomer/account/edit/ address_bookcustomer/address/ - - simplecheckout/cart_item_renderer - groupedcheckout/cart_item_renderer_grouped - configurablecheckout/cart_item_renderer_configurable - - - - + + simplecheckout/cart_item_renderer + groupedcheckout/cart_item_renderer_grouped + configurablecheckout/cart_item_renderer_configurable + + + + diff --git a/app/design/frontend/default/default/layout/directory.xml b/app/design/frontend/default/default/layout/directory.xml index 6b953ac183..211fe29eac 100644 --- a/app/design/frontend/default/default/layout/directory.xml +++ b/app/design/frontend/default/default/layout/directory.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -71,4 +71,4 @@ Catalog Search layout - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/downloadable.xml b/app/design/frontend/default/default/layout/downloadable.xml index 8d3563923c..0f98439f54 100644 --- a/app/design/frontend/default/default/layout/downloadable.xml +++ b/app/design/frontend/default/default/layout/downloadable.xml @@ -19,9 +19,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ @@ -164,4 +164,4 @@ Emails - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/giftmessage.xml b/app/design/frontend/default/default/layout/giftmessage.xml index f2120fd20f..00a1360432 100644 --- a/app/design/frontend/default/default/layout/giftmessage.xml +++ b/app/design/frontend/default/default/layout/giftmessage.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -68,4 +68,4 @@ Gift message remove result - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/googleanalytics.xml b/app/design/frontend/default/default/layout/googleanalytics.xml index edb53a230c..4076951ede 100644 --- a/app/design/frontend/default/default/layout/googleanalytics.xml +++ b/app/design/frontend/default/default/layout/googleanalytics.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -38,4 +38,4 @@ Default layout, loads most of the pages - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/googlecheckout.xml b/app/design/frontend/default/default/layout/googlecheckout.xml index ff7ddaba9d..43d4accff1 100644 --- a/app/design/frontend/default/default/layout/googlecheckout.xml +++ b/app/design/frontend/default/default/layout/googlecheckout.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/googleoptimizer.xml b/app/design/frontend/default/default/layout/googleoptimizer.xml index a61fc6e1cd..124f5293c1 100644 --- a/app/design/frontend/default/default/layout/googleoptimizer.xml +++ b/app/design/frontend/default/default/layout/googleoptimizer.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -150,4 +150,4 @@ Product view - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/newsletter.xml b/app/design/frontend/default/default/layout/newsletter.xml index 5e20d6ed59..7babe0ecce 100644 --- a/app/design/frontend/default/default/layout/newsletter.xml +++ b/app/design/frontend/default/default/layout/newsletter.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -66,4 +66,4 @@ Customer account pages, rendered for all tabs in dashboard - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/page.xml b/app/design/frontend/default/default/layout/page.xml index aa7d6e6bbb..b5e7fd3232 100644 --- a/app/design/frontend/default/default/layout/page.xml +++ b/app/design/frontend/default/default/layout/page.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/default/layout/paypal.xml b/app/design/frontend/default/default/layout/paypal.xml index 389f399a3c..0ad18c7aef 100644 --- a/app/design/frontend/default/default/layout/paypal.xml +++ b/app/design/frontend/default/default/layout/paypal.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -67,4 +67,4 @@ PayPal Express Review details block - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/paypaluk.xml b/app/design/frontend/default/default/layout/paypaluk.xml index 23b1e6f360..eb00e36a86 100644 --- a/app/design/frontend/default/default/layout/paypaluk.xml +++ b/app/design/frontend/default/default/layout/paypaluk.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -67,4 +67,4 @@ PayPalUk Express Review details block - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/poll.xml b/app/design/frontend/default/default/layout/poll.xml index ffb11c3d6b..fbf6cfc456 100644 --- a/app/design/frontend/default/default/layout/poll.xml +++ b/app/design/frontend/default/default/layout/poll.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -54,4 +54,4 @@ Customer account home dashboard layout - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/productalert.xml b/app/design/frontend/default/default/layout/productalert.xml index 9ece2ec3fb..ab70f70bd2 100644 --- a/app/design/frontend/default/default/layout/productalert.xml +++ b/app/design/frontend/default/default/layout/productalert.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/reports.xml b/app/design/frontend/default/default/layout/reports.xml index c9a8d60a6a..b47d0cf144 100644 --- a/app/design/frontend/default/default/layout/reports.xml +++ b/app/design/frontend/default/default/layout/reports.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/review.xml b/app/design/frontend/default/default/layout/review.xml index 3010443c09..80efbb929a 100644 --- a/app/design/frontend/default/default/layout/review.xml +++ b/app/design/frontend/default/default/layout/review.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/default/layout/rss.xml b/app/design/frontend/default/default/layout/rss.xml index 759b6442e1..c98545dce9 100644 --- a/app/design/frontend/default/default/layout/rss.xml +++ b/app/design/frontend/default/default/layout/rss.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -89,4 +89,4 @@ Order layout - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/sales.xml b/app/design/frontend/default/default/layout/sales.xml index 1317ca78f7..615b916743 100644 --- a/app/design/frontend/default/default/layout/sales.xml +++ b/app/design/frontend/default/default/layout/sales.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -273,4 +273,4 @@ Email layouts section - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/sendfriend.xml b/app/design/frontend/default/default/layout/sendfriend.xml index 012dbc1d1e..9c8f5e930b 100644 --- a/app/design/frontend/default/default/layout/sendfriend.xml +++ b/app/design/frontend/default/default/layout/sendfriend.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/shipping.xml b/app/design/frontend/default/default/layout/shipping.xml index 8765f28ca8..92c8118c1f 100644 --- a/app/design/frontend/default/default/layout/shipping.xml +++ b/app/design/frontend/default/default/layout/shipping.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/default/layout/tag.xml b/app/design/frontend/default/default/layout/tag.xml index e5e9b047d9..e8273f35b8 100644 --- a/app/design/frontend/default/default/layout/tag.xml +++ b/app/design/frontend/default/default/layout/tag.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -127,4 +127,4 @@ All tags page - \ No newline at end of file + diff --git a/app/design/frontend/default/default/layout/weee.xml b/app/design/frontend/default/default/layout/weee.xml index a0f7ed3186..2ecde59622 100644 --- a/app/design/frontend/default/default/layout/weee.xml +++ b/app/design/frontend/default/default/layout/weee.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/frontend/default/default/layout/wishlist.xml b/app/design/frontend/default/default/layout/wishlist.xml index 8bac2778b7..e56202348e 100644 --- a/app/design/frontend/default/default/layout/wishlist.xml +++ b/app/design/frontend/default/default/layout/wishlist.xml @@ -19,10 +19,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -101,4 +101,4 @@ Wishlist pages - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/amazonpayments/asp/form.phtml b/app/design/frontend/default/default/template/amazonpayments/asp/form.phtml index f9e95a3fc8..b1b1c4c0a8 100644 --- a/app/design/frontend/default/default/template/amazonpayments/asp/form.phtml +++ b/app/design/frontend/default/default/template/amazonpayments/asp/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -32,4 +32,4 @@ getDescriptionMessage() ?> -
\ No newline at end of file + diff --git a/app/design/frontend/default/default/template/amazonpayments/asp/redirect.phtml b/app/design/frontend/default/default/template/amazonpayments/asp/redirect.phtml index 6b8e98fbad..e9b6dcb7b8 100644 --- a/app/design/frontend/default/default/template/amazonpayments/asp/redirect.phtml +++ b/app/design/frontend/default/default/template/amazonpayments/asp/redirect.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/amazonpayments/asp/shortcut.phtml b/app/design/frontend/default/default/template/amazonpayments/asp/shortcut.phtml index fcb5597618..14a7ea236f 100644 --- a/app/design/frontend/default/default/template/amazonpayments/asp/shortcut.phtml +++ b/app/design/frontend/default/default/template/amazonpayments/asp/shortcut.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_blank - * @package Mage_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/default/default/template/amazonpayments/cba/form.phtml b/app/design/frontend/default/default/template/amazonpayments/cba/form.phtml index 75c294388f..a3f914aa51 100644 --- a/app/design/frontend/default/default/template/amazonpayments/cba/form.phtml +++ b/app/design/frontend/default/default/template/amazonpayments/cba/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
@@ -32,4 +32,4 @@ __('Your billing address will be ignored and you will be redirected to Checkout by Amazon website.') ?> -
\ No newline at end of file + diff --git a/app/design/frontend/default/default/template/amazonpayments/cba/success.phtml b/app/design/frontend/default/default/template/amazonpayments/cba/success.phtml index 3aa71b7c3c..ef0afd5f15 100644 --- a/app/design/frontend/default/default/template/amazonpayments/cba/success.phtml +++ b/app/design/frontend/default/default/template/amazonpayments/cba/success.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> SUCCESS @@ -32,4 +32,4 @@ SUCCESS

__('You will receive an order confirmation email with details of your order and a link to track its progress.') ?>

-
\ No newline at end of file +
diff --git a/app/design/frontend/default/default/template/amazonpayments/link.phtml b/app/design/frontend/default/default/template/amazonpayments/link.phtml index 2b82425b07..16fa4c57ae 100644 --- a/app/design/frontend/default/default/template/amazonpayments/link.phtml +++ b/app/design/frontend/default/default/template/amazonpayments/link.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -46,4 +46,4 @@ <?php echo Mage::helper('amazonpayments')->__('Checkout by Amazon');?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/list/partof.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/list/partof.phtml index 7723a86d55..746e24ce09 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/list/partof.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/list/partof.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItemCollection()->getSize()): ?> diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/price.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/price.phtml index 5c62fe7cdd..0eed28b769 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/price.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/price.phtml @@ -1,263 +1,263 @@ - - -getProduct() ?> -getPriceModel()->getPrices($_product) ?> -getId() ?> - - - -getPrice($_product, $_minimalPrice); ?> -getPrice($_product, $_minimalPrice, true); ?> - -getPriceType() == 1) { - $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product); - if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) { - $_minimalPriceTax += $_weeeTaxAmount; - $_minimalPriceInclTax += $_weeeTaxAmount; - } - if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) { - $_minimalPriceInclTax += $_weeeTaxAmount; - } - - if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) { - $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product); - } -} -?> - -
- getPriceView()): ?> -

- __('As low as') ?>: - helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?> - - __('Excl. Tax:') ?> - currency($_minimalPriceTax) ?> - - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - - __('Incl. Tax:') ?> - currency($_minimalPriceInclTax) ?> - - - currency($_minimalPriceTax) ?> - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?> - currency($_minimalPriceInclTax) ?> - - -

- - $_maximalPrice): ?> -

- __('From') ?>: - helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?> - - __('Excl. Tax:') ?> - currency($_minimalPriceTax) ?> - - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - - __('Incl. Tax:') ?> - currency($_minimalPriceInclTax) ?> - - - currency($_minimalPriceTax) ?> - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?> - currency($_minimalPriceInclTax) ?> - - -

- getPrice($_product, $_maximalPrice); ?> - getPrice($_product, $_maximalPrice, true); ?> - getPriceType() == 1) { - if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) { - $_maximalPriceTax += $_weeeTaxAmount; - $_maximalPriceInclTax += $_weeeTaxAmount; - } - if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) { - $_maximalPriceInclTax += $_weeeTaxAmount; - } - } - ?> -

- __('To') ?>: - helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?> - - __('Excl. Tax:') ?> - currency($_maximalPriceTax) ?> - - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - - __('Incl. Tax') ?> - currency($_maximalPriceInclTax) ?> - - - currency($_maximalPriceTax) ?> - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?> - currency($_maximalPriceInclTax) ?> - - -

- - helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?> - - __('Excl. Tax:') ?> - currency($_minimalPriceTax) ?> - - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - - __('Incl. Tax:') ?> - currency($_minimalPriceInclTax) ?> - - - currency($_minimalPriceTax) ?> - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?> - currency($_minimalPriceInclTax) ?> - - - - -
\ No newline at end of file + + +getProduct() ?> +getPriceModel()->getPrices($_product) ?> +getId() ?> + + + +getPrice($_product, $_minimalPrice); ?> +getPrice($_product, $_minimalPrice, true); ?> + +getPriceType() == 1) { + $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product); + if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) { + $_minimalPriceTax += $_weeeTaxAmount; + $_minimalPriceInclTax += $_weeeTaxAmount; + } + if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) { + $_minimalPriceInclTax += $_weeeTaxAmount; + } + + if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) { + $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product); + } +} +?> + +
+ getPriceView()): ?> +

+ __('As low as') ?>: + helper('tax')->displayBothPrices()): ?> + + __('Excl. Tax:') ?> + currency($_minimalPriceTax) ?> + + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + + __('Incl. Tax:') ?> + currency($_minimalPriceInclTax) ?> + + + currency($_minimalPriceTax) ?> + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?> + currency($_minimalPriceInclTax) ?> + + +

+ + $_maximalPrice): ?> +

+ __('From') ?>: + helper('tax')->displayBothPrices()): ?> + + __('Excl. Tax:') ?> + currency($_minimalPriceTax) ?> + + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + + __('Incl. Tax:') ?> + currency($_minimalPriceInclTax) ?> + + + currency($_minimalPriceTax) ?> + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?> + currency($_minimalPriceInclTax) ?> + + +

+ getPrice($_product, $_maximalPrice); ?> + getPrice($_product, $_maximalPrice, true); ?> + getPriceType() == 1) { + if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) { + $_maximalPriceTax += $_weeeTaxAmount; + $_maximalPriceInclTax += $_weeeTaxAmount; + } + if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) { + $_maximalPriceInclTax += $_weeeTaxAmount; + } + } + ?> +

+ __('To') ?>: + helper('tax')->displayBothPrices()): ?> + + __('Excl. Tax:') ?> + currency($_maximalPriceTax) ?> + + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + + __('Incl. Tax') ?> + currency($_maximalPriceInclTax) ?> + + + currency($_maximalPriceTax) ?> + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?> + currency($_maximalPriceInclTax) ?> + + +

+ + helper('tax')->displayBothPrices()): ?> + + __('Excl. Tax:') ?> + currency($_minimalPriceTax) ?> + + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + + __('Incl. Tax:') ?> + currency($_minimalPriceInclTax) ?> + + + currency($_minimalPriceTax) ?> + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?> + currency($_minimalPriceInclTax) ?> + + + + +
diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/price.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/price.phtml index e759f5012a..34f9cfe426 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/view/price.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/price.phtml @@ -1,93 +1,93 @@ - -getProduct() ?> -getPrice($_product, $_product->getFinalPrice()); ?> -getPrice($_product, $_product->getFinalPrice(), true); ?> - -getPriceType() == 1) { - $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product); - if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) { - $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product); - } -} -?> - -
-

- helper('bundle')->__('Price as configured') ?>: - helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?> - - - __('Excl. Tax:') ?> - currency($_finalPrice,true,false) ?> - - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - - __('Incl. Tax:') ?> - currency($_finalPriceInclTax,true,false) ?> - - - - currency($_finalPrice,true,false) ?> - getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> - ( - - typeOfDisplay($_product, array(2, 4))): ?> - getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> - - getAmount(); ?> - - - - getName(); ?>: currency($amount, true, true); ?> - - - ) - - -

-
-isSaleable()): ?> - - + +getProduct() ?> +getPrice($_product, $_product->getFinalPrice()); ?> +getPrice($_product, $_product->getFinalPrice(), true); ?> + +getPriceType() == 1) { + $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product); + if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) { + $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product); + } +} +?> + +
+

+ helper('bundle')->__('Price as configured') ?>: + helper('tax')->displayBothPrices()): ?> + + + __('Excl. Tax:') ?> + currency($_finalPrice,true,false) ?> + + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + + __('Incl. Tax:') ?> + currency($_finalPriceInclTax,true,false) ?> + + + + currency($_finalPrice,true,false) ?> + getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?> + ( + + typeOfDisplay($_product, array(2, 4))): ?> + getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?> + + getAmount(); ?> + + + + getName(); ?>: currency($amount, true, true); ?> + + + ) + + +

+
+isSaleable()): ?> + + diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/tierprices.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/tierprices.phtml index e8da7e7a26..1f3036e2bf 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/view/tierprices.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/tierprices.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -38,4 +38,4 @@ $_tierPrices = $this->getTierPrices();
  • __('Buy %1$s with %2$s discount each', $_price['price_qty'], ''.($_price['price']*1).'%') ?>
    • - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle.phtml index aee58d4420..62c92c2b98 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml index 7ec43f77ce..ed750649f3 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml index 3aed001151..79315ff8c6 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/multi.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml index 6f55166b3f..299107c64e 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml index 4f70baeb76..1f509224ef 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/options.phtml b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/options.phtml index c35f2f2ce3..4cb44e5b79 100644 --- a/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/options.phtml +++ b/app/design/frontend/default/default/template/bundle/catalog/product/view/type/bundle/options.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/bundle/email/order/items/creditmemo/default.phtml b/app/design/frontend/default/default/template/bundle/email/order/items/creditmemo/default.phtml index 4d3414ab03..30b93638a5 100644 --- a/app/design/frontend/default/default/template/bundle/email/order/items/creditmemo/default.phtml +++ b/app/design/frontend/default/default/template/bundle/email/order/items/creditmemo/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -165,4 +165,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/email/order/items/invoice/default.phtml b/app/design/frontend/default/default/template/bundle/email/order/items/invoice/default.phtml index 90f6bece9d..07bf39c55b 100644 --- a/app/design/frontend/default/default/template/bundle/email/order/items/invoice/default.phtml +++ b/app/design/frontend/default/default/template/bundle/email/order/items/invoice/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -166,4 +166,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/email/order/items/order/default.phtml b/app/design/frontend/default/default/template/bundle/email/order/items/order/default.phtml index 1d692e6c1c..87f527ce2b 100644 --- a/app/design/frontend/default/default/template/bundle/email/order/items/order/default.phtml +++ b/app/design/frontend/default/default/template/bundle/email/order/items/order/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -171,4 +171,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/email/order/items/shipment/default.phtml b/app/design/frontend/default/default/template/bundle/email/order/items/shipment/default.phtml index 4b0f907fcc..528927c457 100644 --- a/app/design/frontend/default/default/template/bundle/email/order/items/shipment/default.phtml +++ b/app/design/frontend/default/default/template/bundle/email/order/items/shipment/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -89,4 +89,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/sales/order/creditmemo/items/renderer.phtml b/app/design/frontend/default/default/template/bundle/sales/order/creditmemo/items/renderer.phtml index 0325bb749c..0af8b5ee1e 100644 --- a/app/design/frontend/default/default/template/bundle/sales/order/creditmemo/items/renderer.phtml +++ b/app/design/frontend/default/default/template/bundle/sales/order/creditmemo/items/renderer.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -327,4 +327,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/sales/order/invoice/items/renderer.phtml b/app/design/frontend/default/default/template/bundle/sales/order/invoice/items/renderer.phtml index 2adaa6b52c..6fcc0e9682 100644 --- a/app/design/frontend/default/default/template/bundle/sales/order/invoice/items/renderer.phtml +++ b/app/design/frontend/default/default/template/bundle/sales/order/invoice/items/renderer.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -350,4 +350,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/sales/order/items/renderer.phtml b/app/design/frontend/default/default/template/bundle/sales/order/items/renderer.phtml index 45fa622d80..7bce41bc8a 100644 --- a/app/design/frontend/default/default/template/bundle/sales/order/items/renderer.phtml +++ b/app/design/frontend/default/default/template/bundle/sales/order/items/renderer.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -373,4 +373,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/bundle/sales/order/shipment/items/renderer.phtml b/app/design/frontend/default/default/template/bundle/sales/order/shipment/items/renderer.phtml index fbd13528ab..2b43cd4343 100644 --- a/app/design/frontend/default/default/template/bundle/sales/order/shipment/items/renderer.phtml +++ b/app/design/frontend/default/default/template/bundle/sales/order/shipment/items/renderer.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -109,4 +109,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/callouts/left_col.phtml b/app/design/frontend/default/default/template/callouts/left_col.phtml index 1443e73902..3e0f55fba5 100644 --- a/app/design/frontend/default/default/template/callouts/left_col.phtml +++ b/app/design/frontend/default/default/template/callouts/left_col.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/callouts/right_col.phtml b/app/design/frontend/default/default/template/callouts/right_col.phtml index c34cdf544d..bb39bf5e75 100644 --- a/app/design/frontend/default/default/template/callouts/right_col.phtml +++ b/app/design/frontend/default/default/template/callouts/right_col.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/catalog/category/page.phtml b/app/design/frontend/default/default/template/catalog/category/page.phtml index 5ce350c0e0..d59c4de4d7 100644 --- a/app/design/frontend/default/default/template/catalog/category/page.phtml +++ b/app/design/frontend/default/default/template/catalog/category/page.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/catalog/category/view.phtml b/app/design/frontend/default/default/template/catalog/category/view.phtml index b854141b90..3ed8320936 100644 --- a/app/design/frontend/default/default/template/catalog/category/view.phtml +++ b/app/design/frontend/default/default/template/catalog/category/view.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> categoryAttribute($_category, $_description, 'description') ?>

    getProductListHtml() ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/layer/filter.phtml b/app/design/frontend/default/default/template/catalog/layer/filter.phtml index 96b995330a..8d51a9a72e 100644 --- a/app/design/frontend/default/default/template/catalog/layer/filter.phtml +++ b/app/design/frontend/default/default/template/catalog/layer/filter.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    getChildHtml('topLeftLinks') ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/compare/list.phtml b/app/design/frontend/default/default/template/catalog/product/compare/list.phtml index 76d5352035..c955e40188 100644 --- a/app/design/frontend/default/default/template/catalog/product/compare/list.phtml +++ b/app/design/frontend/default/default/template/catalog/product/compare/list.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Catalog_Block_Product_Compare_List */ ?> diff --git a/app/design/frontend/default/default/template/catalog/product/compare/sidebar.phtml b/app/design/frontend/default/default/template/catalog/product/compare/sidebar.phtml index 6f689d6b85..d45ad85c80 100644 --- a/app/design/frontend/default/default/template/catalog/product/compare/sidebar.phtml +++ b/app/design/frontend/default/default/template/catalog/product/compare/sidebar.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Catalog_Block_Product_Compare_Sidebar */ ?> diff --git a/app/design/frontend/default/default/template/catalog/product/gallery.phtml b/app/design/frontend/default/default/template/catalog/product/gallery.phtml index 3dcd6156f9..bbcd9c0fca 100644 --- a/app/design/frontend/default/default/template/catalog/product/gallery.phtml +++ b/app/design/frontend/default/default/template/catalog/product/gallery.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getImageWidth() ?> diff --git a/app/design/frontend/default/default/template/catalog/product/list.phtml b/app/design/frontend/default/default/template/catalog/product/list.phtml index c813a25345..0737cf1a05 100644 --- a/app/design/frontend/default/default/template/catalog/product/list.phtml +++ b/app/design/frontend/default/default/template/catalog/product/list.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItems()->getSize()): ?> @@ -94,4 +94,4 @@ function addRelatedToProduct(){ } //--> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/list/toolbar.phtml b/app/design/frontend/default/default/template/catalog/product/list/toolbar.phtml index 2909ce9780..73714add13 100644 --- a/app/design/frontend/default/default/template/catalog/product/list/toolbar.phtml +++ b/app/design/frontend/default/default/template/catalog/product/list/toolbar.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItemCollection()->getItems())): ?> diff --git a/app/design/frontend/default/default/template/catalog/product/new.phtml b/app/design/frontend/default/default/template/catalog/product/new.phtml index 18ea198723..dda9f0917f 100644 --- a/app/design/frontend/default/default/template/catalog/product/new.phtml +++ b/app/design/frontend/default/default/template/catalog/product/new.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category default_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getProductCollection()) && $_products->getSize()): ?> @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/price.phtml b/app/design/frontend/default/default/template/catalog/product/price.phtml index 11200da6e5..3645df916a 100644 --- a/app/design/frontend/default/default/template/catalog/product/price.phtml +++ b/app/design/frontend/default/default/template/catalog/product/price.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -62,7 +62,7 @@ getPrice($_product, $_product->getFinalPrice(), true) ?> getPriceDisplayType(); ?> - displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?> + displayBothPrices()): ?> typeOfDisplay($_product, 0)): // including ?> __('Excl. Tax:') ?> @@ -213,7 +213,7 @@

    - displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?> + displayBothPrices()): ?>

    __('Special Price:') ?> @@ -337,7 +337,7 @@

    - displayBothPrices() && $_finalPriceInclTax != $_finalPrice): ?> + displayBothPrices()): ?>

    __('Special Price:') ?> @@ -372,12 +372,20 @@ + getUseLinkForAsLowAs()):?> + + + __('As low as:') ?> currency($_minimalPriceDisplayValue,true,false) ?> + getUseLinkForAsLowAs()):?> + + + getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?> @@ -389,7 +397,7 @@ getDisplayMinimalPrice() && $_minimalPriceValue): ?>

    __('Starting at:') ?> - displayBothPrices() && ($_exclTax !== $_inclTax)): ?> + displayBothPrices()): ?> __('Excl. Tax:') ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view.phtml b/app/design/frontend/default/default/template/catalog/product/view.phtml index 2d994a6d4a..2df3088ac6 100644 --- a/app/design/frontend/default/default/template/catalog/product/view.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -130,4 +130,4 @@ getChildHtml('upsell_products') ?> getChildHtml('product_additional_data') ?>
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/view/additional.phtml b/app/design/frontend/default/default/template/catalog/product/view/additional.phtml index ab52efe32c..8f07260e03 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/additional.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/additional.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getChildHtmlList() as $_html): ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/addto.phtml b/app/design/frontend/default/default/template/catalog/product/view/addto.phtml index 3882c3d770..372c49a9c2 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/addto.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/addto.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -34,4 +34,4 @@ helper('catalog/product_compare')->getAddUrl($_product) ): ?>
  • | __('Add to Compare') ?>
    • - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/view/addtocart.phtml b/app/design/frontend/default/default/template/catalog/product/view/addtocart.phtml index 8ac16b3d17..aa149aac01 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/addtocart.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/addtocart.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/view/attributes.phtml b/app/design/frontend/default/default/template/catalog/product/view/attributes.phtml index d08352651b..4091e1ef6c 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/attributes.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/attributes.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -46,4 +46,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/view/description.phtml b/app/design/frontend/default/default/template/catalog/product/view/description.phtml index 31b822c743..d8961cd929 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/description.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/description.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -32,4 +32,4 @@ ?>
    helper('catalog/output')->productAttribute($this->getProduct(), nl2br($this->getProduct()->getDescription()), 'description') ?> -
    \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/view/media.phtml b/app/design/frontend/default/default/template/catalog/product/view/media.phtml index 05b8f35e77..fcabf30ef4 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/media.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/media.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/default/default/template/catalog/product/view/options.phtml b/app/design/frontend/default/default/template/catalog/product/view/options.phtml index 3f9eefe0d0..a6f2a693c1 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/options.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/options.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/options/type/date.phtml b/app/design/frontend/default/default/template/catalog/product/view/options/type/date.phtml index 6313ef2943..a44f6e0337 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/options/type/date.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/options/type/date.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOption() ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/options/type/default.phtml b/app/design/frontend/default/default/template/catalog/product/view/options/type/default.phtml index 209edeb7f2..d19c4038ec 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/options/type/default.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/options/type/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOption() ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/options/type/file.phtml b/app/design/frontend/default/default/template/catalog/product/view/options/type/file.phtml index a1b4219377..aa3c8d102e 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/options/type/file.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/options/type/file.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOption() ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/options/type/select.phtml b/app/design/frontend/default/default/template/catalog/product/view/options/type/select.phtml index 72858cc469..5deeb15b66 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/options/type/select.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/options/type/select.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/options/type/text.phtml b/app/design/frontend/default/default/template/catalog/product/view/options/type/text.phtml index 64c9851da7..4500562812 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/options/type/text.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/options/type/text.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOption() ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/options/wrapper.phtml b/app/design/frontend/default/default/template/catalog/product/view/options/wrapper.phtml index 5baa8a23ad..9c6b0dac5d 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/options/wrapper.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/options/wrapper.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -31,4 +31,4 @@

    __('* Required Fields') ?>

    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/view/options/wrapper/bottom.phtml b/app/design/frontend/default/default/template/catalog/product/view/options/wrapper/bottom.phtml index 16b904bec4..48bbd74429 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/options/wrapper/bottom.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/options/wrapper/bottom.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/price.phtml b/app/design/frontend/default/default/template/catalog/product/view/price.phtml index e76419aa1e..416f677646 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/price.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/price.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/catalog/product/view/price_clone.phtml b/app/design/frontend/default/default/template/catalog/product/view/price_clone.phtml index 4475577484..9f08adc7db 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/price_clone.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/price_clone.phtml @@ -18,11 +18,11 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getProduct() ?> -getPriceHtml($_product, false, '_clone') ?> \ No newline at end of file +getPriceHtml($_product, false, '_clone') ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/tierprices.phtml b/app/design/frontend/default/default/template/catalog/product/view/tierprices.phtml index c02c1e1819..c85e39d6c4 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/tierprices.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/tierprices.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -47,7 +47,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) { processTierPrices($_product, $_tierPrices); ?> - helper('tax')->displayBothPrices() && $_price['formated_price'] != $_price['formated_price_incl_tax']): ?> + helper('tax')->displayBothPrices()): ?> typeOfDisplay($_product, 0)): ?>
  • __('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']) ?> typeOfDisplay($_product, 1)): ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/type/configurable.phtml b/app/design/frontend/default/default/template/catalog/product/view/type/configurable.phtml index 83095635b6..1514d5e39e 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/type/configurable.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/type/configurable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/default/template/catalog/product/view/type/grouped.phtml b/app/design/frontend/default/default/template/catalog/product/view/type/grouped.phtml index 79e7849149..c061a2f3dc 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/type/grouped.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/type/grouped.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -79,4 +79,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/catalog/product/view/type/options/configurable.phtml b/app/design/frontend/default/default/template/catalog/product/view/type/options/configurable.phtml index 9f80e99af7..9c0c06201b 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/type/options/configurable.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/type/options/configurable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/catalog/product/view/type/simple.phtml b/app/design/frontend/default/default/template/catalog/product/view/type/simple.phtml index 87b8f71326..3cadb453db 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/type/simple.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/type/simple.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/frontend/default/default/template/catalog/product/view/type/virtual.phtml b/app/design/frontend/default/default/template/catalog/product/view/type/virtual.phtml index bb1bf8d329..3cadb453db 100644 --- a/app/design/frontend/default/default/template/catalog/product/view/type/virtual.phtml +++ b/app/design/frontend/default/default/template/catalog/product/view/type/virtual.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -38,4 +38,4 @@

    __('Availability: Out of stock.') ?>

    -getPriceHtml($_product) ?> \ No newline at end of file +getPriceHtml($_product) ?> diff --git a/app/design/frontend/default/default/template/catalog/seo/sitemap.phtml b/app/design/frontend/default/default/template/catalog/seo/sitemap.phtml index 3c1c4363a2..f5d485b19d 100644 --- a/app/design/frontend/default/default/template/catalog/seo/sitemap.phtml +++ b/app/design/frontend/default/default/template/catalog/seo/sitemap.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/catalog/seo/tree.phtml b/app/design/frontend/default/default/template/catalog/seo/tree.phtml index 417f10f2a6..8bd9866768 100644 --- a/app/design/frontend/default/default/template/catalog/seo/tree.phtml +++ b/app/design/frontend/default/default/template/catalog/seo/tree.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getAttributeYesNoElement($_attribute) ?> +
    getDateInput($_attribute, 'from') ?> - getDateInput($_attribute, 'to') ?> +
    diff --git a/app/design/frontend/default/default/template/catalogsearch/advanced/result.phtml b/app/design/frontend/default/default/template/catalogsearch/advanced/result.phtml index 1e5399f843..c7f7855436 100644 --- a/app/design/frontend/default/default/template/catalogsearch/advanced/result.phtml +++ b/app/design/frontend/default/default/template/catalogsearch/advanced/result.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -59,4 +59,4 @@ getResultCount()): ?> getProductListHtml() ?> -getSearchCriterias(); ?> \ No newline at end of file +getSearchCriterias(); ?> diff --git a/app/design/frontend/default/default/template/catalogsearch/form.mini.phtml b/app/design/frontend/default/default/template/catalogsearch/form.mini.phtml index 33a25a7f41..b2e4641024 100644 --- a/app/design/frontend/default/default/template/catalogsearch/form.mini.phtml +++ b/app/design/frontend/default/default/template/catalogsearch/form.mini.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/catalogsearch/result.phtml b/app/design/frontend/default/default/template/catalogsearch/result.phtml index 2e600456b4..362c5976b8 100644 --- a/app/design/frontend/default/default/template/catalogsearch/result.phtml +++ b/app/design/frontend/default/default/template/catalogsearch/result.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getResultCount()): ?> diff --git a/app/design/frontend/default/default/template/catalogsearch/term.phtml b/app/design/frontend/default/default/template/catalogsearch/term.phtml index 4c0276c2bf..ae0781151d 100644 --- a/app/design/frontend/default/default/template/catalogsearch/term.phtml +++ b/app/design/frontend/default/default/template/catalogsearch/term.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -41,4 +41,4 @@
    __('There are no search terms available.'); ?>
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/cart.phtml b/app/design/frontend/default/default/template/checkout/cart.phtml index e919e7ab64..d505893a1d 100644 --- a/app/design/frontend/default/default/template/checkout/cart.phtml +++ b/app/design/frontend/default/default/template/checkout/cart.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -53,4 +53,4 @@ discountForm.submit = function (isRemove) { return VarienForm.prototype.submit.bind(discountForm)(); } -
    \ No newline at end of file +
    diff --git a/app/design/frontend/default/default/template/checkout/cart/crosssell.phtml b/app/design/frontend/default/default/template/checkout/cart/crosssell.phtml index 2d86b25635..1071d2f971 100644 --- a/app/design/frontend/default/default/template/checkout/cart/crosssell.phtml +++ b/app/design/frontend/default/default/template/checkout/cart/crosssell.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem()?> - <?php $this->__('Remove item')?> - hasProductUrl()):?> - <?php echo $this->htmlEscape($this->getProductName()) ?> + <?php echo $this->__('Remove item')?> + hasProductUrl()):?> + <?php echo $this->htmlEscape($this->getProductName()) ?> hasProductUrl()):?>

    hasProductUrl()):?> @@ -259,4 +259,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/cart/noItems.phtml b/app/design/frontend/default/default/template/checkout/cart/noItems.phtml index eef76f67ac..2e5f65bfad 100644 --- a/app/design/frontend/default/default/template/checkout/cart/noItems.phtml +++ b/app/design/frontend/default/default/template/checkout/cart/noItems.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/checkout/cart/render/default.phtml b/app/design/frontend/default/default/template/checkout/cart/render/default.phtml index 8b1168824a..86e571414e 100644 --- a/app/design/frontend/default/default/template/checkout/cart/render/default.phtml +++ b/app/design/frontend/default/default/template/checkout/cart/render/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -66,4 +66,4 @@ helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getTaxAmount()) ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/cart/render/simple.phtml b/app/design/frontend/default/default/template/checkout/cart/render/simple.phtml index 1eaf457046..d3411e5f53 100644 --- a/app/design/frontend/default/default/template/checkout/cart/render/simple.phtml +++ b/app/design/frontend/default/default/template/checkout/cart/render/simple.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -66,4 +66,4 @@ helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getTaxAmount()) ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/cart/shipping.phtml b/app/design/frontend/default/default/template/checkout/cart/shipping.phtml index b2af19fdca..57a8b444c4 100644 --- a/app/design/frontend/default/default/template/checkout/cart/shipping.phtml +++ b/app/design/frontend/default/default/template/checkout/cart/shipping.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> var coShippingMethodForm = new VarienForm('shipping-zip-form'); -
    \ No newline at end of file +

    diff --git a/app/design/frontend/default/default/template/checkout/cart/sidebar.phtml b/app/design/frontend/default/default/template/checkout/cart/sidebar.phtml index 20b70a1d44..f37a1c1d2d 100644 --- a/app/design/frontend/default/default/template/checkout/cart/sidebar.phtml +++ b/app/design/frontend/default/default/template/checkout/cart/sidebar.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -70,4 +70,4 @@

    __('You have no items in your shopping cart.') ?>

    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/cart/sidebar/default.phtml b/app/design/frontend/default/default/template/checkout/cart/sidebar/default.phtml index 1cc4c3ce65..2da502c841 100644 --- a/app/design/frontend/default/default/template/checkout/cart/sidebar/default.phtml +++ b/app/design/frontend/default/default/template/checkout/cart/sidebar/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -30,19 +30,10 @@ <?php echo $this->htmlEscape($this->getProductName()) ?>
    • - <?php echo $this->__('Remove Product') ?> + <?php echo $this->__('Remove Product') ?> getProductName() ?>
    getQty() ?> x - - - - - - - - - helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?> helper('tax')->displayCartBothPrices()): ?> __('Excl. Tax'); ?>: @@ -138,4 +129,4 @@
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/cart/totals.phtml b/app/design/frontend/default/default/template/checkout/cart/totals.phtml index 30a9491552..65be38f035 100644 --- a/app/design/frontend/default/default/template/checkout/cart/totals.phtml +++ b/app/design/frontend/default/default/template/checkout/cart/totals.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> renderTotals(); ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/links.phtml b/app/design/frontend/default/default/template/checkout/links.phtml index f4b8da433e..03becf2287 100644 --- a/app/design/frontend/default/default/template/checkout/links.phtml +++ b/app/design/frontend/default/default/template/checkout/links.phtml @@ -18,9 +18,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/checkout/multishipping/address/select.phtml b/app/design/frontend/default/default/template/checkout/multishipping/address/select.phtml index ea1c740898..18b7b19552 100644 --- a/app/design/frontend/default/default/template/checkout/multishipping/address/select.phtml +++ b/app/design/frontend/default/default/template/checkout/multishipping/address/select.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/checkout/multishipping/addresses.phtml b/app/design/frontend/default/default/template/checkout/multishipping/addresses.phtml index d2a85f9fe4..7096a036d0 100644 --- a/app/design/frontend/default/default/template/checkout/multishipping/addresses.phtml +++ b/app/design/frontend/default/default/template/checkout/multishipping/addresses.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getQuote()->hasVirtualItems()): ?> @@ -57,4 +57,4 @@
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/multishipping/item/default.phtml b/app/design/frontend/default/default/template/checkout/multishipping/item/default.phtml index 2f65138c75..52042ef4f8 100644 --- a/app/design/frontend/default/default/template/checkout/multishipping/item/default.phtml +++ b/app/design/frontend/default/default/template/checkout/multishipping/item/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    getProductName() ?>

    @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/multishipping/link.phtml b/app/design/frontend/default/default/template/checkout/multishipping/link.phtml index 3bb23161a5..4bc70e8d3f 100644 --- a/app/design/frontend/default/default/template/checkout/multishipping/link.phtml +++ b/app/design/frontend/default/default/template/checkout/multishipping/link.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -
  • __('Checkout with Multiple Addresses');?>
    • \ No newline at end of file +
  • __('Checkout with Multiple Addresses');?>
    • diff --git a/app/design/frontend/default/default/template/checkout/multishipping/overview.phtml b/app/design/frontend/default/default/template/checkout/multishipping/overview.phtml index 885803dd72..30a383d029 100644 --- a/app/design/frontend/default/default/template/checkout/multishipping/overview.phtml +++ b/app/design/frontend/default/default/template/checkout/multishipping/overview.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/checkout/multishipping/shipping.phtml b/app/design/frontend/default/default/template/checkout/multishipping/shipping.phtml index 9b536bbcf0..e678de87bb 100644 --- a/app/design/frontend/default/default/template/checkout/multishipping/shipping.phtml +++ b/app/design/frontend/default/default/template/checkout/multishipping/shipping.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - - - -getSteps() as $_step): ?> - getIsActive()): ?> class="active">getLabel() ?> - - -
    \ No newline at end of file + + + + +getSteps() as $_step): ?> + getIsActive()): ?> class="active">getLabel() ?> + + +
    diff --git a/app/design/frontend/default/default/template/checkout/multishipping/success.phtml b/app/design/frontend/default/default/template/checkout/multishipping/success.phtml index 0a0c477fc3..1b602eb496 100644 --- a/app/design/frontend/default/default/template/checkout/multishipping/success.phtml +++ b/app/design/frontend/default/default/template/checkout/multishipping/success.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/checkout/onepage.phtml b/app/design/frontend/default/default/template/checkout/onepage.phtml index 5602609ba3..34cbd43c59 100644 --- a/app/design/frontend/default/default/template/checkout/onepage.phtml +++ b/app/design/frontend/default/default/template/checkout/onepage.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/checkout/onepage/agreements.phtml b/app/design/frontend/default/default/template/checkout/onepage/agreements.phtml index 3de9b1d06f..b05c8ab438 100644 --- a/app/design/frontend/default/default/template/checkout/onepage/agreements.phtml +++ b/app/design/frontend/default/default/template/checkout/onepage/agreements.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/checkout/onepage/failure.phtml b/app/design/frontend/default/default/template/checkout/onepage/failure.phtml index 6aaa4dd137..188162b044 100644 --- a/app/design/frontend/default/default/template/checkout/onepage/failure.phtml +++ b/app/design/frontend/default/default/template/checkout/onepage/failure.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -30,4 +30,4 @@ getRealOrderId()) : ?>

    __('Order #') . $this->getRealOrderId() ?>

    getErrorMessage()) : ?>

    -

    __('Please continue shopping.', $this->getContinueShoppingUrl()) ?>

    \ No newline at end of file +

    __('Please continue shopping.', $this->getContinueShoppingUrl()) ?>

    diff --git a/app/design/frontend/default/default/template/checkout/onepage/link.phtml b/app/design/frontend/default/default/template/checkout/onepage/link.phtml index f304528268..8e0e12ea23 100644 --- a/app/design/frontend/default/default/template/checkout/onepage/link.phtml +++ b/app/design/frontend/default/default/template/checkout/onepage/link.phtml @@ -18,18 +18,18 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> isPossibleOnepageCheckout()):?>
  • isDisabled()):?> -<?php echo Mage::helper('checkout')->__('Proceed to Checkout');?> + <?php echo Mage::helper('checkout')->__('Proceed to Checkout');?> -<?php echo Mage::helper('checkout')->__('Proceed to Checkout');?> + <?php echo Mage::helper('checkout')->__('Proceed to Checkout');?>
    • - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/onepage/login.phtml b/app/design/frontend/default/default/template/checkout/onepage/login.phtml index 4c7c4dad6b..750a012749 100644 --- a/app/design/frontend/default/default/template/checkout/onepage/login.phtml +++ b/app/design/frontend/default/default/template/checkout/onepage/login.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -118,4 +118,4 @@ } } //]]> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/checkout/onepage/payment.phtml b/app/design/frontend/default/default/template/checkout/onepage/payment.phtml index 8b41bd0498..fcae982ed6 100644 --- a/app/design/frontend/default/default/template/checkout/onepage/payment.phtml +++ b/app/design/frontend/default/default/template/checkout/onepage/payment.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/core/formkey.phtml b/app/design/frontend/default/default/template/core/formkey.phtml index 8eac56b056..b4add88425 100644 --- a/app/design/frontend/default/default/template/core/formkey.phtml +++ b/app/design/frontend/default/default/template/core/formkey.phtml @@ -1,27 +1,27 @@ - - + + diff --git a/app/design/frontend/default/default/template/core/messages.phtml b/app/design/frontend/default/default/template/core/messages.phtml index 77fd8f8645..a5cacbc08d 100644 --- a/app/design/frontend/default/default/template/core/messages.phtml +++ b/app/design/frontend/default/default/template/core/messages.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -39,4 +39,4 @@
    getChildHtml('info1') ?> -getChildHtml('info2') ?> \ No newline at end of file +getChildHtml('info2') ?> diff --git a/app/design/frontend/default/default/template/customer/account/dashboard/address.phtml b/app/design/frontend/default/default/template/customer/account/dashboard/address.phtml index 6076661064..0bf2563890 100644 --- a/app/design/frontend/default/default/template/customer/account/dashboard/address.phtml +++ b/app/design/frontend/default/default/template/customer/account/dashboard/address.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/customer/account/dashboard/hello.phtml b/app/design/frontend/default/default/template/customer/account/dashboard/hello.phtml index d90a6966b1..4d8cec6d19 100644 --- a/app/design/frontend/default/default/template/customer/account/dashboard/hello.phtml +++ b/app/design/frontend/default/default/template/customer/account/dashboard/hello.phtml @@ -18,12 +18,12 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    __('Hello, %s!', $this->htmlEscape($this->getCustomerName())) ?>
    -__('From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.') ?>

    \ No newline at end of file +__('From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.') ?>

    diff --git a/app/design/frontend/default/default/template/customer/account/dashboard/info.phtml b/app/design/frontend/default/default/template/customer/account/dashboard/info.phtml index 57d8ca86fc..0a12347920 100644 --- a/app/design/frontend/default/default/template/customer/account/dashboard/info.phtml +++ b/app/design/frontend/default/default/template/customer/account/dashboard/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/customer/account/dashboard/newsletter.phtml b/app/design/frontend/default/default/template/customer/account/dashboard/newsletter.phtml index 2540eb8d6b..cef31ae125 100644 --- a/app/design/frontend/default/default/template/customer/account/dashboard/newsletter.phtml +++ b/app/design/frontend/default/default/template/customer/account/dashboard/newsletter.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/customer/account/dashboard/sidebar.phtml b/app/design/frontend/default/default/template/customer/account/dashboard/sidebar.phtml index f4b8da433e..03becf2287 100644 --- a/app/design/frontend/default/default/template/customer/account/dashboard/sidebar.phtml +++ b/app/design/frontend/default/default/template/customer/account/dashboard/sidebar.phtml @@ -18,9 +18,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/customer/account/link/back.phtml b/app/design/frontend/default/default/template/customer/account/link/back.phtml index a6446ff7a1..6508d61dec 100644 --- a/app/design/frontend/default/default/template/customer/account/link/back.phtml +++ b/app/design/frontend/default/default/template/customer/account/link/back.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/customer/account/navigation.phtml b/app/design/frontend/default/default/template/customer/account/navigation.phtml index 7d9e709973..5ae0efb0c8 100644 --- a/app/design/frontend/default/default/template/customer/account/navigation.phtml +++ b/app/design/frontend/default/default/template/customer/account/navigation.phtml @@ -1,44 +1,44 @@ - - \ No newline at end of file + + diff --git a/app/design/frontend/default/default/template/customer/address.phtml b/app/design/frontend/default/default/template/customer/address.phtml index e79f906477..f179b4f1e4 100644 --- a/app/design/frontend/default/default/template/customer/address.phtml +++ b/app/design/frontend/default/default/template/customer/address.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    Address Book

    @@ -89,4 +89,4 @@ } return false; } - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/customer/address/book.phtml b/app/design/frontend/default/default/template/customer/address/book.phtml index fa93e69b98..d6356dfb24 100644 --- a/app/design/frontend/default/default/template/customer/address/book.phtml +++ b/app/design/frontend/default/default/template/customer/address/book.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/customer/address/edit.phtml b/app/design/frontend/default/default/template/customer/address/edit.phtml index 9e19e3addd..330bb535b5 100644 --- a/app/design/frontend/default/default/template/customer/address/edit.phtml +++ b/app/design/frontend/default/default/template/customer/address/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - getMessagesBlock()->getGroupedHtml() ?> - __('Your account balance is: %s', $customer->getStoreBalance()) ?> -
    - « __('Back') ?> -
    \ No newline at end of file + + getMessagesBlock()->getGroupedHtml() ?> + __('Your account balance is: %s', $customer->getStoreBalance()) ?> +
    + « __('Back') ?> +
    diff --git a/app/design/frontend/default/default/template/customer/dashboard.phtml b/app/design/frontend/default/default/template/customer/dashboard.phtml index 0cd2a640cc..c4662cadaf 100644 --- a/app/design/frontend/default/default/template/customer/dashboard.phtml +++ b/app/design/frontend/default/default/template/customer/dashboard.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMessagesBlock()->getGroupedHtml() ?> diff --git a/app/design/frontend/default/default/template/customer/form/address.phtml b/app/design/frontend/default/default/template/customer/form/address.phtml index 89f89aff6f..91189b4647 100644 --- a/app/design/frontend/default/default/template/customer/form/address.phtml +++ b/app/design/frontend/default/default/template/customer/form/address.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/customer/form/changepassword.phtml b/app/design/frontend/default/default/template/customer/form/changepassword.phtml index 479a3346ca..0d10aef7e6 100644 --- a/app/design/frontend/default/default/template/customer/form/changepassword.phtml +++ b/app/design/frontend/default/default/template/customer/form/changepassword.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMessagesBlock()->getGroupedHtml() ?> @@ -55,4 +55,4 @@ \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/customer/form/confirmation.phtml b/app/design/frontend/default/default/template/customer/form/confirmation.phtml index 707620a927..3c18fb19b4 100644 --- a/app/design/frontend/default/default/template/customer/form/confirmation.phtml +++ b/app/design/frontend/default/default/template/customer/form/confirmation.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -49,4 +49,3 @@ var dataForm = new VarienForm('form-validate', true); //]]> - \ No newline at end of file diff --git a/app/design/frontend/default/default/template/customer/form/edit.phtml b/app/design/frontend/default/default/template/customer/form/edit.phtml index 308784eeb3..16215c176d 100644 --- a/app/design/frontend/default/default/template/customer/form/edit.phtml +++ b/app/design/frontend/default/default/template/customer/form/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/customer/form/forgotpassword.phtml b/app/design/frontend/default/default/template/customer/form/forgotpassword.phtml index a667fb9b32..f2e2357494 100644 --- a/app/design/frontend/default/default/template/customer/form/forgotpassword.phtml +++ b/app/design/frontend/default/default/template/customer/form/forgotpassword.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -51,4 +51,4 @@ // - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/customer/form/login.phtml b/app/design/frontend/default/default/template/customer/form/login.phtml index 5315b09f11..8ffbefe5e8 100644 --- a/app/design/frontend/default/default/template/customer/form/login.phtml +++ b/app/design/frontend/default/default/template/customer/form/login.phtml @@ -72,4 +72,4 @@ \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/customer/form/mini.login.phtml b/app/design/frontend/default/default/template/customer/form/mini.login.phtml index 00ba04e2b6..35ef755e6d 100644 --- a/app/design/frontend/default/default/template/customer/form/mini.login.phtml +++ b/app/design/frontend/default/default/template/customer/form/mini.login.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/customer/form/mini.newsletter.phtml b/app/design/frontend/default/default/template/customer/form/mini.newsletter.phtml index 6a3d087acd..a5954aa4bf 100644 --- a/app/design/frontend/default/default/template/customer/form/mini.newsletter.phtml +++ b/app/design/frontend/default/default/template/customer/form/mini.newsletter.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/customer/widget/taxvat.phtml b/app/design/frontend/default/default/template/customer/widget/taxvat.phtml index 5290e05cb4..20b6f480dc 100644 --- a/app/design/frontend/default/default/template/customer/widget/taxvat.phtml +++ b/app/design/frontend/default/default/template/customer/widget/taxvat.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/customer/wishlist.phtml b/app/design/frontend/default/default/template/customer/wishlist.phtml index 46cd82e02c..4afee19abd 100644 --- a/app/design/frontend/default/default/template/customer/wishlist.phtml +++ b/app/design/frontend/default/default/template/customer/wishlist.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/directory/currency.phtml b/app/design/frontend/default/default/template/directory/currency.phtml index c91616a4b3..fe850607ce 100644 --- a/app/design/frontend/default/default/template/directory/currency.phtml +++ b/app/design/frontend/default/default/template/directory/currency.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/directory/currency/switch.phtml b/app/design/frontend/default/default/template/directory/currency/switch.phtml index 09e5c44acb..2253df1b25 100644 --- a/app/design/frontend/default/default/template/directory/currency/switch.phtml +++ b/app/design/frontend/default/default/template/directory/currency/switch.phtml @@ -1,31 +1,31 @@ - -

    __('Currency') ?>

    -__('Your current currency is: %s', $currency->getCode()) ?> -
    - __('Continue »') ?> -
    \ No newline at end of file + +

    __('Currency') ?>

    +__('Your current currency is: %s', $currency->getCode()) ?> +
    + __('Continue »') ?> +
    diff --git a/app/design/frontend/default/default/template/downloadable/catalog/product/links.phtml b/app/design/frontend/default/default/template/downloadable/catalog/product/links.phtml index e2c99e0f76..4fcab6172e 100644 --- a/app/design/frontend/default/default/template/downloadable/catalog/product/links.phtml +++ b/app/design/frontend/default/default/template/downloadable/catalog/product/links.phtml @@ -18,9 +18,9 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/default/template/downloadable/catalog/product/samples.phtml b/app/design/frontend/default/default/template/downloadable/catalog/product/samples.phtml index e3774c21b2..b6c9b083e5 100644 --- a/app/design/frontend/default/default/template/downloadable/catalog/product/samples.phtml +++ b/app/design/frontend/default/default/template/downloadable/catalog/product/samples.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/default/template/downloadable/catalog/product/type.phtml b/app/design/frontend/default/default/template/downloadable/catalog/product/type.phtml index 8a105592c8..10d294b387 100644 --- a/app/design/frontend/default/default/template/downloadable/catalog/product/type.phtml +++ b/app/design/frontend/default/default/template/downloadable/catalog/product/type.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/frontend/default/default/template/downloadable/checkout/cart/item/default.phtml b/app/design/frontend/default/default/template/downloadable/checkout/cart/item/default.phtml index a9af45b102..0e100947d3 100644 --- a/app/design/frontend/default/default/template/downloadable/checkout/cart/item/default.phtml +++ b/app/design/frontend/default/default/template/downloadable/checkout/cart/item/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem()?> diff --git a/app/design/frontend/default/default/template/downloadable/checkout/multishipping/item/downloadable.phtml b/app/design/frontend/default/default/template/downloadable/checkout/multishipping/item/downloadable.phtml index f5c83b2e35..4a704e3b19 100644 --- a/app/design/frontend/default/default/template/downloadable/checkout/multishipping/item/downloadable.phtml +++ b/app/design/frontend/default/default/template/downloadable/checkout/multishipping/item/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    getProductName() ?>

    @@ -54,4 +54,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/default/default/template/downloadable/checkout/onepage/review/item.phtml index 21813d6bce..3a4dc75970 100644 --- a/app/design/frontend/default/default/template/downloadable/checkout/onepage/review/item.phtml +++ b/app/design/frontend/default/default/template/downloadable/checkout/onepage/review/item.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem()?> @@ -245,4 +245,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/downloadable/checkout/success.phtml b/app/design/frontend/default/default/template/downloadable/checkout/success.phtml index fde9e95b76..8427f52c81 100644 --- a/app/design/frontend/default/default/template/downloadable/checkout/success.phtml +++ b/app/design/frontend/default/default/template/downloadable/checkout/success.phtml @@ -18,12 +18,12 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrderHasDownloadable()): ?> __('Go to My Downloadable Products', $this->getDownloadableProductsUrl()) ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/downloadable/customer/products/list.phtml b/app/design/frontend/default/default/template/downloadable/customer/products/list.phtml index 96523c17f2..ff7508c830 100644 --- a/app/design/frontend/default/default/template/downloadable/customer/products/list.phtml +++ b/app/design/frontend/default/default/template/downloadable/customer/products/list.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getChildHtml('pager'); ?>
    « __('Back') ?> -
    \ No newline at end of file +
    diff --git a/app/design/frontend/default/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml b/app/design/frontend/default/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml index 44977adefa..e2262514d6 100644 --- a/app/design/frontend/default/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +++ b/app/design/frontend/default/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -125,4 +125,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/downloadable/email/order/items/invoice/downloadable.phtml b/app/design/frontend/default/default/template/downloadable/email/order/items/invoice/downloadable.phtml index 4d40824e16..4522a8a776 100644 --- a/app/design/frontend/default/default/template/downloadable/email/order/items/invoice/downloadable.phtml +++ b/app/design/frontend/default/default/template/downloadable/email/order/items/invoice/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/downloadable/email/order/items/order/downloadable.phtml b/app/design/frontend/default/default/template/downloadable/email/order/items/order/downloadable.phtml index c41d10ad0e..1d89dbf0ec 100644 --- a/app/design/frontend/default/default/template/downloadable/email/order/items/order/downloadable.phtml +++ b/app/design/frontend/default/default/template/downloadable/email/order/items/order/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -134,4 +134,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/design/frontend/default/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml index a401f4276f..d82c5258f7 100644 --- a/app/design/frontend/default/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +++ b/app/design/frontend/default/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/frontend/default/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml b/app/design/frontend/default/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml index 1ba5786ce7..0019e8bbc3 100644 --- a/app/design/frontend/default/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +++ b/app/design/frontend/default/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/frontend/default/default/template/downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/default/default/template/downloadable/sales/order/items/renderer/downloadable.phtml index ebfdb6fbfb..428ab6fbbb 100644 --- a/app/design/frontend/default/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +++ b/app/design/frontend/default/default/template/downloadable/sales/order/items/renderer/downloadable.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/frontend/default/default/template/email/order/creditmemo/items.phtml b/app/design/frontend/default/default/template/email/order/creditmemo/items.phtml index f27db5136b..e2c4c3da50 100644 --- a/app/design/frontend/default/default/template/email/order/creditmemo/items.phtml +++ b/app/design/frontend/default/default/template/email/order/creditmemo/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getCreditmemo() ?> @@ -48,4 +48,4 @@ getChildHtml('creditmemo_totals');?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/email/order/invoice/items.phtml b/app/design/frontend/default/default/template/email/order/invoice/items.phtml index c4f0550060..a30e2bbbb5 100644 --- a/app/design/frontend/default/default/template/email/order/invoice/items.phtml +++ b/app/design/frontend/default/default/template/email/order/invoice/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getInvoice() ?> @@ -48,4 +48,4 @@ getChildHtml('invoice_totals')?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/email/order/items.phtml b/app/design/frontend/default/default/template/email/order/items.phtml index 90e49848ed..6390cad08a 100644 --- a/app/design/frontend/default/default/template/email/order/items.phtml +++ b/app/design/frontend/default/default/template/email/order/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> diff --git a/app/design/frontend/default/default/template/email/order/items/creditmemo/default.phtml b/app/design/frontend/default/default/template/email/order/items/creditmemo/default.phtml index 59d456c940..1ba8bf17ea 100644 --- a/app/design/frontend/default/default/template/email/order/items/creditmemo/default.phtml +++ b/app/design/frontend/default/default/template/email/order/items/creditmemo/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -117,4 +117,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/email/order/items/invoice/default.phtml b/app/design/frontend/default/default/template/email/order/items/invoice/default.phtml index 59d456c940..1ba8bf17ea 100644 --- a/app/design/frontend/default/default/template/email/order/items/invoice/default.phtml +++ b/app/design/frontend/default/default/template/email/order/items/invoice/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -117,4 +117,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/email/order/items/order/default.phtml b/app/design/frontend/default/default/template/email/order/items/order/default.phtml index 9725721335..155e97ad92 100644 --- a/app/design/frontend/default/default/template/email/order/items/order/default.phtml +++ b/app/design/frontend/default/default/template/email/order/items/order/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -123,4 +123,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/email/order/items/shipment/default.phtml b/app/design/frontend/default/default/template/email/order/items/shipment/default.phtml index e8a4de274e..17f5210aca 100644 --- a/app/design/frontend/default/default/template/email/order/items/shipment/default.phtml +++ b/app/design/frontend/default/default/template/email/order/items/shipment/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -40,4 +40,4 @@ getSku($_item) ?> getQty()*1 ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/email/order/shipment/items.phtml b/app/design/frontend/default/default/template/email/order/shipment/items.phtml index d61748617e..e6fca5fe1a 100644 --- a/app/design/frontend/default/default/template/email/order/shipment/items.phtml +++ b/app/design/frontend/default/default/template/email/order/shipment/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getShipment() ?> @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/email/order/shipment/track.phtml b/app/design/frontend/default/default/template/email/order/shipment/track.phtml index bc75dc3e5e..6a5cede93a 100644 --- a/app/design/frontend/default/default/template/email/order/shipment/track.phtml +++ b/app/design/frontend/default/default/template/email/order/shipment/track.phtml @@ -1,46 +1,46 @@ - -getShipment() ?> -getOrder() ?> -getAllTracks()): ?> - - - - - - - - - getAllTracks() as $_item): $i++ ?> - > - - - - - -
    __('Shipped By') ?>__('Tracking Number') ?>
    getTitle() ?>getNumber() ?>
    - \ No newline at end of file + +getShipment() ?> +getOrder() ?> +getAllTracks()): ?> + + + + + + + + + getAllTracks() as $_item): $i++ ?> + > + + + + + +
    __('Shipped By') ?>__('Tracking Number') ?>
    getTitle() ?>getNumber() ?>
    + diff --git a/app/design/frontend/default/default/template/email/productalert/price.phtml b/app/design/frontend/default/default/template/email/productalert/price.phtml index 03a6c6f03f..8c13b9e6b7 100644 --- a/app/design/frontend/default/default/template/email/productalert/price.phtml +++ b/app/design/frontend/default/default/template/email/productalert/price.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category default_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getProducts()): ?> diff --git a/app/design/frontend/default/default/template/email/productalert/stock.phtml b/app/design/frontend/default/default/template/email/productalert/stock.phtml index 05f42bce34..c6e46e08b9 100644 --- a/app/design/frontend/default/default/template/email/productalert/stock.phtml +++ b/app/design/frontend/default/default/template/email/productalert/stock.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category default_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getProducts()): ?> @@ -47,4 +47,4 @@

    __('Unsubscribe from all stock alerts') ?>

    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/giftmessage/form.phtml b/app/design/frontend/default/default/template/giftmessage/form.phtml index 5f7e07c41f..1a869d8b2c 100644 --- a/app/design/frontend/default/default/template/giftmessage/form.phtml +++ b/app/design/frontend/default/default/template/giftmessage/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -78,4 +78,4 @@ }); //]]> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/giftmessage/helper.phtml b/app/design/frontend/default/default/template/giftmessage/helper.phtml index 7cc7150421..78ced9ded1 100644 --- a/app/design/frontend/default/default/template/giftmessage/helper.phtml +++ b/app/design/frontend/default/default/template/giftmessage/helper.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getScriptIncluded() && $this->getCanDisplayContainer()): ?> @@ -77,4 +77,4 @@ var getJsObjectName() ?> = new GiftMessage(' getJsObjectName() ?>.url = 'getEditUrl() ?>'; //]]> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/giftmessage/inline.phtml b/app/design/frontend/default/default/template/giftmessage/inline.phtml index aa7327a318..023eee900e 100644 --- a/app/design/frontend/default/default/template/giftmessage/inline.phtml +++ b/app/design/frontend/default/default/template/giftmessage/inline.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getDontDisplayContainer()): ?> @@ -265,4 +265,4 @@ billing.onSave = function(evt){ -
    \ No newline at end of file +
    diff --git a/app/design/frontend/default/default/template/googlecheckout/form.phtml b/app/design/frontend/default/default/template/googlecheckout/form.phtml index d846e06380..7c333d08fc 100644 --- a/app/design/frontend/default/default/template/googlecheckout/form.phtml +++ b/app/design/frontend/default/default/template/googlecheckout/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_GoogleCheckout - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -31,4 +31,4 @@ __('You will be redirected to Google Checkout website when you place an order.') ?> -
    \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/googlecheckout/link.phtml b/app/design/frontend/default/default/template/googlecheckout/link.phtml index 985e5ad053..157e87c1c8 100644 --- a/app/design/frontend/default/default/template/googlecheckout/link.phtml +++ b/app/design/frontend/default/default/template/googlecheckout/link.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/newsletter/subscribe.phtml b/app/design/frontend/default/default/template/newsletter/subscribe.phtml index aaf36cab8e..6b1fbc682d 100644 --- a/app/design/frontend/default/default/template/newsletter/subscribe.phtml +++ b/app/design/frontend/default/default/template/newsletter/subscribe.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/page/1column.phtml b/app/design/frontend/default/default/template/page/1column.phtml index fb71520356..16fc2978f7 100644 --- a/app/design/frontend/default/default/template/page/1column.phtml +++ b/app/design/frontend/default/default/template/page/1column.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getAbsoluteFooter() ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/2columns-right.phtml b/app/design/frontend/default/default/template/page/2columns-right.phtml index 21453f5346..42e12e12a1 100644 --- a/app/design/frontend/default/default/template/page/2columns-right.phtml +++ b/app/design/frontend/default/default/template/page/2columns-right.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -59,7 +59,7 @@ -
    +
    getChildHtml('right') ?> 
    @@ -80,4 +80,4 @@
    getAbsoluteFooter() ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/3columns.phtml b/app/design/frontend/default/default/template/page/3columns.phtml index 28929d2442..e55c829fc4 100644 --- a/app/design/frontend/default/default/template/page/3columns.phtml +++ b/app/design/frontend/default/default/template/page/3columns.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getAbsoluteFooter() ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/dashboard.phtml b/app/design/frontend/default/default/template/page/dashboard.phtml index 4d1f3c822c..5869b1413b 100644 --- a/app/design/frontend/default/default/template/page/dashboard.phtml +++ b/app/design/frontend/default/default/template/page/dashboard.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getAbsoluteFooter() ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/html/breadcrumbs.phtml b/app/design/frontend/default/default/template/page/html/breadcrumbs.phtml index a19c0ab946..ea3e3ad3ec 100644 --- a/app/design/frontend/default/default/template/page/html/breadcrumbs.phtml +++ b/app/design/frontend/default/default/template/page/html/breadcrumbs.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/page/html/footer.phtml b/app/design/frontend/default/default/template/page/html/footer.phtml index be30800e66..14240f6e82 100644 --- a/app/design/frontend/default/default/template/page/html/footer.phtml +++ b/app/design/frontend/default/default/template/page/html/footer.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/page/html/head.phtml b/app/design/frontend/default/default/template/page/html/head.phtml index fe7876e3d1..b32081b6c3 100644 --- a/app/design/frontend/default/default/template/page/html/head.phtml +++ b/app/design/frontend/default/default/template/page/html/head.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> <?php echo $this->getTitle() ?> diff --git a/app/design/frontend/default/default/template/page/html/header.phtml b/app/design/frontend/default/default/template/page/html/header.phtml index 43708b69a3..5720222c04 100644 --- a/app/design/frontend/default/default/template/page/html/header.phtml +++ b/app/design/frontend/default/default/template/page/html/header.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -39,4 +39,4 @@
    -getChildHtml('topMenu') ?> \ No newline at end of file +getChildHtml('topMenu') ?> diff --git a/app/design/frontend/default/default/template/page/html/notices.phtml b/app/design/frontend/default/default/template/page/html/notices.phtml index 1f5c008294..dc73fb1458 100644 --- a/app/design/frontend/default/default/template/page/html/notices.phtml +++ b/app/design/frontend/default/default/template/page/html/notices.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/page/html/wrapper.phtml b/app/design/frontend/default/default/template/page/html/wrapper.phtml index db412f5b96..d3e75c9dc0 100644 --- a/app/design/frontend/default/default/template/page/html/wrapper.phtml +++ b/app/design/frontend/default/default/template/page/html/wrapper.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -42,4 +42,4 @@ hasTag() ? $this->getTag() : "div" ?> < id="getId()?>" getParams()?>> getChildHtml()?> -> \ No newline at end of file +> diff --git a/app/design/frontend/default/default/template/page/js/calendar.phtml b/app/design/frontend/default/default/template/page/js/calendar.phtml index ebc0fe3517..95f2961759 100644 --- a/app/design/frontend/default/default/template/page/js/calendar.phtml +++ b/app/design/frontend/default/default/template/page/js/calendar.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getChildHtml('before_body_end') ?> getAbsoluteFooter() ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/print.phtml b/app/design/frontend/default/default/template/page/print.phtml index ce51101c2d..72d3b37082 100644 --- a/app/design/frontend/default/default/template/page/print.phtml +++ b/app/design/frontend/default/default/template/page/print.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getAbsoluteFooter() ?>
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/redirect.phtml b/app/design/frontend/default/default/template/page/redirect.phtml index 470938f13c..8b7550cd45 100644 --- a/app/design/frontend/default/default/template/page/redirect.phtml +++ b/app/design/frontend/default/default/template/page/redirect.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Page - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -36,4 +36,4 @@ isHtmlFormRedirect()): ?>

    __('Click here if nothing has happened', $this->getTargetURL()) ?>

    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/switch/flags.phtml b/app/design/frontend/default/default/template/page/switch/flags.phtml index 883252dbb4..4945225f0b 100644 --- a/app/design/frontend/default/default/template/page/switch/flags.phtml +++ b/app/design/frontend/default/default/template/page/switch/flags.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getStores())>1): ?> @@ -35,4 +35,4 @@
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/switch/languages.phtml b/app/design/frontend/default/default/template/page/switch/languages.phtml index c8d43401c6..f9bbe5f443 100644 --- a/app/design/frontend/default/default/template/page/switch/languages.phtml +++ b/app/design/frontend/default/default/template/page/switch/languages.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/switch/stores.phtml b/app/design/frontend/default/default/template/page/switch/stores.phtml index d1be185596..37daeb3439 100644 --- a/app/design/frontend/default/default/template/page/switch/stores.phtml +++ b/app/design/frontend/default/default/template/page/switch/stores.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/page/template/container.phtml b/app/design/frontend/default/default/template/page/template/container.phtml index 9c44985504..059285645f 100644 --- a/app/design/frontend/default/default/template/page/template/container.phtml +++ b/app/design/frontend/default/default/template/page/template/container.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -84,4 +84,4 @@ -
    \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/payment/form/ccsave.phtml b/app/design/frontend/default/default/template/payment/form/ccsave.phtml index d96068108b..2a475e1ab4 100644 --- a/app/design/frontend/default/default/template/payment/form/ccsave.phtml +++ b/app/design/frontend/default/default/template/payment/form/ccsave.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/payment/form/checkmo.phtml b/app/design/frontend/default/default/template/payment/form/checkmo.phtml index 9b910af618..6565d03121 100644 --- a/app/design/frontend/default/default/template/payment/form/checkmo.phtml +++ b/app/design/frontend/default/default/template/payment/form/checkmo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethod()->getMailingAddress() || $this->getMethod()->getPayableTo()): ?> diff --git a/app/design/frontend/default/default/template/payment/form/purchaseorder.phtml b/app/design/frontend/default/default/template/payment/form/purchaseorder.phtml index 4b0e5f949b..f399601483 100644 --- a/app/design/frontend/default/default/template/payment/form/purchaseorder.phtml +++ b/app/design/frontend/default/default/template/payment/form/purchaseorder.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -33,4 +33,4 @@
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/payment/info/cc.phtml b/app/design/frontend/default/default/template/payment/info/cc.phtml index 5b8b30c23f..463c0ab411 100644 --- a/app/design/frontend/default/default/template/payment/info/cc.phtml +++ b/app/design/frontend/default/default/template/payment/info/cc.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getInfo()): ?> @@ -30,4 +30,4 @@ __('Credit Card Number: xxxx-%s', $this->htmlEscape($this->getInfo()->getCcLast4())) ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/payment/info/ccsave.phtml b/app/design/frontend/default/default/template/payment/info/ccsave.phtml index 9af84737e4..6de41ae2b7 100644 --- a/app/design/frontend/default/default/template/payment/info/ccsave.phtml +++ b/app/design/frontend/default/default/template/payment/info/ccsave.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> __('Name on the Card: %s', $this->htmlEscape($this->getInfo()->getCcOwner())) ?>
    diff --git a/app/design/frontend/default/default/template/payment/info/checkmo.phtml b/app/design/frontend/default/default/template/payment/info/checkmo.phtml index 1810c628d1..de2dc3b1c4 100644 --- a/app/design/frontend/default/default/template/payment/info/checkmo.phtml +++ b/app/design/frontend/default/default/template/payment/info/checkmo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    getMethod()->getTitle() ?> @@ -35,4 +35,4 @@ -

    \ No newline at end of file +

    diff --git a/app/design/frontend/default/default/template/payment/info/default.phtml b/app/design/frontend/default/default/template/payment/info/default.phtml index 70f1f6ad7a..3b1c09df58 100644 --- a/app/design/frontend/default/default/template/payment/info/default.phtml +++ b/app/design/frontend/default/default/template/payment/info/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -

    htmlEscape($this->getMethod()->getTitle()) ?>

    \ No newline at end of file +

    htmlEscape($this->getMethod()->getTitle()) ?>

    diff --git a/app/design/frontend/default/default/template/payment/info/purchaseorder.phtml b/app/design/frontend/default/default/template/payment/info/purchaseorder.phtml index cb93c99ed4..c89e83f0ac 100644 --- a/app/design/frontend/default/default/template/payment/info/purchaseorder.phtml +++ b/app/design/frontend/default/default/template/payment/info/purchaseorder.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    getMethod()->getTitle() ?>

    diff --git a/app/design/frontend/default/default/template/paypal/express/form.phtml b/app/design/frontend/default/default/template/paypal/express/form.phtml index 90232b2744..d25d128e0f 100644 --- a/app/design/frontend/default/default/template/paypal/express/form.phtml +++ b/app/design/frontend/default/default/template/paypal/express/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -31,4 +31,4 @@ __('Your billing address will be ignored and you will be redirected to PayPal website') ?> -
    \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/paypal/express/info.phtml b/app/design/frontend/default/default/template/paypal/express/info.phtml index 88e7558f10..94e8d85865 100644 --- a/app/design/frontend/default/default/template/paypal/express/info.phtml +++ b/app/design/frontend/default/default/template/paypal/express/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    getMethod()->getTitle() ?>
    diff --git a/app/design/frontend/default/default/template/paypal/express/review.phtml b/app/design/frontend/default/default/template/paypal/express/review.phtml index 5ee0666216..f55e6233c3 100644 --- a/app/design/frontend/default/default/template/paypal/express/review.phtml +++ b/app/design/frontend/default/default/template/paypal/express/review.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    diff --git a/app/design/frontend/default/default/template/paypal/express/review/details.phtml b/app/design/frontend/default/default/template/paypal/express/review/details.phtml index 59d28cc969..10566ce937 100644 --- a/app/design/frontend/default/default/template/paypal/express/review/details.phtml +++ b/app/design/frontend/default/default/template/paypal/express/review/details.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/paypal/link.phtml b/app/design/frontend/default/default/template/paypal/link.phtml index 454f663bca..f1899a67f9 100644 --- a/app/design/frontend/default/default/template/paypal/link.phtml +++ b/app/design/frontend/default/default/template/paypal/link.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -
  • <?php echo Mage::helper('paypal')->__('Paypal Checkout');?>
    • \ No newline at end of file +
  • <?php echo Mage::helper('paypal')->__('Paypal Checkout');?>
    • diff --git a/app/design/frontend/default/default/template/paypal/standard/form.phtml b/app/design/frontend/default/default/template/paypal/standard/form.phtml index 08cecd7b1c..c8d58da12a 100644 --- a/app/design/frontend/default/default/template/paypal/standard/form.phtml +++ b/app/design/frontend/default/default/template/paypal/standard/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -31,4 +31,4 @@ __('You will be redirected to PayPal website when you place an order.') ?> -
    \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/paypaluk/direct/form.phtml b/app/design/frontend/default/default/template/paypaluk/direct/form.phtml index 1d1bbe4971..275f3fbc11 100644 --- a/app/design/frontend/default/default/template/paypaluk/direct/form.phtml +++ b/app/design/frontend/default/default/template/paypaluk/direct/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getInfo()): ?> @@ -34,4 +34,4 @@ getInfo()->getCcSsStartYear()): ?> __('Switch/Solo card start Date: %s/%s', $this->getCcStartMonth(), $this->getInfo()->getCcSsStartYear()) ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/paypaluk/express/form.phtml b/app/design/frontend/default/default/template/paypaluk/express/form.phtml index 36bf2edeb6..6c001c84f0 100644 --- a/app/design/frontend/default/default/template/paypaluk/express/form.phtml +++ b/app/design/frontend/default/default/template/paypaluk/express/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -31,4 +31,4 @@ __('Your billing address will be ignored and you will be redirected to PayPal UK website') ?> -
    \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/paypaluk/express/info.phtml b/app/design/frontend/default/default/template/paypaluk/express/info.phtml index e03d900c27..f42a502617 100644 --- a/app/design/frontend/default/default/template/paypaluk/express/info.phtml +++ b/app/design/frontend/default/default/template/paypaluk/express/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    getMethod()->getTitle() ?>
    diff --git a/app/design/frontend/default/default/template/paypaluk/express/review.phtml b/app/design/frontend/default/default/template/paypaluk/express/review.phtml index 681d04d629..68115a9541 100644 --- a/app/design/frontend/default/default/template/paypaluk/express/review.phtml +++ b/app/design/frontend/default/default/template/paypaluk/express/review.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>

    diff --git a/app/design/frontend/default/default/template/paypaluk/express/review/details.phtml b/app/design/frontend/default/default/template/paypaluk/express/review/details.phtml index f5c4500d38..3b09202585 100644 --- a/app/design/frontend/default/default/template/paypaluk/express/review/details.phtml +++ b/app/design/frontend/default/default/template/paypaluk/express/review/details.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/paypaluk/link.phtml b/app/design/frontend/default/default/template/paypaluk/link.phtml index da4e2d475d..6bd1d1b490 100644 --- a/app/design/frontend/default/default/template/paypaluk/link.phtml +++ b/app/design/frontend/default/default/template/paypaluk/link.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -
  • <?php echo Mage::helper('paypalUk')->__('Paypal UK Checkout');?>
    • \ No newline at end of file +
  • <?php echo Mage::helper('paypalUk')->__('Paypal UK Checkout');?>
    • diff --git a/app/design/frontend/default/default/template/poll/active.phtml b/app/design/frontend/default/default/template/poll/active.phtml index f79a79702b..9781bf7e88 100644 --- a/app/design/frontend/default/default/template/poll/active.phtml +++ b/app/design/frontend/default/default/template/poll/active.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -65,4 +65,4 @@
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/poll/result.phtml b/app/design/frontend/default/default/template/poll/result.phtml index c20cf14889..424b5d248c 100644 --- a/app/design/frontend/default/default/template/poll/result.phtml +++ b/app/design/frontend/default/default/template/poll/result.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/productalert/price.phtml b/app/design/frontend/default/default/template/productalert/price.phtml index 41e69b36c3..5b124efe13 100644 --- a/app/design/frontend/default/default/template/productalert/price.phtml +++ b/app/design/frontend/default/default/template/productalert/price.phtml @@ -18,12 +18,12 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> isShow()): ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/productalert/stock.phtml b/app/design/frontend/default/default/template/productalert/stock.phtml index 16cbabccd5..95c0edec9c 100644 --- a/app/design/frontend/default/default/template/productalert/stock.phtml +++ b/app/design/frontend/default/default/template/productalert/stock.phtml @@ -18,12 +18,12 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> isShow()): ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/rating/detailed.phtml b/app/design/frontend/default/default/template/rating/detailed.phtml index 11484df4e6..02b55ce238 100644 --- a/app/design/frontend/default/default/template/rating/detailed.phtml +++ b/app/design/frontend/default/default/template/rating/detailed.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getSize()): ?> @@ -41,4 +41,4 @@
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/rating/empty.phtml b/app/design/frontend/default/default/template/rating/empty.phtml index 6eb3e27711..39cfd42f86 100644 --- a/app/design/frontend/default/default/template/rating/empty.phtml +++ b/app/design/frontend/default/default/template/rating/empty.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -

    __('Be the first to review this product') ?>

    \ No newline at end of file +

    __('Be the first to review this product') ?>

    diff --git a/app/design/frontend/default/default/template/reports/home_product_compared.phtml b/app/design/frontend/default/default/template/reports/home_product_compared.phtml index b3f2393901..592df01c8a 100644 --- a/app/design/frontend/default/default/template/reports/home_product_compared.phtml +++ b/app/design/frontend/default/default/template/reports/home_product_compared.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Reports_Block_Product_Compared */ ?> @@ -63,4 +63,4 @@
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/reports/home_product_viewed.phtml b/app/design/frontend/default/default/template/reports/home_product_viewed.phtml index 0a55a4165e..57a4afa2d2 100644 --- a/app/design/frontend/default/default/template/reports/home_product_viewed.phtml +++ b/app/design/frontend/default/default/template/reports/home_product_viewed.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Reports_Block_Product_Viewed */ ?> @@ -69,4 +69,4 @@
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/reports/product_compared.phtml b/app/design/frontend/default/default/template/reports/product_compared.phtml index a4f421ce31..ae4ef86a47 100644 --- a/app/design/frontend/default/default/template/reports/product_compared.phtml +++ b/app/design/frontend/default/default/template/reports/product_compared.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Reports_Block_Product_Compared */ ?> @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/reports/product_viewed.phtml b/app/design/frontend/default/default/template/reports/product_viewed.phtml index 40910fcd2e..5d722276c9 100644 --- a/app/design/frontend/default/default/template/reports/product_viewed.phtml +++ b/app/design/frontend/default/default/template/reports/product_viewed.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* @var $this Mage_Reports_Block_Product_Viewed */ ?> @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/review/customer/list.phtml b/app/design/frontend/default/default/template/review/customer/list.phtml index cb6e6c4888..78f7e96dcf 100644 --- a/app/design/frontend/default/default/template/review/customer/list.phtml +++ b/app/design/frontend/default/default/template/review/customer/list.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMessagesBlock()->getGroupedHtml() ?> diff --git a/app/design/frontend/default/default/template/review/customer/recent.phtml b/app/design/frontend/default/default/template/review/customer/recent.phtml index 38b24f9103..0a4612ebd2 100644 --- a/app/design/frontend/default/default/template/review/customer/recent.phtml +++ b/app/design/frontend/default/default/template/review/customer/recent.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getCollection() && $this->count()): ?> diff --git a/app/design/frontend/default/default/template/review/customer/view.phtml b/app/design/frontend/default/default/template/review/customer/view.phtml index ee437a74fd..fd5a4c759c 100644 --- a/app/design/frontend/default/default/template/review/customer/view.phtml +++ b/app/design/frontend/default/default/template/review/customer/view.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getProductData()->getId()): ?> diff --git a/app/design/frontend/default/default/template/review/form.phtml b/app/design/frontend/default/default/template/review/form.phtml index 14bf26c788..788d709599 100644 --- a/app/design/frontend/default/default/template/review/form.phtml +++ b/app/design/frontend/default/default/template/review/form.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/review/helper/summary.phtml b/app/design/frontend/default/default/template/review/helper/summary.phtml index 721dcbc92d..6f0fb66765 100644 --- a/app/design/frontend/default/default/template/review/helper/summary.phtml +++ b/app/design/frontend/default/default/template/review/helper/summary.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/review/helper/summary_short.phtml b/app/design/frontend/default/default/template/review/helper/summary_short.phtml index 55efc8bc7f..68df9c507e 100644 --- a/app/design/frontend/default/default/template/review/helper/summary_short.phtml +++ b/app/design/frontend/default/default/template/review/helper/summary_short.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/review/product/view/count.phtml b/app/design/frontend/default/default/template/review/product/view/count.phtml index f76ea94331..e033158404 100644 --- a/app/design/frontend/default/default/template/review/product/view/count.phtml +++ b/app/design/frontend/default/default/template/review/product/view/count.phtml @@ -18,12 +18,12 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> __('%s Review(s)', $count) ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/review/product/view/list.phtml b/app/design/frontend/default/default/template/review/product/view/list.phtml index 1fb06d360c..d51031d727 100644 --- a/app/design/frontend/default/default/template/review/product/view/list.phtml +++ b/app/design/frontend/default/default/template/review/product/view/list.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/review/product/view/other.phtml b/app/design/frontend/default/default/template/review/product/view/other.phtml index 45dccfb7dc..0a04e512a7 100644 --- a/app/design/frontend/default/default/template/review/product/view/other.phtml +++ b/app/design/frontend/default/default/template/review/product/view/other.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/review/view.phtml b/app/design/frontend/default/default/template/review/view.phtml index 3578a06fb3..7a2f6a0fe0 100644 --- a/app/design/frontend/default/default/template/review/view.phtml +++ b/app/design/frontend/default/default/template/review/view.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getProductData()->getId()): ?> diff --git a/app/design/frontend/default/default/template/rss/list.phtml b/app/design/frontend/default/default/template/rss/list.phtml index 9fe94f0380..22a7c7066d 100644 --- a/app/design/frontend/default/default/template/rss/list.phtml +++ b/app/design/frontend/default/default/template/rss/list.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage_Rss - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/rss/nofeed.phtml b/app/design/frontend/default/default/template/rss/nofeed.phtml index 9fd1cb0e9f..02bf5d89bc 100644 --- a/app/design/frontend/default/default/template/rss/nofeed.phtml +++ b/app/design/frontend/default/default/template/rss/nofeed.phtml @@ -1 +1 @@ -There was no RSS feed enabled. \ No newline at end of file +There was no RSS feed enabled. diff --git a/app/design/frontend/default/default/template/rss/order/details.phtml b/app/design/frontend/default/default/template/rss/order/details.phtml index 16ae9795f6..834be06a4f 100644 --- a/app/design/frontend/default/default/template/rss/order/details.phtml +++ b/app/design/frontend/default/default/template/rss/order/details.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /* store view name = $_order->getStore()->getName() @@ -99,4 +99,4 @@ store name = $_order->getStore()->getGroup()->getName() - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/creditmemo.phtml b/app/design/frontend/default/default/template/sales/order/creditmemo.phtml index 0e29786772..161389b0c4 100644 --- a/app/design/frontend/default/default/template/sales/order/creditmemo.phtml +++ b/app/design/frontend/default/default/template/sales/order/creditmemo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> helper('giftmessage/message')->getIsMessagesAvailable('order', $this->getOrder())): ?> @@ -60,4 +60,4 @@ function giftMessageToogle(giftMessageIdentifier) getChildHtml('creditmemo_items') ?>
    « __('Back to My Orders') ?> -
    \ No newline at end of file +
    diff --git a/app/design/frontend/default/default/template/sales/order/creditmemo/items.phtml b/app/design/frontend/default/default/template/sales/order/creditmemo/items.phtml index a5d68d1329..ab5e07df5c 100644 --- a/app/design/frontend/default/default/template/sales/order/creditmemo/items.phtml +++ b/app/design/frontend/default/default/template/sales/order/creditmemo/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -65,4 +65,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/default/default/template/sales/order/creditmemo/items/renderer/default.phtml index a2f0fab13d..f6953a5681 100644 --- a/app/design/frontend/default/default/template/sales/order/creditmemo/items/renderer/default.phtml +++ b/app/design/frontend/default/default/template/sales/order/creditmemo/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -295,4 +295,4 @@ formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/details.phtml b/app/design/frontend/default/default/template/sales/order/details.phtml index d4a7ee16d1..c1b0cec75a 100644 --- a/app/design/frontend/default/default/template/sales/order/details.phtml +++ b/app/design/frontend/default/default/template/sales/order/details.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> diff --git a/app/design/frontend/default/default/template/sales/order/history.phtml b/app/design/frontend/default/default/template/sales/order/history.phtml index 33f53cc592..c208de6d87 100644 --- a/app/design/frontend/default/default/template/sales/order/history.phtml +++ b/app/design/frontend/default/default/template/sales/order/history.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMessagesBlock()->getGroupedHtml() ?> diff --git a/app/design/frontend/default/default/template/sales/order/info.phtml b/app/design/frontend/default/default/template/sales/order/info.phtml index 6a13277b58..13170936fd 100644 --- a/app/design/frontend/default/default/template/sales/order/info.phtml +++ b/app/design/frontend/default/default/template/sales/order/info.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -82,4 +82,4 @@

    __('Payment Method') ?>

    getPaymentInfoHtml() ?>
    - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/invoice.phtml b/app/design/frontend/default/default/template/sales/order/invoice.phtml index 7ba6367b1f..b3d807ea2c 100644 --- a/app/design/frontend/default/default/template/sales/order/invoice.phtml +++ b/app/design/frontend/default/default/template/sales/order/invoice.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> helper('giftmessage/message')->getIsMessagesAvailable('order', $this->getOrder())): ?> diff --git a/app/design/frontend/default/default/template/sales/order/invoice/items.phtml b/app/design/frontend/default/default/template/sales/order/invoice/items.phtml index 8a1838b9e5..f359085d8c 100644 --- a/app/design/frontend/default/default/template/sales/order/invoice/items.phtml +++ b/app/design/frontend/default/default/template/sales/order/invoice/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/default/default/template/sales/order/invoice/items/renderer/default.phtml index 54c94c0cb0..df86818499 100644 --- a/app/design/frontend/default/default/template/sales/order/invoice/items/renderer/default.phtml +++ b/app/design/frontend/default/default/template/sales/order/invoice/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> diff --git a/app/design/frontend/default/default/template/sales/order/items.phtml b/app/design/frontend/default/default/template/sales/order/items.phtml index 395dee142d..24f62782ac 100644 --- a/app/design/frontend/default/default/template/sales/order/items.phtml +++ b/app/design/frontend/default/default/template/sales/order/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -67,4 +67,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/items/renderer/default.phtml b/app/design/frontend/default/default/template/sales/order/items/renderer/default.phtml index 6181595621..e217a7bfbc 100644 --- a/app/design/frontend/default/default/template/sales/order/items/renderer/default.phtml +++ b/app/design/frontend/default/default/template/sales/order/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -306,4 +306,4 @@     - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/print.phtml b/app/design/frontend/default/default/template/sales/order/print.phtml index e3627045a3..cfbe88104d 100644 --- a/app/design/frontend/default/default/template/sales/order/print.phtml +++ b/app/design/frontend/default/default/template/sales/order/print.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -85,4 +85,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/print/creditmemo.phtml b/app/design/frontend/default/default/template/sales/order/print/creditmemo.phtml index 2176e1a83d..6adb74a955 100644 --- a/app/design/frontend/default/default/template/sales/order/print/creditmemo.phtml +++ b/app/design/frontend/default/default/template/sales/order/print/creditmemo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -105,4 +105,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/print/invoice.phtml b/app/design/frontend/default/default/template/sales/order/print/invoice.phtml index 5f5469aac7..bc98ce895a 100644 --- a/app/design/frontend/default/default/template/sales/order/print/invoice.phtml +++ b/app/design/frontend/default/default/template/sales/order/print/invoice.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/print/shipment.phtml b/app/design/frontend/default/default/template/sales/order/print/shipment.phtml index eadcf944cb..fbdc78e78e 100644 --- a/app/design/frontend/default/default/template/sales/order/print/shipment.phtml +++ b/app/design/frontend/default/default/template/sales/order/print/shipment.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -92,4 +92,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/recent.phtml b/app/design/frontend/default/default/template/sales/order/recent.phtml index 24b7101295..48a548f4ff 100644 --- a/app/design/frontend/default/default/template/sales/order/recent.phtml +++ b/app/design/frontend/default/default/template/sales/order/recent.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/shipment.phtml b/app/design/frontend/default/default/template/sales/order/shipment.phtml index ac54857e45..5145dd6115 100644 --- a/app/design/frontend/default/default/template/sales/order/shipment.phtml +++ b/app/design/frontend/default/default/template/sales/order/shipment.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> helper('giftmessage/message')->getIsMessagesAvailable('order', $this->getOrder())): ?> diff --git a/app/design/frontend/default/default/template/sales/order/shipment/items.phtml b/app/design/frontend/default/default/template/sales/order/shipment/items.phtml index 1531a20c6d..27acc4cf28 100644 --- a/app/design/frontend/default/default/template/sales/order/shipment/items.phtml +++ b/app/design/frontend/default/default/template/sales/order/shipment/items.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getOrder() ?> @@ -87,4 +87,4 @@ - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/shipment/items/renderer/default.phtml b/app/design/frontend/default/default/template/sales/order/shipment/items/renderer/default.phtml index 16da04a4f2..7dd2bc235b 100644 --- a/app/design/frontend/default/default/template/sales/order/shipment/items/renderer/default.phtml +++ b/app/design/frontend/default/default/template/sales/order/shipment/items/renderer/default.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getItem() ?> @@ -58,4 +58,4 @@ splitInjection($this->getSku()) ?> getQty()*1 ?> - \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/sales/order/trackinginfo.phtml b/app/design/frontend/default/default/template/sales/order/trackinginfo.phtml index 6a83d55a08..e51f3b354f 100644 --- a/app/design/frontend/default/default/template/sales/order/trackinginfo.phtml +++ b/app/design/frontend/default/default/template/sales/order/trackinginfo.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> @@ -65,4 +65,4 @@ - \ No newline at end of file +     diff --git a/app/design/frontend/default/default/template/sales/order/view.phtml b/app/design/frontend/default/default/template/sales/order/view.phtml index 3bb2d08db7..dc99d0b51a 100644 --- a/app/design/frontend/default/default/template/sales/order/view.phtml +++ b/app/design/frontend/default/default/template/sales/order/view.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> helper('giftmessage/message')->getIsMessagesAvailable('items', $this->getOrder())): ?> diff --git a/app/design/frontend/default/default/template/sales/reorder/sidebar.phtml b/app/design/frontend/default/default/template/sales/reorder/sidebar.phtml index f8adcebe44..4e183760da 100644 --- a/app/design/frontend/default/default/template/sales/reorder/sidebar.phtml +++ b/app/design/frontend/default/default/template/sales/reorder/sidebar.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    - +
    diff --git a/app/design/frontend/default/default/template/shipping/tracking/ajax.phtml b/app/design/frontend/default/default/template/shipping/tracking/ajax.phtml index e69de29bb2..8b13789179 100644 --- a/app/design/frontend/default/default/template/shipping/tracking/ajax.phtml +++ b/app/design/frontend/default/default/template/shipping/tracking/ajax.phtml @@ -0,0 +1 @@ + diff --git a/app/design/frontend/default/default/template/shipping/tracking/popup.phtml b/app/design/frontend/default/default/template/shipping/tracking/popup.phtml index 07af95e477..3c15ac94fc 100644 --- a/app/design/frontend/default/default/template/shipping/tracking/popup.phtml +++ b/app/design/frontend/default/default/template/shipping/tracking/popup.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getTrackingInfo() ?> @@ -169,4 +169,4 @@
    -
    \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/tag/cloud.phtml b/app/design/frontend/default/default/template/tag/cloud.phtml index 33ed24c683..1a6e858c7e 100644 --- a/app/design/frontend/default/default/template/tag/cloud.phtml +++ b/app/design/frontend/default/default/template/tag/cloud.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    diff --git a/app/design/frontend/default/default/template/tag/customer/edit.phtml b/app/design/frontend/default/default/template/tag/customer/edit.phtml index c692070e0d..969dc1e51c 100644 --- a/app/design/frontend/default/default/template/tag/customer/edit.phtml +++ b/app/design/frontend/default/default/template/tag/customer/edit.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -46,4 +46,4 @@ \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/tag/customer/recent.phtml b/app/design/frontend/default/default/template/tag/customer/recent.phtml index a7b8fbd76d..2182159e0e 100644 --- a/app/design/frontend/default/default/template/tag/customer/recent.phtml +++ b/app/design/frontend/default/default/template/tag/customer/recent.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/frontend/default/default/template/tag/customer/view.phtml b/app/design/frontend/default/default/template/tag/customer/view.phtml index b6c6f45ef4..89ee9ba6cb 100644 --- a/app/design/frontend/default/default/template/tag/customer/view.phtml +++ b/app/design/frontend/default/default/template/tag/customer/view.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMessagesBlock()->getGroupedHtml() ?>

    - __('Tag Name: %s', $this->htmlEscape($this->getTagInfo()->getName())) ?> - + __('Tag Name: %s', $this->htmlEscape($this->getTagInfo()->getName())) ?> +

    getToolbarHtml() ?> @@ -45,10 +45,10 @@ class="odd"> ', new RegExp('(^|.|\\r|\\n)(__([a-zA-Z0-9_]+)__)', '')); + this.template = new Template('' + this + .getElement('template').innerHTML + '', new RegExp( + '(^|.|\\r|\\n)(__([a-zA-Z0-9_]+)__)', '')); this.fixParentTable(); this.updateImages(); - varienGlobalEvents.attachEventHandler('moveTab', this.onImageTabMove.bind(this)); + varienGlobalEvents.attachEventHandler('moveTab', this.onImageTabMove + .bind(this)); }, - onImageTabMove: function(event) { + onImageTabMove : function(event) { var imagesTab = false; - this.container.ancestors().each(function(parentItem){ + this.container.ancestors().each( function(parentItem) { if (parentItem.tabObject) { imagesTab = parentItem.tabObject; throw $break; } }.bind(this)); - if(imagesTab && event.tab && event.tab.name && imagesTab.name == event.tab.name) { + + if (imagesTab && event.tab && event.tab.name && imagesTab.name == event.tab.name) { + this.container.select('input[type="radio"]').each(function(radio) { + radio.observe('change', this.onChangeRadio); + }.bind(this)); this.updateImages(); } + }, - fixParentTable: function() { - this.container.ancestors().each(function(parentItem){ - if(parentItem.tagName.toLowerCase()=='td') { - parentItem.style.width ='100%'; + fixParentTable : function() { + this.container.ancestors().each( function(parentItem) { + if (parentItem.tagName.toLowerCase() == 'td') { + parentItem.style.width = '100%'; } - if(parentItem.tagName.toLowerCase()=='table') { - parentItem.style.width ='100%'; + if (parentItem.tagName.toLowerCase() == 'table') { + parentItem.style.width = '100%'; throw $break; } }); }, - getElement: function (name) { + getElement : function(name) { return $(this.containerId + '_' + name); }, - showUploader: function () { + showUploader : function() { this.getElement('add_images_button').hide(); this.getElement('uploader').show(); }, - handleUploadComplete: function (files) { - files.each(function(item) { - if (!item.response.isJSON()) { + handleUploadComplete : function(files) { + files.each( function(item) { + if (!item.response.isJSON()) { try { console.log(item.response); } catch (e2) { alert(item.response); } - return; - } - var response = item.response.evalJSON(); - if (response.error) { - return; - } - var newImage = {}; - newImage.url = response.url; - newImage.file = response.file; - newImage.label = ''; - newImage.position = this.getNextPosition(); - newImage.disabled = 0; - newImage.removed = 0; - this.images.push(newImage); - this.uploader.removeFile(item.id); + return; + } + var response = item.response.evalJSON(); + if (response.error) { + return; + } + var newImage = {}; + newImage.url = response.url; + newImage.file = response.file; + newImage.label = ''; + newImage.position = this.getNextPosition(); + newImage.disabled = 0; + newImage.removed = 0; + this.images.push(newImage); + this.uploader.removeFile(item.id); }.bind(this)); this.container.setHasChanges(); this.updateImages(); }, - updateImages: function() { + updateImages : function() { this.getElement('save').value = this.images.toJSON(); - $H(this.imageTypes).each(function(pair) { - this.getFileElement('no_selection', 'cell-' + pair.key + ' input').checked = true; - }.bind(this)); - this.images.each(function(row){ + $H(this.imageTypes).each( + function(pair) { + this.getFileElement('no_selection', + 'cell-' + pair.key + ' input').checked = true; + }.bind(this)); + this.images.each( function(row) { if (!$(this.prepareId(row.file))) { this.createImageRow(row); } @@ -119,76 +133,97 @@ Product.Gallery.prototype = { }.bind(this)); this.updateUseDefault(false); }, - createImageRow: function(image) { + onChangeRadio: function (evt) { + var element = Event.element(evt); + element.setHasChanges(); + }, + createImageRow : function(image) { var vars = Object.clone(image); vars.id = this.prepareId(image.file); var html = this.template.evaluate(vars); - Element.insert(this.getElement('list'), {bottom: html}); + Element.insert(this.getElement('list'), { + bottom :html + }); + + $(vars.id).select('input[type="radio"]').each(function(radio) { + radio.observe('change', this.onChangeRadio); + }.bind(this)); }, - prepareId: function(file) { - if(typeof this.file2id[file] == 'undefined') { + prepareId : function(file) { + if (typeof this.file2id[file] == 'undefined') { this.file2id[file] = this.idIncrement++; } return this.containerId + '-image-' + this.file2id[file]; }, - getNextPosition: function() { - var maxPosition = 0; - this.images.each(function (item) { - if (parseInt(item.position) > maxPosition) { - maxPosition = parseInt(item.position); - } - }); - return maxPosition + 1; - }, - updateImage: function(file) { - var index = this.getIndexByFile(file); - this.images[index].label = this.getFileElement(file, 'cell-label input').value; - this.images[index].position = this.getFileElement(file, 'cell-position input').value; - this.images[index].removed = (this.getFileElement(file, 'cell-remove input').checked ? 1 : 0); - this.images[index].disabled = (this.getFileElement(file, 'cell-disable input').checked ? 1 : 0); - this.getElement('save').value = this.images.toJSON(); - this.updateState(file); - this.container.setHasChanges(); - }, - loadImage: function(file) { - var image = this.getImageByFile(file); - this.getFileElement(file, 'cell-image img').src = image.url; - this.getFileElement(file, 'cell-image img').show(); - this.getFileElement(file, 'cell-image .place-holder').hide(); - }, - setProductImages: function(file) { - $H(this.imageTypes).each(function(pair){ - if(this.getFileElement(file, 'cell-' + pair.key + ' input').checked) { - this.imagesValues[pair.key] = (file == 'no_selection' ? null : file); - } - }.bind(this)); - - this.getElement('save_image').value = $H(this.imagesValues).toJSON(); - }, - updateVisualisation: function(file) { - var image = this.getImageByFile(file); - this.getFileElement(file, 'cell-label input').value = image.label; - this.getFileElement(file, 'cell-position input').value = image.position; - this.getFileElement(file, 'cell-remove input').checked = (image.removed == 1); - this.getFileElement(file, 'cell-disable input').checked = (image.disabled == 1); - $H(this.imageTypes).each(function(pair) { - if(this.imagesValues[pair.key] == file) { - this.getFileElement(file, 'cell-' + pair.key + ' input').checked = true; - } - }.bind(this)); - this.updateState(file); - }, - updateState: function (file) { - if(this.getFileElement(file, 'cell-disable input').checked) { - this.getFileElement(file, 'cell-position input').disabled = true; - } else { - this.getFileElement(file, 'cell-position input').disabled = false; - } - }, - getFileElement: function(file, element){ + getNextPosition : function() { + var maxPosition = 0; + this.images.each( function(item) { + if (parseInt(item.position) > maxPosition) { + maxPosition = parseInt(item.position); + } + }); + return maxPosition + 1; + }, + updateImage : function(file) { + var index = this.getIndexByFile(file); + this.images[index].label = this + .getFileElement(file, 'cell-label input').value; + this.images[index].position = this.getFileElement(file, + 'cell-position input').value; + this.images[index].removed = (this.getFileElement(file, + 'cell-remove input').checked ? 1 : 0); + this.images[index].disabled = (this.getFileElement(file, + 'cell-disable input').checked ? 1 : 0); + this.getElement('save').value = this.images.toJSON(); + this.updateState(file); + this.container.setHasChanges(); + }, + loadImage : function(file) { + var image = this.getImageByFile(file); + this.getFileElement(file, 'cell-image img').src = image.url; + this.getFileElement(file, 'cell-image img').show(); + this.getFileElement(file, 'cell-image .place-holder').hide(); + }, + setProductImages : function(file) { + $H(this.imageTypes) + .each( + function(pair) { + if (this.getFileElement(file, + 'cell-' + pair.key + ' input').checked) { + this.imagesValues[pair.key] = (file == 'no_selection' ? null + : file); + } + }.bind(this)); + + this.getElement('save_image').value = $H(this.imagesValues).toJSON(); + }, + updateVisualisation : function(file) { + var image = this.getImageByFile(file); + this.getFileElement(file, 'cell-label input').value = image.label; + this.getFileElement(file, 'cell-position input').value = image.position; + this.getFileElement(file, 'cell-remove input').checked = (image.removed == 1); + this.getFileElement(file, 'cell-disable input').checked = (image.disabled == 1); + $H(this.imageTypes) + .each( + function(pair) { + if (this.imagesValues[pair.key] == file) { + this.getFileElement(file, + 'cell-' + pair.key + ' input').checked = true; + } + }.bind(this)); + this.updateState(file); + }, + updateState : function(file) { + if (this.getFileElement(file, 'cell-disable input').checked) { + this.getFileElement(file, 'cell-position input').disabled = true; + } else { + this.getFileElement(file, 'cell-position input').disabled = false; + } + }, + getFileElement : function(file, element) { var selector = '#' + this.prepareId(file) + ' .' + element; var elems = $$(selector); - if(!elems[0]) { + if (!elems[0]) { try { console.log(selector); } catch (e2) { @@ -196,65 +231,66 @@ Product.Gallery.prototype = { } } - return $$('#' + this.prepareId(file) + ' .' + element)[0]; + return $$('#' + this.prepareId(file) + ' .' + element)[0]; }, - getImageByFile: function(file) { - if (this.getIndexByFile(file)===null) { - return false; - } + getImageByFile : function(file) { + if (this.getIndexByFile(file) === null) { + return false; + } - return this.images[this.getIndexByFile(file)]; + return this.images[this.getIndexByFile(file)]; }, - getIndexByFile: function(file) { - var index; - this.images.each(function (item, i) { - if (item.file == file) { - index = i; - } - }); - return index; + getIndexByFile : function(file) { + var index; + this.images.each( function(item, i) { + if (item.file == file) { + index = i; + } + }); + return index; }, - updateUseDefault: function () - { - if (this.getElement('default')) { - this.getElement('default').select('input').each(function(input){ - $(this.containerId).select('.cell-' + input.value + ' input').each(function(radio) { - radio.disabled = input.checked; - }); - }.bind(this)); - } + updateUseDefault : function() { + if (this.getElement('default')) { + this.getElement('default').select('input').each( + function(input) { + $(this.containerId).select( + '.cell-' + input.value + ' input').each( + function(radio) { + radio.disabled = input.checked; + }); + }.bind(this)); + } - if (arguments.length == 0) { - this.container.setHasChanges(); - } + if (arguments.length == 0) { + this.container.setHasChanges(); + } }, - handleUploadProgress: function (file) { + handleUploadProgress : function(file) { }, - handleUploadError: function (fileId) { + handleUploadError : function(fileId) { } }; Product.AttributesBridge = { - tabsObject: false, - bindTabs2Attributes: {}, - bind: function(tabId, attributesObject) { + tabsObject :false, + bindTabs2Attributes : {}, + bind : function(tabId, attributesObject) { this.bindTabs2Attributes[tabId] = attributesObject; }, - getAttributes: function(tabId) { + getAttributes : function(tabId) { return this.bindTabs2Attributes[tabId]; }, - setTabsObject: function(tabs) { + setTabsObject : function(tabs) { this.tabsObject = tabs; }, - getTabsObject: function() { + getTabsObject : function() { return this.tabsObject; }, - addAttributeRow: function(data) - { - $H(data).each(function(item){ - if(this.getTabsObject().activeTab.name!=item.key) { + addAttributeRow : function(data) { + $H(data).each( function(item) { + if (this.getTabsObject().activeTab.name != item.key) { this.getTabsObject().showTabContent($(item.key)); } this.getAttributes(item.key).addRow(item.value); @@ -264,539 +300,610 @@ Product.AttributesBridge = { Product.Attributes = Class.create(); Product.Attributes.prototype = { - config: {}, - containerId: null, - initialize: function(containerId) { + config : {}, + containerId :null, + initialize : function(containerId) { this.containerId = containerId; }, - setConfig: function(config) { + setConfig : function(config) { this.config = config; Product.AttributesBridge.bind(this.getConfig().tab_id, this); }, - getConfig: function () { + getConfig : function() { return this.config; }, - create: function () { - var win = window.open(this.getConfig().url, 'new_attribute', 'width=900,height=600,resizable=1,scrollbars=1'); + create : function() { + var win = window.open(this.getConfig().url, 'new_attribute', + 'width=900,height=600,resizable=1,scrollbars=1'); win.focus(); }, - addRow: function(html) { + addRow : function(html) { var attributesContainer = $$('#group_fields' + this.getConfig().group_id + ' .form-list tbody')[0]; - Element.insert(attributesContainer, {bottom: html}); + Element.insert(attributesContainer, { + bottom :html + }); var childs = attributesContainer.childElements(); - var element = childs[childs.size()-1].select('input','select','textarea')[0]; + var element = childs[childs.size() - 1].select('input', 'select', + 'textarea')[0]; if (element) { - window.scrollTo(0, Position.cumulativeOffset(element)[1] + element.offsetHeight); + window.scrollTo(0, Position.cumulativeOffset(element)[1] + + element.offsetHeight); } } }; Product.Configurable = Class.create(); Product.Configurable.prototype = { - initialize: function (attributes, links, idPrefix, grid, readonly) { - this.templatesSyntax = new RegExp('(^|.|\\r|\\n)(\'{{\\s*(\\w+)\\s*}}\')', ""); - this.attributes = attributes; // Attributes - this.idPrefix = idPrefix; // Container id prefix - this.links = $H(links); // Associated products - this.newProducts = []; // For product that's created througth Create Empty and Copy from Configurable + initialize : function(attributes, links, idPrefix, grid, readonly) { + this.templatesSyntax = new RegExp( + '(^|.|\\r|\\n)(\'{{\\s*(\\w+)\\s*}}\')', ""); + this.attributes = attributes; // Attributes + this.idPrefix = idPrefix; // Container id prefix + this.links = $H(links); // Associated products + this.newProducts = []; // For product that's created through Create + // Empty and Copy from Configurable this.readonly = readonly; - - /* Generation templates */ - this.addAttributeTemplate = new Template($(idPrefix + 'attribute_template').innerHTML.replace(/__id__/g,"'{{html_id}}'").replace(/ template no-display/g,''), this.templatesSyntax); - this.addValueTemplate = new Template($(idPrefix + 'value_template').innerHTML.replace(/__id__/g,"'{{html_id}}'").replace(/ template no-display/g,''), this.templatesSyntax); - this.pricingValueTemplate = new Template($(idPrefix + 'simple_pricing').innerHTML, this.templatesSyntax); - this.pricingValueViewTemplate = new Template($(idPrefix + 'simple_pricing_view').innerHTML, this.templatesSyntax); - - this.container = $(idPrefix + 'attributes'); - - /* Listeners */ - this.onLabelUpdate = this.updateLabel.bindAsEventListener(this); // Update attribute label - this.onValuePriceUpdate = this.updateValuePrice.bindAsEventListener(this); // Update pricing value - this.onValueTypeUpdate = this.updateValueType.bindAsEventListener(this); // Update pricing type - this.onValueDefaultUpdate = this.updateValueUseDefault.bindAsEventListener(this); - - /* Grid initialization and attributes initialization */ - this.createAttributes(); // Creation of default attributes - - this.grid = grid; - this.grid.rowClickCallback = this.rowClick.bind(this); - this.grid.initRowCallback = this.rowInit.bind(this); - this.grid.checkboxCheckCallback = this.registerProduct.bind(this); // Associate/Unassociate simple product - - this.grid.rows.each(function(row) { - this.rowInit(this.grid, row); - }.bind(this)); - }, - createAttributes: function() { - this.attributes.each(function(attribute, index) { - //var li = Builder.node('li', {className:'attribute'}); - var li = $(document.createElement('LI')); - li.className = 'attribute'; - - li.id = this.idPrefix + '_attribute_' + index; - attribute.html_id = li.id; - if(attribute && attribute.label && attribute.label.blank()) { - attribute.label = ' ' - } - var label_readonly = ''; - var use_default_checked = ''; - if (attribute.use_default == '1') { - use_default_checked = ' checked="checked"'; - label_readonly = ' redonly="redonly"'; - } - - var template = this.addAttributeTemplate.evaluate(attribute); - template = template.replace(new RegExp(' readonly="label"', 'g'), label_readonly); - template = template.replace(new RegExp(' checked="use_default"', 'g'), use_default_checked); - li.update(template); - li.attributeObject = attribute; - - this.container.appendChild(li); - li.attributeValues = li.down('.attribute-values'); - - if (attribute.values) { - attribute.values.each(function(value){ - this.createValueRow(li, value); // Add pricing values - }.bind(this)); - } - - /* Observe label change */ - Event.observe(li.down('.attribute-label'),'change', this.onLabelUpdate); - Event.observe(li.down('.attribute-label'),'keyup', this.onLabelUpdate); - Event.observe(li.down('.attribute-use-default-label'), 'change', this.onLabelUpdate); - }.bind(this)); - if (!this.readonly) { - // Creation of sortable for attributes sorting - Sortable.create(this.container, {handle:'attribute-name-container',onUpdate:this.updatePositions.bind(this)}); - } - this.updateSaveInput(); - }, - - updateLabel: function (event) { - var li = Event.findElement(event, 'LI'); - var labelEl = li.down('.attribute-label'); - var defEl = li.down('.attribute-use-default-label'); - - li.attributeObject.label = labelEl.value; - if (defEl.checked) { - labelEl.readOnly = true; - li.attributeObject.use_default = 1; - } else { - labelEl.readOnly = false; - li.attributeObject.use_default = 0; - } - - this.updateSaveInput(); - }, - updatePositions: function(param) { - this.container.childElements().each(function(row, index) { - row.attributeObject.position = index; - }); - this.updateSaveInput(); - }, - addNewProduct: function(productId, attributes) { - if (this.checkAttributes(attributes)) { - this.links.set(productId, this.cloneAttributes(attributes)); - } else { - this.newProducts.push(productId); - } + + /* Generation templates */ + this.addAttributeTemplate = new Template( + $(idPrefix + 'attribute_template').innerHTML.replace(/__id__/g, + "'{{html_id}}'").replace(/ template no-display/g, ''), + this.templatesSyntax); + this.addValueTemplate = new Template( + $(idPrefix + 'value_template').innerHTML.replace(/__id__/g, + "'{{html_id}}'").replace(/ template no-display/g, ''), + this.templatesSyntax); + this.pricingValueTemplate = new Template( + $(idPrefix + 'simple_pricing').innerHTML, this.templatesSyntax); + this.pricingValueViewTemplate = new Template( + $(idPrefix + 'simple_pricing_view').innerHTML, + this.templatesSyntax); + + this.container = $(idPrefix + 'attributes'); + + /* Listeners */ + this.onLabelUpdate = this.updateLabel.bindAsEventListener(this); // Update + // attribute + // label + this.onValuePriceUpdate = this.updateValuePrice + .bindAsEventListener(this); // Update pricing value + this.onValueTypeUpdate = this.updateValueType.bindAsEventListener(this); // Update + // pricing + // type + this.onValueDefaultUpdate = this.updateValueUseDefault + .bindAsEventListener(this); + + /* Grid initialization and attributes initialization */ + this.createAttributes(); // Creation of default attributes + + this.grid = grid; + this.grid.rowClickCallback = this.rowClick.bind(this); + this.grid.initRowCallback = this.rowInit.bind(this); + this.grid.checkboxCheckCallback = this.registerProduct.bind(this); // Associate/Unassociate + // simple + // product + + this.grid.rows.each( function(row) { + this.rowInit(this.grid, row); + }.bind(this)); + }, + createAttributes : function() { + this.attributes.each( function(attribute, index) { + // var li = Builder.node('li', {className:'attribute'}); + var li = $(document.createElement('LI')); + li.className = 'attribute'; + + li.id = this.idPrefix + '_attribute_' + index; + attribute.html_id = li.id; + if (attribute && attribute.label && attribute.label.blank()) { + attribute.label = ' ' + } + var label_readonly = ''; + var use_default_checked = ''; + if (attribute.use_default == '1') { + use_default_checked = ' checked="checked"'; + label_readonly = ' redonly="redonly"'; + } + + var template = this.addAttributeTemplate.evaluate(attribute); + template = template.replace( + new RegExp(' readonly="label"', 'g'), label_readonly); + template = template.replace(new RegExp( + ' checked="use_default"', 'g'), use_default_checked); + li.update(template); + li.attributeObject = attribute; + + this.container.appendChild(li); + li.attributeValues = li.down('.attribute-values'); + + if (attribute.values) { + attribute.values.each( function(value) { + this.createValueRow(li, value); // Add pricing values + }.bind(this)); + } + + /* Observe label change */ + Event.observe(li.down('.attribute-label'), 'change', + this.onLabelUpdate); + Event.observe(li.down('.attribute-label'), 'keyup', + this.onLabelUpdate); + Event.observe(li.down('.attribute-use-default-label'), + 'change', this.onLabelUpdate); + }.bind(this)); + if (!this.readonly) { + // Creation of sortable for attributes sorting + Sortable.create(this.container, { + handle :'attribute-name-container', + onUpdate :this.updatePositions.bind(this) + }); + } + this.updateSaveInput(); + }, + + updateLabel : function(event) { + var li = Event.findElement(event, 'LI'); + var labelEl = li.down('.attribute-label'); + var defEl = li.down('.attribute-use-default-label'); + + li.attributeObject.label = labelEl.value; + if (defEl.checked) { + labelEl.readOnly = true; + li.attributeObject.use_default = 1; + } else { + labelEl.readOnly = false; + li.attributeObject.use_default = 0; + } + + this.updateSaveInput(); + }, + updatePositions : function(param) { + this.container.childElements().each( function(row, index) { + row.attributeObject.position = index; + }); + this.updateSaveInput(); + }, + addNewProduct : function(productId, attributes) { + if (this.checkAttributes(attributes)) { + this.links.set(productId, this.cloneAttributes(attributes)); + } else { + this.newProducts.push(productId); + } this.updateGrid(); - this.updateValues(); - this.grid.reload(null); - }, - createEmptyProduct: function() { - this.createPopup(this.createEmptyUrl) - }, - createNewProduct: function() { - this.createPopup(this.createNormalUrl); - }, - createPopup: function(url) { - if (this.win && !this.win.closed) { - this.win.close(); - } - - this.win = window.open(url, '','width=1000,height=700,resizable=1,scrollbars=1'); - this.win.focus(); - }, - registerProduct: function(grid, element, checked) { - if(checked){ - if(element.linkAttributes) { - this.links.set(element.value, element.linkAttributes); - } + this.updateValues(); + this.grid.reload(null); + }, + createEmptyProduct : function() { + this.createPopup(this.createEmptyUrl) + }, + createNewProduct : function() { + this.createPopup(this.createNormalUrl); + }, + createPopup : function(url) { + if (this.win && !this.win.closed) { + this.win.close(); } - else{ + + this.win = window.open(url, '', + 'width=1000,height=700,resizable=1,scrollbars=1'); + this.win.focus(); + }, + registerProduct : function(grid, element, checked) { + if (checked) { + if (element.linkAttributes) { + this.links.set(element.value, element.linkAttributes); + } + } else { this.links.unset(element.value); } this.updateGrid(); - this.grid.rows.each(function(row) { - this.revalidateRow(this.grid, row); - }.bind(this)); - this.updateValues(); - }, - updateProduct: function(productId, attributes) { - var isAssociated = false; - - if (typeof this.links.get(productId) != 'undefined') { - isAssociated = true; - this.links.unset(productId); - } - - if (isAssociated && this.checkAttributes(attributes)) { - this.links.set(productId, this.cloneAttributes(attributes)); - } else if (isAssociated) { - this.newProducts.push(productId); - } - - this.updateGrid(); - this.updateValues(); - this.grid.reload(null); - }, - cloneAttributes: function (attributes) { - var newObj = []; - for (var i=0, length=attributes.length; i
    '}); + if (select.value + && !$('simple_product_' + attributeCode + '_pricing_container')) { + Element + .insert( + select, + { + after :'
    ' + }); var newContainer = select.next('div'); select.parentNode.removeChild(select); newContainer.appendChild(select); @@ -807,7 +914,7 @@ Product.Configurable.prototype = { var container = $('simple_product_' + attributeCode + '_pricing_container'); if (select.value) { - var value = this.getValueByIndex(attribute,select.value); + var value = this.getValueByIndex(attribute, select.value); if (!value) { if (!container.down('.attribute-price')) { if (value == null) { @@ -815,7 +922,8 @@ Product.Configurable.prototype = { } container.update(this.pricingValueTemplate.evaluate(value)); var priceValueField = container.down('.attribute-price'); - var priceTypeField = container.down('.attribute-price-type'); + var priceTypeField = container + .down('.attribute-price-type'); priceValueField.attributeCode = attributeCode; priceValueField.priceField = priceValueField; @@ -825,17 +933,21 @@ Product.Configurable.prototype = { priceTypeField.priceField = priceValueField; priceTypeField.typeField = priceTypeField; - Event.observe(priceValueField, 'change', this.updateSimplePricing.bindAsEventListener(this)); - Event.observe(priceValueField, 'keyup', this.updateSimplePricing.bindAsEventListener(this)); - Event.observe(priceTypeField, 'change', this.updateSimplePricing.bindAsEventListener(this)); + Event.observe(priceValueField, 'change', + this.updateSimplePricing.bindAsEventListener(this)); + Event.observe(priceValueField, 'keyup', + this.updateSimplePricing.bindAsEventListener(this)); + Event.observe(priceTypeField, 'change', + this.updateSimplePricing.bindAsEventListener(this)); $('simple_product_' + attributeCode + '_pricing_value').value = null; $('simple_product_' + attributeCode + '_pricing_type').value = null; } } else if (!isNaN(parseFloat(value.pricing_value))) { - container.update(this.pricingValueViewTemplate.evaluate({ - 'value': (parseFloat(value.pricing_value) > 0 ? '+' : '') + parseFloat(value.pricing_value) - + ( parseInt(value.is_percent) > 0 ? '%' : '') + container.update(this.pricingValueViewTemplate.evaluate( { + 'value' :(parseFloat(value.pricing_value) > 0 ? '+' : '') + + parseFloat(value.pricing_value) + + (parseInt(value.is_percent) > 0 ? '%' : '') })); $('simple_product_' + attributeCode + '_pricing_value').value = value.pricing_value; $('simple_product_' + attributeCode + '_pricing_type').value = value.is_percent; @@ -844,13 +956,13 @@ Product.Configurable.prototype = { $('simple_product_' + attributeCode + '_pricing_value').value = null; $('simple_product_' + attributeCode + '_pricing_type').value = null; } - } else if(container) { + } else if (container) { container.update(''); $('simple_product_' + attributeCode + '_pricing_value').value = null; $('simple_product_' + attributeCode + '_pricing_type').value = null; } - }, - updateSimplePricing: function(evt) { + }, + updateSimplePricing : function(evt) { var element = Event.element(evt); if (!element.priceField.value.blank()) { $('simple_product_' + element.attributeCode + '_pricing_value').value = element.priceField.value; @@ -859,48 +971,48 @@ Product.Configurable.prototype = { $('simple_product_' + element.attributeCode + '_pricing_value').value = null; $('simple_product_' + element.attributeCode + '_pricing_type').value = null; } - }, - updateSimpleForm: function() { - this.attributes.each(function(attribute) { - if ($('simple_product_' + attribute.attribute_code)) { - this.showPricing($('simple_product_' + attribute.attribute_code), attribute.attribute_code); - } - }.bind(this)); - } + }, + updateSimpleForm : function() { + this.attributes.each( function(attribute) { + if ($('simple_product_' + attribute.attribute_code)) { + this.showPricing( + $('simple_product_' + attribute.attribute_code), + attribute.attribute_code); + } + }.bind(this)); + } } var onInitDisableFieldsList = []; function toogleFieldEditMode(toogleIdentifier, fieldContainer) { - if($(toogleIdentifier).checked) { - enableFieldEditMode(fieldContainer); - } else { - disableFieldEditMode(fieldContainer); - } + if ($(toogleIdentifier).checked) { + enableFieldEditMode(fieldContainer); + } else { + disableFieldEditMode(fieldContainer); + } } function disableFieldEditMode(fieldContainer) { $(fieldContainer).disabled = true; - if($(fieldContainer + '_hidden')) { + if ($(fieldContainer + '_hidden')) { $(fieldContainer + '_hidden').disabled = true; } } function enableFieldEditMode(fieldContainer) { $(fieldContainer).disabled = false; - if($(fieldContainer + '_hidden')) { + if ($(fieldContainer + '_hidden')) { $(fieldContainer + '_hidden').disabled = false; } } -function initDisableFields(fieldContainer) -{ +function initDisableFields(fieldContainer) { onInitDisableFieldsList.push(fieldContainer); } -function onCompleteDisableInited() -{ - onInitDisableFieldsList.each(function(item){ +function onCompleteDisableInited() { + onInitDisableFieldsList.each( function(item) { disableFieldEditMode(item); }); } diff --git a/js/mage/adminhtml/tools.js b/js/mage/adminhtml/tools.js index d0068f5ce0..b8558c79f2 100644 --- a/js/mage/adminhtml/tools.js +++ b/js/mage/adminhtml/tools.js @@ -194,6 +194,14 @@ function updateElementAtCursor(el, value, win) { } } +// Firebug detection +function firebugEnabled() { + if(window.console && window.console.firebug) { + return true; + } + return false; +} + /********** Ajax session expiration ***********/ diff --git a/js/prototype/validation.js b/js/prototype/validation.js index 9cab7a2d56..c3180a826d 100644 --- a/js/prototype/validation.js +++ b/js/prototype/validation.js @@ -479,7 +479,7 @@ Validation.addAllThese([ ['validate-clean-url', 'Please enter a valid URL. For example http://www.example.com or www.example.com', function (v) { return Validation.get('IsEmpty').test(v) || /^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(v) || /^(www)((\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(v) }], - ['validate-identifier', 'Please enter a valid Identifier. For example example-page, example-page.html or anotherlevel/example-page', function (v) { + ['validate-identifier', 'Please enter a valid URL Key. For example "example-page", "example-page.html" or "anotherlevel/example-page"', function (v) { return Validation.get('IsEmpty').test(v) || /^[A-Z0-9][A-Z0-9_\/-]+(\.[A-Z0-9_-]+)*$/i.test(v) }], ['validate-xml-identifier', 'Please enter a valid XML-identifier. For example something_1, block5, id-4', function (v) { diff --git a/js/scriptaculous/slider.js b/js/scriptaculous/slider.js index e64a0c40c8..4580cb8b6d 100644 --- a/js/scriptaculous/slider.js +++ b/js/scriptaculous/slider.js @@ -83,7 +83,8 @@ Control.Slider = Class.create({ this.track.observe("mousedown", this.eventMouseDown); document.observe("mouseup", this.eventMouseUp); - this.track.parentNode.parentNode.observe("mousemove", this.eventMouseMove); + $(this.track.parentNode.parentNode).observe("mousemove", this.eventMouseMove); + this.initialized = true; }, @@ -98,6 +99,7 @@ Control.Slider = Class.create({ }, setDisabled: function(){ this.disabled = true; + this.track.parentNode.className = this.track.parentNode.className + ' disabled'; }, setEnabled: function(){ this.disabled = false; diff --git a/js/varien/form.js b/js/varien/form.js index 5ac0ec4c33..b7dfd92eb9 100644 --- a/js/varien/form.js +++ b/js/varien/form.js @@ -251,10 +251,10 @@ RegionUpdater.prototype = { setMarkDisplay: function(elem, display){ elem = $(elem); - var labelElement = elem.up(1).down('label > span.required') || - elem.up(2).down('label > span.required') || - elem.up(1).down('label.required > em') || - elem.up(2).down('label.required > em'); + var labelElement = elem.up(0).down('label > span.required') || + elem.up(1).down('label > span.required') || + elem.up(0).down('label.required > em') || + elem.up(1).down('label.required > em'); if(labelElement) { inputElement = labelElement.up().next('input'); if (display) { diff --git a/js/varien/js.js b/js/varien/js.js index 6f4bc623a5..d83a5afe50 100644 --- a/js/varien/js.js +++ b/js/varien/js.js @@ -326,11 +326,11 @@ Varien.searchForm.prototype = { paramName: this.field.name, minChars: 2, updateElement: this._selectAutocompleteItem.bind(this), - onShow : function(element, update) { + onShow : function(element, update) { if(!update.style.position || update.style.position=='absolute') { update.style.position = 'absolute'; Position.clone(element, update, { - setHeight: false, + setHeight: false, offsetTop: element.offsetHeight }); } @@ -466,4 +466,14 @@ function truncateOptions() { } Event.observe(window, 'load', function(){ truncateOptions(); -}); \ No newline at end of file +}); + +if (!("console" in window) || !("firebug" in console)) +{ + var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", + "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; + + window.console = {}; + for (var i = 0; i < names.length; ++i) + window.console[names[i]] = function() {} +} diff --git a/js/varien/product.js b/js/varien/product.js index 874a4520a0..d9793422db 100644 --- a/js/varien/product.js +++ b/js/varien/product.js @@ -122,15 +122,22 @@ Product.Zoom.prototype = { }, scale: function (v) { - - var centerX = (this.containerDim.width*(1-this.imageZoom)/2-this.imageX)/this.imageZoom; - var centerY = (this.containerDim.height*(1-this.imageZoom)/2-this.imageY)/this.imageZoom; - + var centerX = (this.containerDim.width*(1-this.imageZoom)/2-this.imageX)/this.imageZoom; + var centerY = (this.containerDim.height*(1-this.imageZoom)/2-this.imageY)/this.imageZoom; + var overSize = (this.imageDim.width > this.containerDim.width && this.imageDim.height > this.containerDim.height); + this.imageZoom = this.floorZoom+(v*(this.ceilingZoom-this.floorZoom)); - this.imageEl.style.width = (this.imageZoom*this.containerDim.width)+'px'; - if(this.containerDim.ratio){ - this.imageEl.style.height = (this.imageZoom*this.containerDim.width*this.containerDim.ratio)+'px'; // for safari + if (overSize) { + if (this.imageDim.width > this.containerDim.width) { + this.imageEl.style.width = (this.imageZoom*this.containerDim.width)+'px'; + } + + if(this.containerDim.ratio){ + this.imageEl.style.height = (this.imageZoom*this.containerDim.width*this.containerDim.ratio)+'px'; // for safari + } + } else { + this.slider.setDisabled(); } this.imageX = this.containerDim.width*(1-this.imageZoom)/2-centerX*this.imageZoom; @@ -143,19 +150,23 @@ Product.Zoom.prototype = { startZoomIn: function() { - this.zoomBtnPressed = true; - this.sliderAccel = .002; - this.periodicalZoom(); - this.zoomer = new PeriodicalExecuter(this.periodicalZoom.bind(this), .05); + if (!this.slider.disabled) { + this.zoomBtnPressed = true; + this.sliderAccel = .002; + this.periodicalZoom(); + this.zoomer = new PeriodicalExecuter(this.periodicalZoom.bind(this), .05); + } return this; }, startZoomOut: function() { - this.zoomBtnPressed = true; - this.sliderAccel = -.002; - this.periodicalZoom(); - this.zoomer = new PeriodicalExecuter(this.periodicalZoom.bind(this), .05); + if (!this.slider.disabled) { + this.zoomBtnPressed = true; + this.sliderAccel = -.002; + this.periodicalZoom(); + this.zoomer = new PeriodicalExecuter(this.periodicalZoom.bind(this), .05); + } return this; }, @@ -204,6 +215,14 @@ Product.Zoom.prototype = { y = y>yMin ? yMin : y; y = y dim.width) { + x = (this.containerDim.width/2) - (dim.width/2); + } + + if (this.containerDim.height > dim.height) { + y = (this.containerDim.height/2) - (dim.height/2); + } + this.imageX = x; this.imageY = y; diff --git a/lib/Varien/Data/Form/Element/Editor.php b/lib/Varien/Data/Form/Element/Editor.php index c7794dafc0..fd348e2b3e 100644 --- a/lib/Varien/Data/Form/Element/Editor.php +++ b/lib/Varien/Data/Form/Element/Editor.php @@ -48,13 +48,45 @@ public function __construct($attributes=array()) public function getElementHtml() { + $js = ' + '; + if($this->isEnabled()) { + // add Firebug notice translations + $this->getConfig()->addData(array( + 'firebug_warning_title' => $this->translate('Warning'), + 'firebug_warning_text' => $this->translate('Firebug is known to make the WYSIWYG editor slow unless it is turned off or configured properly.'), + 'firebug_warning_anchor' => $this->translate('Hide'), + )); + $jsSetupObject = 'wysiwyg' . $this->getHtmlId(); $html = $this->_getButtonsHtml() .' + '.$js.' +
    -
    htmlEscape($_product->getName()) ?>
    - getPriceHtml($_product) ?> + htmlEscape($_product->getName()) ?> getReviewsSummaryHtml($_product, 'short') ?> -

    getDescription() ?>

    + getPriceHtml($_product) ?> + getDescription() ?>     		isSaleable()): ?> diff --git a/app/design/frontend/default/default/template/tag/list.phtml b/app/design/frontend/default/default/template/tag/list.phtml index edee0d0f67..dd783da075 100644 --- a/app/design/frontend/default/default/template/tag/list.phtml +++ b/app/design/frontend/default/default/template/tag/list.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>
    @@ -56,4 +56,4 @@
    __("Use spaces to separate tags. Use single quotes (') for phrases.") ?> -
    \ No newline at end of file + diff --git a/app/design/frontend/default/default/template/tag/mytags.phtml b/app/design/frontend/default/default/template/tag/mytags.phtml index 01573ba695..4b4429c105 100644 --- a/app/design/frontend/default/default/template/tag/mytags.phtml +++ b/app/design/frontend/default/default/template/tag/mytags.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> \ No newline at end of file + diff --git a/app/design/install/default/default/template/install/end.phtml b/app/design/install/default/default/template/install/end.phtml index 11f865ce87..0e8559670b 100644 --- a/app/design/install/default/default/template/install/end.phtml +++ b/app/design/install/default/default/template/install/end.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -42,4 +42,4 @@
       -
    \ No newline at end of file + diff --git a/app/design/install/default/default/template/install/locale.phtml b/app/design/install/default/default/template/install/locale.phtml index 2d25d11f87..506a8a668f 100644 --- a/app/design/install/default/default/template/install/locale.phtml +++ b/app/design/install/default/default/template/install/locale.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @@ -74,4 +74,4 @@ if($('locale')){ Event.observe($('locale'), 'change', changeLocale); } - \ No newline at end of file + diff --git a/app/design/install/default/default/template/install/state.phtml b/app/design/install/default/default/template/install/state.phtml index 4b8d5f8219..b3e09ffa28 100644 --- a/app/design/install/default/default/template/install/state.phtml +++ b/app/design/install/default/default/template/install/state.phtml @@ -1,44 +1,44 @@ - -
    -

    __('Installation') ?>

    -
      -
    1. __('Download')?>
      2. - -
    2. getActive()): ?>style="color:green; font-weight:bold; ">__($_step->getCode()) ?>
      3. - -
    -
    - -
    -

    - __('Having trouble installing Magento?') ?> - __('Check out our') ?> __('Installation Guide') ?> - -

    + +
    +

    __('Installation') ?>

    +
      +
    1. __('Download')?>
      2. + +
    2. getActive()): ?>style="color:green; font-weight:bold; ">__($_step->getCode()) ?>
      3. + +
    +
    + +
    +

    + __('Having trouble installing Magento?') ?> + __('Check out our') ?> __('Installation Guide') ?> + +

    diff --git a/app/design/install/default/default/template/page.phtml b/app/design/install/default/default/template/page.phtml index af3bf31624..c7f9d9732c 100644 --- a/app/design/install/default/default/template/page.phtml +++ b/app/design/install/default/default/template/page.phtml @@ -18,10 +18,10 @@ * versions in the future. If you wish to customize Magento for your * needs please refer to http://www.magentocommerce.com for more information. * - * @category design_default - * @package Mage - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category design + * @package default_default + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/etc/modules/Mage_AmazonPayments.xml b/app/etc/modules/Mage_AmazonPayments.xml index eb0a2b3ed7..c6459220a4 100644 --- a/app/etc/modules/Mage_AmazonPayments.xml +++ b/app/etc/modules/Mage_AmazonPayments.xml @@ -19,10 +19,10 @@ * 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_AmazonPayments - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_AmazonPayments + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/etc/modules/Mage_Api.xml b/app/etc/modules/Mage_Api.xml index eee585c63d..f42ea827f2 100644 --- a/app/etc/modules/Mage_Api.xml +++ b/app/etc/modules/Mage_Api.xml @@ -19,10 +19,10 @@ * 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_Api - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/app/etc/modules/Mage_Bundle.xml b/app/etc/modules/Mage_Bundle.xml index 69a29c2e9d..28995c8b14 100644 --- a/app/etc/modules/Mage_Bundle.xml +++ b/app/etc/modules/Mage_Bundle.xml @@ -19,10 +19,10 @@ * 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_Bundle - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/app/etc/modules/Mage_Compiler.xml b/app/etc/modules/Mage_Compiler.xml index 9085f82038..e5843623ae 100644 --- a/app/etc/modules/Mage_Compiler.xml +++ b/app/etc/modules/Mage_Compiler.xml @@ -1,38 +1,38 @@ - - - - - - true - core - - - - - - \ No newline at end of file + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Downloadable.xml b/app/etc/modules/Mage_Downloadable.xml index 8f303e8322..a6efda28ac 100644 --- a/app/etc/modules/Mage_Downloadable.xml +++ b/app/etc/modules/Mage_Downloadable.xml @@ -19,10 +19,10 @@ * 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_Downloadable - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/app/etc/modules/Mage_Weee.xml b/app/etc/modules/Mage_Weee.xml index 1cea80f3ec..af8696cc15 100644 --- a/app/etc/modules/Mage_Weee.xml +++ b/app/etc/modules/Mage_Weee.xml @@ -19,10 +19,10 @@ * 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_Weee - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com) + * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/app/locale/en_US/Mage_Cms.csv b/app/locale/en_US/Mage_Cms.csv index 148d9bf205..fd8f11adaf 100644 --- a/app/locale/en_US/Mage_Cms.csv +++ b/app/locale/en_US/Mage_Cms.csv @@ -55,7 +55,7 @@ "Save Block","Save Block" "Save Page","Save Page" "Show breadcrumbs for CMS pages","Show breadcrumbs for CMS pages" -"Show notice if JavaScipt is disabled","Show notice if JavaScipt is disabled" +"Show notice if JavaScript is disabled","Show notice if JavaScript is disabled" "Static Blocks","Static Blocks" "Status","Status" "Store View","Store View" diff --git a/js/lib/boxover.js b/js/lib/boxover.js index e39c39e2b5..a511139cbe 100644 --- a/js/lib/boxover.js +++ b/js/lib/boxover.js @@ -1,25 +1,3 @@ -/** - * 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. - * - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) - */ /* --- BoxOver --- /* --- v 2.1 17th June 2006 By Oliver Bryant with help of Matthew Tagg diff --git a/js/lib/ds-sleight.js b/js/lib/ds-sleight.js index 417101caac..b43be15edd 100644 --- a/js/lib/ds-sleight.js +++ b/js/lib/ds-sleight.js @@ -1,25 +1,3 @@ -/** - * 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. - * - * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) - */ // Universal transparent-PNG enabler for MSIE/Win 5.5+ // http://dsandler.org // From original code: http://www.youngpup.net/?request=/snippets/sleight.xml diff --git a/js/mage/adminhtml/accordion.js b/js/mage/adminhtml/accordion.js index 46bbd631a2..257329cf5a 100644 --- a/js/mage/adminhtml/accordion.js +++ b/js/mage/adminhtml/accordion.js @@ -121,6 +121,9 @@ varienAccordion.prototype = { location.href = item.link.href; }, setItemContent : function(content){ + if (content.isJSON) { + return; + } this.loadingItem.dd.innerHTML = content; }, hideAllItems : function(){ diff --git a/js/mage/adminhtml/grid.js b/js/mage/adminhtml/grid.js index 70f079f435..9918fc3e2b 100644 --- a/js/mage/adminhtml/grid.js +++ b/js/mage/adminhtml/grid.js @@ -87,6 +87,10 @@ varienGrid.prototype = { } } }, + initGridAjax: function () { + this.initGrid(); + this.initGridRows(); + }, initGridRows: function() { if(this.initRowCallback){ for (var row=0; row' + this.getElement('template').innerHTML + '