From 565e537d43fb4360305b6558c88134bd0aaf32be Mon Sep 17 00:00:00 2001 From: carlos Date: Fri, 24 Jun 2016 14:18:13 -0300 Subject: [PATCH 01/31] Add store code to url when enabled in the Magento config --- README.md | 0 .../Block/Adminhtml/Abandonedmails.php | 0 .../Block/Adminhtml/Abandonedmails/Grid.php | 0 .../Block/Adminhtml/Abandonedorder.php | 0 .../Block/Adminhtml/Abandonedorder/Grid.php | 0 .../AbandonedCart/Block/Adminhtml/Dashboard.php | 0 .../Block/Adminhtml/Dashboard/Sales.php | 0 .../Block/Adminhtml/Dashboard/Totals.php | 0 .../Block/Adminhtml/System/Config/Date.php | 0 .../Block/Adminhtml/System/Config/Fieldset/Hint.php | 0 .../AbandonedCart/Block/Email/Order/Items.php | 0 .../AbandonedCart/Block/Popup/Emailcatcher.php | 0 .../Ebizmarts/AbandonedCart/Helper/Data.php | 0 .../Ebizmarts/AbandonedCart/Model/Abtesting.php | 0 .../Ebizmarts/AbandonedCart/Model/Config.php | 0 .../Ebizmarts/AbandonedCart/Model/Cron.php | 0 .../Ebizmarts/AbandonedCart/Model/EventObserver.php | 0 .../Ebizmarts/AbandonedCart/Model/Mailssent.php | 0 .../Ebizmarts/AbandonedCart/Model/Popup.php | 0 .../AbandonedCart/Model/Resource/Abtesting.php | 0 .../Model/Resource/Abtesting/Collection.php | 0 .../AbandonedCart/Model/Resource/Mailssent.php | 0 .../Model/Resource/Mailssent/Collection.php | 0 .../Model/Resource/Order/Collection.php | 0 .../AbandonedCart/Model/Resource/Popup.php | 0 .../Model/Resource/Popup/Collection.php | 0 .../AbandonedCart/Model/System/Config/Automatic.php | 0 .../AbandonedCart/Model/System/Config/Cmspage.php | 0 .../Model/System/Config/Customergroup.php | 0 .../Model/System/Config/Discounttype.php | 0 .../AbandonedCart/Model/System/Config/Maxemails.php | 0 .../AbandonedCart/Model/System/Config/Unit.php | 0 .../Model/System/Config/Yesnovariation.php | 0 .../controllers/AbandonedController.php | 0 .../Adminhtml/AbandonedmailsController.php | 0 .../Adminhtml/AbandonedorderController.php | 0 .../Ebizmarts/AbandonedCart/etc/adminhtml.xml | 0 .../Ebizmarts/AbandonedCart/etc/config.xml | 0 .../Ebizmarts/AbandonedCart/etc/system.xml | 0 .../mysql4-install-0.1.0.php | 0 .../mysql4-upgrade-0.1.12-0.1.13.php | 0 .../mysql4-upgrade-0.1.18-0.1.19.php | 0 .../mysql4-upgrade-0.1.2-0.1.3.php | 0 .../mysql4-upgrade-0.1.20-0.1.21.php | 0 .../mysql4-upgrade-0.1.29-0.1.30.php | 0 .../mysql4-upgrade-0.1.30-0.1.31.php | 0 .../mysql4-upgrade-0.1.6-0.1.7.php | 0 .../mysql4-upgrade-1.1.35-1.2.0.php | 0 .../System/Config/Backtostock/Fieldset/Hint.php | 0 .../System/Config/Birthday/Fieldset/Hint.php | 0 .../Block/Adminhtml/System/Config/Fieldset/Hint.php | 0 .../System/Config/Review/Fieldset/Hint.php | 0 .../System/Config/Wishlist/Fieldset/Hint.php | 0 .../Autoresponder/Block/Backtostock/Notice.php | 0 .../Autoresponder/Block/Customer/Account/List.php | 0 .../Autoresponder/Block/Email/Backtostock/Item.php | 0 .../Autoresponder/Block/Email/Related/Items.php | 0 .../Autoresponder/Block/Email/Review/Items.php | 0 .../Autoresponder/Block/Email/Wishlist/Items.php | 0 .../Ebizmarts/Autoresponder/Block/Review/Form.php | 0 .../Ebizmarts/Autoresponder/Block/Unsubscribe.php | 0 .../Ebizmarts/Autoresponder/Helper/Data.php | 0 .../Ebizmarts/Autoresponder/Model/Backtostock.php | 0 .../Autoresponder/Model/Backtostockalert.php | 0 .../Ebizmarts/Autoresponder/Model/Config.php | 0 .../Ebizmarts/Autoresponder/Model/Cron.php | 9 ++++++++- .../Ebizmarts/Autoresponder/Model/EventObserver.php | 0 .../Autoresponder/Model/Resource/Backtostock.php | 0 .../Model/Resource/Backtostock/Collection.php | 0 .../Model/Resource/Backtostockalert.php | 0 .../Model/Resource/Backtostockalert/Collection.php | 0 .../Autoresponder/Model/Resource/Review.php | 0 .../Model/Resource/Review/Collection.php | 0 .../Autoresponder/Model/Resource/Unsubscribe.php | 0 .../Model/Resource/Unsubscribe/Collection.php | 0 .../Autoresponder/Model/Resource/Visited.php | 0 .../Model/Resource/Visited/Collection.php | 0 .../Ebizmarts/Autoresponder/Model/Review.php | 0 .../Autoresponder/Model/System/Config/Automatic.php | 0 .../Model/System/Config/Couponcounter.php | 0 .../Model/System/Config/Customergroup.php | 0 .../Model/System/Config/Discounttype.php | 0 .../Model/System/Config/Generaltype.php | 0 .../Autoresponder/Model/System/Config/Hours.php | 0 .../Model/System/Config/Newordertrigger.php | 0 .../Autoresponder/Model/System/Config/Time.php | 0 .../Ebizmarts/Autoresponder/Model/Unsubscribe.php | 0 .../Ebizmarts/Autoresponder/Model/Visited.php | 0 .../controllers/AutoresponderController.php | 0 .../controllers/BacktostockController.php | 0 .../Ebizmarts/Autoresponder/etc/adminhtml.xml | 0 .../Ebizmarts/Autoresponder/etc/config.xml | 0 .../Ebizmarts/Autoresponder/etc/system.xml | 0 .../mysql4-install-0.1.0.php | 0 .../mysql4-upgrade-0.1.3-0.1.4.php | 0 .../mysql4-upgrade-0.1.4-0.1.5.php | 0 .../mysql4-upgrade-0.1.5-0.1.6.php | 0 .../mysql4-upgrade-0.1.9-0.1.10.php | 0 .../mysql4-upgrade-1.1.14-1.2.0.php | 0 .../mysql4-upgrade-1.2.0-1.2.1.php | 0 .../MageMonkey/Block/Adminhtml/Bulksync/Export.php | 0 .../Block/Adminhtml/Bulksync/Export/Form.php | 0 .../MageMonkey/Block/Adminhtml/Bulksync/Import.php | 0 .../Block/Adminhtml/Bulksync/Import/Form.php | 0 .../MageMonkey/Block/Adminhtml/Bulksync/Queue.php | 0 .../Block/Adminhtml/Bulksync/Queue/Grid.php | 0 .../Block/Adminhtml/Bulksync/QueueExport.php | 0 .../Block/Adminhtml/Bulksync/QueueExport/Grid.php | 0 .../Block/Adminhtml/Bulksync/QueueImport.php | 0 .../Block/Adminhtml/Bulksync/QueueImport/Grid.php | 0 .../Adminhtml/Customer/Edit/Tab/Memberactivity.php | 0 .../MageMonkey/Block/Adminhtml/Ecommerce.php | 0 .../MageMonkey/Block/Adminhtml/Ecommerce/Grid.php | 0 .../MageMonkey/Block/Adminhtml/Ecommerceapi.php | 0 .../Block/Adminhtml/Ecommerceapi/Grid.php | 0 .../Block/Adminhtml/Ecommerceapi/Renderer/Items.php | 0 .../Block/Adminhtml/Memberactivity/Grid.php | 0 .../Newsletter/Subscriber/Renderer/Firstname.php | 0 .../Newsletter/Subscriber/Renderer/Lastname.php | 0 .../MageMonkey/Block/Adminhtml/Renderer/Date.php | 0 .../Block/Adminhtml/Renderer/Importypes.php | 0 .../MageMonkey/Block/Adminhtml/Renderer/Lists.php | 0 .../Block/Adminhtml/Renderer/Progress.php | 0 .../MageMonkey/Block/Adminhtml/Renderer/Yesno.php | 0 .../Block/Adminhtml/System/Config/Account.php | 0 .../Block/Adminhtml/System/Config/Date.php | 0 .../Block/Adminhtml/System/Config/Fieldset/Hint.php | 0 .../System/Config/Form/Field/Mapfields.php | 0 .../Block/Adminhtml/System/Config/OauthWizard.php | 0 .../Adminhtml/System/Config/ResetLocalEcommerce.php | 0 .../System/Config/ResetRemoteEcommerce.php | 0 .../Adminhtml/System/Config/UpgradeForPatch.php | 0 .../MageMonkey/Block/Checkout/Subscribe.php | 0 .../MageMonkey/Block/Customer/Account/Lists.php | 0 .../community/Ebizmarts/MageMonkey/Block/Lists.php | 0 .../community/Ebizmarts/MageMonkey/Block/Signup.php | 0 .../community/Ebizmarts/MageMonkey/Helper/Cache.php | 0 .../community/Ebizmarts/MageMonkey/Helper/Data.php | 0 .../Ebizmarts/MageMonkey/Helper/Export.php | 0 .../Ebizmarts/MageMonkey/Helper/Oauth2.php | 0 .../community/Ebizmarts/MageMonkey/Model/Api.php | 0 .../Ebizmarts/MageMonkey/Model/Asyncorders.php | 0 .../Ebizmarts/MageMonkey/Model/Asyncsubscribers.php | 0 .../Ebizmarts/MageMonkey/Model/BulksyncExport.php | 0 .../Ebizmarts/MageMonkey/Model/BulksyncImport.php | 0 .../community/Ebizmarts/MageMonkey/Model/Cache.php | 0 .../community/Ebizmarts/MageMonkey/Model/Config.php | 0 .../community/Ebizmarts/MageMonkey/Model/Cron.php | 0 .../MageMonkey/Model/Custom/Collection.php | 0 .../Ebizmarts/MageMonkey/Model/Ecommerce.php | 0 .../Ebizmarts/MageMonkey/Model/Ecommerce360.php | 0 .../Ebizmarts/MageMonkey/Model/Email/Template.php | 0 .../Ebizmarts/MageMonkey/Model/Feed/Updates.php | 0 .../Ebizmarts/MageMonkey/Model/Lastorder.php | 0 .../community/Ebizmarts/MageMonkey/Model/MCAPI.php | 0 .../Ebizmarts/MageMonkey/Model/MCEXPORTAPI.php | 0 .../community/Ebizmarts/MageMonkey/Model/Monkey.php | 0 .../Ebizmarts/MageMonkey/Model/Mysql4/Apidebug.php | 0 .../MageMonkey/Model/Mysql4/Apidebug/Collection.php | 0 .../MageMonkey/Model/Mysql4/Asyncorders.php | 0 .../Model/Mysql4/Asyncorders/Collection.php | 0 .../MageMonkey/Model/Mysql4/Asyncsubscribers.php | 0 .../Model/Mysql4/Asyncsubscribers/Collection.php | 0 .../MageMonkey/Model/Mysql4/Bulksync/Export.php | 0 .../Model/Mysql4/Bulksync/Export/Collection.php | 0 .../MageMonkey/Model/Mysql4/Bulksync/Import.php | 0 .../Model/Mysql4/Bulksync/Import/Collection.php | 0 .../Ebizmarts/MageMonkey/Model/Mysql4/Ecommerce.php | 0 .../Model/Mysql4/Ecommerce/Collection.php | 0 .../Ebizmarts/MageMonkey/Model/Mysql4/Lastorder.php | 0 .../Model/Mysql4/Lastorder/Collection.php | 0 .../Ebizmarts/MageMonkey/Model/Observer.php | 0 .../Ebizmarts/MageMonkey/Model/Subscriber.php | 0 .../Model/System/Config/Source/Account.php | 0 .../Model/System/Config/Source/Attributes.php | 0 .../System/Config/Source/BulksyncDatasource.php | 0 .../Model/System/Config/Source/BulksyncStatus.php | 0 .../System/Config/Source/Checkoutsubscribe.php | 0 .../Model/System/Config/Source/CronProcessLimit.php | 0 .../Model/System/Config/Source/CustomerGroup.php | 0 .../Model/System/Config/Source/Ecommerce360.php | 0 .../MageMonkey/Model/System/Config/Source/List.php | 0 .../System/Config/Source/OrderProcessLimit.php | 0 .../Model/System/Config/Source/OrderStatus.php | 0 .../Model/System/Config/Source/Status.php | 0 .../System/Config/Source/TransactionalEmails.php | 0 .../Model/System/Config/Source/WebhookDelete.php | 0 .../controllers/Adminhtml/BulksyncController.php | 0 .../controllers/Adminhtml/ConfigController.php | 0 .../controllers/Adminhtml/EcommerceController.php | 0 .../controllers/Customer/AccountController.php | 0 .../MageMonkey/controllers/SignupController.php | 0 .../MageMonkey/controllers/WebhookController.php | 0 .../Ebizmarts/MageMonkey/etc/adminhtml.xml | 0 .../community/Ebizmarts/MageMonkey/etc/config.xml | 0 .../community/Ebizmarts/MageMonkey/etc/system.xml | 0 .../sql/monkey_setup/mysql4-install-0.0.1.php | 0 .../sql/monkey_setup/mysql4-upgrade-0.0.1-0.0.2.php | 0 .../sql/monkey_setup/mysql4-upgrade-0.0.2-0.0.3.php | 0 .../sql/monkey_setup/mysql4-upgrade-0.0.3-0.0.4.php | 0 .../sql/monkey_setup/mysql4-upgrade-0.0.4-0.0.5.php | 0 .../sql/monkey_setup/mysql4-upgrade-0.0.5-0.0.6.php | 0 .../sql/monkey_setup/mysql4-upgrade-0.0.6-0.0.7.php | 0 .../monkey_setup/mysql4-upgrade-1.0.10-1.0.11.php | 0 .../monkey_setup/mysql4-upgrade-1.1.21-1.1.22.php | 0 .../monkey_setup/mysql4-upgrade-1.1.23-1.1.24.php | 0 .../monkey_setup/mysql4-upgrade-1.1.33-1.1.34.php | 0 .../sql/monkey_setup/mysql4-upgrade-1.1.5-1.1.6.php | 0 .../sql/monkey_setup/mysql4-upgrade-1.2.1-1.2.2.php | 0 .../Block/Adminhtml/System/Config/Fieldset/Hint.php | 0 .../Block/Adminhtml/System/Config/Userinfo.php | 0 .../Block/Adminhtml/Templates/Templates.php | 0 .../Block/Adminhtml/Templates/Templates/Grid.php | 0 .../Mandrill/Block/Adminhtml/Users/Senders.php | 0 .../Mandrill/Block/Adminhtml/Users/Senders/Grid.php | 0 .../community/Ebizmarts/Mandrill/Helper/Data.php | 0 .../Ebizmarts/Mandrill/Model/Customcollection.php | 0 .../Ebizmarts/Mandrill/Model/Email/Template.php | 0 .../Ebizmarts/Mandrill/Model/System/Config.php | 0 .../Model/System/Config/Source/Userinfo.php | 0 .../Adminhtml/Mandrill/UsersController.php | 0 .../community/Ebizmarts/Mandrill/etc/adminhtml.xml | 0 .../community/Ebizmarts/Mandrill/etc/config.xml | 0 .../community/Ebizmarts/Mandrill/etc/system.xml | 0 .../Block/Adminhtml/System/Config/Autovars.php | 0 .../Block/Adminhtml/System/Config/Fieldset/Hint.php | 0 .../System/Config/Form/Field/Mapfields.php | 0 .../community/Ebizmarts/SweetMonkey/Helper/Data.php | 0 .../Ebizmarts/SweetMonkey/Model/Observer.php | 0 .../controllers/Adminhtml/MageMonkeyController.php | 0 .../Ebizmarts/SweetMonkey/etc/adminhtml.xml | 0 .../community/Ebizmarts/SweetMonkey/etc/config.xml | 0 .../community/Ebizmarts/SweetMonkey/etc/system.xml | 0 .../default/layout/ebizmarts/abandonedcart.xml | 0 .../default/default/layout/ebizmarts/mandrill.xml | 0 .../adminhtml/default/default/layout/magemonkey.xml | 0 .../ebizmarts/abandonedcart/dashboard/index.phtml | 0 .../ebizmarts/abandonedcart/dashboard/salebar.phtml | 0 .../abandonedcart/dashboard/totalbar.phtml | 0 .../abandonedcart/system/config/fieldset/hint.phtml | 0 .../system/config/backtostock/fieldset/hint.phtml | 0 .../system/config/birthday/fieldset/hint.phtml | 0 .../autoresponder/system/config/fieldset/hint.phtml | 0 .../system/config/review/fieldset/hint.phtml | 0 .../system/config/wishlist/fieldset/hint.phtml | 0 .../mandrill/system/config/fieldset/hint.phtml | 0 .../template/magemonkey/bulksync/export/form.phtml | 0 .../template/magemonkey/bulksync/import/form.phtml | 0 .../magemonkey/system/config/fieldset/hint.phtml | 0 .../magemonkey/system/config/oauth_wizard.phtml | 0 .../magemonkey/system/config/resetlocal360.phtml | 0 .../magemonkey/system/config/resetremote360.phtml | 0 .../magemonkey/system/config/upgradeforpatch.phtml | 0 .../sweetmonkey/system/config/autovars.phtml | 0 .../sweetmonkey/system/config/fieldset/hint.phtml | 0 .../base/default/layout/ebizmarts/abandonedcart.xml | 0 .../base/default/layout/ebizmarts/autoresponder.xml | 0 .../frontend/base/default/layout/magemonkey.xml | 0 .../backtostock/catalog/product/form.phtml | 0 .../backtostock/catalog/product/notice.phtml | 0 .../ebizmarts/autoresponder/backtostock/item.phtml | 0 .../ebizmarts/autoresponder/customer/list.phtml | 0 .../ebizmarts/autoresponder/related/items.phtml | 0 .../ebizmarts/autoresponder/review/items.phtml | 0 .../ebizmarts/autoresponder/unsubscribe.phtml | 0 .../ebizmarts/autoresponder/wishlist/items.phtml | 0 .../ebizmarts_abandonedcart/email/order/items.phtml | 0 .../email/order/items/order/default.phtml | 0 .../popup/emailcatcher.phtml | 0 .../template/magemonkey/checkout/subscribe.phtml | 0 .../base/default/template/magemonkey/lists.phtml | 0 app/etc/modules/Ebizmarts_AbandonedCart.xml | 0 app/etc/modules/Ebizmarts_Autoresponder.xml | 0 app/etc/modules/Ebizmarts_MageMonkey.xml | 0 app/etc/modules/Ebizmarts_Mandrill.xml | 0 app/etc/modules/Ebizmarts_SweetMonkey.xml | 0 app/locale/en_US/Ebizmarts_AbandonedCart.csv | 0 app/locale/en_US/Ebizmarts_Autoresponder.csv | 0 app/locale/en_US/Ebizmarts_MageMonkey.csv | 0 app/locale/en_US/Ebizmarts_Mandrill.csv | 0 app/locale/en_US/Ebizmarts_SweetMonkey.csv | 0 .../abandonedcart/abandoned_cart_mail_1.html | 0 .../abandonedcart/abandoned_cart_mail_2.html | 0 .../abandonedcart/abandoned_cart_mail_3.html | 0 .../abandonedcart/abandoned_cart_mail_generic.html | 0 .../abandonedcart/popup_coupon_template.html | 0 .../email/ebizmarts/autoresponder/backtostock.html | 0 .../email/ebizmarts/autoresponder/birthday.html | 0 .../email/ebizmarts/autoresponder/neworder.html | 0 .../email/ebizmarts/autoresponder/noactivity.html | 0 .../ebizmarts/autoresponder/relatedproducts.html | 0 .../email/ebizmarts/autoresponder/review.html | 0 .../email/ebizmarts/autoresponder/reviewcoupon.html | 0 .../ebizmarts/autoresponder/visitedproducts.html | 0 .../email/ebizmarts/autoresponder/wishlist.html | 0 app/locale/nl_NL/Ebizmarts_AbandonedCart.csv | 0 app/locale/nl_NL/Ebizmarts_MageMonkey.csv | 0 app/locale/nl_NL/Ebizmarts_SweetMonkey.csv | 0 .../abandonedcart/abandoned_cart_mail_1.html | 0 .../abandonedcart/abandoned_cart_mail_2.html | 0 .../abandonedcart/abandoned_cart_mail_3.html | 0 .../abandonedcart/abandoned_cart_mail_generic.html | 0 .../abandonedcart/popup_coupon_template.html | 0 .../email/ebizmarts/autoresponder/backtostock.html | 0 .../email/ebizmarts/autoresponder/birthday.html | 0 .../email/ebizmarts/autoresponder/neworder.html | 0 .../email/ebizmarts/autoresponder/noactivity.html | 0 .../ebizmarts/autoresponder/relatedproducts.html | 0 .../email/ebizmarts/autoresponder/review.html | 0 .../email/ebizmarts/autoresponder/reviewcoupon.html | 0 .../ebizmarts/autoresponder/visitedproducts.html | 0 .../email/ebizmarts/autoresponder/wishlist.html | 0 js/ebizmarts/abandonedcart/popup.css | 0 js/ebizmarts/abandonedcart/xmark.png | Bin js/ebizmarts/autoresponders/visitedproducts.js | 0 .../autoresponders/visitedproductsstorecodes.js | 0 js/ebizmarts/magemonkey/campaignCatcher.js | 0 lib/Mandrill/Mandrill.php | 0 lib/Mandrill/Mandrill/Exceptions.php | 0 lib/Mandrill/Mandrill/Exports.php | 0 lib/Mandrill/Mandrill/Inbound.php | 0 lib/Mandrill/Mandrill/Internal.php | 0 lib/Mandrill/Mandrill/Ips.php | 0 lib/Mandrill/Mandrill/Messages.php | 0 lib/Mandrill/Mandrill/Metadata.php | 0 lib/Mandrill/Mandrill/Rejects.php | 0 lib/Mandrill/Mandrill/Senders.php | 0 lib/Mandrill/Mandrill/Subaccounts.php | 0 lib/Mandrill/Mandrill/Tags.php | 0 lib/Mandrill/Mandrill/Templates.php | 0 lib/Mandrill/Mandrill/Urls.php | 0 lib/Mandrill/Mandrill/Users.php | 0 lib/Mandrill/Mandrill/Webhooks.php | 0 lib/Mandrill/Mandrill/Whitelists.php | 0 lib/Mandrill/Message.php | 0 .../default/default/abandonedcart/abandonedcart.css | 0 .../default/default/ebizmarts/ebizmarts-tab.png | Bin .../default/default/ebizmarts/ebizmarts.css | 0 .../default/ebizmarts/mandrill/mandrill-tab.png | Bin .../default/default/ebizmarts/mandrill/mandrill.css | 0 .../default/default/magemonkey/magemonkey.css | 0 .../default/default/magemonkey/magemonkey.js | 0 .../mailchimp-connected-ebizmarts-title.png | Bin .../default/default/magemonkey/mailchimp-ico.png | Bin .../magemonkey/mailchimp-section-background.png | Bin .../default/default/magemonkey/mailchimp-tab.png | Bin .../frontend/base/default/magemonkey/magemonkey.css | 0 skin/frontend/base/default/magemonkey/monkey.js | 0 348 files changed, 8 insertions(+), 1 deletion(-) mode change 100755 => 100644 README.md mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedmails.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedmails/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedorder.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedorder/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard/Sales.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard/Totals.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/System/Config/Date.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/System/Config/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Email/Order/Items.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Block/Popup/Emailcatcher.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Helper/Data.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Abtesting.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Config.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/EventObserver.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Mailssent.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Popup.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Abtesting.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Abtesting/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Mailssent.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Mailssent/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Order/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Popup.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Popup/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Automatic.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Cmspage.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Customergroup.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Discounttype.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Maxemails.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Unit.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Yesnovariation.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/controllers/Adminhtml/AbandonedmailsController.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/controllers/Adminhtml/AbandonedorderController.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/etc/adminhtml.xml mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/etc/config.xml mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/etc/system.xml mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-install-0.1.0.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.12-0.1.13.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.18-0.1.19.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.2-0.1.3.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.20-0.1.21.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.29-0.1.30.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.30-0.1.31.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.6-0.1.7.php mode change 100755 => 100644 app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-1.1.35-1.2.0.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Backtostock/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Birthday/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Review/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Wishlist/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Backtostock/Notice.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Customer/Account/List.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Email/Backtostock/Item.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Email/Related/Items.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Email/Review/Items.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Email/Wishlist/Items.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Review/Form.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Block/Unsubscribe.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Helper/Data.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Backtostock.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Backtostockalert.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Config.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Cron.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/EventObserver.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostock.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostock/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostockalert.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostockalert/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Review.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Review/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Unsubscribe.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Unsubscribe/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Visited.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Resource/Visited/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Review.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Automatic.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Couponcounter.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Customergroup.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Discounttype.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Generaltype.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Hours.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Newordertrigger.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Time.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Unsubscribe.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/Model/Visited.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/controllers/AutoresponderController.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/controllers/BacktostockController.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/etc/adminhtml.xml mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/etc/config.xml mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/etc/system.xml mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-install-0.1.0.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.3-0.1.4.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.4-0.1.5.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.5-0.1.6.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.9-0.1.10.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-1.1.14-1.2.0.php mode change 100755 => 100644 app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-1.2.0-1.2.1.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Export.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Export/Form.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Import.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Import/Form.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Queue.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Queue/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueExport.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueExport/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueImport.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueImport/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Customer/Edit/Tab/Memberactivity.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerce.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerce/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi/Renderer/Items.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Memberactivity/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Date.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Importypes.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Lists.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Progress.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Yesno.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Account.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Date.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Form/Field/Mapfields.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/OauthWizard.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/ResetLocalEcommerce.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/ResetRemoteEcommerce.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/UpgradeForPatch.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Checkout/Subscribe.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Customer/Account/Lists.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Lists.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Block/Signup.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Helper/Cache.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Helper/Data.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Helper/Export.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Helper/Oauth2.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Api.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Asyncorders.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Asyncsubscribers.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/BulksyncExport.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/BulksyncImport.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Cache.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Config.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Cron.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Custom/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Email/Template.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Feed/Updates.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Lastorder.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/MCAPI.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/MCEXPORTAPI.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Apidebug.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Apidebug/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncorders.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncorders/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncsubscribers.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncsubscribers/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Export.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Export/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Import.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Import/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Ecommerce.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Ecommerce/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Lastorder.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Lastorder/Collection.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Observer.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/Subscriber.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Account.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Attributes.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/BulksyncDatasource.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/BulksyncStatus.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Checkoutsubscribe.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/CronProcessLimit.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/CustomerGroup.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Ecommerce360.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/List.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/OrderProcessLimit.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/OrderStatus.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Status.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/TransactionalEmails.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/WebhookDelete.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/BulksyncController.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/EcommerceController.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/controllers/Customer/AccountController.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/controllers/SignupController.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/controllers/WebhookController.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/etc/adminhtml.xml mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/etc/config.xml mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/etc/system.xml mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-install-0.0.1.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.1-0.0.2.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.2-0.0.3.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.3-0.0.4.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.4-0.0.5.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.5-0.0.6.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.6-0.0.7.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.0.10-1.0.11.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.21-1.1.22.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.23-1.1.24.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.33-1.1.34.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.5-1.1.6.php mode change 100755 => 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.1-1.2.2.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/System/Config/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/System/Config/Userinfo.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Templates/Templates.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Templates/Templates/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Users/Senders.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Users/Senders/Grid.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Helper/Data.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Model/Customcollection.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Model/Email/Template.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Model/System/Config.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/Model/System/Config/Source/Userinfo.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/controllers/Adminhtml/Mandrill/UsersController.php mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/etc/adminhtml.xml mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/etc/config.xml mode change 100755 => 100644 app/code/community/Ebizmarts/Mandrill/etc/system.xml mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Autovars.php mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Fieldset/Hint.php mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Form/Field/Mapfields.php mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/Helper/Data.php mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/Model/Observer.php mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/controllers/Adminhtml/MageMonkeyController.php mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/etc/adminhtml.xml mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/etc/config.xml mode change 100755 => 100644 app/code/community/Ebizmarts/SweetMonkey/etc/system.xml mode change 100755 => 100644 app/design/adminhtml/default/default/layout/ebizmarts/abandonedcart.xml mode change 100755 => 100644 app/design/adminhtml/default/default/layout/ebizmarts/mandrill.xml mode change 100755 => 100644 app/design/adminhtml/default/default/layout/magemonkey.xml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/index.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/salebar.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/totalbar.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/system/config/fieldset/hint.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/backtostock/fieldset/hint.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/birthday/fieldset/hint.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/fieldset/hint.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/review/fieldset/hint.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/wishlist/fieldset/hint.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/ebizmarts/mandrill/system/config/fieldset/hint.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/magemonkey/bulksync/export/form.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/magemonkey/bulksync/import/form.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/magemonkey/system/config/fieldset/hint.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/magemonkey/system/config/oauth_wizard.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/magemonkey/system/config/resetlocal360.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/magemonkey/system/config/resetremote360.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/magemonkey/system/config/upgradeforpatch.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/sweetmonkey/system/config/autovars.phtml mode change 100755 => 100644 app/design/adminhtml/default/default/template/sweetmonkey/system/config/fieldset/hint.phtml mode change 100755 => 100644 app/design/frontend/base/default/layout/ebizmarts/abandonedcart.xml mode change 100755 => 100644 app/design/frontend/base/default/layout/ebizmarts/autoresponder.xml mode change 100755 => 100644 app/design/frontend/base/default/layout/magemonkey.xml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/catalog/product/form.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/catalog/product/notice.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/item.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts/autoresponder/customer/list.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts/autoresponder/related/items.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts/autoresponder/review/items.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts/autoresponder/unsubscribe.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts/autoresponder/wishlist/items.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items/order/default.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/ebizmarts_abandonedcart/popup/emailcatcher.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/magemonkey/checkout/subscribe.phtml mode change 100755 => 100644 app/design/frontend/base/default/template/magemonkey/lists.phtml mode change 100755 => 100644 app/etc/modules/Ebizmarts_AbandonedCart.xml mode change 100755 => 100644 app/etc/modules/Ebizmarts_Autoresponder.xml mode change 100755 => 100644 app/etc/modules/Ebizmarts_MageMonkey.xml mode change 100755 => 100644 app/etc/modules/Ebizmarts_Mandrill.xml mode change 100755 => 100644 app/etc/modules/Ebizmarts_SweetMonkey.xml mode change 100755 => 100644 app/locale/en_US/Ebizmarts_AbandonedCart.csv mode change 100755 => 100644 app/locale/en_US/Ebizmarts_Autoresponder.csv mode change 100755 => 100644 app/locale/en_US/Ebizmarts_MageMonkey.csv mode change 100755 => 100644 app/locale/en_US/Ebizmarts_Mandrill.csv mode change 100755 => 100644 app/locale/en_US/Ebizmarts_SweetMonkey.csv mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_1.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_2.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_3.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_generic.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/abandonedcart/popup_coupon_template.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/backtostock.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/birthday.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/neworder.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/noactivity.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/relatedproducts.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/review.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/reviewcoupon.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/visitedproducts.html mode change 100755 => 100644 app/locale/en_US/template/email/ebizmarts/autoresponder/wishlist.html mode change 100755 => 100644 app/locale/nl_NL/Ebizmarts_AbandonedCart.csv mode change 100755 => 100644 app/locale/nl_NL/Ebizmarts_MageMonkey.csv mode change 100755 => 100644 app/locale/nl_NL/Ebizmarts_SweetMonkey.csv mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_1.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_2.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_3.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_generic.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/abandonedcart/popup_coupon_template.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/backtostock.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/birthday.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/neworder.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/noactivity.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/relatedproducts.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/review.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/reviewcoupon.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/visitedproducts.html mode change 100755 => 100644 app/locale/nl_NL/template/email/ebizmarts/autoresponder/wishlist.html mode change 100755 => 100644 js/ebizmarts/abandonedcart/popup.css mode change 100755 => 100644 js/ebizmarts/abandonedcart/xmark.png mode change 100755 => 100644 js/ebizmarts/autoresponders/visitedproducts.js mode change 100755 => 100644 js/ebizmarts/autoresponders/visitedproductsstorecodes.js mode change 100755 => 100644 js/ebizmarts/magemonkey/campaignCatcher.js mode change 100755 => 100644 lib/Mandrill/Mandrill.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Exceptions.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Exports.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Inbound.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Internal.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Ips.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Messages.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Metadata.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Rejects.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Senders.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Subaccounts.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Tags.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Templates.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Urls.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Users.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Webhooks.php mode change 100755 => 100644 lib/Mandrill/Mandrill/Whitelists.php mode change 100755 => 100644 lib/Mandrill/Message.php mode change 100755 => 100644 skin/adminhtml/default/default/abandonedcart/abandonedcart.css mode change 100755 => 100644 skin/adminhtml/default/default/ebizmarts/ebizmarts-tab.png mode change 100755 => 100644 skin/adminhtml/default/default/ebizmarts/ebizmarts.css mode change 100755 => 100644 skin/adminhtml/default/default/ebizmarts/mandrill/mandrill-tab.png mode change 100755 => 100644 skin/adminhtml/default/default/ebizmarts/mandrill/mandrill.css mode change 100755 => 100644 skin/adminhtml/default/default/magemonkey/magemonkey.css mode change 100755 => 100644 skin/adminhtml/default/default/magemonkey/magemonkey.js mode change 100755 => 100644 skin/adminhtml/default/default/magemonkey/mailchimp-connected-ebizmarts-title.png mode change 100755 => 100644 skin/adminhtml/default/default/magemonkey/mailchimp-ico.png mode change 100755 => 100644 skin/adminhtml/default/default/magemonkey/mailchimp-section-background.png mode change 100755 => 100644 skin/adminhtml/default/default/magemonkey/mailchimp-tab.png mode change 100755 => 100644 skin/frontend/base/default/magemonkey/magemonkey.css mode change 100755 => 100644 skin/frontend/base/default/magemonkey/monkey.js diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedmails.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedmails.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedmails/Grid.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedmails/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedorder.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedorder.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedorder/Grid.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Abandonedorder/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard/Sales.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard/Sales.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard/Totals.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/Dashboard/Totals.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/System/Config/Date.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/System/Config/Date.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Adminhtml/System/Config/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Email/Order/Items.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Email/Order/Items.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Block/Popup/Emailcatcher.php b/app/code/community/Ebizmarts/AbandonedCart/Block/Popup/Emailcatcher.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Helper/Data.php b/app/code/community/Ebizmarts/AbandonedCart/Helper/Data.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Abtesting.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Abtesting.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/EventObserver.php b/app/code/community/Ebizmarts/AbandonedCart/Model/EventObserver.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Mailssent.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Mailssent.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Popup.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Popup.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Abtesting.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Abtesting.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Abtesting/Collection.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Abtesting/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Mailssent.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Mailssent.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Mailssent/Collection.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Mailssent/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Order/Collection.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Order/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Popup.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Popup.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Popup/Collection.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Resource/Popup/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Automatic.php b/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Automatic.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Cmspage.php b/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Cmspage.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Customergroup.php b/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Customergroup.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Discounttype.php b/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Discounttype.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Maxemails.php b/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Maxemails.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Unit.php b/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Unit.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Yesnovariation.php b/app/code/community/Ebizmarts/AbandonedCart/Model/System/Config/Yesnovariation.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php b/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/controllers/Adminhtml/AbandonedmailsController.php b/app/code/community/Ebizmarts/AbandonedCart/controllers/Adminhtml/AbandonedmailsController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/controllers/Adminhtml/AbandonedorderController.php b/app/code/community/Ebizmarts/AbandonedCart/controllers/Adminhtml/AbandonedorderController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/etc/adminhtml.xml b/app/code/community/Ebizmarts/AbandonedCart/etc/adminhtml.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml b/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml b/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-install-0.1.0.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-install-0.1.0.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.12-0.1.13.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.12-0.1.13.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.18-0.1.19.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.18-0.1.19.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.2-0.1.3.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.20-0.1.21.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.20-0.1.21.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.29-0.1.30.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.29-0.1.30.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.30-0.1.31.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.30-0.1.31.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-0.1.6-0.1.7.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-1.1.35-1.2.0.php b/app/code/community/Ebizmarts/AbandonedCart/sql/ebizmarts_abandonedcart_setup/mysql4-upgrade-1.1.35-1.2.0.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Backtostock/Fieldset/Hint.php b/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Backtostock/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Birthday/Fieldset/Hint.php b/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Birthday/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Review/Fieldset/Hint.php b/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Review/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Wishlist/Fieldset/Hint.php b/app/code/community/Ebizmarts/Autoresponder/Block/Adminhtml/System/Config/Wishlist/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Backtostock/Notice.php b/app/code/community/Ebizmarts/Autoresponder/Block/Backtostock/Notice.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Customer/Account/List.php b/app/code/community/Ebizmarts/Autoresponder/Block/Customer/Account/List.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Email/Backtostock/Item.php b/app/code/community/Ebizmarts/Autoresponder/Block/Email/Backtostock/Item.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Email/Related/Items.php b/app/code/community/Ebizmarts/Autoresponder/Block/Email/Related/Items.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Email/Review/Items.php b/app/code/community/Ebizmarts/Autoresponder/Block/Email/Review/Items.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Email/Wishlist/Items.php b/app/code/community/Ebizmarts/Autoresponder/Block/Email/Wishlist/Items.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Review/Form.php b/app/code/community/Ebizmarts/Autoresponder/Block/Review/Form.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Block/Unsubscribe.php b/app/code/community/Ebizmarts/Autoresponder/Block/Unsubscribe.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Helper/Data.php b/app/code/community/Ebizmarts/Autoresponder/Helper/Data.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Backtostock.php b/app/code/community/Ebizmarts/Autoresponder/Model/Backtostock.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Backtostockalert.php b/app/code/community/Ebizmarts/Autoresponder/Model/Backtostockalert.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Config.php b/app/code/community/Ebizmarts/Autoresponder/Model/Config.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php old mode 100755 new mode 100644 index a98b97ad..917fb0c6 --- a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php +++ b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php @@ -615,7 +615,14 @@ protected function _sendVisitedProductEmail($email,$storeId,$products,$name,$tag $senderId = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::GENERAL_SENDER, $storeId); $sender = array('name' => Mage::getStoreConfig("trans_email/ident_$senderId/name", $storeId), 'email' => Mage::getStoreConfig("trans_email/ident_$senderId/email", $storeId)); $templateId = Mage::getStoreConfig(Ebizmarts_Autoresponder_Model_Config::VISITED_TEMPLATE, $storeId); - $url = Mage::getModel('core/url')->setStore($storeId)->getUrl() . 'ebizautoresponder/autoresponder/unsubscribe?list=visitedproducts&email=' . $email . '&store=' . $storeId; + $store=Mage::getModel('core/store')->load($storeId); + $storeCode=$store->getCode(); + $storeCodeUrl = Mage::getStoreConfig('web/url/use_store', $storeId); + if($storeCodeUrl){ + $url = Mage::getModel('core/url')->setStore($storeId)->getUrl() . $storeCode . '/ebizautoresponder/autoresponder/unsubscribe?list=neworder&email=' . $email . '&store=' . $storeId; + }else { + $url = Mage::getModel('core/url')->setStore($storeId)->getUrl() . 'ebizautoresponder/autoresponder/unsubscribe?list=neworder&email=' . $email . '&store=' . $storeId; + } $vars = array('name' => $name, 'tags' => array($tags), 'products' => $products, 'url' => $url); $customer = Mage::getModel('customer/customer') diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/EventObserver.php b/app/code/community/Ebizmarts/Autoresponder/Model/EventObserver.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostock.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostock.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostock/Collection.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostock/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostockalert.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostockalert.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostockalert/Collection.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Backtostockalert/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Review.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Review.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Review/Collection.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Review/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Unsubscribe.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Unsubscribe.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Unsubscribe/Collection.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Unsubscribe/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Visited.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Visited.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Visited/Collection.php b/app/code/community/Ebizmarts/Autoresponder/Model/Resource/Visited/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Review.php b/app/code/community/Ebizmarts/Autoresponder/Model/Review.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Automatic.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Automatic.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Couponcounter.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Couponcounter.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Customergroup.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Customergroup.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Discounttype.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Discounttype.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Generaltype.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Generaltype.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Hours.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Hours.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Newordertrigger.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Newordertrigger.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Time.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Time.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Unsubscribe.php b/app/code/community/Ebizmarts/Autoresponder/Model/Unsubscribe.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Visited.php b/app/code/community/Ebizmarts/Autoresponder/Model/Visited.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/controllers/AutoresponderController.php b/app/code/community/Ebizmarts/Autoresponder/controllers/AutoresponderController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/controllers/BacktostockController.php b/app/code/community/Ebizmarts/Autoresponder/controllers/BacktostockController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/adminhtml.xml b/app/code/community/Ebizmarts/Autoresponder/etc/adminhtml.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/config.xml b/app/code/community/Ebizmarts/Autoresponder/etc/config.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/system.xml b/app/code/community/Ebizmarts/Autoresponder/etc/system.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-install-0.1.0.php b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-install-0.1.0.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.3-0.1.4.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.4-0.1.5.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.5-0.1.6.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.9-0.1.10.php b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-0.1.9-0.1.10.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-1.1.14-1.2.0.php b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-1.1.14-1.2.0.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-1.2.0-1.2.1.php b/app/code/community/Ebizmarts/Autoresponder/sql/ebizmarts_autoresponder_setup/mysql4-upgrade-1.2.0-1.2.1.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Export.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Export.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Export/Form.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Export/Form.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Import.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Import.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Import/Form.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Import/Form.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Queue.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Queue.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Queue/Grid.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/Queue/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueExport.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueExport.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueExport/Grid.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueExport/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueImport.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueImport.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueImport/Grid.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Bulksync/QueueImport/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Customer/Edit/Tab/Memberactivity.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Customer/Edit/Tab/Memberactivity.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerce.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerce.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerce/Grid.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerce/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi/Grid.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi/Renderer/Items.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Ecommerceapi/Renderer/Items.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Memberactivity/Grid.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Memberactivity/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Date.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Date.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Importypes.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Importypes.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Lists.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Lists.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Progress.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Progress.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Yesno.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/Renderer/Yesno.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Account.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Account.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Date.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Date.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Form/Field/Mapfields.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/Form/Field/Mapfields.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/OauthWizard.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/OauthWizard.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/ResetLocalEcommerce.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/ResetLocalEcommerce.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/ResetRemoteEcommerce.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/ResetRemoteEcommerce.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/UpgradeForPatch.php b/app/code/community/Ebizmarts/MageMonkey/Block/Adminhtml/System/Config/UpgradeForPatch.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Checkout/Subscribe.php b/app/code/community/Ebizmarts/MageMonkey/Block/Checkout/Subscribe.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Customer/Account/Lists.php b/app/code/community/Ebizmarts/MageMonkey/Block/Customer/Account/Lists.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Lists.php b/app/code/community/Ebizmarts/MageMonkey/Block/Lists.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Block/Signup.php b/app/code/community/Ebizmarts/MageMonkey/Block/Signup.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Cache.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Cache.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Export.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Export.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Oauth2.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Oauth2.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Api.php b/app/code/community/Ebizmarts/MageMonkey/Model/Api.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Asyncorders.php b/app/code/community/Ebizmarts/MageMonkey/Model/Asyncorders.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Asyncsubscribers.php b/app/code/community/Ebizmarts/MageMonkey/Model/Asyncsubscribers.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/BulksyncExport.php b/app/code/community/Ebizmarts/MageMonkey/Model/BulksyncExport.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/BulksyncImport.php b/app/code/community/Ebizmarts/MageMonkey/Model/BulksyncImport.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cache.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cache.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Config.php b/app/code/community/Ebizmarts/MageMonkey/Model/Config.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Custom/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Custom/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce.php b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Email/Template.php b/app/code/community/Ebizmarts/MageMonkey/Model/Email/Template.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Feed/Updates.php b/app/code/community/Ebizmarts/MageMonkey/Model/Feed/Updates.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Lastorder.php b/app/code/community/Ebizmarts/MageMonkey/Model/Lastorder.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/MCAPI.php b/app/code/community/Ebizmarts/MageMonkey/Model/MCAPI.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/MCEXPORTAPI.php b/app/code/community/Ebizmarts/MageMonkey/Model/MCEXPORTAPI.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Apidebug.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Apidebug.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Apidebug/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Apidebug/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncorders.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncorders.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncorders/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncorders/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncsubscribers.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncsubscribers.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncsubscribers/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncsubscribers/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Export.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Export.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Export/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Export/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Import.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Import.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Import/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Bulksync/Import/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Ecommerce.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Ecommerce.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Ecommerce/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Ecommerce/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Lastorder.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Lastorder.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Lastorder/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Lastorder/Collection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Subscriber.php b/app/code/community/Ebizmarts/MageMonkey/Model/Subscriber.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Account.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Account.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Attributes.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Attributes.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/BulksyncDatasource.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/BulksyncDatasource.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/BulksyncStatus.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/BulksyncStatus.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Checkoutsubscribe.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Checkoutsubscribe.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/CronProcessLimit.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/CronProcessLimit.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/CustomerGroup.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/CustomerGroup.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Ecommerce360.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Ecommerce360.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/List.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/List.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/OrderProcessLimit.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/OrderProcessLimit.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/OrderStatus.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/OrderStatus.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Status.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/Status.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/TransactionalEmails.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/TransactionalEmails.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/WebhookDelete.php b/app/code/community/Ebizmarts/MageMonkey/Model/System/Config/Source/WebhookDelete.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/BulksyncController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/BulksyncController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/ConfigController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/EcommerceController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/Adminhtml/EcommerceController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/Customer/AccountController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/Customer/AccountController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/SignupController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/SignupController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/WebhookController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/WebhookController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/adminhtml.xml b/app/code/community/Ebizmarts/MageMonkey/etc/adminhtml.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/system.xml b/app/code/community/Ebizmarts/MageMonkey/etc/system.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-install-0.0.1.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-install-0.0.1.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.1-0.0.2.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.1-0.0.2.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.2-0.0.3.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.2-0.0.3.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.3-0.0.4.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.3-0.0.4.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.4-0.0.5.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.4-0.0.5.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.5-0.0.6.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.5-0.0.6.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.6-0.0.7.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-0.0.6-0.0.7.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.0.10-1.0.11.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.0.10-1.0.11.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.21-1.1.22.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.21-1.1.22.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.23-1.1.24.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.23-1.1.24.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.33-1.1.34.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.33-1.1.34.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.5-1.1.6.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.5-1.1.6.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.1-1.2.2.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.1-1.2.2.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/System/Config/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/System/Config/Userinfo.php b/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/System/Config/Userinfo.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Templates/Templates.php b/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Templates/Templates.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Templates/Templates/Grid.php b/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Templates/Templates/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Users/Senders.php b/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Users/Senders.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Users/Senders/Grid.php b/app/code/community/Ebizmarts/Mandrill/Block/Adminhtml/Users/Senders/Grid.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Helper/Data.php b/app/code/community/Ebizmarts/Mandrill/Helper/Data.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Model/Customcollection.php b/app/code/community/Ebizmarts/Mandrill/Model/Customcollection.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Model/Email/Template.php b/app/code/community/Ebizmarts/Mandrill/Model/Email/Template.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Model/System/Config.php b/app/code/community/Ebizmarts/Mandrill/Model/System/Config.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/Model/System/Config/Source/Userinfo.php b/app/code/community/Ebizmarts/Mandrill/Model/System/Config/Source/Userinfo.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/controllers/Adminhtml/Mandrill/UsersController.php b/app/code/community/Ebizmarts/Mandrill/controllers/Adminhtml/Mandrill/UsersController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/etc/adminhtml.xml b/app/code/community/Ebizmarts/Mandrill/etc/adminhtml.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/etc/config.xml b/app/code/community/Ebizmarts/Mandrill/etc/config.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/Mandrill/etc/system.xml b/app/code/community/Ebizmarts/Mandrill/etc/system.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Autovars.php b/app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Autovars.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Fieldset/Hint.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Form/Field/Mapfields.php b/app/code/community/Ebizmarts/SweetMonkey/Block/Adminhtml/System/Config/Form/Field/Mapfields.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/Helper/Data.php b/app/code/community/Ebizmarts/SweetMonkey/Helper/Data.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/Model/Observer.php b/app/code/community/Ebizmarts/SweetMonkey/Model/Observer.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/controllers/Adminhtml/MageMonkeyController.php b/app/code/community/Ebizmarts/SweetMonkey/controllers/Adminhtml/MageMonkeyController.php old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/etc/adminhtml.xml b/app/code/community/Ebizmarts/SweetMonkey/etc/adminhtml.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/etc/config.xml b/app/code/community/Ebizmarts/SweetMonkey/etc/config.xml old mode 100755 new mode 100644 diff --git a/app/code/community/Ebizmarts/SweetMonkey/etc/system.xml b/app/code/community/Ebizmarts/SweetMonkey/etc/system.xml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/layout/ebizmarts/abandonedcart.xml b/app/design/adminhtml/default/default/layout/ebizmarts/abandonedcart.xml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/layout/ebizmarts/mandrill.xml b/app/design/adminhtml/default/default/layout/ebizmarts/mandrill.xml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/layout/magemonkey.xml b/app/design/adminhtml/default/default/layout/magemonkey.xml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/index.phtml b/app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/index.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/salebar.phtml b/app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/salebar.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/totalbar.phtml b/app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/dashboard/totalbar.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/system/config/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/ebizmarts/abandonedcart/system/config/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/backtostock/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/backtostock/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/birthday/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/birthday/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/review/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/review/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/wishlist/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/ebizmarts/autoresponder/system/config/wishlist/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/ebizmarts/mandrill/system/config/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/ebizmarts/mandrill/system/config/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/magemonkey/bulksync/export/form.phtml b/app/design/adminhtml/default/default/template/magemonkey/bulksync/export/form.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/magemonkey/bulksync/import/form.phtml b/app/design/adminhtml/default/default/template/magemonkey/bulksync/import/form.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/magemonkey/system/config/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/magemonkey/system/config/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/magemonkey/system/config/oauth_wizard.phtml b/app/design/adminhtml/default/default/template/magemonkey/system/config/oauth_wizard.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/magemonkey/system/config/resetlocal360.phtml b/app/design/adminhtml/default/default/template/magemonkey/system/config/resetlocal360.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/magemonkey/system/config/resetremote360.phtml b/app/design/adminhtml/default/default/template/magemonkey/system/config/resetremote360.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/magemonkey/system/config/upgradeforpatch.phtml b/app/design/adminhtml/default/default/template/magemonkey/system/config/upgradeforpatch.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/sweetmonkey/system/config/autovars.phtml b/app/design/adminhtml/default/default/template/sweetmonkey/system/config/autovars.phtml old mode 100755 new mode 100644 diff --git a/app/design/adminhtml/default/default/template/sweetmonkey/system/config/fieldset/hint.phtml b/app/design/adminhtml/default/default/template/sweetmonkey/system/config/fieldset/hint.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/layout/ebizmarts/abandonedcart.xml b/app/design/frontend/base/default/layout/ebizmarts/abandonedcart.xml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/layout/ebizmarts/autoresponder.xml b/app/design/frontend/base/default/layout/ebizmarts/autoresponder.xml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/layout/magemonkey.xml b/app/design/frontend/base/default/layout/magemonkey.xml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/catalog/product/form.phtml b/app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/catalog/product/form.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/catalog/product/notice.phtml b/app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/catalog/product/notice.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/item.phtml b/app/design/frontend/base/default/template/ebizmarts/autoresponder/backtostock/item.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts/autoresponder/customer/list.phtml b/app/design/frontend/base/default/template/ebizmarts/autoresponder/customer/list.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts/autoresponder/related/items.phtml b/app/design/frontend/base/default/template/ebizmarts/autoresponder/related/items.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts/autoresponder/review/items.phtml b/app/design/frontend/base/default/template/ebizmarts/autoresponder/review/items.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts/autoresponder/unsubscribe.phtml b/app/design/frontend/base/default/template/ebizmarts/autoresponder/unsubscribe.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts/autoresponder/wishlist/items.phtml b/app/design/frontend/base/default/template/ebizmarts/autoresponder/wishlist/items.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items.phtml b/app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items/order/default.phtml b/app/design/frontend/base/default/template/ebizmarts_abandonedcart/email/order/items/order/default.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/ebizmarts_abandonedcart/popup/emailcatcher.phtml b/app/design/frontend/base/default/template/ebizmarts_abandonedcart/popup/emailcatcher.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/magemonkey/checkout/subscribe.phtml b/app/design/frontend/base/default/template/magemonkey/checkout/subscribe.phtml old mode 100755 new mode 100644 diff --git a/app/design/frontend/base/default/template/magemonkey/lists.phtml b/app/design/frontend/base/default/template/magemonkey/lists.phtml old mode 100755 new mode 100644 diff --git a/app/etc/modules/Ebizmarts_AbandonedCart.xml b/app/etc/modules/Ebizmarts_AbandonedCart.xml old mode 100755 new mode 100644 diff --git a/app/etc/modules/Ebizmarts_Autoresponder.xml b/app/etc/modules/Ebizmarts_Autoresponder.xml old mode 100755 new mode 100644 diff --git a/app/etc/modules/Ebizmarts_MageMonkey.xml b/app/etc/modules/Ebizmarts_MageMonkey.xml old mode 100755 new mode 100644 diff --git a/app/etc/modules/Ebizmarts_Mandrill.xml b/app/etc/modules/Ebizmarts_Mandrill.xml old mode 100755 new mode 100644 diff --git a/app/etc/modules/Ebizmarts_SweetMonkey.xml b/app/etc/modules/Ebizmarts_SweetMonkey.xml old mode 100755 new mode 100644 diff --git a/app/locale/en_US/Ebizmarts_AbandonedCart.csv b/app/locale/en_US/Ebizmarts_AbandonedCart.csv old mode 100755 new mode 100644 diff --git a/app/locale/en_US/Ebizmarts_Autoresponder.csv b/app/locale/en_US/Ebizmarts_Autoresponder.csv old mode 100755 new mode 100644 diff --git a/app/locale/en_US/Ebizmarts_MageMonkey.csv b/app/locale/en_US/Ebizmarts_MageMonkey.csv old mode 100755 new mode 100644 diff --git a/app/locale/en_US/Ebizmarts_Mandrill.csv b/app/locale/en_US/Ebizmarts_Mandrill.csv old mode 100755 new mode 100644 diff --git a/app/locale/en_US/Ebizmarts_SweetMonkey.csv b/app/locale/en_US/Ebizmarts_SweetMonkey.csv old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_1.html b/app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_1.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_2.html b/app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_2.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_3.html b/app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_3.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_generic.html b/app/locale/en_US/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_generic.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/abandonedcart/popup_coupon_template.html b/app/locale/en_US/template/email/ebizmarts/abandonedcart/popup_coupon_template.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/backtostock.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/backtostock.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/birthday.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/birthday.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/neworder.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/neworder.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/noactivity.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/noactivity.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/relatedproducts.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/relatedproducts.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/review.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/review.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/reviewcoupon.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/reviewcoupon.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/visitedproducts.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/visitedproducts.html old mode 100755 new mode 100644 diff --git a/app/locale/en_US/template/email/ebizmarts/autoresponder/wishlist.html b/app/locale/en_US/template/email/ebizmarts/autoresponder/wishlist.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/Ebizmarts_AbandonedCart.csv b/app/locale/nl_NL/Ebizmarts_AbandonedCart.csv old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/Ebizmarts_MageMonkey.csv b/app/locale/nl_NL/Ebizmarts_MageMonkey.csv old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/Ebizmarts_SweetMonkey.csv b/app/locale/nl_NL/Ebizmarts_SweetMonkey.csv old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_1.html b/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_1.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_2.html b/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_2.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_3.html b/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_3.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_generic.html b/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/abandoned_cart_mail_generic.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/popup_coupon_template.html b/app/locale/nl_NL/template/email/ebizmarts/abandonedcart/popup_coupon_template.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/backtostock.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/backtostock.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/birthday.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/birthday.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/neworder.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/neworder.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/noactivity.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/noactivity.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/relatedproducts.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/relatedproducts.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/review.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/review.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/reviewcoupon.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/reviewcoupon.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/visitedproducts.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/visitedproducts.html old mode 100755 new mode 100644 diff --git a/app/locale/nl_NL/template/email/ebizmarts/autoresponder/wishlist.html b/app/locale/nl_NL/template/email/ebizmarts/autoresponder/wishlist.html old mode 100755 new mode 100644 diff --git a/js/ebizmarts/abandonedcart/popup.css b/js/ebizmarts/abandonedcart/popup.css old mode 100755 new mode 100644 diff --git a/js/ebizmarts/abandonedcart/xmark.png b/js/ebizmarts/abandonedcart/xmark.png old mode 100755 new mode 100644 diff --git a/js/ebizmarts/autoresponders/visitedproducts.js b/js/ebizmarts/autoresponders/visitedproducts.js old mode 100755 new mode 100644 diff --git a/js/ebizmarts/autoresponders/visitedproductsstorecodes.js b/js/ebizmarts/autoresponders/visitedproductsstorecodes.js old mode 100755 new mode 100644 diff --git a/js/ebizmarts/magemonkey/campaignCatcher.js b/js/ebizmarts/magemonkey/campaignCatcher.js old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill.php b/lib/Mandrill/Mandrill.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Exceptions.php b/lib/Mandrill/Mandrill/Exceptions.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Exports.php b/lib/Mandrill/Mandrill/Exports.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Inbound.php b/lib/Mandrill/Mandrill/Inbound.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Internal.php b/lib/Mandrill/Mandrill/Internal.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Ips.php b/lib/Mandrill/Mandrill/Ips.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Messages.php b/lib/Mandrill/Mandrill/Messages.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Metadata.php b/lib/Mandrill/Mandrill/Metadata.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Rejects.php b/lib/Mandrill/Mandrill/Rejects.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Senders.php b/lib/Mandrill/Mandrill/Senders.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Subaccounts.php b/lib/Mandrill/Mandrill/Subaccounts.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Tags.php b/lib/Mandrill/Mandrill/Tags.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Templates.php b/lib/Mandrill/Mandrill/Templates.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Urls.php b/lib/Mandrill/Mandrill/Urls.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Users.php b/lib/Mandrill/Mandrill/Users.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Webhooks.php b/lib/Mandrill/Mandrill/Webhooks.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Mandrill/Whitelists.php b/lib/Mandrill/Mandrill/Whitelists.php old mode 100755 new mode 100644 diff --git a/lib/Mandrill/Message.php b/lib/Mandrill/Message.php old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/abandonedcart/abandonedcart.css b/skin/adminhtml/default/default/abandonedcart/abandonedcart.css old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/ebizmarts/ebizmarts-tab.png b/skin/adminhtml/default/default/ebizmarts/ebizmarts-tab.png old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/ebizmarts/ebizmarts.css b/skin/adminhtml/default/default/ebizmarts/ebizmarts.css old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/ebizmarts/mandrill/mandrill-tab.png b/skin/adminhtml/default/default/ebizmarts/mandrill/mandrill-tab.png old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/ebizmarts/mandrill/mandrill.css b/skin/adminhtml/default/default/ebizmarts/mandrill/mandrill.css old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/magemonkey/magemonkey.css b/skin/adminhtml/default/default/magemonkey/magemonkey.css old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/magemonkey/magemonkey.js b/skin/adminhtml/default/default/magemonkey/magemonkey.js old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/magemonkey/mailchimp-connected-ebizmarts-title.png b/skin/adminhtml/default/default/magemonkey/mailchimp-connected-ebizmarts-title.png old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/magemonkey/mailchimp-ico.png b/skin/adminhtml/default/default/magemonkey/mailchimp-ico.png old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/magemonkey/mailchimp-section-background.png b/skin/adminhtml/default/default/magemonkey/mailchimp-section-background.png old mode 100755 new mode 100644 diff --git a/skin/adminhtml/default/default/magemonkey/mailchimp-tab.png b/skin/adminhtml/default/default/magemonkey/mailchimp-tab.png old mode 100755 new mode 100644 diff --git a/skin/frontend/base/default/magemonkey/magemonkey.css b/skin/frontend/base/default/magemonkey/magemonkey.css old mode 100755 new mode 100644 diff --git a/skin/frontend/base/default/magemonkey/monkey.js b/skin/frontend/base/default/magemonkey/monkey.js old mode 100755 new mode 100644 From 610fad23a38431cdcadb19c354351aa4cedfc984 Mon Sep 17 00:00:00 2001 From: carlos Date: Wed, 29 Jun 2016 18:06:04 -0300 Subject: [PATCH 02/31] -Insert data in asyncwebhooks table. -Correction in construct. --- .../MageMonkey/Model/Asyncwebhooks.php | 22 ++++ .../Ebizmarts/MageMonkey/Model/Monkey.php | 105 ++++++++++-------- .../MageMonkey/Model/Mysql4/Asyncwebhooks.php | 22 ++++ 3 files changed, 100 insertions(+), 49 deletions(-) create mode 100644 app/code/community/Ebizmarts/MageMonkey/Model/Asyncwebhooks.php create mode 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncwebhooks.php diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Asyncwebhooks.php b/app/code/community/Ebizmarts/MageMonkey/Model/Asyncwebhooks.php new file mode 100644 index 00000000..f385dd7f --- /dev/null +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Asyncwebhooks.php @@ -0,0 +1,22 @@ + + * Date : 9/15/14 + * Time : 12:46 PM + * File : Asyncwebhooks.php + * Module : Ebizmarts_MageMonkey + */ +class Ebizmarts_MageMonkey_Model_Asyncwebhooks extends Mage_Core_Model_Abstract +{ + /** + * Initialize model + * + * @return void + */ + public function _construct() + { + parent::_construct(); + $this->_init('monkey/asyncwebhooks'); + } +} diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php index f2611b33..67f04d6a 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php @@ -26,57 +26,64 @@ class Ebizmarts_MageMonkey_Model_Monkey */ public function processWebhookData(array $data) { - $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id -// $store = Mage::helper('monkey')->getStoreByList($listId); - $subscriber = Mage::getModel('newsletter/subscriber') - ->loadByEmail($data['data']['email']); - $storeId = $subscriber->getStoreId(); - $store = Mage::getModel('core/store')->load($storeId); - if (!is_null($store)) { - $curstore = Mage::app()->getStore(); - Mage::app()->setCurrentStore($store); - } - - //Object for cache clean - $object = new stdClass(); - $object->requestParams = array(); - $object->requestParams['id'] = $listId; - if (isset($data['data']['email'])) { - $object->requestParams['email_address'] = $data['data']['email']; - } - $cacheHelper = Mage::helper('monkey/cache'); - - switch ($data['type']) { - case 'subscribe': - $this->_subscribe($data); - $cacheHelper->clearCache('listSubscribe', $object); - break; - case 'unsubscribe': - $this->_unsubscribe($data); - $cacheHelper->clearCache('listUnsubscribe', $object); - break; - case 'cleaned': - $this->_clean($data); - $cacheHelper->clearCache('listUnsubscribe', $object); - break; - case 'campaign': - $this->_campaign($data); - break; - //case 'profile': Cuando se actualiza email en MC como merchant, te manda un upmail y un profile (no siempre en el mismo órden) - case 'upemail': - $this->_updateEmail($data); - $cacheHelper->clearCache('listUpdateMember', $object); - break; - case 'profile': - $this->_profile($data); - $cacheHelper->clearCache('listUpdateMember', $object); - break; - } - if (!is_null($store)) { - Mage::app()->setCurrentStore($curstore); - } + Mage::getModel('monkey/asyncwebhooks') + ->setWebhookType($data['type']) + ->setWebhookData(json_encode($data)) + ->save(); + +// $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id +//// $store = Mage::helper('monkey')->getStoreByList($listId); +// $subscriber = Mage::getModel('newsletter/subscriber') +// ->loadByEmail($data['data']['email']); +// $storeId = $subscriber->getStoreId(); +// $store = Mage::getModel('core/store')->load($storeId); +// if (!is_null($store)) { +// $curstore = Mage::app()->getStore(); +// Mage::app()->setCurrentStore($store); +// } +// +// //Object for cache clean +// $object = new stdClass(); +// $object->requestParams = array(); +// $object->requestParams['id'] = $listId; +// +// if (isset($data['data']['email'])) { +// $object->requestParams['email_address'] = $data['data']['email']; +// } +// $cacheHelper = Mage::helper('monkey/cache'); +// +// switch ($data['type']) { +// case 'subscribe': +// $this->_subscribe($data); +// $cacheHelper->clearCache('listSubscribe', $object); +// break; +// case 'unsubscribe': +// $this->_unsubscribe($data); +// $cacheHelper->clearCache('listUnsubscribe', $object); +// break; +// case 'cleaned': +// $this->_clean($data); +// $cacheHelper->clearCache('listUnsubscribe', $object); +// break; +// case 'campaign': +// $this->_campaign($data); +// break; +// //case 'profile': Cuando se actualiza email en MC como merchant, te manda un upmail y un profile (no siempre en el mismo órden) +// case 'upemail': +// $this->_updateEmail($data); +// $cacheHelper->clearCache('listUpdateMember', $object); +// break; +// case 'profile': +// $this->_profile($data); +// $cacheHelper->clearCache('listUpdateMember', $object); +// break; +// } +// +// if (!is_null($store)) { +// Mage::app()->setCurrentStore($curstore); +// } } /** diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncwebhooks.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncwebhooks.php new file mode 100644 index 00000000..04ecbf50 --- /dev/null +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncwebhooks.php @@ -0,0 +1,22 @@ + + * Date : 9/12/14 + * Time : 1:09 AM + * File : AsyncWebhooks.php + * Module : Ebizmarts_MageMonkey + */ +class Ebizmarts_MageMonkey_Model_Mysql4_Asyncwebhooks extends Mage_Core_Model_Mysql4_Abstract +{ + + /** + * Initialize + * + * @return void + */ + public function _construct() + { + $this->_init('monkey/asyncwebhooks', 'id'); + } +} \ No newline at end of file From 83fd14025b490114339761fbb0a89086a30baf56 Mon Sep 17 00:00:00 2001 From: carlos Date: Fri, 1 Jul 2016 17:37:03 -0300 Subject: [PATCH 03/31] -Webhook module [Work in progress] --- .../Ebizmarts/MageMonkey/Model/Cron.php | 108 ++++++++++++++++++ .../Ebizmarts/MageMonkey/Model/Monkey.php | 1 + .../Model/Mysql4/Asyncwebhooks/Collection.php | 23 ++++ .../controllers/WebhookController.php | 1 - .../Ebizmarts/MageMonkey/etc/config.xml | 15 ++- .../mysql4-upgrade-1.1.23-1.1.24.php | 6 +- .../mysql4-upgrade-1.2.3-1.2.4.php | 17 +++ 7 files changed, 167 insertions(+), 4 deletions(-) create mode 100644 app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncwebhooks/Collection.php create mode 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.3-1.2.4.php diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index ce1d2115..6bed8a63 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -520,4 +520,112 @@ public function cleanSubscribersAsync() $item->delete(); } } + + + public function processWebhookData($cron) + { + + $collection = Mage::getModel('monkey/asyncwebhooks')->getCollection(); + $collection->addFieldToFilter('processed', array('eq' => 0)); + + foreach ($collection as $item) { + $data=$item->getWebhookData(); + Mage::log($data,NULL,"keller.log",true); + $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id + $store = Mage::helper('monkey')->getStoreByList($listId); + $subscriber = Mage::getModel('newsletter/subscriber') + ->loadByEmail($data['data']['email']); + $storeId = $subscriber->getStoreId(); + $store = Mage::getModel('core/store')->load($storeId); + if (!is_null($store)) { + $curstore = Mage::app()->getStore(); + Mage::app()->setCurrentStore($store); + } + // Object for cache clean + $object = new stdClass(); + $object->requestParams = array(); + $object->requestParams['id'] = $listId; + + if (isset($data['data']['email'])) { + $object->requestParams['email_address'] = $data['data']['email']; + } + $cacheHelper = Mage::helper('monkey/cache'); + + switch ($data->getWebhookType()) { + case 'subscribe': + $this->_subscribe($data); + $cacheHelper->clearCache('listSubscribe', $object); + break; + case 'unsubscribe': + $this->_unsubscribe($data); + $cacheHelper->clearCache('listUnsubscribe', $object); + break; + case 'cleaned': + $this->_clean($data); + $cacheHelper->clearCache('listUnsubscribe', $object); + break; + case 'campaign': + $this->_campaign($data); + break; + //case 'profile': Cuando se actualiza email en MC como merchant, te manda un upmail y un profile (no siempre en el mismo órden) + case 'upemail': + $this->_updateEmail($data); + $cacheHelper->clearCache('listUpdateMember', $object); + break; + case 'profile': + $this->_profile($data); + $cacheHelper->clearCache('listUpdateMember', $object); + break; + } + + if (!is_null($store)) { + Mage::app()->setCurrentStore($curstore); + } + $item(setProcessed(1))->save(); + + } + + + } + + + protected function _subscribe(array $data) + { + try { + + //TODO: El método subscribe de Subscriber (Magento) hace un load by email + // entonces si existe en un store, lo acutaliza y lo cambia de store, no lo agrega a otra store + //VALIDAR si es lo que se requiere + + $subscriber = Mage::getModel('newsletter/subscriber') + ->loadByEmail($data['data']['email']); + if ($subscriber->getId()) { + $subscriber->setStatus(Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) + ->save(); + } else { + $subscriber = Mage::getModel('newsletter/subscriber')->setImportMode(TRUE); + if(isset($data['data']['fname'])){ + $subscriber->setSubscriberFirstname($data['data']['fname']); + } + if(isset($data['data']['lname'])){ + $subscriber->setSubscriberLastname($data['data']['lname']); + } + $subscriber->subscribe($data['data']['email']); + + } + $customerExist = Mage::getSingleton('customer/customer') + ->getCollection() + ->addAttributeToFilter('email', array('eq' => $data['data']['email']) ) + ->getFirstItem(); + if($customerExist){ + $storeId = $customerExist->getStoreId(); + } + if($customerExist && Mage::getStoreConfig('sweetmonkey/general/active', $storeId)){ + Mage::helper('sweetmonkey')->pushVars($customerExist); + } + } catch (Exception $e) { + Mage::logException($e); + } + } + } diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php index 67f04d6a..191be5d0 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php @@ -31,6 +31,7 @@ public function processWebhookData(array $data) Mage::getModel('monkey/asyncwebhooks') ->setWebhookType($data['type']) ->setWebhookData(json_encode($data)) + ->setProcessed(0) ->save(); // $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncwebhooks/Collection.php b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncwebhooks/Collection.php new file mode 100644 index 00000000..7ce8cc4e --- /dev/null +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Mysql4/Asyncwebhooks/Collection.php @@ -0,0 +1,23 @@ + + * Date : 9/12/14 + * Time : 1:17 AM + * File : Collection.php + * Module : Ebizmarts_MageMonkey + */ +class Ebizmarts_MageMonkey_Model_Mysql4_Asyncwebhooks_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract +{ + + /** + * Set resource type + * + * @return void + */ + public function _construct() + { + parent::_construct(); + $this->_init('monkey/asyncwebhooks'); + } +} \ No newline at end of file diff --git a/app/code/community/Ebizmarts/MageMonkey/controllers/WebhookController.php b/app/code/community/Ebizmarts/MageMonkey/controllers/WebhookController.php index 813248cc..de216177 100644 --- a/app/code/community/Ebizmarts/MageMonkey/controllers/WebhookController.php +++ b/app/code/community/Ebizmarts/MageMonkey/controllers/WebhookController.php @@ -17,7 +17,6 @@ class Ebizmarts_MageMonkey_WebhookController extends Mage_Core_Controller_Front_ public function indexAction() { $requestKey = $this->getRequest()->getParam('wkey'); - //Checking if "wkey" para is present on request, we cannot check for !isPost() //because Mailchimp pings the URL (GET request) to validate webhook if (!$requestKey) { diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml index bbe6849b..50ef6d6f 100644 --- a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml +++ b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml @@ -10,7 +10,7 @@ - 1.2.3 + 1.2.4 @@ -69,6 +69,9 @@ magemonkey_last_order
 + + magemonkey_async_webhooks
+ @@ -320,7 +323,7 @@ monkey/cron::cleanordersAsync - + */15 * * * * @@ -336,6 +339,14 @@ monkey/cron::cleanSubscribersAsync + + + */15 * * * * + + + monkey/cron::processWebhookData + + diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.23-1.1.24.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.23-1.1.24.php index 9a20e003..0b19b496 100644 --- a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.23-1.1.24.php +++ b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.1.23-1.1.24.php @@ -4,9 +4,13 @@ $installer->startSetup(); -$installer->run(" +try { + $installer->run(" ALTER TABLE `{$this->getTable('magemonkey_async_subscribers')}` CHANGE `proccessed` `processed` INT; ALTER TABLE `{$this->getTable('magemonkey_async_orders')}` CHANGE `proccessed` `processed` INT; "); +} + +catch(Exception $e){} $installer->endSetup(); \ No newline at end of file diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.3-1.2.4.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.3-1.2.4.php new file mode 100644 index 00000000..355c979d --- /dev/null +++ b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.3-1.2.4.php @@ -0,0 +1,17 @@ +startSetup(); + +$installer->run(" + CREATE TABLE IF NOT EXISTS `{$this->getTable('magemonkey_async_webhooks')}` ( + `id` INT(10) unsigned NOT NULL auto_increment, + `webhook_type` varchar(24), + `webhook_data` text, + `processed` INT(1) NOT NULL default 0, + PRIMARY KEY (`id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +"); + +$installer->endSetup(); \ No newline at end of file From 95d9e279babff9bdc663a64d1852260d5a9d8893 Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 5 Jul 2016 11:10:43 -0300 Subject: [PATCH 04/31] -json_decode in variable $data --- app/code/community/Ebizmarts/MageMonkey/Model/Cron.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index 6bed8a63..ed49d8e8 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -522,14 +522,14 @@ public function cleanSubscribersAsync() } - public function processWebhookData($cron) + public function processWebhookData($cron) //This parameter isn't being used for some reason { $collection = Mage::getModel('monkey/asyncwebhooks')->getCollection(); $collection->addFieldToFilter('processed', array('eq' => 0)); foreach ($collection as $item) { - $data=$item->getWebhookData(); + $data=json_decode($item->getWebhookData()); Mage::log($data,NULL,"keller.log",true); $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id $store = Mage::helper('monkey')->getStoreByList($listId); From 3f1eb134ff926f33d3dd8209b7ece20103d169e6 Mon Sep 17 00:00:00 2001 From: keller_ebizmarts Date: Wed, 6 Jul 2016 18:04:17 -0300 Subject: [PATCH 05/31] Webhook requests [Work in progress] -Case "subscribe" working -Case "unsubscribe" working -Case "clean" in progress -Remaining cases queued --- .../Ebizmarts/MageMonkey/Model/Cron.php | 108 ++++++++++++-- .../Ebizmarts/MageMonkey/Model/Monkey.php | 137 +----------------- 2 files changed, 100 insertions(+), 145 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index ed49d8e8..a425f8de 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -522,15 +522,15 @@ public function cleanSubscribersAsync() } - public function processWebhookData($cron) //This parameter isn't being used for some reason + public function processWebhookData() { $collection = Mage::getModel('monkey/asyncwebhooks')->getCollection(); $collection->addFieldToFilter('processed', array('eq' => 0)); foreach ($collection as $item) { - $data=json_decode($item->getWebhookData()); - Mage::log($data,NULL,"keller.log",true); + $data=json_decode($item->getWebhookData(), true); +// Mage::log($data,NULL,"keller.log",true); $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id $store = Mage::helper('monkey')->getStoreByList($listId); $subscriber = Mage::getModel('newsletter/subscriber') @@ -550,8 +550,8 @@ public function processWebhookData($cron) //This parameter isn't being used for $object->requestParams['email_address'] = $data['data']['email']; } $cacheHelper = Mage::helper('monkey/cache'); - - switch ($data->getWebhookType()) { +// Mage::log($item->getWebhookType(),NULL,"keller.log",true); + switch ($item->getWebhookType()) { case 'subscribe': $this->_subscribe($data); $cacheHelper->clearCache('listSubscribe', $object); @@ -577,11 +577,11 @@ public function processWebhookData($cron) //This parameter isn't being used for $cacheHelper->clearCache('listUpdateMember', $object); break; } - +// Mage::log('afterswitch',NULL,"keller.log",true); if (!is_null($store)) { Mage::app()->setCurrentStore($curstore); } - $item(setProcessed(1))->save(); + $item->setProcessed(1)->save(); } @@ -589,6 +589,13 @@ public function processWebhookData($cron) //This parameter isn't being used for } + /** + * Subscribe email to Magento list + * + * @param array $data + * @return void + */ + protected function _subscribe(array $data) { try { @@ -596,13 +603,14 @@ protected function _subscribe(array $data) //TODO: El método subscribe de Subscriber (Magento) hace un load by email // entonces si existe en un store, lo acutaliza y lo cambia de store, no lo agrega a otra store //VALIDAR si es lo que se requiere - - $subscriber = Mage::getModel('newsletter/subscriber') + $subscriber = Mage::getSingleton('newsletter/subscriber') ->loadByEmail($data['data']['email']); if ($subscriber->getId()) { + $subscriber->setStatus(Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) ->save(); } else { + Mage::log('else',NULL,"keller.log",true); $subscriber = Mage::getModel('newsletter/subscriber')->setImportMode(TRUE); if(isset($data['data']['fname'])){ $subscriber->setSubscriberFirstname($data['data']['fname']); @@ -610,7 +618,17 @@ protected function _subscribe(array $data) if(isset($data['data']['lname'])){ $subscriber->setSubscriberLastname($data['data']['lname']); } + if(isset($data['data']['merges']['STOREID'])){ + $subscriberStoreId=$data['data']['merges']['STOREID']; + }else { + $subscriberStoreId = Mage::app() + ->getWebsite(1) + ->getDefaultGroup() + ->getDefaultStoreId(); + } + Mage::app()->setCurrentStore($subscriberStoreId); $subscriber->subscribe($data['data']['email']); + Mage::app()->setCurrentStore(0); } $customerExist = Mage::getSingleton('customer/customer') @@ -628,4 +646,76 @@ protected function _subscribe(array $data) } } + + /** + * Unsubscribe or delete email from Magento list + * + * @param array $data + * @return void + */ + + protected function _unsubscribe(array $data) + { +// $subscriber = $this->loadByEmail($data['data']['email']); + $subscriber = Mage::getSingleton('newsletter/subscriber') + ->loadByEmail($data['data']['email']); + if (!$subscriber->getId()) { + $subscriber = Mage::getModel('newsletter/subscriber') + ->loadByEmail($data['data']['email']); + } + if($subscriber->getId()){ + try { + if(!Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CONFIRMATION_EMAIL, $subscriber->getStoreId())){ + $subscriber->setImportMode(true); + } + + switch ($data['data']['action']) { + case 'delete' : + //if config setting "Webhooks Delete action" is set as "Delete customer account" + if (Mage::getStoreConfig("monkey/general/webhook_delete") == 1) { + $subscriber->delete(); + } else { + $subscriber->unsubscribe(); + } + break; + case 'unsub': + $subscriber->unsubscribe(); + break; + } + } catch (Exception $e) { + Mage::logException($e); + } + } + } + + + protected function _clean(array $data) + { + + if (Mage::helper('monkey')->isAdminNotificationEnabled()) { + Mage::log('afterif', NULL, "keller.log", true); + $text = Mage::helper('monkey')->__('MailChimp Cleaned Emails: %s %s at %s reason: %s', $data['data']['email'], $data['type'], $data['fired_at'], $data['data']['reason']); + + $this->_getInbox() + ->setTitle($text) + ->setDescription($text) + ->save(); + } + + //Delete subscriber from Magento + $s = $this->loadByEmail($data['data']['email']); + Mage::log('loadsemail?', NULL, "keller.log", true); + if ($s->getId()) { + Mage::log('afterif2', NULL, "keller.log", true); + try { + $s->delete(); + } catch (Exception $e) { + Mage::logException($e); + } + } + } + + + + } diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php index 191be5d0..24b52447 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php @@ -34,57 +34,6 @@ public function processWebhookData(array $data) ->setProcessed(0) ->save(); -// $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id -//// $store = Mage::helper('monkey')->getStoreByList($listId); -// $subscriber = Mage::getModel('newsletter/subscriber') -// ->loadByEmail($data['data']['email']); -// $storeId = $subscriber->getStoreId(); -// $store = Mage::getModel('core/store')->load($storeId); -// if (!is_null($store)) { -// $curstore = Mage::app()->getStore(); -// Mage::app()->setCurrentStore($store); -// } -// -// //Object for cache clean -// $object = new stdClass(); -// $object->requestParams = array(); -// $object->requestParams['id'] = $listId; -// -// if (isset($data['data']['email'])) { -// $object->requestParams['email_address'] = $data['data']['email']; -// } -// $cacheHelper = Mage::helper('monkey/cache'); -// -// switch ($data['type']) { -// case 'subscribe': -// $this->_subscribe($data); -// $cacheHelper->clearCache('listSubscribe', $object); -// break; -// case 'unsubscribe': -// $this->_unsubscribe($data); -// $cacheHelper->clearCache('listUnsubscribe', $object); -// break; -// case 'cleaned': -// $this->_clean($data); -// $cacheHelper->clearCache('listUnsubscribe', $object); -// break; -// case 'campaign': -// $this->_campaign($data); -// break; -// //case 'profile': Cuando se actualiza email en MC como merchant, te manda un upmail y un profile (no siempre en el mismo órden) -// case 'upemail': -// $this->_updateEmail($data); -// $cacheHelper->clearCache('listUpdateMember', $object); -// break; -// case 'profile': -// $this->_profile($data); -// $cacheHelper->clearCache('listUpdateMember', $object); -// break; -// } -// -// if (!is_null($store)) { -// Mage::app()->setCurrentStore($curstore); -// } } /** @@ -164,91 +113,7 @@ protected function _campaign(array $data) } - /** - * Subscribe email to Magento list, store aware - * - * @param array $data - * @return void - */ - protected function _subscribe(array $data) - { - try { - - //TODO: El método subscribe de Subscriber (Magento) hace un load by email - // entonces si existe en un store, lo acutaliza y lo cambia de store, no lo agrega a otra store - //VALIDAR si es lo que se requiere - - $subscriber = Mage::getModel('newsletter/subscriber') - ->loadByEmail($data['data']['email']); - if ($subscriber->getId()) { - $subscriber->setStatus(Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) - ->save(); - } else { - $subscriber = Mage::getModel('newsletter/subscriber')->setImportMode(TRUE); - if(isset($data['data']['fname'])){ - $subscriber->setSubscriberFirstname($data['data']['fname']); - } - if(isset($data['data']['lname'])){ - $subscriber->setSubscriberLastname($data['data']['lname']); - } - $subscriber->subscribe($data['data']['email']); - - } - $customerExist = Mage::getSingleton('customer/customer') - ->getCollection() - ->addAttributeToFilter('email', array('eq' => $data['data']['email']) ) - ->getFirstItem(); - if($customerExist){ - $storeId = $customerExist->getStoreId(); - } - if($customerExist && Mage::getStoreConfig('sweetmonkey/general/active', $storeId)){ - Mage::helper('sweetmonkey')->pushVars($customerExist); - } - } catch (Exception $e) { - Mage::logException($e); - } - } - - /** - * Unsubscribe or delete email from Magento list, store aware - * - * @param array $data - * @return void - */ - protected function _unsubscribe(array $data) - { - $subscriber = $this->loadByEmail($data['data']['email']); - - if (!$subscriber->getId()) { - $subscriber = Mage::getModel('newsletter/subscriber') - ->loadByEmail($data['data']['email']); - } - - if ($subscriber->getId()) { - try { - if(!Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CONFIRMATION_EMAIL, $subscriber->getStoreId())){ - $subscriber->setImportMode(true); - } - - switch ($data['data']['action']) { - case 'delete' : - //if config setting "Webhooks Delete action" is set as "Delete customer account" - if (Mage::getStoreConfig("monkey/general/webhook_delete") == 1) { - $subscriber->delete(); - } else { - $subscriber->unsubscribe(); - } - break; - case 'unsub': - $subscriber->unsubscribe(); - break; - } - } catch (Exception $e) { - Mage::logException($e); - } - } - } - + protected function _profile(array $data) { $email = $data['data']['email']; From 191294a80988ba83cddb51a68f56fd2129360a57 Mon Sep 17 00:00:00 2001 From: keller_ebizmarts Date: Fri, 15 Jul 2016 17:30:10 -0300 Subject: [PATCH 06/31] Webhook requests [Work in progress] -Case "cleaned" and "campaign" have an issue with the function isAdminNotificationEnabled not working properly, it should return true but it doesn't -Rest of cases working properly according to tests made -Case "cleaned" except for what was specified above seems to work fine --- .../Ebizmarts/MageMonkey/Model/Cron.php | 127 +++++++++++++++--- .../Ebizmarts/MageMonkey/Model/Monkey.php | 112 +-------------- 2 files changed, 112 insertions(+), 127 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index a425f8de..cf91eb75 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -534,7 +534,7 @@ public function processWebhookData() $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id $store = Mage::helper('monkey')->getStoreByList($listId); $subscriber = Mage::getModel('newsletter/subscriber') - ->loadByEmail($data['data']['email']); + ->loadByEmail(isset($data['data']['email'])); $storeId = $subscriber->getStoreId(); $store = Mage::getModel('core/store')->load($storeId); if (!is_null($store)) { @@ -561,7 +561,7 @@ public function processWebhookData() $cacheHelper->clearCache('listUnsubscribe', $object); break; case 'cleaned': - $this->_clean($data); + $this->_cleaned($data); $cacheHelper->clearCache('listUnsubscribe', $object); break; case 'campaign': @@ -610,7 +610,6 @@ protected function _subscribe(array $data) $subscriber->setStatus(Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) ->save(); } else { - Mage::log('else',NULL,"keller.log",true); $subscriber = Mage::getModel('newsletter/subscriber')->setImportMode(TRUE); if(isset($data['data']['fname'])){ $subscriber->setSubscriberFirstname($data['data']['fname']); @@ -621,10 +620,7 @@ protected function _subscribe(array $data) if(isset($data['data']['merges']['STOREID'])){ $subscriberStoreId=$data['data']['merges']['STOREID']; }else { - $subscriberStoreId = Mage::app() - ->getWebsite(1) - ->getDefaultGroup() - ->getDefaultStoreId(); + $subscriberStoreId = Mage::helper('monkey')->getStoreByList(); } Mage::app()->setCurrentStore($subscriberStoreId); $subscriber->subscribe($data['data']['email']); @@ -656,9 +652,9 @@ protected function _subscribe(array $data) protected function _unsubscribe(array $data) { -// $subscriber = $this->loadByEmail($data['data']['email']); $subscriber = Mage::getSingleton('newsletter/subscriber') ->loadByEmail($data['data']['email']); + if (!$subscriber->getId()) { $subscriber = Mage::getModel('newsletter/subscriber') ->loadByEmail($data['data']['email']); @@ -688,25 +684,33 @@ protected function _unsubscribe(array $data) } } + /** + * Add "Cleaned Emails" notification to Adminnotification Inbox + * + * @param array $data + * @return void + */ - protected function _clean(array $data) - { - if (Mage::helper('monkey')->isAdminNotificationEnabled()) { - Mage::log('afterif', NULL, "keller.log", true); + protected function _cleaned(array $data) + { + if (Mage::helper('monkey')->isAdminNotificationEnabled()) { //This 'if' returns false even if Admin Notification is enabled on the module sometimes, must check why + Mage::log('enters if_cleaned', NULL, "keller.log", true); $text = Mage::helper('monkey')->__('MailChimp Cleaned Emails: %s %s at %s reason: %s', $data['data']['email'], $data['type'], $data['fired_at'], $data['data']['reason']); - - $this->_getInbox() + Mage::log($text, NULL, "keller.log", true); + $temp1=$this->_getInbox() ->setTitle($text) ->setDescription($text) ->save(); + Mage::log($temp1, NULL, "keller.log", true); } //Delete subscriber from Magento - $s = $this->loadByEmail($data['data']['email']); + $s = Mage::getSingleton('newsletter/subscriber') + ->loadByEmail($data['data']['email']); Mage::log('loadsemail?', NULL, "keller.log", true); if ($s->getId()) { - Mage::log('afterif2', NULL, "keller.log", true); + Mage::log('enters_if2', NULL, "keller.log", true); try { $s->delete(); } catch (Exception $e) { @@ -716,6 +720,97 @@ protected function _clean(array $data) } + /** + * Add "Campaign Sending Status" notification to Adminnotification Inbox + * + * @param array $data + * @return void + */ + + protected function _campaign(array $data) + { + Mage::log('enters function campaign', NULL, "keller.log", true); + if (Mage::helper('monkey')->isAdminNotificationEnabled()) { + Mage::log('enters if', NULL, "keller.log", true); + $text = Mage::helper('monkey')->__('MailChimp Campaign Send: %s %s at %s', $data['data']['subject'], $data['data']['status'], $data['fired_at']); + Mage::log($text, NULL, "keller.log", true); + $temp2=$this->_getInbox() + ->setTitle($text) + ->setDescription($text) + ->save(); + Mage::log($temp2, NULL, "keller.log", true); + } + + } + + + + + protected function _profile(array $data) + { + $email = $data['data']['email']; + $subscriber = Mage::getSingleton('newsletter/subscriber') + ->loadByEmail($data['data']['email']); + + $customerCollection = Mage::getModel('customer/customer')->getCollection() + ->addFieldToFilter('email', array('eq' => $email)); + if (count($customerCollection) > 0) { + $toUpdate = $customerCollection->getFirstItem(); + }else { + $toUpdate = $subscriber; + } + $toUpdate->setFirstname($data['data']['merges']['FNAME']); + $toUpdate->setLastname($data['data']['merges']['LNAME']); + $toUpdate->save(); + } + + /** + * Update customer email + * + * @param array $data + * @return void + */ + protected function _updateEmail(array $data) + { + $old = $data['data']['old_email']; + $new = $data['data']['new_email']; + + + $oldSubscriber = Mage::getSingleton('newsletter/subscriber')->loadByEmail($old); + $newSubscriber = Mage::getSingleton('newsletter/subscriber')->loadByEmail($new); + + + $subscriberStoreId = Mage::helper('monkey')->getStoreByList(); + + Mage::app()->setCurrentStore($subscriberStoreId); + + + if ($oldSubscriber->getId()) { + $oldSubscriber->setSubscriberEmail($new) + ->save(); + Mage::app()->setCurrentStore(0); + } elseif (!$newSubscriber->getId() && !$oldSubscriber->getId()) { + Mage::getModel('newsletter/subscriber') + ->setImportMode(TRUE) + ->setStoreId(Mage::app()->getStore()->getId()) + ->subscribe($new); + Mage::app()->setCurrentStore(0); + } + } + + + + /** + * Return Inbox model instance + * + * @return Mage_AdminNotification_Model_Inbox + */ + protected function _getInbox() + { + return Mage::getModel('adminnotification/inbox') + ->setSeverity(4)//Notice + ->setDateAdded(Mage::getModel('core/date')->gmtDate()); + } } diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php index 24b52447..aa1f4a4d 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Monkey.php @@ -36,117 +36,7 @@ public function processWebhookData(array $data) } - /** - * Update customer email - * - * @param array $data - * @return void - */ - protected function _updateEmail(array $data) - { - - $old = $data['data']['old_email']; - $new = $data['data']['new_email']; - - $oldSubscriber = $this->loadByEmail($old); - $newSubscriber = $this->loadByEmail($new); - - if (!$newSubscriber->getId() && $oldSubscriber->getId()) { - $oldSubscriber->setSubscriberEmail($new) - ->save(); - } elseif (!$newSubscriber->getId() && !$oldSubscriber->getId()) { - - Mage::getModel('newsletter/subscriber') - ->setImportMode(TRUE) - ->setStoreId(Mage::app()->getStore()->getId()) - ->subscribe($new); - } - } - - /** - * Add "Cleaned Emails" notification to Adminnotification Inbox - * - * @param array $data - * @return void - */ - protected function _clean(array $data) - { - - if (Mage::helper('monkey')->isAdminNotificationEnabled()) { - $text = Mage::helper('monkey')->__('MailChimp Cleaned Emails: %s %s at %s reason: %s', $data['data']['email'], $data['type'], $data['fired_at'], $data['data']['reason']); - - $this->_getInbox() - ->setTitle($text) - ->setDescription($text) - ->save(); - } - - //Delete subscriber from Magento - $s = $this->loadByEmail($data['data']['email']); - - if ($s->getId()) { - try { - $s->delete(); - } catch (Exception $e) { - Mage::logException($e); - } - } - } - - /** - * Add "Campaign Sending Status" notification to Adminnotification Inbox - * - * @param array $data - * @return void - */ - protected function _campaign(array $data) - { - - if (Mage::helper('monkey')->isAdminNotificationEnabled()) { - $text = Mage::helper('monkey')->__('MailChimp Campaign Send: %s %s at %s', $data['data']['subject'], $data['data']['status'], $data['fired_at']); - - $this->_getInbox() - ->setTitle($text) - ->setDescription($text) - ->save(); - } - - } - - - protected function _profile(array $data) - { - $email = $data['data']['email']; - $subscriber = $this->loadByEmail($email); - $storeId = $subscriber->getStoreId(); - - $customerCollection = Mage::getModel('customer/customer')->getCollection() - ->addFieldToFilter('email', array('eq' => $email)); - if (count($customerCollection) > 0) { - $toUpdate = $customerCollection->getFirstItem(); - } else { - $toUpdate = $subscriber; - } - $toUpdate->setFirstname($data['data']['merges']['FNAME']); - $toUpdate->setLastname($data['data']['merges']['LNAME']); - $toUpdate->save(); - - - } - - /** - * Return Inbox model instance - * - * @return Mage_AdminNotification_Model_Inbox - */ - protected function _getInbox() - { - return Mage::getModel('adminnotification/inbox') - ->setSeverity(4)//Notice - ->setDateAdded(Mage::getModel('core/date')->gmtDate()); - } - - /** + /** * Load newsletter_subscriber by email * * @param string $email From 977dad67934a07bd0618ea169970228ff79d195e Mon Sep 17 00:00:00 2001 From: Santiago Date: Wed, 20 Jul 2016 16:45:29 -0300 Subject: [PATCH 07/31] Minor changes to pull request to add configuration to enable webhook creation. --- .../Ebizmarts/MageMonkey/Model/Config.php | 2 + .../Ebizmarts/MageMonkey/Model/Observer.php | 111 +++++++++++------- .../Ebizmarts/MageMonkey/etc/config.xml | 8 ++ 3 files changed, 80 insertions(+), 41 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Config.php b/app/code/community/Ebizmarts/MageMonkey/Model/Config.php index 94fc39c7..ec4af03f 100755 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Config.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Config.php @@ -35,6 +35,8 @@ class Ebizmarts_MageMonkey_Model_Config const GENERAL_ADMINHTML_NOTIFICATION = 'monkey/general/adminhtml_notification'; const GENERAL_ENABLE_LOG = 'monkey/general/enable_log'; + const GENERAL_CHECKOUT_SUBSCRIBE_DATA = 'monkey/general/checkout_subscribe_data'; + const ECOMMERCE360_ACTIVE = 'monkey/ecommerce360/active'; const ECOMMERCE360_ORDER_STATUS = 'monkey/ecommerce360/order_status'; diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 5f1e5b7a..0f602544 100755 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -357,6 +357,24 @@ public function updateCustomer(Varien_Event_Observer $observer) return $observer; } + public function registerCheckoutSubscribeWithSagePay(Varien_Event_Observer $observer){ + if (!Mage::helper('monkey')->canMonkey()) { + return $observer; + } + $post = $observer->getEvent()->getPost(); + $oneStep = Mage::app()->getRequest()->getModuleName() == 'onestepcheckout'; + $subscribe = $post['magemonkey_subscribe']; + + Mage::getSingleton('core/session')->setMonkeyPost(serialize($post)); + if (!is_null($subscribe) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CHECKOUT_SUBSCRIBE, Mage::app()->getStore()->getId()) >= 3) { + Mage::getSingleton('core/session')->setMonkeyCheckout(true); + } + if ($oneStep) { + Mage::getSingleton('core/session')->setIsOneStepCheckout(true); + } + return $observer; + } + /** * Add flag on session to tell the module if on success page should subscribe customer * @@ -368,19 +386,26 @@ public function registerCheckoutSubscribe(Varien_Event_Observer $observer) if (!Mage::helper('monkey')->canMonkey()) { return $observer; } - - $oneStep = Mage::app()->getRequest()->getModuleName() == 'onestepcheckout'; - if (Mage::app()->getRequest()->isPost()) { - $subscribe = Mage::app()->getRequest()->getPost('magemonkey_subscribe'); - $force = Mage::app()->getRequest()->getPost('magemonkey_force'); - - Mage::getSingleton('core/session')->setMonkeyPost(serialize(Mage::app()->getRequest()->getPost())); - if (!is_null($subscribe) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CHECKOUT_SUBSCRIBE) >= 3) { - Mage::getSingleton('core/session')->setMonkeyCheckout(true); + if (Mage::getSingleton('core/session')->getMonkeyPost()){ + $order = $observer->getEvent()->getOrder(); + $this->_handleCheckoutSubscription($order, true); + }else { + $oneStep = Mage::app()->getRequest()->getModuleName() == 'onestepcheckout'; + if (Mage::app()->getRequest()->isPost()) { + $subscribe = Mage::app()->getRequest()->getPost('magemonkey_subscribe'); + + Mage::getSingleton('core/session')->setMonkeyPost(serialize(Mage::app()->getRequest()->getPost())); + if (!is_null($subscribe) || Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CHECKOUT_SUBSCRIBE, Mage::app()->getStore()->getId()) >= 3) { + Mage::getSingleton('core/session')->setMonkeyCheckout(true); + } + } + if ($oneStep) { + Mage::getSingleton('core/session')->setIsOneStepCheckout(true); + } + if (Mage::getSingleton('core/session')->getMonkeyPost()){ + $order = $observer->getEvent()->getOrder(); + $this->_handleCheckoutSubscription($order, true); } - } - if ($oneStep) { - Mage::getSingleton('core/session')->setIsOneStepCheckout(true); } return $observer; } @@ -406,8 +431,40 @@ public function registerCheckoutSuccess(Varien_Event_Observer $observer) if ($orderId) { $order = Mage::getModel('sales/order')->load($orderId); } + $this->_handleCheckoutSubscription($order, false); + + return $observer; + } + + /** Add mass action option to Sales -> Order grid in admin panel to send orders to MC (Ecommerce360) + * + * @param Varien_Event_Observer $observer + * @return void + */ + public function massActionOption(Varien_Event_Observer $observer) + { + $stores = Mage::app()->getStores(); + if (!Mage::helper('monkey')->canMonkey($stores)) { + return $observer; + } + $block = $observer->getEvent()->getBlock(); - if (is_object($order) && $order->getId()) { + if ($block instanceof Mage_Adminhtml_Block_Widget_Grid_Massaction || $block instanceof Enterprise_SalesArchive_Block_Adminhtml_Sales_Order_Grid_Massaction) { + + if ($block->getRequest()->getControllerName() == 'sales_order') { + + $block->addItem('magemonkey_ecommerce360', array( + 'label' => Mage::helper('monkey')->__('Send to MailChimp'), + 'url' => Mage::getModel('adminhtml/url')->getUrl('adminhtml/ecommerce/masssend', Mage::app()->getStore()->isCurrentlySecure() ? array('_secure' => true) : array()), + )); + + } + } + return $observer; + } + + protected function _handleCheckoutSubscription($order, $isSaveOrderBefore = false){ + if (is_object($order) && ($order->getId() || $isSaveOrderBefore)) { //Set Campaign Id if exist $campaign_id = Mage::getModel('monkey/ecommerce360')->getCookie()->get('magemonkey_campaign_id'); if ($campaign_id) { @@ -442,34 +499,6 @@ public function registerCheckoutSuccess(Varien_Event_Observer $observer) Mage::getSingleton('core/session')->setMonkeyPost(NULL); Mage::getSingleton('core/session')->setIsOneStepCheckout(FALSE); Mage::getSingleton('core/session')->setRegisterCheckoutSuccess(FALSE); - return $observer; - } - - /** Add mass action option to Sales -> Order grid in admin panel to send orders to MC (Ecommerce360) - * - * @param Varien_Event_Observer $observer - * @return void - */ - public function massActionOption(Varien_Event_Observer $observer) - { - $stores = Mage::app()->getStores(); - if (!Mage::helper('monkey')->canMonkey($stores)) { - return $observer; - } - $block = $observer->getEvent()->getBlock(); - - if ($block instanceof Mage_Adminhtml_Block_Widget_Grid_Massaction || $block instanceof Enterprise_SalesArchive_Block_Adminhtml_Sales_Order_Grid_Massaction) { - - if ($block->getRequest()->getControllerName() == 'sales_order') { - - $block->addItem('magemonkey_ecommerce360', array( - 'label' => Mage::helper('monkey')->__('Send to MailChimp'), - 'url' => Mage::getModel('adminhtml/url')->getUrl('adminhtml/ecommerce/masssend', Mage::app()->getStore()->isCurrentlySecure() ? array('_secure' => true) : array()), - )); - - } - } - return $observer; } public function alterNewsletterGrid(Varien_Event_Observer $observer){ diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml index 4206f48d..c2b0c838 100755 --- a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml +++ b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml @@ -135,6 +135,14 @@ + + + + monkey/observer + registerCheckoutSubscribeWithSagePay + + + From 75245eeb389d7aa44b9d32cee2a931ff892e6e01 Mon Sep 17 00:00:00 2001 From: keller_ebizmarts Date: Fri, 22 Jul 2016 16:20:27 -0300 Subject: [PATCH 08/31] Webhook requests [Work in progress] -isAdminNotificationEnabled function not working yet -The rest working according to tests --- app/code/community/Ebizmarts/MageMonkey/Model/Cron.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index cf91eb75..f4b52f5d 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -530,9 +530,8 @@ public function processWebhookData() foreach ($collection as $item) { $data=json_decode($item->getWebhookData(), true); -// Mage::log($data,NULL,"keller.log",true); $listId = $data['data']['list_id']; //According to the docs, the events are always related to a list_id - $store = Mage::helper('monkey')->getStoreByList($listId); +// $store = Mage::helper('monkey')->getStoreByList($listId); $subscriber = Mage::getModel('newsletter/subscriber') ->loadByEmail(isset($data['data']['email'])); $storeId = $subscriber->getStoreId(); @@ -550,7 +549,7 @@ public function processWebhookData() $object->requestParams['email_address'] = $data['data']['email']; } $cacheHelper = Mage::helper('monkey/cache'); -// Mage::log($item->getWebhookType(),NULL,"keller.log",true); + switch ($item->getWebhookType()) { case 'subscribe': $this->_subscribe($data); @@ -577,7 +576,7 @@ public function processWebhookData() $cacheHelper->clearCache('listUpdateMember', $object); break; } -// Mage::log('afterswitch',NULL,"keller.log",true); + if (!is_null($store)) { Mage::app()->setCurrentStore($curstore); } From a8b3c5badb9ddadd265c5e2a783f28a031625279 Mon Sep 17 00:00:00 2001 From: keller_ebizmarts Date: Fri, 22 Jul 2016 16:28:28 -0300 Subject: [PATCH 09/31] Webhook requests [Work in progress] -Logs erased --- .../community/Ebizmarts/MageMonkey/Model/Cron.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index f4b52f5d..2619ad2a 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -694,22 +694,19 @@ protected function _unsubscribe(array $data) protected function _cleaned(array $data) { if (Mage::helper('monkey')->isAdminNotificationEnabled()) { //This 'if' returns false even if Admin Notification is enabled on the module sometimes, must check why - Mage::log('enters if_cleaned', NULL, "keller.log", true); $text = Mage::helper('monkey')->__('MailChimp Cleaned Emails: %s %s at %s reason: %s', $data['data']['email'], $data['type'], $data['fired_at'], $data['data']['reason']); - Mage::log($text, NULL, "keller.log", true); $temp1=$this->_getInbox() ->setTitle($text) ->setDescription($text) ->save(); - Mage::log($temp1, NULL, "keller.log", true); + } //Delete subscriber from Magento $s = Mage::getSingleton('newsletter/subscriber') ->loadByEmail($data['data']['email']); - Mage::log('loadsemail?', NULL, "keller.log", true); + if ($s->getId()) { - Mage::log('enters_if2', NULL, "keller.log", true); try { $s->delete(); } catch (Exception $e) { @@ -728,16 +725,12 @@ protected function _cleaned(array $data) protected function _campaign(array $data) { - Mage::log('enters function campaign', NULL, "keller.log", true); if (Mage::helper('monkey')->isAdminNotificationEnabled()) { - Mage::log('enters if', NULL, "keller.log", true); $text = Mage::helper('monkey')->__('MailChimp Campaign Send: %s %s at %s', $data['data']['subject'], $data['data']['status'], $data['fired_at']); - Mage::log($text, NULL, "keller.log", true); - $temp2=$this->_getInbox() + $this->_getInbox() ->setTitle($text) ->setDescription($text) ->save(); - Mage::log($temp2, NULL, "keller.log", true); } } From 5f22cf94a711f6f9aa4347414211c3ade8a02254 Mon Sep 17 00:00:00 2001 From: Santiago Date: Tue, 26 Jul 2016 15:40:30 -0300 Subject: [PATCH 10/31] Removed guests from Product Review coupons since it doesn't work. --- .../System/Config/Registeredcustomergroup.php | 23 +++++++++++++++++++ .../Ebizmarts/Autoresponder/etc/system.xml | 2 +- .../Ebizmarts/MageMonkey/Model/Observer.php | 2 -- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Registeredcustomergroup.php diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Registeredcustomergroup.php b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Registeredcustomergroup.php new file mode 100644 index 00000000..4da6fc4e --- /dev/null +++ b/app/code/community/Ebizmarts/Autoresponder/Model/System/Config/Registeredcustomergroup.php @@ -0,0 +1,23 @@ + + * @license http://opensource.org/licenses/osl-3.0.php + */ +class Ebizmarts_Autoresponder_Model_System_Config_Registeredcustomergroup +{ + protected $_options; + + public function toOptionArray() + { + if (!$this->_options) { + $this->_options = Mage::getResourceModel('customer/group_collection') + ->loadData()->toOptionArray(); + } + unset($this->_options[0]); + return $this->_options; + } +} diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/system.xml b/app/code/community/Ebizmarts/Autoresponder/etc/system.xml index 9eff1f93..b2484229 100755 --- a/app/code/community/Ebizmarts/Autoresponder/etc/system.xml +++ b/app/code/community/Ebizmarts/Autoresponder/etc/system.xml @@ -552,7 +552,7 @@ multiselect - ebizmarts_autoresponder/system_config_customergroup + ebizmarts_autoresponder/system_config_registeredcustomergroup 110 1 1 diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 0f602544..1bc0ee22 100755 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -268,13 +268,11 @@ protected function _saveCustomerGroups($lists,$api,$selectedLists,$hookUrl) //If webhook was not added, add a message on Admin panel if ($api->errorCode && Mage::helper('monkey')->isAdmin()) { - //Don't show an error if webhook already in, otherwise, show error message and code if ($api->errorMessage !== "Setting up multiple WebHooks for one URL is not allowed.") { $message = Mage::helper('monkey')->__('Could not add Webhook "%s" for list "%s", error code %s, %s', $hookUrl, $list['name'], $api->errorCode, $api->errorMessage); Mage::getSingleton('adminhtml/session')->addError($message); } - } /** * Adding Webhooks From 6383c0cef82baa879c0f6679a8cdda718fc165aa Mon Sep 17 00:00:00 2001 From: Santiago Date: Wed, 27 Jul 2016 16:51:55 -0300 Subject: [PATCH 11/31] Compatibility for checkout subscription with SagePay (In Progress). --- .../Ebizmarts/MageMonkey/Helper/Data.php | 71 ++++++++++++++++--- .../Ebizmarts/MageMonkey/Model/Cron.php | 10 +++ .../Ebizmarts/MageMonkey/Model/Observer.php | 3 +- .../Ebizmarts/MageMonkey/etc/config.xml | 2 +- .../mysql4-upgrade-1.2.4-1.2.5.php | 11 +++ 5 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index a3838506..39d38bb9 100755 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -498,6 +498,49 @@ public function getMergeVars($customer, $includeEmail = FALSE, $websiteId = NULL //magemonkey_mergevars_after return $merge_vars; } + + public function getMergeVarsFromOrder($maps, $order, $merge_vars){ + + foreach ($maps as $map) { + + $customAtt = $map['magento']; + $chimpTag = $map['mailchimp']; + + if ($chimpTag && $customAtt) { + + $key = strtoupper($chimpTag); + + switch ($customAtt) { + + case 'billing_address': + case 'shipping_address': + $merge_vars = array_merge($merge_vars, $this->_setAddress($customAtt,$merge_vars, $order, $key)); + break; + case 'date_of_purchase': + + $merge_vars[$key] = $order->getUpdatedAt(); + + break; + + case 'store_code': + $storeId = (string)$order->getData('store_id'); + $storeCode = Mage::getModel('core/store')->load($storeId)->getCode(); + if ($storeCode) { + $merge_vars[$key] = $storeCode; + } + break; + case 'fname': + $merge_vars[$key] = $order->getCustomerFirstname(); + break; + case 'lname': + $merge_vars[$key] = $order->getCustomerLastname(); + break; + } + + } + } + return $merge_vars; + } private function _setMaps($maps,$customer,$merge_vars, $websiteId) { foreach ($maps as $map) { @@ -593,14 +636,19 @@ private function _setMaps($maps,$customer,$merge_vars, $websiteId) } return $merge_vars; } - protected function _setAddress($customAtt,$merge_vars, $customer, $key) + protected function _setAddress($customAtt,$merge_vars, $object, $key) { - - $addr = explode('_', $customAtt); - $address = $customer->{'getPrimary' . ucfirst($addr[0]) . 'Address'}(); - if (!$address) { - if ($customer->{'getDefault' . ucfirst($addr[0])}()) { - $address = Mage::getModel('customer/address')->load($customer->{'getDefault' . ucfirst($addr[0])}()); + if($object instanceof Mage_Sales_Model_Order){ + $addr = explode('_', $customAtt); + $address = $object->{'get' . ucfirst($addr[0]) . 'Address'}(); + }else { + + $addr = explode('_', $customAtt); + $address = $object->{'getPrimary' . ucfirst($addr[0]) . 'Address'}(); + if (!$address) { + if ($object->{'getDefault' . ucfirst($addr[0])}()) { + $address = Mage::getModel('customer/address')->load($object->{'getDefault' . ucfirst($addr[0])}()); + } } } if ($address) { @@ -982,10 +1030,11 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = $isOnMailChimp = Mage::helper('monkey')->subscribedToList($email, $listId); //if( TRUE === $subscriber->getIsStatusChanged() ){ + $orderId = ($object->getOrderId()) ? $object->getOrderId() : null; if ($isOnMailChimp == 1) { if(Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { $mergeVars = Mage::helper('monkey')->mergeVars($object, FALSE, $listId); - $this->_subscribe($listId, $email, $mergeVars, 0, 1); + $this->_subscribe($listId, $email, $mergeVars, 0, 1, $orderId); } return; } @@ -995,7 +1044,7 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = } $mergeVars = Mage::helper('monkey')->mergeVars($object, FALSE, $listId); - $this->_subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db); + $this->_subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db, $orderId); if(Mage::getSingleton('core/session')->getMonkeyCheckout()){ $subscriber->subscribe($email); } @@ -1012,8 +1061,9 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = * @param $mergeVars * @param $isConfirmNeed * @param $db + * @param $orderId */ - public function _subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db) + public function _subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db, $orderId = null) { if ($db) { if ($isConfirmNeed) { @@ -1026,6 +1076,7 @@ public function _subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db) ->setConfirm($isConfirmNeed) ->setProcessed(0) ->setCreatedAt(Mage::getModel('core/date')->gmtDate()) + ->setOrderId($orderId) ->save(); } else { if ($isConfirmNeed) { diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index ce1d2115..9060a067 100755 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -487,6 +487,9 @@ public function sendSubscribersAsync() $oldList = $newList; } $mergeVars = unserialize($item->getMapfields()); + if($item->getOrderId()){ + $mergeVars = $this->_addOrderData($item->getOrderId(), $mergeVars); + } if ($newList != $oldList || $eachIsConfirmNeed != $isConfirmNeed) { if (count($batch) > 0) { Mage::getSingleton('monkey/api')->listBatchSubscribe($oldList, $batch, $isConfirmNeed, TRUE, FALSE); @@ -512,6 +515,13 @@ public function sendSubscribersAsync() } + protected function _addOrderData($orderId, $mergeVars){ + $order = Mage::getModel('sales/order')->load($orderId); + $maps = Mage::helper('monkey')->getMergeMaps($order->getStoreId()); + $mergeVars = Mage::helper('monkey')->getMergeVarsFromOrder($maps, $order, $mergeVars); + return $mergeVars; + } + public function cleanSubscribersAsync() { $collection = Mage::getModel('monkey/asyncsubscribers')->getCollection(); diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 1bc0ee22..1a940781 100755 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -485,7 +485,8 @@ protected function _handleCheckoutSubscription($order, $isSaveOrderBefore = fals ->setStoreId($order->getStoreId()) ->setSubscriberFirstname($order->getCustomerFirstname()) ->setSubscriberLastname($order->getCustomerLastname()) - ->setEmail($order->getCustomerEmail()); + ->setEmail($order->getCustomerEmail()) + ->setOrderId($order->getId()); } if(Mage::getSingleton('core/session')->getMonkeyCheckout() || Mage::getSingleton('core/session')->getIsOneStepCheckout()) { diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml index c2b0c838..17db2797 100755 --- a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml +++ b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml @@ -10,7 +10,7 @@ - 1.2.4.1 + 1.2.5 diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php new file mode 100644 index 00000000..5cfda0f3 --- /dev/null +++ b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php @@ -0,0 +1,11 @@ +startSetup(); + +$installer->getConnection()->addColumn( + $installer->getTable('magemonkey_async_subscriber'), 'order_id', 'smallint(5)' +); + +$installer->endSetup(); \ No newline at end of file From 48a11a914257f38d07c162aea5088169f1ef6aae Mon Sep 17 00:00:00 2001 From: Santiago Date: Fri, 29 Jul 2016 17:44:07 -0300 Subject: [PATCH 12/31] Compatibility for checkout subscription with SagePay (In Progress). --- .../Ebizmarts/MageMonkey/Helper/Data.php | 16 +++++++++------- .../Ebizmarts/MageMonkey/Model/Observer.php | 7 ++++--- .../monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index 39d38bb9..6ce3ea7e 100755 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -965,26 +965,27 @@ protected function _McAddressToMage(array $data, $type, $customer) * * @param $object * @param $db + * @param $orderId */ - public function listsSubscription($object, $db) + public function listsSubscription($object, $db, $orderId = null) { $monkeyPost = Mage::getSingleton('core/session')->getMonkeyPost(); $post = unserialize($monkeyPost); if (isset($post['magemonkey_force'])) { foreach ($post['list'] as $list) { $listId = $list['subscribed']; - $this->subscribeToList($object, $db, $listId); + $this->subscribeToList($object, $db, $listId, false, $orderId); } } elseif (isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe']) { $lists = explode(',', $post['magemonkey_subscribe']); foreach ($lists as $listId) { - $this->subscribeToList($object, $db, $listId); + $this->subscribeToList($object, $db, $listId, false, $orderId); } //Subscription for One Step Checkout with force subscription } elseif (Mage::getSingleton('core/session')->getIsOneStepCheckout() && Mage::helper('monkey')->config('checkout_subscribe') > 2 && !Mage::getSingleton('core/session')->getIsUpdateCustomer()) { - $this->subscribeToList($object, $db); + $this->subscribeToList($object, $db, null, false, $orderId); } elseif(!Mage::getSingleton('core/session')->getMonkeyCheckout()){ - $this->subscribeToList($object, $db, NULL, TRUE); + $this->subscribeToList($object, $db, NULL, TRUE, $orderId); } } @@ -995,8 +996,10 @@ public function listsSubscription($object, $db) * @param $object * @param $db * @param null $listId + * @param $forceSubscribe + * @param $orderId */ - public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = FALSE) + public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = FALSE, $orderId = null) { $email = $object->getEmail(); $storeId = $object->getStoreId(); @@ -1030,7 +1033,6 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = $isOnMailChimp = Mage::helper('monkey')->subscribedToList($email, $listId); //if( TRUE === $subscriber->getIsStatusChanged() ){ - $orderId = ($object->getOrderId()) ? $object->getOrderId() : null; if ($isOnMailChimp == 1) { if(Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { $mergeVars = Mage::helper('monkey')->mergeVars($object, FALSE, $listId); diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 1a940781..2c22f74b 100755 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -485,12 +485,13 @@ protected function _handleCheckoutSubscription($order, $isSaveOrderBefore = fals ->setStoreId($order->getStoreId()) ->setSubscriberFirstname($order->getCustomerFirstname()) ->setSubscriberLastname($order->getCustomerLastname()) - ->setEmail($order->getCustomerEmail()) - ->setOrderId($order->getId()); + ->setEmail($order->getCustomerEmail()); + } + $orderId = $order->getId(); if(Mage::getSingleton('core/session')->getMonkeyCheckout() || Mage::getSingleton('core/session')->getIsOneStepCheckout()) { - Mage::helper('monkey')->listsSubscription($toSubscribe, $saveOnDb); + Mage::helper('monkey')->listsSubscription($toSubscribe, $saveOnDb, $orderId); } } diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php index 5cfda0f3..5ce18373 100644 --- a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php +++ b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php @@ -5,7 +5,7 @@ $installer->startSetup(); $installer->getConnection()->addColumn( - $installer->getTable('magemonkey_async_subscriber'), 'order_id', 'smallint(5)' + $installer->getTable('magemonkey_async_subscribers'), 'order_id', 'smallint(5)' ); $installer->endSetup(); \ No newline at end of file From 7f3e806ad58a87d897701b80aac74b997aa680b9 Mon Sep 17 00:00:00 2001 From: Santiago Date: Mon, 1 Aug 2016 13:39:44 -0300 Subject: [PATCH 13/31] Removed Autologin feature from Abandoned Carts Recovery. --- .../Ebizmarts/AbandonedCart/Model/Config.php | 1 - .../controllers/AbandonedController.php | 14 -------------- .../Ebizmarts/AbandonedCart/etc/config.xml | 2 +- .../Ebizmarts/AbandonedCart/etc/system.xml | 13 ------------- 4 files changed, 1 insertion(+), 29 deletions(-) diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php index f203e697..2256e108 100755 --- a/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php +++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Config.php @@ -33,7 +33,6 @@ class Ebizmarts_AbandonedCart_Model_Config const FOURTH_SUBJECT = "ebizmarts_abandonedcart/general/subject4"; const FIFTH_SUBJECT = "ebizmarts_abandonedcart/general/subject5"; const LOG = "ebizmarts_abandonedcart/general/log"; - const AUTOLOGIN = "ebizmarts_abandonedcart/general/autologin"; const ABANDONED_TAGS = 'global/ebizmarts_abandonedcart/mandrill-tag'; const IN_DAYS = 0; const IN_HOURS = 1; diff --git a/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php b/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php index d74796d1..63c46905 100755 --- a/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php +++ b/app/code/community/Ebizmarts/AbandonedCart/controllers/AbandonedController.php @@ -48,10 +48,6 @@ public function loadquoteAction() $quote->setCouponCode($params['coupon']); $quote->save(); } - if ((!isset($params['token']) || (isset($params['token']) && $params['token'] != $quote->getEbizmartsAbandonedcartToken())) && Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::AUTOLOGIN, $quote->getStoreId())) { - Mage::getSingleton('customer/session')->addNotice("Your token cart is incorrect"); - $this->_redirect($url); - } else { $url = Mage::getUrl(Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::PAGE, $quote->getStoreId())); $first = true; foreach($analytics as $key => $value) { @@ -71,14 +67,6 @@ public function loadquoteAction() $this->getResponse() ->setRedirect($url, 301); } else { - if (Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::AUTOLOGIN, $quote->getStoreId())) { - $customer = Mage::getModel('customer/customer')->load($quote->getCustomerId()); - if ($customer->getId()) { - Mage::getSingleton('customer/session')->setCustomerAsLoggedIn($customer); - } - $this->getResponse() - ->setRedirect($url, 301); - } else { if (Mage::helper('customer')->isLoggedIn()) { $this->getResponse() ->setRedirect($url, 301); @@ -86,9 +74,7 @@ public function loadquoteAction() Mage::getSingleton('customer/session')->addNotice("Login to complete your order"); $this->_redirect('customer/account'); } - } } - } } // $this->_redirect('checkout/cart'); } diff --git a/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml b/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml index ab7f768f..0915d9a8 100755 --- a/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml +++ b/app/code/community/Ebizmarts/AbandonedCart/etc/config.xml @@ -10,7 +10,7 @@ - 1.2.2.1 + 1.2.3 diff --git a/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml b/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml index a7e1c024..f3655955 100755 --- a/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml +++ b/app/code/community/Ebizmarts/AbandonedCart/etc/system.xml @@ -356,19 +356,6 @@ 1 - - - select - adminhtml/system_config_source_yesno - 65 - 1 - 1 - 1 - - - 1 - - From b1759a714a5bafeeb1fe6d5d73220ee34e45d944 Mon Sep 17 00:00:00 2001 From: Santiago Date: Tue, 2 Aug 2016 15:11:31 -0300 Subject: [PATCH 14/31] Fixed typos and finish merge. --- .../community/Ebizmarts/Autoresponder/Model/Cron.php | 4 ++-- app/code/community/Ebizmarts/MageMonkey/Model/Cron.php | 3 --- .../sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php | 10 ++++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php index 917fb0c6..282911e4 100644 --- a/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php +++ b/app/code/community/Ebizmarts/Autoresponder/Model/Cron.php @@ -619,9 +619,9 @@ protected function _sendVisitedProductEmail($email,$storeId,$products,$name,$tag $storeCode=$store->getCode(); $storeCodeUrl = Mage::getStoreConfig('web/url/use_store', $storeId); if($storeCodeUrl){ - $url = Mage::getModel('core/url')->setStore($storeId)->getUrl() . $storeCode . '/ebizautoresponder/autoresponder/unsubscribe?list=neworder&email=' . $email . '&store=' . $storeId; + $url = Mage::getModel('core/url')->setStore($storeId)->getUrl() . $storeCode . '/ebizautoresponder/autoresponder/unsubscribe?list=visitedproducts&email=' . $email . '&store=' . $storeId; }else { - $url = Mage::getModel('core/url')->setStore($storeId)->getUrl() . 'ebizautoresponder/autoresponder/unsubscribe?list=neworder&email=' . $email . '&store=' . $storeId; + $url = Mage::getModel('core/url')->setStore($storeId)->getUrl() . 'ebizautoresponder/autoresponder/unsubscribe?list=visitedproducts&email=' . $email . '&store=' . $storeId; } $vars = array('name' => $name, 'tags' => array($tags), 'products' => $products, 'url' => $url); diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index 754aaf5c..f0688d1b 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -610,9 +610,6 @@ protected function _subscribe(array $data) { try { - //TODO: El método subscribe de Subscriber (Magento) hace un load by email - // entonces si existe en un store, lo acutaliza y lo cambia de store, no lo agrega a otra store - //VALIDAR si es lo que se requiere $subscriber = Mage::getSingleton('newsletter/subscriber') ->loadByEmail($data['data']['email']); if ($subscriber->getId()) { diff --git a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php index 5ce18373..273e98e0 100644 --- a/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php +++ b/app/code/community/Ebizmarts/MageMonkey/sql/monkey_setup/mysql4-upgrade-1.2.4-1.2.5.php @@ -8,4 +8,14 @@ $installer->getTable('magemonkey_async_subscribers'), 'order_id', 'smallint(5)' ); +$installer->run(" + CREATE TABLE IF NOT EXISTS `{$this->getTable('magemonkey_async_webhooks')}` ( + `id` INT(10) unsigned NOT NULL auto_increment, + `webhook_type` varchar(24), + `webhook_data` text, + `processed` INT(1) NOT NULL default 0, + PRIMARY KEY (`id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +"); + $installer->endSetup(); \ No newline at end of file From a48867100430ebf112cf077e26c6b2d3d1775472 Mon Sep 17 00:00:00 2001 From: Santiago Date: Tue, 2 Aug 2016 15:19:36 -0300 Subject: [PATCH 15/31] Fixed Remove from quote when no stock available for Abandoned Cart Recovery emails. It still sends the email if backorders is enabled. --- app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php index fb18fa96..ed3e7e85 100644 --- a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php +++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php @@ -335,7 +335,7 @@ protected function _proccessCollection($quote, $storeId) is_object($stock) && ($stock->getManageStock() || ($stock->getUseConfigManageStock() && Mage::getStoreConfig('cataloginventory/item_options/manage_stock', $quote->getStoreId()))) ) - && $stockQty < $item->getQty() && (!$inventory->getBackorders() || $stockItem->getBackorders()) + && $stockQty < $item->getQty() && (!$inventory->getBackorders() || !$stockItem->getBackorders()) ) { Mage::log('AbandonedCart; ' . $product->getSku() . ' is no longer in stock; remove from quote ' . $quote->getId() . ' for email', null, 'Ebizmarts_AbandonedCart.log'); $removeFromQuote = true; From d7103c781a8a588a093d07bc17d929e7be914679 Mon Sep 17 00:00:00 2001 From: Santiago Date: Wed, 3 Aug 2016 15:29:38 -0300 Subject: [PATCH 16/31] Fixed Remove from quote when no stock available for Abandoned Cart Recovery emails. It still sends the email if backorders is enabled. Fixed redundant code and set it to set the first name and last name of the configured settings if none other available. closes #137 Fixed cookie handling to delete the campaign cookie when order is made. --- .../Ebizmarts/AbandonedCart/Model/Cron.php | 3 +- .../Ebizmarts/MageMonkey/Helper/Data.php | 4 +- .../MageMonkey/Model/Ecommerce360.php | 19 ++++++- .../popup/emailcatcher.phtml | 57 ++++++++++--------- js/ebizmarts/magemonkey/campaignCatcher.js | 55 +++++++++--------- 5 files changed, 79 insertions(+), 59 deletions(-) diff --git a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php index ed3e7e85..a6b898c5 100644 --- a/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php +++ b/app/code/community/Ebizmarts/AbandonedCart/Model/Cron.php @@ -162,7 +162,7 @@ protected function _processRun($adapter, $run, $storeId) } // for each cart of the current run foreach ($collection as $quote) { - $this->_proccessCollection($quote, $storeId); + $quote = $this->_proccessCollection($quote, $storeId); if (count($quote->getAllVisibleItems()) < 1) { $quote2 = Mage::getModel('sales/quote')->loadByIdWithoutStore($quote->getId()); @@ -344,6 +344,7 @@ protected function _proccessCollection($quote, $storeId) $quote->removeItem($item->getId()); } } + return $quote; } protected function _sendPopupCoupon($storeId) { diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index 6ce3ea7e..41cec239 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -437,7 +437,7 @@ public function getMergeVars($customer, $includeEmail = FALSE, $websiteId = NULL if($customer->getSubscriberFirstname()){ $guestFirstName = $this->config('guest_name', $customer->getStoreId()); }elseif($this->config('guest_name', $customer->getStoreId())) { - $guestFirstName = $customer->getSubscriberFirstname(); + $guestFirstName = $this->config('guest_name', $customer->getStoreId()); } if ($guestFirstName) { @@ -449,7 +449,7 @@ public function getMergeVars($customer, $includeEmail = FALSE, $websiteId = NULL if($customer->getSubscriberLastname()){ $guestLastName = $this->config('guest_lastname', $customer->getStoreId()); }elseif($this->config('guest_lastname', $customer->getStoreId())){ - $guestLastName = $customer->getSubscriberLastname(); + $guestLastName = $this->config('guest_lastname', $customer->getStoreId()); } if ($guestLastName) { diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php index a8df8d67..38659a9d 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Ecommerce360.php @@ -95,10 +95,11 @@ public function run(Varien_Event_Observer $observer) $order = $observer->getEvent()->getOrder(); if (is_object($order) && $order->getId()) { //Set Campaign Id if exist - $campaign_id = Mage::getModel('monkey/ecommerce360')->getCookie()->get('magemonkey_campaign_id'); + $campaign_id = $this->_getCampaignCookie(); if ($campaign_id && $order->getEbizmartsMagemonkeyCampaignId() == null) { $order->setEbizmartsMagemonkeyCampaignId($campaign_id)->save(); } + $this->_deleteCampaignCookie(); $customerEmail = $order->getCustomerEmail(); $collection = Mage::getModel('monkey/lastorder')->getCollection() ->addFieldToFilter('email', array('eq' => $customerEmail)); @@ -313,7 +314,21 @@ protected function _getEmailCookie() */ protected function _getCampaignCookie() { - return $this->getCookie()->get('magemonkey_campaign_id'); + $cookie = Mage::getModel('core/cookie')->get('magemonkey_campaign_id'); + if($cookie && Mage::getModel('core/cookie')->getLifetime('magemonkey_campaign_id') == 3600) { + return $cookie; + } + else { + return null; + } + } + + protected function _deleteCampaignCookie() + { + if($this->_getCampaignCookie()) + { + Mage::getModel('core/cookie')->delete('magemonkey_campaign_id'); + } } /** diff --git a/app/design/frontend/base/default/template/ebizmarts_abandonedcart/popup/emailcatcher.phtml b/app/design/frontend/base/default/template/ebizmarts_abandonedcart/popup/emailcatcher.phtml index 1fe7f012..2ed3ec87 100644 --- a/app/design/frontend/base/default/template/ebizmarts_abandonedcart/popup/emailcatcher.phtml +++ b/app/design/frontend/base/default/template/ebizmarts_abandonedcart/popup/emailcatcher.phtml @@ -83,26 +83,22 @@ onCancel: function (win) { load($counterId); + $counter = $_COOKIE['counter']; //if(counter en config == counter en db){ - if($counter->getCounter()+1 >= Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::POPUP_INSIST, Mage::app()->getStore()->getId())): + if($counter+1 >= Mage::getStoreConfig(Ebizmarts_AbandonedCart_Model_Config::POPUP_INSIST, Mage::app()->getStore()->getId())): ?> - document.cookie = 'counter=; expires=Thu, 01 Jan 1970 00:00:01 GMT'; - createCookie('email=none', _getStoreId()))); ?>); - setCounter(($counter->getCounter()+1)); - $counter->save(); - endif; ?> + Mage.Cookies.clear('counter'); + createCookie('email', 'none', _getStoreId()))); ?>); + + createCookie('counter',,_getStoreId()))); ?>); + getStore()->getId()) == 1): ?> - createCookie('email=none', _getStoreId()))); ?>); - _getStoreId()))); ?>); + $newCounter = Mage::getModel('ebizmarts_abandonedcart/popup'); - $newCounter->setCounter(1)->save(); - ?> - createCookie('counter=' +getId())); ?>, _getStoreId()))); ?>); + createCookie('counter',1,_getStoreId()))); ?>); }, @@ -121,10 +117,9 @@ lname = inputFieldLName.value; } if (validateEmail(email)) { - var cookie = 'email=' + email + '/' + fname + '/' + lname; - createCookie(cookie, 365); + createCookie('email',email + '/' + fname + '/' + lname, 365); _modalSubscribe()): ?> - createCookie('subscribe=true', 365); + createCookie('subscribe', 'true', 365); location.reload(); win.close(); @@ -158,20 +153,28 @@ return re.test(email); } function emailCookieExists() { - var cookie = document.cookie; - var cookieArr = cookie.split(';'); - var cookieStored = false; - for (var i = 0; i < cookieArr.length; i++) { - if (cookieArr[i].indexOf('email=') > -1) { - cookieStored = true; - } +// var cookie = document.cookie; +// var cookieArr = cookie.split(';'); +// var cookieStored = false; +// for (var i = 0; i < cookieArr.length; i++) { +// if (cookieArr[i].indexOf('email=') > -1) { +// cookieStored = true; +// } +// } +// return cookieStored; + if(Mage.Cookies.get('email')) { + return true + } + else { + return false } - return cookieStored; } - function createCookie(cookie, expirationInDays) { + function createCookie(name, value, expirationInDays) { var now = new Date(); var expire = new Date(now.getTime() + (expirationInDays * 24 * 60) * 60000);//[(1 * 365 * 24 * 60) * 60000] == 1 year -- (Years * Days * Hours * Minutes) * 60000 - document.cookie = cookie + '; expires=' + expire + '; path=/'; + //document.cookie = cookie + '; expires=' + expire + '; path=/'; + Mage.Cookies.expires = expire; + Mage.Cookies.set(name,value); } \ No newline at end of file diff --git a/js/ebizmarts/magemonkey/campaignCatcher.js b/js/ebizmarts/magemonkey/campaignCatcher.js index 0c2b7575..fa56ba6c 100644 --- a/js/ebizmarts/magemonkey/campaignCatcher.js +++ b/js/ebizmarts/magemonkey/campaignCatcher.js @@ -1,32 +1,33 @@ - - function getCampaign() { - var params = location.search.substr(1).split('&'); - var cookies = new Array(); - for (var i = 0; i < params.length; i++) { - var cookie = params[i].split('='); - var key = cookie[0]; - var val = cookie[1]; - if (key && val) { - cookies[key] = val; - } - } - - if (cookies['mc_cid']) { - createCookie('magemonkey_campaign_id=' + cookies['mc_cid'], 30); - } - if (cookies['mc_eid']) { - createCookie('magemonkey_email_id=' + cookies['mc_eid'], 30); +function getCampaign() { + var urlparams = location.search.substr(1).split('&'); + var params = new Array(); + for (var i = 0; i < urlparams.length; i++) { + var param = urlparams[i].split('='); + var key = param[0]; + var val = param[1]; + if (key && val) { + params[key] = val; } } - function createCookie(cookie, expirationInDays) { - var now = new Date(); - var expire = new Date(now.getTime() + (expirationInDays * 24 * 60) * 60000);//[(1 * 365 * 24 * 60) * 60000] == 1 year -- (Years * Days * Hours * Minutes) * 60000 - document.cookie = cookie + '; expires=' + expire + '; path=/'; + if (params['mc_cid']) { + createCookie('magemonkey_campaign_id', params['mc_cid'], 3600); + } + if (params['mc_eid']) { + createCookie('magemonkey_email_id', params['mc_eid'], 3600); } +} + +function createCookie(name, value, expirationInSec) { + var now = new Date(); + var expire = new Date(now.getTime() + (expirationInSec * 1000));//[(1 * 365 * 24 * 60) * 60000] == 1 year -- (Years * Days * Hours * Minutes) * 60000 + alert('creating cookie'); + Mage.Cookies.expires = expire; + Mage.Cookies.set(name,value); +} - if (document.loaded) { - getCampaign; - } else { - document.observe('dom:loaded', getCampaign); - } \ No newline at end of file +if (document.loaded) { + getCampaign; +} else { + document.observe('dom:loaded', getCampaign); +} \ No newline at end of file From 24bb33ddfc9b2ec22f7a09f6952dfa16fb408c3d Mon Sep 17 00:00:00 2001 From: Santiago Date: Wed, 3 Aug 2016 16:00:38 -0300 Subject: [PATCH 17/31] Fixed Back end order creation process exception when creating new customer. closes #136 --- app/code/community/Ebizmarts/MageMonkey/Model/Observer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 2c22f74b..8c9bd608 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -296,7 +296,7 @@ public function updateCustomer(Varien_Event_Observer $observer) $request = Mage::app()->getRequest(); $isAdmin = $request->getActionName() == 'save' && $request->getControllerName() == 'customer' && $request->getModuleName() == (string)Mage::getConfig()->getNode('admin/routers/adminhtml/args/frontName'); $customer = $observer->getEvent()->getCustomer(); - $isCheckout = $request->getModuleName() == 'checkout' || $request->getModuleName() == 'sgps' || Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout(); + $isCheckout = $request->getControllerName() == 'sales_order_create' || $request->getModuleName() == 'checkout' || $request->getModuleName() == 'sgps' || Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout(); // $isConfirmNeed = FALSE; // if (!Mage::helper('monkey')->isAdmin() && // (Mage::getStoreConfig(Mage_Newsletter_Model_Subscriber::XML_PATH_CONFIRMATION_FLAG, $customer->getStoreId()) == 1) From c2dcc7fea2bc2a1794a10fed89c523e839e83603 Mon Sep 17 00:00:00 2001 From: keller_ebizmarts Date: Wed, 3 Aug 2016 16:35:30 -0300 Subject: [PATCH 18/31] closes #140 Fixes "Maximum function nesting level" error in checkout --- app/code/community/Ebizmarts/MageMonkey/Helper/Data.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index a3838506..21269534 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -996,7 +996,8 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = $mergeVars = Mage::helper('monkey')->mergeVars($object, FALSE, $listId); $this->_subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db); - if(Mage::getSingleton('core/session')->getMonkeyCheckout()){ + $subscriberExist=Mage::getModel('newsletter/subscriber')->loadbyEmail($email); + if(Mage::getSingleton('core/session')->getMonkeyCheckout() && !$subscriberExist->getId()){ $subscriber->subscribe($email); } } From 3fbfb56be16b4301eed7decc5655e5fa7357dd08 Mon Sep 17 00:00:00 2001 From: Santiago Date: Wed, 3 Aug 2016 16:59:11 -0300 Subject: [PATCH 19/31] Added compatibility with Fire checkout. closes #94 --- .../community/Ebizmarts/MageMonkey/Model/Observer.php | 2 +- app/code/community/Ebizmarts/MageMonkey/etc/config.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 8c9bd608..5868fd05 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -296,7 +296,7 @@ public function updateCustomer(Varien_Event_Observer $observer) $request = Mage::app()->getRequest(); $isAdmin = $request->getActionName() == 'save' && $request->getControllerName() == 'customer' && $request->getModuleName() == (string)Mage::getConfig()->getNode('admin/routers/adminhtml/args/frontName'); $customer = $observer->getEvent()->getCustomer(); - $isCheckout = $request->getControllerName() == 'sales_order_create' || $request->getModuleName() == 'checkout' || $request->getModuleName() == 'sgps' || Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout(); + $isCheckout = $request->getControllerName() == 'sales_order_create' || $request->getModuleName() == 'firecheckout' || $request->getModuleName() == 'checkout' || $request->getModuleName() == 'sgps' || Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout(); // $isConfirmNeed = FALSE; // if (!Mage::helper('monkey')->isAdmin() && // (Mage::getStoreConfig(Mage_Newsletter_Model_Subscriber::XML_PATH_CONFIRMATION_FLAG, $customer->getStoreId()) == 1) diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml index 2b39fa31..72e06084 100755 --- a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml +++ b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml @@ -154,6 +154,14 @@ + + + + monkey/observer + registerCheckoutSubscribe + + + From da3b9a73ac2697ec934bebbd86c8c72eb65ed79c Mon Sep 17 00:00:00 2001 From: Santiago Date: Thu, 4 Aug 2016 15:13:40 -0300 Subject: [PATCH 20/31] Added logs for testing. --- app/code/community/Ebizmarts/MageMonkey/Helper/Data.php | 3 +++ app/code/community/Ebizmarts/MageMonkey/Model/Observer.php | 1 + 2 files changed, 4 insertions(+) diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index 40e42a8d..81f4fb50 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -969,6 +969,7 @@ protected function _McAddressToMage(array $data, $type, $customer) */ public function listsSubscription($object, $db, $orderId = null) { + Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); $monkeyPost = Mage::getSingleton('core/session')->getMonkeyPost(); $post = unserialize($monkeyPost); if (isset($post['magemonkey_force'])) { @@ -1001,6 +1002,7 @@ public function listsSubscription($object, $db, $orderId = null) */ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = FALSE, $orderId = null) { + Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); $email = $object->getEmail(); $storeId = $object->getStoreId(); if ($object instanceof Mage_Customer_Model_Customer) { @@ -1068,6 +1070,7 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = */ public function _subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db, $orderId = null) { + Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); if ($db) { if ($isConfirmNeed) { Mage::getSingleton('core/session')->addSuccess(Mage::helper('monkey')->__('Confirmation request will be sent soon.')); diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 5868fd05..00aed0de 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -489,6 +489,7 @@ protected function _handleCheckoutSubscription($order, $isSaveOrderBefore = fals } $orderId = $order->getId(); + Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); if(Mage::getSingleton('core/session')->getMonkeyCheckout() || Mage::getSingleton('core/session')->getIsOneStepCheckout()) { Mage::helper('monkey')->listsSubscription($toSubscribe, $saveOnDb, $orderId); From 6c164a51ed3c2d95bb232c5f32dfd86ed27da726 Mon Sep 17 00:00:00 2001 From: Santiago Date: Thu, 4 Aug 2016 15:34:48 -0300 Subject: [PATCH 21/31] Added logs for testing. --- app/code/community/Ebizmarts/MageMonkey/Helper/Data.php | 3 +++ app/code/community/Ebizmarts/MageMonkey/Model/Observer.php | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index 81f4fb50..2193740e 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -969,6 +969,7 @@ protected function _McAddressToMage(array $data, $type, $customer) */ public function listsSubscription($object, $db, $orderId = null) { + Mage::log(__METHOD__, null, 'ebizmarts.log', true); Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); $monkeyPost = Mage::getSingleton('core/session')->getMonkeyPost(); $post = unserialize($monkeyPost); @@ -1002,6 +1003,7 @@ public function listsSubscription($object, $db, $orderId = null) */ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = FALSE, $orderId = null) { + Mage::log(__METHOD__, null, 'ebizmarts.log', true); Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); $email = $object->getEmail(); $storeId = $object->getStoreId(); @@ -1070,6 +1072,7 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = */ public function _subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db, $orderId = null) { + Mage::log(__METHOD__, null, 'ebizmarts.log', true); Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); if ($db) { if ($isConfirmNeed) { diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 00aed0de..12d375f5 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -356,6 +356,7 @@ public function updateCustomer(Varien_Event_Observer $observer) } public function registerCheckoutSubscribeWithSagePay(Varien_Event_Observer $observer){ + Mage::log(__METHOD__, null, 'ebizmarts.log', true); if (!Mage::helper('monkey')->canMonkey()) { return $observer; } @@ -381,6 +382,7 @@ public function registerCheckoutSubscribeWithSagePay(Varien_Event_Observer $obse */ public function registerCheckoutSubscribe(Varien_Event_Observer $observer) { + Mage::log(__METHOD__, null, 'ebizmarts.log', true); if (!Mage::helper('monkey')->canMonkey()) { return $observer; } @@ -416,6 +418,7 @@ public function registerCheckoutSubscribe(Varien_Event_Observer $observer) */ public function registerCheckoutSuccess(Varien_Event_Observer $observer) { + Mage::log(__METHOD__, null, 'ebizmarts.log', true); Mage::getSingleton('core/session')->setRegisterCheckoutSuccess(TRUE); if (!Mage::helper('monkey')->canMonkey()) { Mage::getSingleton('core/session')->setMonkeyCheckout(FALSE); @@ -462,6 +465,7 @@ public function massActionOption(Varien_Event_Observer $observer) } protected function _handleCheckoutSubscription($order, $isSaveOrderBefore = false){ + Mage::log(__METHOD__, null, 'ebizmarts.log', true); if (is_object($order) && ($order->getId() || $isSaveOrderBefore)) { //Set Campaign Id if exist $campaign_id = Mage::getModel('monkey/ecommerce360')->getCookie()->get('magemonkey_campaign_id'); From 2d28cd78e2a5a4b7379b6f245ea66f2751501dae Mon Sep 17 00:00:00 2001 From: Santiago Date: Thu, 4 Aug 2016 15:58:55 -0300 Subject: [PATCH 22/31] Added logs for testing. --- app/code/community/Ebizmarts/MageMonkey/Helper/Data.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index 2193740e..fc0f2b21 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -976,17 +976,21 @@ public function listsSubscription($object, $db, $orderId = null) if (isset($post['magemonkey_force'])) { foreach ($post['list'] as $list) { $listId = $list['subscribed']; + Mage::log('subscribeToList 1', null, 'ebizmarts.log', true); $this->subscribeToList($object, $db, $listId, false, $orderId); } } elseif (isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe']) { $lists = explode(',', $post['magemonkey_subscribe']); foreach ($lists as $listId) { + Mage::log('subscribeToList 2', null, 'ebizmarts.log', true); $this->subscribeToList($object, $db, $listId, false, $orderId); } //Subscription for One Step Checkout with force subscription } elseif (Mage::getSingleton('core/session')->getIsOneStepCheckout() && Mage::helper('monkey')->config('checkout_subscribe') > 2 && !Mage::getSingleton('core/session')->getIsUpdateCustomer()) { + Mage::log('subscribeToList 3', null, 'ebizmarts.log', true); $this->subscribeToList($object, $db, null, false, $orderId); } elseif(!Mage::getSingleton('core/session')->getMonkeyCheckout()){ + Mage::log('subscribeToList 4', null, 'ebizmarts.log', true); $this->subscribeToList($object, $db, NULL, TRUE, $orderId); } From 48c5e00d6848ab8c9733ff2b1a41de08366b02ae Mon Sep 17 00:00:00 2001 From: Santiago Date: Thu, 4 Aug 2016 16:17:02 -0300 Subject: [PATCH 23/31] Added logs for testing. --- app/code/community/Ebizmarts/MageMonkey/Helper/Data.php | 1 + app/code/community/Ebizmarts/MageMonkey/Model/Observer.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index fc0f2b21..f3cee910 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -1232,6 +1232,7 @@ public function handlePost($request, $guestEmail) $customer->setMcListId($listId); $subscriber = Mage::getModel('newsletter/subscriber') ->setSubscriberEmail($email); + Mage::log(__METHOD__, null, 'ebizmarts.log', true); $this->subscribeToList($subscriber, 0, $listId); } diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 12d375f5..88565031 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -18,6 +18,7 @@ class Ebizmarts_MageMonkey_Model_Observer */ public function handleSubscriber(Varien_Event_Observer $observer) { + Mage::log(__METHOD__, null, 'ebizmarts.log', true); if (!Mage::helper('monkey')->canMonkey()) { return $observer; } @@ -51,10 +52,12 @@ public function handleSubscriber(Varien_Event_Observer $observer) Mage::getSingleton('core/session')->setIsHandleSubscriber(TRUE); if (Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { $saveOnDb = Mage::helper('monkey')->config('checkout_async'); + Mage::log('subscribeToList 6', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb); } else { $post = Mage::app()->getRequest()->getPost(); if (isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer() || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE) { + Mage::log('subscribeToList 7', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($subscriber, 0); } } @@ -311,6 +314,7 @@ public function updateCustomer(Varien_Event_Observer $observer) $subscriber = Mage::getSingleton('newsletter/subscriber')->loadByEmail($email); $monkeyPost = unserialize(Mage::getSingleton('core/session')->getMonkeyPost()); if (!Mage::helper('monkey')->subscribedToList($email, $defaultList) && !$isAdmin && ($subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED) || $monkeyPost) { + Mage::log('subscribeToList 7', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($customer, 0); //$api->listSubscribe($defaultList, $customer->getEmail(), $mergeVars, $isConfirmNeed); } From 92b867da7350b14196829c78a7da50d3c9bd5116 Mon Sep 17 00:00:00 2001 From: Santiago Date: Fri, 5 Aug 2016 15:13:12 -0300 Subject: [PATCH 24/31] Added logs for testing. --- .../Ebizmarts/MageMonkey/Model/Observer.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 88565031..347c03ac 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -50,17 +50,17 @@ public function handleSubscriber(Varien_Event_Observer $observer) } if (TRUE === $subscriber->getIsStatusChanged()) { Mage::getSingleton('core/session')->setIsHandleSubscriber(TRUE); - if (Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { - $saveOnDb = Mage::helper('monkey')->config('checkout_async'); - Mage::log('subscribeToList 6', null, 'ebizmarts.log', true); - Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb); - } else { +// if (Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { +// $saveOnDb = Mage::helper('monkey')->config('checkout_async'); +// Mage::log('subscribeToList 6', null, 'ebizmarts.log', true); +// Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb); +// } else { $post = Mage::app()->getRequest()->getPost(); if (isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer() || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE) { Mage::log('subscribeToList 7', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($subscriber, 0); } - } +// } Mage::getSingleton('core/session')->setIsHandleSubscriber(FALSE); } return $observer; From c34825fb0b9100ca852f886c4452ef96023b00e3 Mon Sep 17 00:00:00 2001 From: Santiago Date: Fri, 5 Aug 2016 15:39:56 -0300 Subject: [PATCH 25/31] Added logs for testing. --- app/code/community/Ebizmarts/MageMonkey/Model/Observer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 347c03ac..39eda2b6 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -56,7 +56,7 @@ public function handleSubscriber(Varien_Event_Observer $observer) // Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb); // } else { $post = Mage::app()->getRequest()->getPost(); - if (isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer() || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE) { + if (!Mage::getSingleton('core/session')->getIsOneStepCheckout() && !Mage::getSingleton('core/session')->getMonkeyCheckout() && isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer() || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE) { Mage::log('subscribeToList 7', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($subscriber, 0); } From 78e256482e7a50b5f4a688017fdf661941d390e8 Mon Sep 17 00:00:00 2001 From: Santiago Date: Fri, 5 Aug 2016 16:12:14 -0300 Subject: [PATCH 26/31] Added logs for testing. --- app/code/community/Ebizmarts/MageMonkey/Model/Observer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 39eda2b6..32a436c7 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -56,7 +56,7 @@ public function handleSubscriber(Varien_Event_Observer $observer) // Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb); // } else { $post = Mage::app()->getRequest()->getPost(); - if (!Mage::getSingleton('core/session')->getIsOneStepCheckout() && !Mage::getSingleton('core/session')->getMonkeyCheckout() && isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer() || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE) { + if (!Mage::getSingleton('core/session')->getIsOneStepCheckout() && !Mage::getSingleton('core/session')->getMonkeyCheckout() && isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer()) { Mage::log('subscribeToList 7', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($subscriber, 0); } From 589b90a470baf919200d083d59e6b0e1271a3060 Mon Sep 17 00:00:00 2001 From: Santiago Date: Fri, 5 Aug 2016 17:42:19 -0300 Subject: [PATCH 27/31] Added logs for testing. --- .../Ebizmarts/MageMonkey/Helper/Data.php | 16 ++++++++-------- .../Ebizmarts/MageMonkey/Model/Observer.php | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index f3cee910..2990371d 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -1023,8 +1023,16 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = $listId = $defaultList; } $alreadySubscribed = Mage::getSingleton('newsletter/subscriber')->loadByEmail($email); + $mergeVars = Mage::helper('monkey')->mergeVars($object, FALSE, $listId); + $isConfirmNeed = FALSE; + if (!Mage::helper('monkey')->isAdmin() && + (Mage::getStoreConfig(Mage_Newsletter_Model_Subscriber::XML_PATH_CONFIRMATION_FLAG, $object->getStoreId()) == 1 && !Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CONFIRMATION_EMAIL, $object->getStoreId()) || $forceSubscribe && Mage::getSingleton('core/session')->getMonkeyCheckout()) + ) { + $isConfirmNeed = TRUE; + } if ($listId == $defaultList && !Mage::getSingleton('core/session')->getIsHandleSubscriber() && !$forceSubscribe && (!$alreadySubscribed || !$alreadySubscribed->getId())) { $subscriber->setStoreId($storeId)->subscribe($email); + $this->_subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db, $orderId); } else { $alreadyOnList = Mage::getSingleton('monkey/asyncsubscribers')->getCollection() ->addFieldToFilter('lists', $listId) @@ -1032,18 +1040,11 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = ->addFieldToFilter('processed', 0); //if not in magemonkey_async_subscribers with processed 0 add list if (count($alreadyOnList) == 0) { - $isConfirmNeed = FALSE; - if (!Mage::helper('monkey')->isAdmin() && - (Mage::getStoreConfig(Mage_Newsletter_Model_Subscriber::XML_PATH_CONFIRMATION_FLAG, $object->getStoreId()) == 1 && !Mage::getStoreConfig(Ebizmarts_MageMonkey_Model_Config::GENERAL_CONFIRMATION_EMAIL, $object->getStoreId()) || $forceSubscribe && Mage::getSingleton('core/session')->getMonkeyCheckout()) - ) { - $isConfirmNeed = TRUE; - } $isOnMailChimp = Mage::helper('monkey')->subscribedToList($email, $listId); //if( TRUE === $subscriber->getIsStatusChanged() ){ if ($isOnMailChimp == 1) { if(Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { - $mergeVars = Mage::helper('monkey')->mergeVars($object, FALSE, $listId); $this->_subscribe($listId, $email, $mergeVars, 0, 1, $orderId); } return; @@ -1053,7 +1054,6 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = $subscriber->setStatus(Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED); } - $mergeVars = Mage::helper('monkey')->mergeVars($object, FALSE, $listId); $this->_subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db, $orderId); $subscriberExists = Mage::getModel('newsletter/subscriber')->loadbyEmail($email); if(Mage::getSingleton('core/session')->getMonkeyCheckout() && !$subscriberExists->getId()){ diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 32a436c7..88565031 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -50,17 +50,17 @@ public function handleSubscriber(Varien_Event_Observer $observer) } if (TRUE === $subscriber->getIsStatusChanged()) { Mage::getSingleton('core/session')->setIsHandleSubscriber(TRUE); -// if (Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { -// $saveOnDb = Mage::helper('monkey')->config('checkout_async'); -// Mage::log('subscribeToList 6', null, 'ebizmarts.log', true); -// Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb); -// } else { + if (Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { + $saveOnDb = Mage::helper('monkey')->config('checkout_async'); + Mage::log('subscribeToList 6', null, 'ebizmarts.log', true); + Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb); + } else { $post = Mage::app()->getRequest()->getPost(); - if (!Mage::getSingleton('core/session')->getIsOneStepCheckout() && !Mage::getSingleton('core/session')->getMonkeyCheckout() && isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer()) { + if (isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer() || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE) { Mage::log('subscribeToList 7', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($subscriber, 0); } -// } + } Mage::getSingleton('core/session')->setIsHandleSubscriber(FALSE); } return $observer; From 667ec7deac132544523c488990b4e492481a8bc4 Mon Sep 17 00:00:00 2001 From: Santiago Date: Mon, 8 Aug 2016 15:24:52 -0300 Subject: [PATCH 28/31] Removed logs. --- .../community/Ebizmarts/MageMonkey/Helper/Data.php | 11 ----------- .../community/Ebizmarts/MageMonkey/Model/Observer.php | 9 --------- 2 files changed, 20 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php index 2990371d..91802949 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php +++ b/app/code/community/Ebizmarts/MageMonkey/Helper/Data.php @@ -969,28 +969,22 @@ protected function _McAddressToMage(array $data, $type, $customer) */ public function listsSubscription($object, $db, $orderId = null) { - Mage::log(__METHOD__, null, 'ebizmarts.log', true); - Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); $monkeyPost = Mage::getSingleton('core/session')->getMonkeyPost(); $post = unserialize($monkeyPost); if (isset($post['magemonkey_force'])) { foreach ($post['list'] as $list) { $listId = $list['subscribed']; - Mage::log('subscribeToList 1', null, 'ebizmarts.log', true); $this->subscribeToList($object, $db, $listId, false, $orderId); } } elseif (isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe']) { $lists = explode(',', $post['magemonkey_subscribe']); foreach ($lists as $listId) { - Mage::log('subscribeToList 2', null, 'ebizmarts.log', true); $this->subscribeToList($object, $db, $listId, false, $orderId); } //Subscription for One Step Checkout with force subscription } elseif (Mage::getSingleton('core/session')->getIsOneStepCheckout() && Mage::helper('monkey')->config('checkout_subscribe') > 2 && !Mage::getSingleton('core/session')->getIsUpdateCustomer()) { - Mage::log('subscribeToList 3', null, 'ebizmarts.log', true); $this->subscribeToList($object, $db, null, false, $orderId); } elseif(!Mage::getSingleton('core/session')->getMonkeyCheckout()){ - Mage::log('subscribeToList 4', null, 'ebizmarts.log', true); $this->subscribeToList($object, $db, NULL, TRUE, $orderId); } @@ -1007,8 +1001,6 @@ public function listsSubscription($object, $db, $orderId = null) */ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = FALSE, $orderId = null) { - Mage::log(__METHOD__, null, 'ebizmarts.log', true); - Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); $email = $object->getEmail(); $storeId = $object->getStoreId(); if ($object instanceof Mage_Customer_Model_Customer) { @@ -1076,8 +1068,6 @@ public function subscribeToList($object, $db, $listId = NULL, $forceSubscribe = */ public function _subscribe($listId, $email, $mergeVars, $isConfirmNeed, $db, $orderId = null) { - Mage::log(__METHOD__, null, 'ebizmarts.log', true); - Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); if ($db) { if ($isConfirmNeed) { Mage::getSingleton('core/session')->addSuccess(Mage::helper('monkey')->__('Confirmation request will be sent soon.')); @@ -1232,7 +1222,6 @@ public function handlePost($request, $guestEmail) $customer->setMcListId($listId); $subscriber = Mage::getModel('newsletter/subscriber') ->setSubscriberEmail($email); - Mage::log(__METHOD__, null, 'ebizmarts.log', true); $this->subscribeToList($subscriber, 0, $listId); } diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php index 88565031..5868fd05 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php @@ -18,7 +18,6 @@ class Ebizmarts_MageMonkey_Model_Observer */ public function handleSubscriber(Varien_Event_Observer $observer) { - Mage::log(__METHOD__, null, 'ebizmarts.log', true); if (!Mage::helper('monkey')->canMonkey()) { return $observer; } @@ -52,12 +51,10 @@ public function handleSubscriber(Varien_Event_Observer $observer) Mage::getSingleton('core/session')->setIsHandleSubscriber(TRUE); if (Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) { $saveOnDb = Mage::helper('monkey')->config('checkout_async'); - Mage::log('subscribeToList 6', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb); } else { $post = Mage::app()->getRequest()->getPost(); if (isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer() || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE) { - Mage::log('subscribeToList 7', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($subscriber, 0); } } @@ -314,7 +311,6 @@ public function updateCustomer(Varien_Event_Observer $observer) $subscriber = Mage::getSingleton('newsletter/subscriber')->loadByEmail($email); $monkeyPost = unserialize(Mage::getSingleton('core/session')->getMonkeyPost()); if (!Mage::helper('monkey')->subscribedToList($email, $defaultList) && !$isAdmin && ($subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED) || $monkeyPost) { - Mage::log('subscribeToList 7', null, 'ebizmarts.log', true); Mage::helper('monkey')->subscribeToList($customer, 0); //$api->listSubscribe($defaultList, $customer->getEmail(), $mergeVars, $isConfirmNeed); } @@ -360,7 +356,6 @@ public function updateCustomer(Varien_Event_Observer $observer) } public function registerCheckoutSubscribeWithSagePay(Varien_Event_Observer $observer){ - Mage::log(__METHOD__, null, 'ebizmarts.log', true); if (!Mage::helper('monkey')->canMonkey()) { return $observer; } @@ -386,7 +381,6 @@ public function registerCheckoutSubscribeWithSagePay(Varien_Event_Observer $obse */ public function registerCheckoutSubscribe(Varien_Event_Observer $observer) { - Mage::log(__METHOD__, null, 'ebizmarts.log', true); if (!Mage::helper('monkey')->canMonkey()) { return $observer; } @@ -422,7 +416,6 @@ public function registerCheckoutSubscribe(Varien_Event_Observer $observer) */ public function registerCheckoutSuccess(Varien_Event_Observer $observer) { - Mage::log(__METHOD__, null, 'ebizmarts.log', true); Mage::getSingleton('core/session')->setRegisterCheckoutSuccess(TRUE); if (!Mage::helper('monkey')->canMonkey()) { Mage::getSingleton('core/session')->setMonkeyCheckout(FALSE); @@ -469,7 +462,6 @@ public function massActionOption(Varien_Event_Observer $observer) } protected function _handleCheckoutSubscription($order, $isSaveOrderBefore = false){ - Mage::log(__METHOD__, null, 'ebizmarts.log', true); if (is_object($order) && ($order->getId() || $isSaveOrderBefore)) { //Set Campaign Id if exist $campaign_id = Mage::getModel('monkey/ecommerce360')->getCookie()->get('magemonkey_campaign_id'); @@ -497,7 +489,6 @@ protected function _handleCheckoutSubscription($order, $isSaveOrderBefore = fals } $orderId = $order->getId(); - Mage::log('order id '.$orderId, null, 'ebizmarts.log', true); if(Mage::getSingleton('core/session')->getMonkeyCheckout() || Mage::getSingleton('core/session')->getIsOneStepCheckout()) { Mage::helper('monkey')->listsSubscription($toSubscribe, $saveOnDb, $orderId); From 53680af590df4b5322aae309a52cdc4dc668674b Mon Sep 17 00:00:00 2001 From: Santiago Date: Wed, 10 Aug 2016 10:57:54 -0300 Subject: [PATCH 29/31] Set Webhooks to be enabled by default. --- app/code/community/Ebizmarts/MageMonkey/etc/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml index 72e06084..e60e7e14 100755 --- a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml +++ b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml @@ -286,6 +286,7 @@ 1 1 HASCLICKED + 1 0 From a1a0b27c8d6a15e1bef8e9973d2280542b33ba03 Mon Sep 17 00:00:00 2001 From: Santiago Date: Wed, 10 Aug 2016 13:38:28 -0300 Subject: [PATCH 30/31] Webhook fixes. --- .../Ebizmarts/MageMonkey/Model/Cron.php | 19 +++++++++++++++---- .../Ebizmarts/MageMonkey/etc/config.xml | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php index 716f5bba..56ddbaed 100644 --- a/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php +++ b/app/code/community/Ebizmarts/MageMonkey/Model/Cron.php @@ -626,7 +626,7 @@ protected function _subscribe(array $data) if(isset($data['data']['merges']['STOREID'])){ $subscriberStoreId=$data['data']['merges']['STOREID']; }else { - $subscriberStoreId = Mage::helper('monkey')->getStoreByList(); + $subscriberStoreId = Mage::helper('monkey')->getStoreByList($data['data']['id']); } Mage::app()->setCurrentStore($subscriberStoreId); $subscriber->subscribe($data['data']['email']); @@ -755,11 +755,22 @@ protected function _profile(array $data) ->addFieldToFilter('email', array('eq' => $email)); if (count($customerCollection) > 0) { $toUpdate = $customerCollection->getFirstItem(); + if(isset($data['data']['merges']['FNAME'])) { + $toUpdate->setFirstname($data['data']['merges']['FNAME']); + } + if(isset($data['data']['merges']['LNAME'])) { + $toUpdate->setLastname($data['data']['merges']['LNAME']); + } }else { $toUpdate = $subscriber; + if(isset($data['data']['merges']['FNAME'])) { + $toUpdate->setSubscriberFirstname($data['data']['merges']['FNAME']); + } + if(isset($data['data']['merges']['LNAME'])) { + $toUpdate->setSubscriberLastname($data['data']['merges']['LNAME']); + } } - $toUpdate->setFirstname($data['data']['merges']['FNAME']); - $toUpdate->setLastname($data['data']['merges']['LNAME']); + $toUpdate->save(); } @@ -779,7 +790,7 @@ protected function _updateEmail(array $data) $newSubscriber = Mage::getSingleton('newsletter/subscriber')->loadByEmail($new); - $subscriberStoreId = Mage::helper('monkey')->getStoreByList(); + $subscriberStoreId = Mage::helper('monkey')->getStoreByList($data['data']['list_id']); Mage::app()->setCurrentStore($subscriberStoreId); diff --git a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml index e60e7e14..99bb2983 100755 --- a/app/code/community/Ebizmarts/MageMonkey/etc/config.xml +++ b/app/code/community/Ebizmarts/MageMonkey/etc/config.xml @@ -293,7 +293,7 @@ all_status - + 86400 From cae6ddc25a9fd2b2d9b3655b4598aa4edddcd74d Mon Sep 17 00:00:00 2001 From: Santiago Date: Wed, 10 Aug 2016 13:53:26 -0300 Subject: [PATCH 31/31] Updated Autoresponder module version. --- app/code/community/Ebizmarts/Autoresponder/etc/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/community/Ebizmarts/Autoresponder/etc/config.xml b/app/code/community/Ebizmarts/Autoresponder/etc/config.xml index f26d7c10..48a92980 100644 --- a/app/code/community/Ebizmarts/Autoresponder/etc/config.xml +++ b/app/code/community/Ebizmarts/Autoresponder/etc/config.xml @@ -10,7 +10,7 @@ - 1.2.1.1 + 1.2.2