Springbot - Version 1.5.2.1

Version Notes

Refactor existing code
Amazon Order Sync

Release Info

Developer	Springbot Integrations Team
Extension	Springbot
Version	1.5.2.1
Comparing to
See all releases

Code changes from version 1.4.7.0 to 1.5.2.1

Files changed (299) hide show

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Auth.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Bmbleb/Login.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Bmbleb/Login/Form.php +1 -1
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Connected.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Help.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Index.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Index/Messages.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Index/Terms.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Jobs.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Jobs/Grid.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Jobs/Status.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Login.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Logout.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Logs.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Notifications.php +1 -1
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Order/Marketplaces.php +42 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Status.php +0 -0
app/code/community/Springbot/Bmbleb/Block/Adminhtml/Tabs.php +0 -0
app/code/community/Springbot/Bmbleb/Helper/Account.php +0 -0
app/code/community/Springbot/Bmbleb/Helper/Data.php +0 -0
app/code/community/Springbot/Bmbleb/Helper/PluginStatus.php +0 -0
app/code/community/Springbot/Bmbleb/Model/Bmbleb.php +0 -0
app/code/community/Springbot/Bmbleb/Model/Observer.php +21 -0
app/code/community/Springbot/Bmbleb/Model/Status.php +0 -0
app/code/community/Springbot/Bmbleb/Model/Sync.php +0 -0
app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/HelpController.php +0 -0
app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/IndexController.php +1 -1
app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/JobsController.php +2 -0
app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/LoginController.php +29 -17
app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/LogsController.php +0 -0
app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/SettingsController.php +0 -0
app/code/community/Springbot/Bmbleb/etc/config.xml +107 -97
app/code/community/Springbot/BoneCollector/Model/HarvestAbstract.php +0 -0
app/code/community/Springbot/BoneCollector/Model/HarvestAttribute/Observer.php +2 -2
app/code/community/Springbot/BoneCollector/Model/HarvestCart/Observer.php +4 -4
app/code/community/Springbot/BoneCollector/Model/HarvestCategory/Observer.php +2 -2
app/code/community/Springbot/BoneCollector/Model/HarvestCustomer/Observer.php +3 -3
app/code/community/Springbot/BoneCollector/Model/HarvestInventoryItem/Observer.php +4 -4
app/code/community/Springbot/BoneCollector/Model/HarvestProduct/Observer.php +2 -2
app/code/community/Springbot/BoneCollector/Model/HarvestPurchase/Observer.php +4 -4
app/code/community/Springbot/BoneCollector/Model/HarvestRule/Observer.php +2 -2
app/code/community/Springbot/BoneCollector/Model/HarvestSubscriber/Observer.php +2 -2
app/code/community/Springbot/BoneCollector/etc/config.xml +0 -0
app/code/community/Springbot/Boss.php +1 -2
app/code/community/Springbot/Cli.php +1 -0
app/code/community/Springbot/Combine/Helper/Attributes.php +1 -1
app/code/community/Springbot/Combine/Helper/Cart.php +0 -0
app/code/community/Springbot/Combine/Helper/Data.php +0 -0
app/code/community/Springbot/Combine/Helper/Harvest.php +4 -2
app/code/community/Springbot/Combine/Helper/Marketplaces.php +38 -0
app/code/community/Springbot/Combine/Helper/Parser.php +0 -0
app/code/community/Springbot/Combine/Helper/Redirect.php +1 -1
app/code/community/Springbot/Combine/Helper/Store.php +0 -0
app/code/community/Springbot/Combine/Helper/Trackable.php +0 -0
app/code/community/Springbot/Combine/Model/Action.php +0 -0
app/code/community/Springbot/Combine/Model/Api.php +1 -1
app/code/community/Springbot/Combine/Model/Cron.php +1 -1
app/code/community/Springbot/Combine/Model/Cron/Count.php +0 -0
app/code/community/Springbot/Combine/Model/Cron/Manager/Status.php +0 -0
app/code/community/Springbot/Combine/Model/Cron/Queue.php +1 -1
app/code/community/Springbot/Combine/Model/Cron/Queue/Batch.php +0 -0
app/code/community/Springbot/Combine/Model/Cron/Queue/Batch/Row.php +0 -0
app/code/community/Springbot/Combine/Model/Cron/Worker.php +1 -1
app/code/community/Springbot/Combine/Model/File/Io.php +0 -0
app/code/community/Springbot/Combine/Model/File/Path.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest.php +1 -1
app/code/community/Springbot/Combine/Model/Harvest/AttributeSets.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Carts.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Categories.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Coupons.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/CustomerAttributeSets.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Customers.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Guests.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Inventories.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Products.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Purchases.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Rules.php +0 -0
app/code/community/Springbot/Combine/Model/Harvest/Subscribers.php +0 -0
app/code/community/Springbot/Combine/Model/Marketplaces/Order/Builder.php +266 -0
app/code/community/Springbot/Combine/Model/Marketplaces/Order/Customer.php +135 -0
app/code/community/Springbot/Combine/Model/Marketplaces/Order/Item.php +92 -0
app/code/community/Springbot/Combine/Model/Marketplaces/Order/Parser.php +41 -0
app/code/community/Springbot/Combine/Model/Marketplaces/OrderService.php +43 -0
app/code/community/Springbot/Combine/Model/Marketplaces/Payment.php +10 -0
app/code/community/Springbot/Combine/Model/Marketplaces/Remote/Order.php +24 -0
app/code/community/Springbot/Combine/Model/Marketplaces/Shipping.php +23 -0
app/code/community/Springbot/Combine/Model/Mysql4/Action.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Action/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Cron/Count.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Cron/Queue.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Cron/Queue/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Redirect.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Redirect/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Redirect/Order.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Redirect/Order/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Setup.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Trackable.php +0 -0
app/code/community/Springbot/Combine/Model/Mysql4/Trackable/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Parser.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/AttributeSet.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Category.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Coupon.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Customer.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/CustomerAttributeSet.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Guest.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Inventory.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Product.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Purchase.php +26 -0
app/code/community/Springbot/Combine/Model/Parser/Purchase/Item.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Purchase/Shipment.php +48 -0
app/code/community/Springbot/Combine/Model/Parser/Quote.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Quote/Item.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Rule.php +0 -0
app/code/community/Springbot/Combine/Model/Parser/Subscriber.php +0 -0
app/code/community/Springbot/Combine/Model/Redirect.php +1 -1
app/code/community/Springbot/Combine/Model/Redirect/Order.php +1 -1
app/code/community/Springbot/Combine/Model/Resource/Abstract.php +1 -1
app/code/community/Springbot/Combine/Model/Resource/Action.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Action/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Cron/Count.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Cron/Count/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Cron/Queue.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Cron/Queue/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Debug.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Marketplaces/Remote/Order.php +10 -0
app/code/community/Springbot/Combine/Model/Resource/Marketplaces/Remote/Order/Collection.php +10 -0
app/code/community/Springbot/Combine/Model/Resource/Redirect.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Redirect/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Redirect/Order.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Redirect/Order/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Setup.php +2 -0
app/code/community/Springbot/Combine/Model/Resource/Trackable.php +0 -0
app/code/community/Springbot/Combine/Model/Resource/Trackable/Collection.php +0 -0
app/code/community/Springbot/Combine/Model/Rewrite.php +87 -10
app/code/community/Springbot/Combine/Model/System/Config/Source/Harvestertype.php +0 -0
app/code/community/Springbot/Combine/Model/System/Config/Source/LogFormat.php +0 -0
app/code/community/Springbot/Combine/Model/System/Config/Source/LogLevel.php +0 -0
app/code/community/Springbot/Combine/Model/System/Config/Source/Stability.php +0 -0
app/code/community/Springbot/Combine/Model/System/Config/Source/UrlType.php +0 -0
app/code/community/Springbot/Combine/Model/Trackable.php +0 -0
app/code/community/Springbot/Combine/etc/adminhtml.xml +0 -0
app/code/community/Springbot/Combine/etc/config.xml +28 -1
app/code/community/Springbot/Combine/etc/system.xml +0 -9
app/code/community/Springbot/Combine/sql/combine_setup/mysql4-install-1.0.0.70.php +1 -1
app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.0.0.70-1.0.0.84.php +0 -0
app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.0.0.84-1.0.0.88.php +0 -0
app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.0.0.88-1.2.0.0.php +1 -1
app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.2.0.0-1.2.0.1.php +0 -0
app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.2.0.1-1.2.1.0.php +1 -1
app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.3.9.9-1.4.0.0.php +2 -2
app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.4.7.0-1.5.0.0.php +42 -0
app/code/community/Springbot/Log.php +7 -2
app/code/community/Springbot/Services.php +0 -0
app/code/community/Springbot/Services/Cmd/Forecast.php +0 -0
app/code/community/Springbot/Services/Cmd/Halt.php +0 -0
app/code/community/Springbot/Services/Cmd/Harvest.php +0 -0
app/code/community/Springbot/Services/Cmd/Healthcheck.php +0 -0
app/code/community/Springbot/Services/Cmd/Update.php +0 -66
app/code/community/Springbot/Services/Harvest.php +0 -0
app/code/community/Springbot/Services/Harvest/AttributeSets.php +0 -0
app/code/community/Springbot/Services/Harvest/Carts.php +0 -0
app/code/community/Springbot/Services/Harvest/Categories.php +0 -0
app/code/community/Springbot/Services/Harvest/Coupons.php +0 -0
app/code/community/Springbot/Services/Harvest/CustomerAttributeSets.php +0 -0
app/code/community/Springbot/Services/Harvest/Customers.php +0 -0
app/code/community/Springbot/Services/Harvest/Guests.php +3 -1
app/code/community/Springbot/Services/Harvest/Inventories.php +0 -0
app/code/community/Springbot/Services/Harvest/Products.php +0 -0
app/code/community/Springbot/Services/Harvest/Purchases.php +0 -0
app/code/community/Springbot/Services/Harvest/Rules.php +0 -0
app/code/community/Springbot/Services/Harvest/Subscribers.php +0 -0
app/code/community/Springbot/Services/Log/Installer.php +0 -0
app/code/community/Springbot/Services/Post.php +0 -0
app/code/community/Springbot/Services/Post/Attribute.php +0 -0
app/code/community/Springbot/Services/Post/AttributeSet.php +0 -0
app/code/community/Springbot/Services/Post/Cart.php +0 -0
app/code/community/Springbot/Services/Post/Category.php +0 -0
app/code/community/Springbot/Services/Post/Coupon.php +0 -0
app/code/community/Springbot/Services/Post/Customer.php +0 -0
app/code/community/Springbot/Services/Post/Guest.php +0 -0
app/code/community/Springbot/Services/Post/Inventory.php +0 -0
app/code/community/Springbot/Services/Post/Json.php +0 -0
app/code/community/Springbot/Services/Post/Jsonstring.php +0 -0
app/code/community/Springbot/Services/Post/Product.php +0 -0
app/code/community/Springbot/Services/Post/Purchase.php +0 -0
app/code/community/Springbot/Services/Post/Rule.php +0 -0
app/code/community/Springbot/Services/Post/Subscriber.php +0 -0
app/code/community/Springbot/Services/Registry.php +0 -0
app/code/community/Springbot/Services/Store/Finalize.php +0 -0
app/code/community/Springbot/Services/Store/Register.php +0 -0
app/code/community/Springbot/Services/Tasks.php +0 -0
app/code/community/Springbot/Services/Tasks/ClearCache.php +1 -0
app/code/community/Springbot/Services/Tasks/ClearJobs.php +0 -0
app/code/community/Springbot/Services/Tasks/ClearStores.php +0 -0
app/code/community/Springbot/Services/Tasks/CreateRewrite.php +0 -0
app/code/community/Springbot/Services/Tasks/Debug.php +0 -0
app/code/community/Springbot/Services/Tasks/DeleteJob.php +0 -0
app/code/community/Springbot/Services/Tasks/DeliverEventLog.php +1 -1
app/code/community/Springbot/Services/Tasks/Forecast.php +0 -0
app/code/community/Springbot/Services/Tasks/GetLog.php +0 -0
app/code/community/Springbot/Services/Tasks/Harvest.php +0 -0
app/code/community/Springbot/Services/Tasks/HarvestInventory.php +0 -0
app/code/community/Springbot/Services/Tasks/Healthcheck.php +0 -0
app/code/community/Springbot/Services/Tasks/Jobs.php +0 -0
app/code/community/Springbot/Services/Tasks/KillHarvest.php +0 -0
app/code/community/Springbot/Services/Tasks/LaunchFullHarvest.php +0 -0
app/code/community/Springbot/Services/Tasks/LaunchPartialHarvest.php +0 -0
app/code/community/Springbot/Services/Tasks/PackageUpdate.php +0 -13
app/code/community/Springbot/Services/Tasks/PluginVersion.php +18 -0
app/code/community/Springbot/Services/Tasks/PostItem.php +0 -0
app/code/community/Springbot/Services/Tasks/Redirects.php +159 -0
app/code/community/Springbot/Services/Tasks/RegisterStores.php +0 -0
app/code/community/Springbot/Services/Tasks/ResetRetries.php +0 -0
app/code/community/Springbot/Services/Tasks/ResumeHarvest.php +0 -0
app/code/community/Springbot/Services/Tasks/Run.php +0 -0
app/code/community/Springbot/Services/Tasks/SetVar.php +0 -0
app/code/community/Springbot/Services/Tasks/Stores.php +33 -0
app/code/community/Springbot/Services/Tasks/UnlockJobs.php +0 -0
app/code/community/Springbot/Services/Tasks/ViewConfig.php +0 -0
app/code/community/Springbot/Services/Update/Abstract.php +0 -49
app/code/community/Springbot/Services/Update/Connect.php +0 -119
app/code/community/Springbot/Services/Update/Downloader.php +0 -63
app/code/community/Springbot/Services/Update/Installer.php +0 -57
app/code/community/Springbot/Services/Update/Package.php +0 -148
app/code/community/Springbot/Services/Work/Cleanup.php +0 -0
app/code/community/Springbot/Services/Work/Manager.php +0 -0
app/code/community/Springbot/Services/Work/Report.php +0 -0
app/code/community/Springbot/Services/Work/Restart.php +0 -0
app/code/community/Springbot/Services/Work/Runner.php +0 -0
app/code/community/Springbot/Services/Work/Stop.php +0 -0
app/code/community/Springbot/Shadow/Block/Action/View.php +0 -0
app/code/community/Springbot/Shadow/Block/Async.php +0 -0
app/code/community/Springbot/Shadow/Controller/Action.php +0 -0
app/code/community/Springbot/Shadow/Helper/Data.php +0 -0
app/code/community/Springbot/Shadow/Helper/Prattler.php +0 -0
app/code/community/Springbot/Shadow/Model/Listeners/Observer.php +1 -1
app/code/community/Springbot/Shadow/controllers/ActionController.php +1 -1
app/code/community/Springbot/Shadow/controllers/IndexController.php +1 -0
app/code/community/Springbot/Shadow/etc/config.xml +0 -0
app/code/community/Springbot/Util/Caller.php +0 -0
app/code/community/Springbot/Util/Categories.php +0 -0
app/code/community/Springbot/Util/Log/Rollover.php +0 -0
app/code/community/Springbot/Util/Logger.php +1 -0
app/code/community/Springbot/Util/Partition.php +0 -0
app/design/adminhtml/default/default/layout/bmbleb.xml +5 -2
app/design/adminhtml/default/default/template/bmbleb/auth.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/dashboard_loggedout.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/help/index.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/index/messages.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/index/terms.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/jobs.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/jobs/status.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/login.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/logout.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/logs/index.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/notifications.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/order/marketplaces.phtml +23 -0
app/design/adminhtml/default/default/template/bmbleb/problems/index.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/status.phtml +0 -0
app/design/adminhtml/default/default/template/bmbleb/tabs.phtml +0 -0
app/design/frontend/base/default/layout/shadow.xml +0 -0
app/design/frontend/base/default/template/shadow/async.phtml +0 -0
app/design/frontend/base/default/template/shadow/conversion.phtml +1 -1
app/etc/modules/Springbot.xml +22 -18
package.xml +7 -8
shell/springbot.php +2 -2
skin/adminhtml/default/default/bmbleb/bmbleb.css +0 -0
skin/adminhtml/default/default/bmbleb/images/arrows_up-down-large.png +0 -0
skin/adminhtml/default/default/bmbleb/images/bmb-ctl.png +0 -0
skin/adminhtml/default/default/bmbleb/images/check.png +0 -0
skin/adminhtml/default/default/bmbleb/images/grn-bg.png +0 -0
skin/adminhtml/default/default/bmbleb/images/h3-bg.png +0 -0
skin/adminhtml/default/default/bmbleb/images/icon-alert.png +0 -0
skin/adminhtml/default/default/bmbleb/images/icon-bmbleb.png +0 -0
skin/adminhtml/default/default/bmbleb/images/icon-insights.png +0 -0
skin/adminhtml/default/default/bmbleb/images/icon-status.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico1.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico2.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico3.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico4.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico5.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico6.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico7.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico8.png +0 -0
skin/adminhtml/default/default/bmbleb/images/left-ico_demographics.png +0 -0
skin/adminhtml/default/default/bmbleb/images/login-icn-b.png +0 -0
skin/adminhtml/default/default/bmbleb/images/login-icn.png +0 -0
skin/adminhtml/default/default/bmbleb/images/logo.png +0 -0
skin/adminhtml/default/default/bmbleb/images/orng-bg.png +0 -0
skin/adminhtml/default/default/bmbleb/images/plugin_dashboard_syncing.jpg +0 -0
skin/adminhtml/default/default/bmbleb/images/register.png +0 -0
skin/adminhtml/default/default/bmbleb/images/registration-bg-25.png +0 -0
skin/adminhtml/default/default/bmbleb/images/registration-bg-50.png +0 -0
skin/adminhtml/default/default/bmbleb/images/registration-bg.png +0 -0
skin/adminhtml/default/default/bmbleb/images/spinner.gif +0 -0
skin/adminhtml/default/default/bmbleb/images/springbot-ctl.png +0 -0
skin/adminhtml/default/default/bmbleb/images/submit-btn-bg.png +0 -0
skin/adminhtml/default/default/bmbleb/images/sync_icon.png +0 -0
skin/adminhtml/default/default/bmbleb/images/white-check.png +0 -0

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Auth.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Bmbleb/Login.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Bmbleb/Login/Form.php CHANGED Viewed

	@@ -78,7 +78,7 @@ class Springbot_Bmbleb_Block_Adminhtml_Bmbleb_Login_Form extends Mage_Adminhtml_
78	$client->setHeaders('Content-type: application/json');
79	$req = $client->request('POST');
80	} catch (Exception $e) {
81	- Springbot_Log::error($e);
82	}
83	}
84


78	$client->setHeaders('Content-type: application/json');
79	$req = $client->request('POST');
80	} catch (Exception $e) {
81	+ Springbot_Log::error($e->getMessage());
82	}
83	}
84

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Connected.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Help.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Index.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Index/Messages.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Index/Terms.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Jobs.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Jobs/Grid.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Jobs/Status.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Login.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Logout.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Logs.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Notifications.php CHANGED Viewed

	@@ -20,7 +20,7 @@ class Springbot_Bmbleb_Block_Adminhtml_Notifications extends Mage_Adminhtml_Bloc
20	}
21	}
22	catch (Exception $e) {
23	- Springbot_Log::error($e);
24	}
25	return false;
26	}


20	}
21	}
22	catch (Exception $e) {
23	+ Springbot_Log::error($e->getMessage());
24	}
25	return false;
26	}

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Order/Marketplaces.php ADDED Viewed

	@@ -0,0 +1,42 @@


1	+ <?php
2	+
3	+ class Springbot_Bmbleb_Block_Adminhtml_Order_Marketplaces extends Mage_Core_Block_Template
4	+ {
5	+ protected $_order;
6	+ protected $_mpOrder;
7	+
8	+ public function getOrder()
9	+ {
10	+ if (is_null($this->_order)) {
11	+ if (Mage::registry('current_order')) {
12	+ $order = Mage::registry('current_order');
13	+ }
14	+ elseif (Mage::registry('order')) {
15	+ $order = Mage::registry('order');
16	+ }
17	+ else {
18	+ $order = new Varien_Object();
19	+ }
20	+ $this->_order = $order;
21	+ }
22	+ return $this->order;
23	+ }
24	+
25	+ public function isMarketplaces($order)
26	+ {
27	+ Springbot_Log::debug($order->debug());
28	+ return $this->getMarketplacesOrder($order) != null;
29	+ }
30	+
31	+ public function getMarketplacesOrder($order = null)
32	+ {
33	+ if(is_null($this->_mpOrder)) {
34	+ if(!is_null($order) && is_null($this->_order)) {
35	+ $this->_order = $order;
36	+ }
37	+ $this->_mpOrder = Mage::getModel('combine/marketplaces_remote_order')
38	+ ->findByIncrementId($this->_order->getIncrementId());
39	+ }
40	+ return $this->_mpOrder;
41	+ }
42	+ }

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Status.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Block/Adminhtml/Tabs.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Helper/Account.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Helper/Data.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Helper/PluginStatus.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Model/Bmbleb.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Model/Observer.php ADDED Viewed

	@@ -0,0 +1,21 @@


1	+ <?php
2	+ class Springbot_Bmbleb_Model_Observer
3	+ {
4	+ public function getSalesOrderViewInfo(Varien_Event_Observer $observer)
5	+ {
6	+ $block = $observer->getBlock();
7	+ if (
8	+ ($block->getNameInLayout() == 'order_info')
9	+ && ($child = $block->getChild('bmbleb.order.marketplaces'))
10	+ ) {
11	+ if($child->isMarketplaces($block->getOrder())) {
12	+ $transport = $observer->getTransport();
13	+ if ($transport) {
14	+ $html = $transport->getHtml();
15	+ $html .= $child->toHtml();
16	+ $transport->setHtml($html);
17	+ }
18	+ }
19	+ }
20	+ }
21	+ }

app/code/community/Springbot/Bmbleb/Model/Status.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/Model/Sync.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/HelpController.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/IndexController.php CHANGED Viewed

	@@ -26,7 +26,7 @@ class Springbot_Bmbleb_Adminhtml_Bmbleb_IndexController extends Mage_Adminhtml_C
26	Springbot_Cli::launchHarvestInline();
27	}
28	catch (Exception $e) {
29	- Springbot_Log::error($e);
30	}
31	$this->_redirect('//status');
32	return;


26	Springbot_Cli::launchHarvestInline();
27	}
28	catch (Exception $e) {
29	+ Springbot_Log::error($e->getMessage());
30	}
31	$this->_redirect('//status');
32	return;

app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/JobsController.php CHANGED Viewed

	@@ -46,6 +46,7 @@ class Springbot_Bmbleb_Adminhtml_Bmbleb_JobsController extends Mage_Adminhtml_Co
46	$job = $this->_loadJob($jobId);
47	$job->run();
48	} catch (Exception $e) {

49	Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
50	}
51	}
	@@ -63,6 +64,7 @@ class Springbot_Bmbleb_Adminhtml_Bmbleb_JobsController extends Mage_Adminhtml_Co
63	$job = $this->_loadJob($jobId);
64	$job->delete();
65	} catch (Exception $e) {

66	Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
67	}
68	}


46	$job = $this->_loadJob($jobId);
47	$job->run();
48	} catch (Exception $e) {
49	+ Springbot_Log::error($e->getMessage());
50	Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
51	}
52	}

64	$job = $this->_loadJob($jobId);
65	$job->delete();
66	} catch (Exception $e) {
67	+ Springbot_Log::error($e->getMessage());
68	Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
69	}
70	}

app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/LoginController.php CHANGED Viewed

	@@ -1,12 +1,14 @@
1	<?php

2	class Springbot_Bmbleb_Adminhtml_Bmbleb_LoginController extends Mage_Adminhtml_Controller_Action
3	{
4	-
5	public function loginAction()
6	{

7	$email = $this->getRequest()->getParam('email');
8	$pass = $this->getRequest()->getParam('password');
9

10	$bmblebAccount = Mage::helper('bmbleb/Account');
11	$bmblebAccount->setIsLoggedIn(false);
12	if (!($url = Mage::getStoreConfig('springbot/config/api_url'))) {
	@@ -15,28 +17,37 @@ class Springbot_Bmbleb_Adminhtml_Bmbleb_LoginController extends Mage_Adminhtml_C
15	$url .= 'api/registration/login';
16
17	try {
18	- ~~$client~~ = ~~new~~ ~~Varien_Http_Client($url);~~
19	- $~~client->setRawData~~('~~{"user_id":"'.$email~~.~~'", "password":"'.$pass~~.'~~"}'~~);
20	- ~~$client->setHeaders('Content-type: application/json');~~
21	- ~~$response~~ = ~~$client->request('POST');~~
22	- ~~$result = json_decode~~($~~response->getBody()~~,true);
23	- }
24	- ~~catch~~ (~~Exception~~ $e) {
25	- ~~Springbot_Log::error($e);~~






26	Mage::getSingleton('adminhtml/session')->addError('Service unavailable from ' . $url . ' please contact support@springbot.com.');
27	$this->_redirect('*/bmbleb_index/auth');
28	return;
29	}
30
31	- if ~~($result['status']=='~~error~~') {~~
32	- ~~Mage::getSingleton~~(~~'adminhtml/session')->addError(~~$result['~~message~~'].' or ~~service unavailable from~~ '~~.$url~~);


33	$this->_redirect('*/bmbleb_index/auth');
34	- }
35	- ~~else~~ {
36	if ($result['token'] == '') {
37	- Mage::getSingleton('adminhtml/session')~~->addError('Login denied by Springbot');~~

38	$this->_redirect('*/bmbleb_index/auth');
39	- }
40	else {
41	$bmblebAccount->setSavedAccountInformation($email,$pass,$result['token']);
42	$this->_redirect('*/bmbleb_index/harvest');
	@@ -44,10 +55,11 @@ class Springbot_Bmbleb_Adminhtml_Bmbleb_LoginController extends Mage_Adminhtml_C
44	}
45	}
46

47	protected function _isAllowed()
48	{
49	- return Mage::getSingleton('admin/session')~~->isAllowed('springbot_bmbleb/dashboard');~~

50	}
51
52	-
53	}


1	<?php
2	+
3	class Springbot_Bmbleb_Adminhtml_Bmbleb_LoginController extends Mage_Adminhtml_Controller_Action
4	{

5	public function loginAction()
6	{
7	+ // Pull request params
8	$email = $this->getRequest()->getParam('email');
9	$pass = $this->getRequest()->getParam('password');
10
11	+ // Set helper data and configure API URL
12	$bmblebAccount = Mage::helper('bmbleb/Account');
13	$bmblebAccount->setIsLoggedIn(false);
14	if (!($url = Mage::getStoreConfig('springbot/config/api_url'))) {

17	$url .= 'api/registration/login';
18
19	try {
20	+ // Initialize cURL target URL
21	+ $c = curl_init('https://api.springbot.com/api/registration/login');
22	+
23	+ // Build cURL query
24	+ curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
25	+ curl_setopt($c, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
26	+ curl_setopt($c, CURLOPT_POSTFIELDS, "{\"user_id\":\"$email\", \"password\":\"$pass\"}");
27	+
28	+ // Save the response/result
29	+ $response = curl_exec($c);
30	+ $result = json_decode($response, true);
31	+ } catch (Exception $e) {
32	+ // Notify user the API service is unavailable
33	+ Springbot_Log::error($e->getMessage());
34	Mage::getSingleton('adminhtml/session')->addError('Service unavailable from ' . $url . ' please contact support@springbot.com.');
35	$this->_redirect('*/bmbleb_index/auth');
36	return;
37	}
38
39	+ // Notify user of any error
40	+ if ($result['status'] == 'error') {
41	+ Mage::getSingleton('adminhtml/session')
42	+ ->addError($result['message'] . ' or service unavailable from ' . $url);
43	$this->_redirect('*/bmbleb_index/auth');
44	+ } else {
45	+ // Notify user of denied login attempt
46	if ($result['token'] == '') {
47	+ Mage::getSingleton('adminhtml/session')
48	+ ->addError('Login denied by Springbot');
49	$this->_redirect('*/bmbleb_index/auth');
50	+ } // Redirect successful login to Springbot Dashboard
51	else {
52	$bmblebAccount->setSavedAccountInformation($email,$pass,$result['token']);
53	$this->_redirect('*/bmbleb_index/harvest');

55	}
56	}
57
58	+ // Make sure user is authorized to access this page
59	protected function _isAllowed()
60	{
61	+ return Mage::getSingleton('admin/session')
62	+ ->isAllowed('springbot_bmbleb/dashboard');
63	}
64

65	}

app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/LogsController.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/controllers/Adminhtml/Bmbleb/SettingsController.php CHANGED Viewed

File without changes

app/code/community/Springbot/Bmbleb/etc/config.xml CHANGED Viewed

@@ -1,107 +1,117 @@
             <?xml version="1.0"?>
             <config>
-            -
                <modules>
-            -
                    <Springbot_Bmbleb>
-            -
                        <version>0.3.0</version>
-            -
                    </Springbot_Bmbleb>
-            -
                </modules>
-            -
                <admin>
-            -
                    <routers>
-            -
                        <adminhtml>
             				<args>
             					<modules>
             						<bmbleb after="Mage_Adminhtml">Springbot_Bmbleb_Adminhtml</bmbleb>
             					</modules>
             				</args>
             			</adminhtml>
-            -
                    </routers>
-            -
                </admin>
-            -
                <adminhtml>
-            -
                    <menu>
-            -
                        <springbot_bmbleb module="bmbleb">
-            -
                            <title>Springbot</title>
-            -
                            <sort_order>71</sort_order>
-            -
                            <children>
-            -
                                <dashboard module="bmbleb">
-            -
                                    <title>Dashboard</title>
-            -
                                    <action>adminhtml/bmbleb_settings/index</action>
-            -
                                </dashboard>
-            -
                            </children>
-            -
                        </springbot_bmbleb>
-            -
                    </menu>
-            -
                    <acl>
-            -
                        <resources>
-            -
                            <all><title>Allow Everything</title></all>
-            -
                            <admin>
-            -
                                <children>
-            -
                                    <springbot_bmbleb translate="title" module="bmbleb">
-            -
                                        <title>Springbot</title>
-            -
                                        <sort_order>300</sort_order>
-            -
                                        <children>
-            -
                                            <dashboard translate="title" module="bmbleb">
-            -
                                                <title>Dashboard</title>
-            -
                                                <sort_order>10</sort_order>
-            -
                                            </dashboard>
-            -
                                        </children>
-            -
                                    </springbot_bmbleb>
-            -
                                </children>
-            -
                            </admin>
-            -
                        </resources>
-            -
                    </acl>
-            -
                    <layout>
-            -
                        <updates>
-            -
                            <bmbleb>
-            -
                                <file>bmbleb.xml</file>
-            -
                            </bmbleb>
-            -
                        </updates>
-            -
                    </layout>
-            -
                </adminhtml>
-            -
                <global>
-            -
                    <models>
-            -
                        <bmbleb>
-            -
                            <class>Sprigbot_Bmbleb_Model</class>
-            -
                            <resourceModel>bmbleb_mysql4</resourceModel>
-            -
                        </bmbleb>
-            -
                        <bmbleb_mysql4>
-            -
                            <class>Springbot_Bmbleb_Model_Mysql4</class>
-            -
                        </bmbleb_mysql4>
-            -
                    </models>
-            -
                    <resources>
-            -
                        <bmbleb_setup>
-            -
                            <setup>
-            -
                                <module>Springbot_Bmbleb</module>
-            -
                            </setup>
-            -
                            <connection>
-            -
                                <use>core_setup</use>
-            -
                            </connection>
-            -
                        </bmbleb_setup>
-            -
                        <bmbleb_write>
-            -
                            <connection>
-            -
                                <use>core_write</use>
-            -
                            </connection>
-            -
                        </bmbleb_write>
-            -
                        <bmbleb_read>
-            -
                            <connection>
-            -
                                <use>core_read</use>
-            -
                            </connection>
-            -
                        </bmbleb_read>
-            -
                    </resources>
-            -
                    <blocks>
-            -
                        <bmbleb>
-            -
                            <class>Springbot_Bmbleb_Block</class>
-            -
                        </bmbleb>
-            -
                    </blocks>
-            -
                    <helpers>
-            -
                        <bmbleb>
-            -
                            <class>Springbot_Bmbleb_Helper</class>
-            -
                        </bmbleb>
-            -
                    </helpers>
-            -
                </global>
-            -
                <default>
-            -
                    <bmbleb>
-            -
                        <config>
-            -
                        </config>
-            -
                    </bmbleb>
-            -
                </default>
             </config>


1	<?xml version="1.0"?>
2	<config>
3	+ <modules>
4	+ <Springbot_Bmbleb>
5	+ <version>0.3.0</version>
6	+ </Springbot_Bmbleb>
7	+ </modules>
8	+ <admin>
9	+ <routers>
10	+ <adminhtml>
11	<args>
12	<modules>
13	<bmbleb after="Mage_Adminhtml">Springbot_Bmbleb_Adminhtml</bmbleb>
14	</modules>
15	</args>
16	</adminhtml>
17	+ </routers>
18	+ </admin>
19	+ <adminhtml>
20	+ <menu>
21	+ <springbot_bmbleb module="bmbleb">
22	+ <title>Springbot</title>
23	+ <sort_order>71</sort_order>
24	+ <children>
25	+ <dashboard module="bmbleb">
26	+ <title>Dashboard</title>
27	+ <action>adminhtml/bmbleb_settings/index</action>
28	+ </dashboard>
29	+ </children>
30	+ </springbot_bmbleb>
31	+ </menu>
32	+ <acl>
33	+ <resources>
34	+ <all><title>Allow Everything</title></all>
35	+ <admin>
36	+ <children>
37	+ <springbot_bmbleb translate="title" module="bmbleb">
38	+ <title>Springbot</title>
39	+ <sort_order>300</sort_order>
40	+ <children>
41	+ <dashboard translate="title" module="bmbleb">
42	+ <title>Dashboard</title>
43	+ <sort_order>10</sort_order>
44	+ </dashboard>
45	+ </children>
46	+ </springbot_bmbleb>
47	+ </children>
48	+ </admin>
49	+ </resources>
50	+ </acl>
51	+ <layout>
52	+ <updates>
53	+ <bmbleb>
54	+ <file>bmbleb.xml</file>
55	+ </bmbleb>
56	+ </updates>
57	+ </layout>
58	+ <events>
59	+ <core_block_abstract_to_html_after>
60	+ <observers>
61	+ <bmbleb_mp_order_view_info>
62	+ <class>Springbot_Bmbleb_Model_Observer</class>
63	+ <method>getSalesOrderViewInfo</method>
64	+ </bmbleb_mp_order_view_info>
65	+ </observers>
66	+ </core_block_abstract_to_html_after>
67	+ </events>
68	+ </adminhtml>
69	+ <global>
70	+ <models>
71	+ <bmbleb>
72	+ <class>Sprigbot_Bmbleb_Model</class>
73	+ <resourceModel>bmbleb_mysql4</resourceModel>
74	+ </bmbleb>
75	+ <bmbleb_mysql4>
76	+ <class>Springbot_Bmbleb_Model_Mysql4</class>
77	+ </bmbleb_mysql4>
78	+ </models>
79	+ <resources>
80	+ <bmbleb_setup>
81	+ <setup>
82	+ <module>Springbot_Bmbleb</module>
83	+ </setup>
84	+ <connection>
85	+ <use>core_setup</use>
86	+ </connection>
87	+ </bmbleb_setup>
88	+ <bmbleb_write>
89	+ <connection>
90	+ <use>core_write</use>
91	+ </connection>
92	+ </bmbleb_write>
93	+ <bmbleb_read>
94	+ <connection>
95	+ <use>core_read</use>
96	+ </connection>
97	+ </bmbleb_read>
98	+ </resources>
99	+ <blocks>
100	+ <bmbleb>
101	+ <class>Springbot_Bmbleb_Block</class>
102	+ </bmbleb>
103	+ </blocks>
104	+ <helpers>
105	+ <bmbleb>
106	+ <class>Springbot_Bmbleb_Helper</class>
107	+ </bmbleb>
108	+ </helpers>
109	+ </global>
110	+ <default>
111	+ <bmbleb>
112	+ <config>
113	+ </config>
114	+ </bmbleb>
115	+ </default>
116	</config>
117

app/code/community/Springbot/BoneCollector/Model/HarvestAbstract.php CHANGED Viewed

File without changes

app/code/community/Springbot/BoneCollector/Model/HarvestAttribute/Observer.php CHANGED Viewed

	@@ -23,7 +23,7 @@ class Springbot_BoneCollector_Model_HarvestAttribute_Observer extends Springbot_
23	}
24	}
25	catch (Exception $e) {
26	- Springbot_Log::error($e);
27	}
28	}
29
	@@ -38,7 +38,7 @@ class Springbot_BoneCollector_Model_HarvestAttribute_Observer extends Springbot_
38	}
39	}
40	catch (Exception $e) {
41	- Springbot_Log::error($e);
42	}
43	}
44


23	}
24	}
25	catch (Exception $e) {
26	+ Springbot_Log::error($e->getMessage());
27	}
28	}
29

38	}
39	}
40	catch (Exception $e) {
41	+ Springbot_Log::error($e->getMessage());
42	}
43	}
44

app/code/community/Springbot/BoneCollector/Model/HarvestCart/Observer.php CHANGED Viewed

	@@ -24,7 +24,7 @@ class Springbot_BoneCollector_Model_HarvestCart_Observer extends Springbot_BoneC
24	if (Mage::helper('combine')->doSendQuote($json)) {
25	Springbot_Boss::addTrackable(
26	'cart_user_agent',
27	- ~~$_SERVER[~~'~~HTTP_USER_AGENT~~'],
28	$quoteParser->getQuoteId(),
29	$quoteParser->getCustomerId(),
30	$quoteParser->getCustomerEmail()
	@@ -42,7 +42,7 @@ class Springbot_BoneCollector_Model_HarvestCart_Observer extends Springbot_BoneC
42	}
43	}
44	catch (Exception $e) {
45	- Springbot_Log::error($e);
46	}
47	}
48
	@@ -77,7 +77,7 @@ class Springbot_BoneCollector_Model_HarvestCart_Observer extends Springbot_BoneC
77	));
78	}
79	catch (Exception $e) {
80	- Springbot_Log::error($e);
81	}
82	}
83
	@@ -125,7 +125,7 @@ class Springbot_BoneCollector_Model_HarvestCart_Observer extends Springbot_BoneC
125	}
126	}
127	catch (Exception $e) {
128	- Springbot_Log::error($e);
129	}
130	}
131


24	if (Mage::helper('combine')->doSendQuote($json)) {
25	Springbot_Boss::addTrackable(
26	'cart_user_agent',
27	+ Mage::helper('core/http')->getHttpUserAgent(),
28	$quoteParser->getQuoteId(),
29	$quoteParser->getCustomerId(),
30	$quoteParser->getCustomerEmail()

42	}
43	}
44	catch (Exception $e) {
45	+ Springbot_Log::error($e->getMessage());
46	}
47	}
48

77	));
78	}
79	catch (Exception $e) {
80	+ Springbot_Log::error($e->getMessage());
81	}
82	}
83

125	}
126	}
127	catch (Exception $e) {
128	+ Springbot_Log::error($e->getMessage());
129	}
130	}
131

app/code/community/Springbot/BoneCollector/Model/HarvestCategory/Observer.php CHANGED Viewed

	@@ -12,7 +12,7 @@ class Springbot_BoneCollector_Model_HarvestCategory_Observer extends Springbot_B
12	}
13	}
14	catch (Exception $e) {
15	- Springbot_Log::error($e);
16	}
17	}
18
	@@ -32,7 +32,7 @@ class Springbot_BoneCollector_Model_HarvestCategory_Observer extends Springbot_B
32
33	}
34	catch (Exception $e) {
35	- Springbot_Log::error($e);
36	}
37	}
38	}


12	}
13	}
14	catch (Exception $e) {
15	+ Springbot_Log::error($e->getMessage());
16	}
17	}
18

32
33	}
34	catch (Exception $e) {
35	+ Springbot_Log::error($e->getMessage());
36	}
37	}
38	}

app/code/community/Springbot/BoneCollector/Model/HarvestCustomer/Observer.php CHANGED Viewed

	@@ -15,7 +15,7 @@ class Springbot_BoneCollector_Model_HarvestCustomer_Observer extends Springbot_B
15	Springbot_Boss::scheduleJob('post:customer', array('i' => $customerId), Springbot_Services::LISTENER, 'listener');
16	}
17	} catch (Exception $e) {
18	- Springbot_Log::error($e);
19	}
20	}
21
	@@ -30,7 +30,7 @@ class Springbot_BoneCollector_Model_HarvestCustomer_Observer extends Springbot_B
30	'delete' => true,
31	))->run();
32	} catch (Exception $e) {
33	- Springbot_Log::error($e);
34	}
35	}
36
	@@ -46,7 +46,7 @@ class Springbot_BoneCollector_Model_HarvestCustomer_Observer extends Springbot_B
46	}
47	}
48	catch (Exception $e) {
49	- Springbot_Log::~~debug~~('Exception caught during attribute iteration for customer observer');
50	}
51
52


15	Springbot_Boss::scheduleJob('post:customer', array('i' => $customerId), Springbot_Services::LISTENER, 'listener');
16	}
17	} catch (Exception $e) {
18	+ Springbot_Log::error($e->getMessage());
19	}
20	}
21

30	'delete' => true,
31	))->run();
32	} catch (Exception $e) {
33	+ Springbot_Log::error($e->getMessage());
34	}
35	}
36

46	}
47	}
48	catch (Exception $e) {
49	+ Springbot_Log::error('Exception caught during attribute iteration for customer observer: ' . $e->getMessage());
50	}
51
52

app/code/community/Springbot/BoneCollector/Model/HarvestInventoryItem/Observer.php CHANGED Viewed

	@@ -23,7 +23,7 @@ class Springbot_BoneCollector_Model_HarvestInventoryItem_Observer extends Spring
23	}
24	}
25	catch (Exception $e) {
26	- Springbot_Log::error($e);
27	}
28	}
29	}
	@@ -40,7 +40,7 @@ class Springbot_BoneCollector_Model_HarvestInventoryItem_Observer extends Spring
40	);
41	}
42	catch (Exception $e) {
43	- Springbot_Log::error($e);
44	}
45	}
46	}
	@@ -57,7 +57,7 @@ class Springbot_BoneCollector_Model_HarvestInventoryItem_Observer extends Spring
57	);
58	}
59	catch (Exception $e) {
60	- Springbot_Log::error($e);
61	}
62	}
63	}
	@@ -81,7 +81,7 @@ class Springbot_BoneCollector_Model_HarvestInventoryItem_Observer extends Spring
81	}
82	}
83	catch (Exception $e) {
84	- Springbot_Log::error($e);
85	}
86	}
87


23	}
24	}
25	catch (Exception $e) {
26	+ Springbot_Log::error($e->getMessage());
27	}
28	}
29	}

40	);
41	}
42	catch (Exception $e) {
43	+ Springbot_Log::error($e->getMessage());
44	}
45	}
46	}

57	);
58	}
59	catch (Exception $e) {
60	+ Springbot_Log::error($e->getMessage());
61	}
62	}
63	}

81	}
82	}
83	catch (Exception $e) {
84	+ Springbot_Log::error($e->getMessage());
85	}
86	}
87

app/code/community/Springbot/BoneCollector/Model/HarvestProduct/Observer.php CHANGED Viewed

	@@ -34,7 +34,7 @@ class Springbot_BoneCollector_Model_HarvestProduct_Observer extends Springbot_Bo
34	}
35
36	} catch (Exception $e) {
37	- Springbot_Log::error($e);
38	}
39	}
40
	@@ -56,7 +56,7 @@ class Springbot_BoneCollector_Model_HarvestProduct_Observer extends Springbot_Bo
56	}
57	Mage::helper('combine/harvest')->deleteRemote($post, 'products');
58	} catch (Exception $e) {
59	- Springbot_Log::error($e);
60	}
61	}
62


34	}
35
36	} catch (Exception $e) {
37	+ Springbot_Log::error($e->getMessage());
38	}
39	}
40

56	}
57	Mage::helper('combine/harvest')->deleteRemote($post, 'products');
58	} catch (Exception $e) {
59	+ Springbot_Log::error($e->getMessage());
60	}
61	}
62

app/code/community/Springbot/BoneCollector/Model/HarvestPurchase/Observer.php CHANGED Viewed

	@@ -11,7 +11,7 @@ class Springbot_BoneCollector_Model_HarvestPurchase_Observer extends Springbot_B
11	Mage::helper('combine/trackable')->updateTrackables($order);
12	Springbot_Boss::addTrackable(
13	'purchase_user_agent',
14	- ~~$_SERVER[~~'~~HTTP_USER_AGENT~~'],
15	$order->getQuoteId(),
16	$order->getCustomerId(),
17	$order->getCustomerEmail(),
	@@ -20,7 +20,7 @@ class Springbot_BoneCollector_Model_HarvestPurchase_Observer extends Springbot_B
20	$this->_schedulePurchasePost($order, true);
21	}
22	catch (Exception $e) {
23	- Springbot_Log::error($e);
24	}
25	}
26
	@@ -32,7 +32,7 @@ class Springbot_BoneCollector_Model_HarvestPurchase_Observer extends Springbot_B
32	$this->_schedulePurchasePost($order, false);
33	}
34	catch (Exception $e) {
35	- Springbot_Log::error($e);
36	}
37	}
38
	@@ -64,7 +64,7 @@ class Springbot_BoneCollector_Model_HarvestPurchase_Observer extends Springbot_B
64
65	}
66	catch (Exception $e) {
67	- Springbot_Log::error($e);
68	}
69	}
70


11	Mage::helper('combine/trackable')->updateTrackables($order);
12	Springbot_Boss::addTrackable(
13	'purchase_user_agent',
14	+ Mage::helper('core/http')->getHttpUserAgent(),
15	$order->getQuoteId(),
16	$order->getCustomerId(),
17	$order->getCustomerEmail(),

20	$this->_schedulePurchasePost($order, true);
21	}
22	catch (Exception $e) {
23	+ Springbot_Log::error($e->getMessage());
24	}
25	}
26

32	$this->_schedulePurchasePost($order, false);
33	}
34	catch (Exception $e) {
35	+ Springbot_Log::error($e->getMessage());
36	}
37	}
38

64
65	}
66	catch (Exception $e) {
67	+ Springbot_Log::error($e->getMessage());
68	}
69	}
70

app/code/community/Springbot/BoneCollector/Model/HarvestRule/Observer.php CHANGED Viewed

	@@ -56,7 +56,7 @@ class Springbot_BoneCollector_Model_HarvestRule_Observer extends Springbot_BoneC
56	}
57	}
58	catch (Exception $e) {
59	- Springbot_Log::error($e);
60	}
61
62	}
	@@ -75,7 +75,7 @@ class Springbot_BoneCollector_Model_HarvestRule_Observer extends Springbot_BoneC
75	);
76	}
77	catch (Exception $e) {
78	- Springbot_Log::error($e);
79	}
80	}
81


56	}
57	}
58	catch (Exception $e) {
59	+ Springbot_Log::error($e->getMessage());
60	}
61
62	}

75	);
76	}
77	catch (Exception $e) {
78	+ Springbot_Log::error($e->getMessage());
79	}
80	}
81

app/code/community/Springbot/BoneCollector/Model/HarvestSubscriber/Observer.php CHANGED Viewed

	@@ -17,7 +17,7 @@ class Springbot_BoneCollector_Model_HarvestSubscriber_Observer extends Springbot
17
18	}
19	catch (Exception $e) {
20	- Springbot_Log::error($e);
21	}
22	}
23
	@@ -32,7 +32,7 @@ class Springbot_BoneCollector_Model_HarvestSubscriber_Observer extends Springbot
32	))->run();
33	}
34	catch (Exception $e) {
35	- Springbot_Log::error($e);
36	}
37	}
38	}


17
18	}
19	catch (Exception $e) {
20	+ Springbot_Log::error($e->getMessage());
21	}
22	}
23

32	))->run();
33	}
34	catch (Exception $e) {
35	+ Springbot_Log::error($e->getMessage());
36	}
37	}
38	}

app/code/community/Springbot/BoneCollector/etc/config.xml CHANGED Viewed

File without changes

app/code/community/Springbot/Boss.php CHANGED Viewed

	@@ -59,12 +59,11 @@ class Springbot_Boss
59	{
60	if(self::active()) {
61	if(!isset($data['type']) \|\| !isset($data['store_id'])) {
62	- Springbot_Log::error(~~new Exception(~~"Invalid action attempted to log"));
63	return;
64	}
65	$event = Mage::getModel('combine/action');
66	$event->setData($data);
67	- $event->setVisitorIp(Mage::helper('core/http')->getRemoteAddr(true));
68	$event->save();
69
70	Springbot_Log::debug($event->getData());


59	{
60	if(self::active()) {
61	if(!isset($data['type']) \|\| !isset($data['store_id'])) {
62	+ Springbot_Log::error("Invalid action attempted to log");
63	return;
64	}
65	$event = Mage::getModel('combine/action');
66	$event->setData($data);

67	$event->save();
68
69	Springbot_Log::debug($event->getData());

app/code/community/Springbot/Cli.php CHANGED Viewed

	@@ -170,6 +170,7 @@ class Springbot_Cli
170	self::$_phpExec = $php;
171	}
172	catch (Exception $e) {

173	return '';
174	}
175	}


170	self::$_phpExec = $php;
171	}
172	catch (Exception $e) {
173	+ Springbot_Log::error($e->getMessage());
174	return '';
175	}
176	}

app/code/community/Springbot/Combine/Helper/Attributes.php CHANGED Viewed

	@@ -103,7 +103,7 @@ class Springbot_Combine_Helper_Attributes extends Mage_Core_Helper_Abstract
103	->toOptionArray();
104	}
105	} catch (Exception $e) {
106	- ~~// onward! We don't stop for poor api design.~~
107	}
108	}
109


103	->toOptionArray();
104	}
105	} catch (Exception $e) {
106	+ Springbot_Log::error($e->getMessage());
107	}
108	}
109

app/code/community/Springbot/Combine/Helper/Cart.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Helper/Data.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Helper/Harvest.php CHANGED Viewed

	@@ -111,7 +111,9 @@ class Springbot_Combine_Helper_Harvest extends Mage_Core_Helper_Abstract
111	if(is_null($id)) {
112	try {
113	$id = $collection->getResource()->getIdFieldName();
114	- } catch (Exception $e) {}


115	}
116
117	if(is_null($id)) {
	@@ -250,7 +252,7 @@ class Springbot_Combine_Helper_Harvest extends Mage_Core_Helper_Abstract
250	}
251
252	} catch (Exception $e) {
253	- Springbot_Log::error($e);
254	Springbot_Log::harvest("Unknown quantity of {$label} to harvest!");
255	}
256	}


111	if(is_null($id)) {
112	try {
113	$id = $collection->getResource()->getIdFieldName();
114	+ } catch (Exception $e) {
115	+ Springbot_Log::error($e->getMessage());
116	+ }
117	}
118
119	if(is_null($id)) {

252	}
253
254	} catch (Exception $e) {
255	+ Springbot_Log::error($e->getMessage());
256	Springbot_Log::harvest("Unknown quantity of {$label} to harvest!");
257	}
258	}

app/code/community/Springbot/Combine/Helper/Marketplaces.php ADDED Viewed

	@@ -0,0 +1,38 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Helper_Marketplaces extends Mage_Core_Helper_Abstract
4	+ {
5	+ public function fetch($keys, $obj = null, $origKey = null)
6	+ {
7	+ if(is_null($obj)) {
8	+ return null;
9	+ }
10	+ if(is_null($origKey)) {
11	+ $origKey = $keys;
12	+ }
13	+ if(!is_array($keys)) {
14	+ $keys = explode('->', $keys);
15	+ }
16	+
17	+ $key = array_shift($keys);
18	+
19	+ if(!isset($obj[$key])) {
20	+ throw new Exception("Missing required value for key {$origKey}", 422);
21	+ }
22	+
23	+ if(count($keys) > 0) {
24	+ return $this->fetch($keys, $obj[$key], $origKey);
25	+ } else {
26	+ return $obj[$key];
27	+ }
28	+ }
29	+
30	+ public function safeFetch($keys, $obj = null, $origKey = null)
31	+ {
32	+ try {
33	+ return $this->fetch($keys, $obj, $origKey);
34	+ } catch (Exception $e) {
35	+ return null;
36	+ }
37	+ }
38	+ }

app/code/community/Springbot/Combine/Helper/Parser.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Helper/Redirect.php CHANGED Viewed

	@@ -72,7 +72,7 @@ class Springbot_Combine_Helper_Redirect extends Mage_Core_Helper_Abstract
72	$output[] = $value;
73	} else {
74	$ip = Mage::helper('core/http')->getRemoteAddr();
75	- Springbot_Log::error(~~new Exception(~~"{$value} attempted to pass as cookie param from {$ip}. Possible insertion attack."));
76	Springbot_Boss::setCookie(Springbot_Boss::COOKIE_NAME, '');
77	}
78	}


72	$output[] = $value;
73	} else {
74	$ip = Mage::helper('core/http')->getRemoteAddr();
75	+ Springbot_Log::error("{$value} attempted to pass as cookie param from {$ip}. Possible insertion attack.");
76	Springbot_Boss::setCookie(Springbot_Boss::COOKIE_NAME, '');
77	}
78	}

app/code/community/Springbot/Combine/Helper/Store.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Helper/Trackable.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Action.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Api.php CHANGED Viewed

	@@ -74,7 +74,7 @@ class Springbot_Combine_Model_Api extends Varien_Object
74	}
75	Springbot_Log::http($payload);
76	} catch (Exception $e) {
77	- Springbot_Log::error($e);
78	$code = isset($result['status']) ? $result['status'] : 'null';
79	throw new Exception("$method call failed with code: $code");
80	}


74	}
75	Springbot_Log::http($payload);
76	} catch (Exception $e) {
77	+ Springbot_Log::error($e->getMessage());
78	$code = isset($result['status']) ? $result['status'] : 'null';
79	throw new Exception("$method call failed with code: $code");
80	}

app/code/community/Springbot/Combine/Model/Cron.php CHANGED Viewed

	@@ -16,7 +16,7 @@ class Springbot_Combine_Model_Cron extends Mage_Core_Model_Abstract
16	}
17	catch(Exception $e) {
18	$this->_getResource()->rollBack();
19	- Springbot_Log::error($e);
20	}
21	return $this;
22	}


16	}
17	catch(Exception $e) {
18	$this->_getResource()->rollBack();
19	+ Springbot_Log::error($e->getMessage());
20	}
21	return $this;
22	}

app/code/community/Springbot/Combine/Model/Cron/Count.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Cron/Manager/Status.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Cron/Queue.php CHANGED Viewed

	@@ -80,7 +80,7 @@ class Springbot_Combine_Model_Cron_Queue extends Springbot_Combine_Model_Cron
80	}
81	}
82	catch (Exception $e) {
83	- Springbot_Log::error($e);
84	}
85
86	return $return;


80	}
81	}
82	catch (Exception $e) {
83	+ Springbot_Log::error($e->getMessage());
84	}
85
86	return $return;

app/code/community/Springbot/Combine/Model/Cron/Queue/Batch.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Cron/Queue/Batch/Row.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Cron/Worker.php CHANGED Viewed

	@@ -27,7 +27,7 @@ class Springbot_Combine_Model_Cron_Worker extends Mage_Core_Model_Abstract
27	} while ($job && ($count < $maxJobs));
28	}
29	} catch (Exception $e) {
30	- Springbot_Log::error($e);
31	}
32	}
33


27	} while ($job && ($count < $maxJobs));
28	}
29	} catch (Exception $e) {
30	+ Springbot_Log::error($e->getMessage());
31	}
32	}
33

app/code/community/Springbot/Combine/Model/File/Io.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/File/Path.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest.php CHANGED Viewed

	@@ -119,7 +119,7 @@ abstract class Springbot_Combine_Model_Harvest
119	}
120	}
121	catch (Exception $e) {
122	- Springbot_Log::error($e);
123	}
124	}
125


119	}
120	}
121	catch (Exception $e) {
122	+ Springbot_Log::error($e->getMessage());
123	}
124	}
125

app/code/community/Springbot/Combine/Model/Harvest/AttributeSets.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Carts.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Categories.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Coupons.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/CustomerAttributeSets.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Customers.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Guests.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Inventories.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Products.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Purchases.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Rules.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Harvest/Subscribers.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Marketplaces/Order/Builder.php ADDED Viewed

	@@ -0,0 +1,266 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Marketplaces_Order_Builder extends Varien_Object
4	+ {
5	+ protected $_data;
6	+ protected $_products;
7	+ protected $_customer;
8	+ protected $_storeId;
9	+ protected $_order;
10	+ protected $_mpOrder;
11	+
12	+ protected $_shippingMethod = 'sbShipping';
13	+ protected $_paymentMethod = 'sbPayment';
14	+ protected $_itemTotals;
15	+
16	+ public function __construct($data)
17	+ {
18	+ $this->_data = $data;
19	+ $this->_helper = Mage::helper('combine/marketplaces');
20	+ }
21	+
22	+ public function buildOrder($products, $customer)
23	+ {
24	+ $customer->cleanAllAddresses();
25	+
26	+ $this->_customer = $customer;
27	+ $this->_products = $products;
28	+
29	+ $this->_storeId = $customer->getStoreId();
30	+
31	+ $this->makeOrder()
32	+ ->setAddresses()
33	+ ->setPayment()
34	+ ->addProducts()
35	+ ->setTotals();
36	+
37	+ $this->makeMarketplaceOrder();
38	+
39	+ try {
40	+ $transaction = Mage::getModel('core/resource_transaction');
41	+
42	+ $transaction->addObject($this->_order)
43	+ ->addObject($this->_mpOrder)
44	+ ->addCommitCallback(array($this->_order, 'place'))
45	+ ->addCommitCallback(array($this->_order, 'save'))
46	+ ->save();
47	+ } catch (Zend_Db_Statement_Exception $e) {
48	+ throw new Exception("Order already exists for order with id {$this->_mpOrder->getRemoteOrderId()}", 409);
49	+ }
50	+
51	+ $this->_mpOrder->setOrderId($this->_order->getId())->save();
52	+
53	+ return $this->_order;
54	+ }
55	+
56	+ private function makeMarketplaceOrder()
57	+ {
58	+ Springbot_Log::debug("Making mp order for {$this->fetch('amazon_order_id')}");
59	+ $this->_mpOrder = Mage::getModel('combine/marketplaces_remote_order');
60	+ $this->_mpOrder->setData(array(
61	+ 'increment_id' => $this->_order->getIncrementId(),
62	+ 'remote_order_id' => $this->fetch('amazon_order_id'),
63	+ 'marketplace_type' => Springbot_Combine_Model_Marketplaces_OrderService::AMAZON
64	+ ));
65	+
66	+ Springbot_Log::debug($this->_mpOrder->getData());
67	+
68	+ return $this;
69	+ }
70	+
71	+ private function makeOrder()
72	+ {
73	+ $reservedOrderId = $this->reserveOrderId();
74	+
75	+ $currencyCode = $this->getCurrencyCode();
76	+
77	+ $this->_order = Mage::getModel('sales/order')
78	+ ->setIncrementId($reservedOrderId)
79	+ ->setStoreId($this->_customer->getStoreId())
80	+ ->setQuoteId(0)
81	+ ->setGlobalCurrencyCode($currencyCode)
82	+ ->setBaseCurrencyCode($currencyCode)
83	+ ->setStoreCurrencyCode($currencyCode)
84	+ ->setOrderCurrencyCode($currencyCode)
85	+ ;
86	+
87	+ $this->_order->setCustomerEmail($this->_customer->getEmail())
88	+ ->setCustomerFirstname($this->_customer->getFirstname())
89	+ ->setCustomerLastname($this->_customer->getLastname())
90	+ ->setCustomerGroupId($this->_customer->getGroupId())
91	+ ->setCustomerIsGuest(0)
92	+ ->setCustomer($this->_customer);
93	+
94	+ return $this;
95	+ }
96	+
97	+ private function setTotals()
98	+ {
99	+ $total = $this->fetch('order_total->Amount');
100	+ $subtotal = $this->getSubtotal();
101	+
102	+ Springbot_Log::debug($this->getItemTotals());
103	+
104	+ $this->_order->setSubtotal($subtotal)
105	+ ->setBaseSubtotal($subtotal)
106	+ ->setGrandTotal($total)
107	+ ->setBaseGrandTotal($total)
108	+ ->setTotalPaid($total)
109	+ ->setBaseTotalPaid($total)
110	+ ->setShippingAmount($this->getShipping())
111	+ ->setBaseShippingAmount($this->getShipping())
112	+ ->setShippingTaxAmount($this->getShippingTax())
113	+ ->setBaseShippingTaxAmount($this->getShippingTax())
114	+ ->setTaxAmount($this->getTax())
115	+ ->setBaseTaxAmount($this->getTax())
116	+ ;
117	+
118	+ return $this;
119	+ }
120	+
121	+ private function setAddresses()
122	+ {
123	+ $billing = $this->_customer->getDefaultBillingAddress();
124	+ $billingAddress = Mage::getModel('sales/order_address')
125	+ ->setStoreId($this->_storeId)
126	+ ->setAddressType(Mage_Sales_Model_Quote_Address::TYPE_BILLING)
127	+ ->setCustomerId($this->_customer->getId())
128	+ ->setCustomerAddressId($this->_customer->getDefaultBilling())
129	+ ->setCustomerAddress_id($billing->getEntityId())
130	+ ->setPrefix($billing->getPrefix())
131	+ ->setFirstname($billing->getFirstname())
132	+ ->setMiddlename($billing->getMiddlename())
133	+ ->setLastname($billing->getLastname())
134	+ ->setSuffix($billing->getSuffix())
135	+ ->setCompany($billing->getCompany())
136	+ ->setStreet($billing->getStreet())
137	+ ->setCity($billing->getCity())
138	+ ->setCountry_id($billing->getCountryId())
139	+ ->setRegion($billing->getRegion())
140	+ ->setRegion_id($billing->getRegionId())
141	+ ->setPostcode($billing->getPostcode())
142	+ ->setTelephone($billing->getTelephone())
143	+ ->setFax($billing->getFax())
144	+ ->setVatId($billing->getVatId());
145	+ $this->_order->setBillingAddress($billingAddress);
146	+
147	+ $shipping = $this->_customer->getDefaultShippingAddress();
148	+ $shippingAddress = Mage::getModel('sales/order_address')
149	+ ->setStoreId($this->_storeId)
150	+ ->setAddressType(Mage_Sales_Model_Quote_Address::TYPE_SHIPPING)
151	+ ->setCustomerId($this->_customer->getId())
152	+ ->setCustomerAddressId($this->_customer->getDefaultShipping())
153	+ ->setCustomer_address_id($shipping->getEntityId())
154	+ ->setPrefix($shipping->getPrefix())
155	+ ->setFirstname($shipping->getFirstname())
156	+ ->setMiddlename($shipping->getMiddlename())
157	+ ->setLastname($shipping->getLastname())
158	+ ->setSuffix($shipping->getSuffix())
159	+ ->setCompany($shipping->getCompany())
160	+ ->setStreet($shipping->getStreet())
161	+ ->setCity($shipping->getCity())
162	+ ->setCountry_id($shipping->getCountryId())
163	+ ->setRegion($shipping->getRegion())
164	+ ->setRegion_id($shipping->getRegionId())
165	+ ->setPostcode($shipping->getPostcode())
166	+ ->setTelephone($shipping->getTelephone())
167	+ ->setFax($shipping->getFax())
168	+ ->setVatId($billing->getVatId());
169	+
170	+ $this->_order->setShippingAddress($shippingAddress)
171	+ ->setShippingMethod($this->_shippingMethod)
172	+ ->setShippingDescription($this->fetch('shipment_service_level_category'));
173	+
174	+ return $this;
175	+ }
176	+
177	+ private function setPayment()
178	+ {
179	+ $orderPayment = Mage::getModel('sales/order_payment')
180	+ ->setStoreId($this->_customer->getStoreId())
181	+ ->setCustomerPaymentId(0)
182	+ ->setMethod($this->_paymentMethod)
183	+ ->setPoNumber($this->safeFetch('purchase_order_number'));
184	+
185	+ $this->_order->setPayment($orderPayment);
186	+
187	+ return $this;
188	+ }
189	+
190	+ private function addProducts()
191	+ {
192	+ foreach ($this->_products as $product) {
193	+ $item = Mage::getModel('combine/marketplaces_order_item')->makeOrderItem($product, $this->_data);
194	+ $this->_order->addItem($item);
195	+ }
196	+ return $this;
197	+ }
198	+
199	+ private function getCurrencyCode()
200	+ {
201	+ if($value = $this->fetch('order_total->CurrencyCode')) {
202	+ return $value;
203	+ } else {
204	+ return Mage::app()->getBaseCurrencyCode();
205	+ }
206	+ }
207	+
208	+ private function reserveOrderId()
209	+ {
210	+ $transaction = Mage::getModel('core/resource_transaction');
211	+ return Mage::getSingleton('eav/config')
212	+ ->getEntityType('order')
213	+ ->fetchNewIncrementId($this->_storeId);
214	+ }
215	+
216	+ private function getSubtotal()
217	+ {
218	+ return $this->getItemTotals()['item_price'] + $this->getItemTotals()['tax'];
219	+ }
220	+
221	+ private function getShipping()
222	+ {
223	+ return $this->getItemTotals()['shipping'];
224	+ }
225	+
226	+ private function getShippingTax()
227	+ {
228	+ return $this->getItemTotals()['shipping_tax'];
229	+ }
230	+
231	+ private function getTax()
232	+ {
233	+ return $this->getItemTotals()['tax'];
234	+ }
235	+
236	+ private function getItemTotals()
237	+ {
238	+ if(!isset($this->_itemTotals)) {
239	+ $shipping = 0; $shippingTax = 0; $tax = 0; $itemPrice = 0;
240	+ foreach($this->fetch('order_items') as $item) {
241	+ $shipping += $this->_helper->safeFetch('shipping_price->Amount', $item);
242	+ $shippingTax += $this->_helper->safeFetch('shipping_tax->Amount', $item);
243	+ $tax += $this->_helper->safeFetch('item_tax->Amount', $item);
244	+ $itemPrice += $this->_helper->safeFetch('item_price->Amount', $item);
245	+ }
246	+ $this->_itemTotals = array(
247	+ 'shipping' => $shipping,
248	+ 'shipping_tax' => $shippingTax,
249	+ 'tax' => $tax,
250	+ 'item_price' => $itemPrice
251	+ );
252	+ Springbot_Log::debug($this->_itemTotals);
253	+ }
254	+ return $this->_itemTotals;
255	+ }
256	+
257	+ private function safeFetch($key)
258	+ {
259	+ return $this->_helper->safeFetch($key, $this->_data);
260	+ }
261	+
262	+ private function fetch($key)
263	+ {
264	+ return $this->_helper->fetch($key, $this->_data);
265	+ }
266	+ }

app/code/community/Springbot/Combine/Model/Marketplaces/Order/Customer.php ADDED Viewed

	@@ -0,0 +1,135 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Marketplaces_Order_Customer extends Varien_Object
4	+ {
5	+ protected $_data;
6	+ protected $_region;
7	+
8	+ public function __construct($data)
9	+ {
10	+ $this->_data = $data;
11	+ }
12	+
13	+ public function createCustomer()
14	+ {
15	+ if ($customer = $this->existingCustomer()) {
16	+ // nop
17	+ } else {
18	+ $password = Mage::helper('core')->getRandomString(6);
19	+
20	+ $customer = Mage::getModel('customer/customer')
21	+ ->setData('firstname', $this->getFirstname())
22	+ ->setData('lastname', $this->getLastname())
23	+ ->setData('website_id', 0)
24	+ ->setData('group_id', 0)
25	+ ->setData('email', $this->fetch('buyer_email'))
26	+ ->setData('confirmation', $password);
27	+
28	+ $customer->setPassword($password);
29	+ $customer->save();
30	+ }
31	+
32	+ $customerAddress = Mage::getModel('customer/address')
33	+ ->setFirstname($this->getFirstname())
34	+ ->setLastname($this->getLastname())
35	+ ->setCompany($this->getCompany())
36	+ ->setRegion($this->getRegion())
37	+ ->setRegionId($this->getRegionId())
38	+ ->setCountryId($this->safeFetch('shipping_address->CountryCode'))
39	+ ->setCity($this->safeFetch('shipping_address->City'))
40	+ ->setPostcode($this->safeFetch('shipping_address->PostalCode'))
41	+ ->setPhone($this->safeFetch('shipping_address->Phone'))
42	+ ->setStreet($this->getStreet())
43	+ ->setCustomer($customer)
44	+ ->setIsDefaultBilling(true)
45	+ ->setIsDefaultShipping(true);
46	+
47	+ $customerAddress->save();
48	+
49	+ $customer->setDefaultBilling($customerAddress->getEntityId())
50	+ ->setDefaultShipping($customerAddress->getEntityId());
51	+
52	+ $customer->save();
53	+
54	+ Springbot_Log::debug($customer->debug());
55	+
56	+ return $customer;
57	+ }
58	+
59	+ private function getCompany()
60	+ {
61	+ if($this->fetch('buyer_name') != $this->fetch('shipping_address->Name')) {
62	+ return $this->fetch('shipping_address->Name');
63	+ }
64	+ }
65	+
66	+ public function getFirstname()
67	+ {
68	+ return preg_replace('/\s.*$/', '', $this->fetch('buyer_name'));
69	+ }
70	+
71	+ public function getLastname()
72	+ {
73	+ return str_replace($this->getFirstname(), '', $this->fetch('buyer_name'));
74	+ }
75	+
76	+ private function getStreet()
77	+ {
78	+ return $this->fetch('shipping_address->AddressLine1')
79	+ . PHP_EOL . $this->safeFetch('shipping_address->AddressLine2')
80	+ . PHP_EOL . $this->safeFetch('shipping_address->AddressLine3');
81	+ }
82	+
83	+ private function getRegion()
84	+ {
85	+ if(!isset($this->_region)) {
86	+ $this->_region = Mage::getModel('directory/region')->loadByName(
87	+ $this->fetch('shipping_address->StateOrRegion'),
88	+ $this->fetch('shipping_address->CountryCode')
89	+ );
90	+
91	+ // If we can't load by region, fail over and try to load by code
92	+ if($this->_region->getId() == null) {
93	+ $this->_region = Mage::getModel('directory/region')->loadByCode(
94	+ $this->fetch('shipping_address->StateOrRegion'),
95	+ $this->fetch('shipping_address->CountryCode')
96	+ );
97	+ }
98	+ }
99	+ return $this->_region;
100	+ }
101	+
102	+ private function getRegionId()
103	+ {
104	+ if($region = $this->getRegion()) {
105	+ return $region->getId();
106	+ }
107	+ return null;
108	+ }
109	+
110	+ private function safeFetch($keys)
111	+ {
112	+ return Mage::helper('combine/marketplaces')->safeFetch($keys, $this->_data);
113	+ }
114	+
115	+ private function fetch($keys, $obj = null, $origKey = null)
116	+ {
117	+ if(is_null($obj)) {
118	+ $obj = $this->_data;
119	+ }
120	+ return Mage::helper('combine/marketplaces')->fetch($keys, $this->_data);
121	+ }
122	+
123	+ private function existingCustomer()
124	+ {
125	+ $customer = Mage::getModel('customer/customer');
126	+ $customer->setWebsiteId(0);
127	+ $customer->loadByEmail($this->fetch('buyer_email'));
128	+
129	+ if ($customer->getId()) {
130	+ return $customer;
131	+ } else {
132	+ return false;
133	+ }
134	+ }
135	+ }

app/code/community/Springbot/Combine/Model/Marketplaces/Order/Item.php ADDED Viewed

	@@ -0,0 +1,92 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Marketplaces_Order_Item
4	+ {
5	+ private $_product;
6	+ private $_data;
7	+
8	+ public function makeOrderItem($product)
9	+ {
10	+ $this->_product = $product['product'];
11	+ $this->_data = $product['data'];
12	+
13	+ $this->setOptions();
14	+
15	+ return $this->buildItem();
16	+ }
17	+
18	+ private function buildItem()
19	+ {
20	+ $product = $this->_product;
21	+ $options = $product->getTypeInstance(true)->getOrderOptions($product);
22	+
23	+ $qty = $this->fetch('quantity_ordered');
24	+ $tax = $this->fetch('item_tax->Amount');
25	+ $itemPrice = floatval($this->fetch('item_price->Amount'));
26	+
27	+ if ($qty == 0) {
28	+ throw new Exception("No quantity provided for product with sku: {$this->_product()->getSku()}");
29	+ }
30	+
31	+ $price = $itemPrice / $qty;
32	+ $rowTotal = $itemPrice + $tax;
33	+
34	+ $orderItem = Mage::getModel('sales/order_item')
35	+ ->setStoreId(0)
36	+ ->setQuoteItemId(0)
37	+ ->setQuoteParentItemId(NULL)
38	+ ->setProductId($product->getId())
39	+ ->setProductType($product->getTypeId())
40	+ ->setQtyBackordered(NULL)
41	+ ->setTotalQtyOrdered($qty)
42	+ ->setQtyOrdered($qty)
43	+ ->setName($product->getName())
44	+ ->setSku($product->getSku())
45	+ ->setPrice($price)
46	+ ->setBasePrice($price)
47	+ ->setTax($tax)
48	+ ->setBaseTax($tax)
49	+ ->setOriginalPrice($rowTotal)
50	+ ->setRowTotal($rowTotal)
51	+ ->setBaseRowTotal($rowTotal)
52	+
53	+ ->setWeeeTaxApplied(serialize(array()))
54	+ ->setBaseWeeeTaxDisposition(0)
55	+ ->setWeeeTaxDisposition(0)
56	+ ->setBaseWeeeTaxRowDisposition(0)
57	+ ->setWeeeTaxRowDisposition(0)
58	+ ->setBaseWeeeTaxAppliedAmount(0)
59	+ ->setBaseWeeeTaxAppliedRowAmount(0)
60	+ ->setWeeeTaxAppliedAmount(0)
61	+ ->setWeeeTaxAppliedRowAmount(0)
62	+
63	+ ->setProductOptions($options);
64	+
65	+ return $orderItem;
66	+ }
67	+
68	+ private function setOptions()
69	+ {
70	+ $options = $this->_product->getCustomOptions();
71	+
72	+ $optionsByCode = array();
73	+
74	+ foreach ($options as $option)
75	+ {
76	+ $quoteOption = Mage::getModel('sales/quote_item_option')->setData($option->getData())
77	+ ->setProduct($option->getProduct());
78	+
79	+ $optionsByCode[$quoteOption->getCode()] = $quoteOption;
80	+ }
81	+
82	+ $this->_product->setCustomOptions($optionsByCode);
83	+
84	+ return $this;
85	+ }
86	+
87	+ private function fetch($keys)
88	+ {
89	+ return Mage::helper('combine/marketplaces')->fetch($keys, $this->_data);
90	+ }
91	+ }
92	+

app/code/community/Springbot/Combine/Model/Marketplaces/Order/Parser.php ADDED Viewed

	@@ -0,0 +1,41 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Marketplaces_Order_Parser extends Varien_Object
4	+ {
5	+ protected $_data;
6	+
7	+ public function __construct($data)
8	+ {
9	+ $this->_data = $data;
10	+ }
11	+
12	+ public function loadProducts()
13	+ {
14	+ $products = array();
15	+
16	+ foreach($this->fetch('order_items') as $item) {
17	+ $id = $this->fetch('product_id', $item);
18	+ $product = Mage::getModel('catalog/product')->load($id);
19	+
20	+ if(is_null($product->getId())) {
21	+ throw new Exception("Could not find product where id = {$id}", 409);
22	+ }
23	+
24	+ $products[] = array(
25	+ 'data' => $item,
26	+ 'product' => $product
27	+ );
28	+ }
29	+
30	+ return $products;
31	+ }
32	+
33	+ private function fetch($keys, $obj = null, $origKey = null)
34	+ {
35	+ if(is_null($obj)) {
36	+ $obj = $this->_data;
37	+ }
38	+
39	+ return Mage::helper('combine/marketplaces')->fetch($keys, $obj);
40	+ }
41	+ }

app/code/community/Springbot/Combine/Model/Marketplaces/OrderService.php ADDED Viewed

	@@ -0,0 +1,43 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Marketplaces_OrderService
4	+ {
5	+ const AMAZON = 'amz';
6	+
7	+ protected $_data;
8	+
9	+ public function __construct($data)
10	+ {
11	+ $this->_data = $data;
12	+ }
13	+
14	+ public function createOrder()
15	+ {
16	+ $products = $this->loadProducts();
17	+
18	+ $customer = $this->createCustomer();
19	+
20	+ $builder = $this->getOrderBuilder();
21	+
22	+ $order = $builder->buildOrder($products, $customer);
23	+
24	+ return Mage::getModel('combine/parser_purchase', $order)->parse();
25	+ }
26	+
27	+ public function loadProducts()
28	+ {
29	+ return Mage::getModel('combine/marketplaces_order_parser', $this->_data)->loadProducts();
30	+ }
31	+
32	+ public function createCustomer()
33	+ {
34	+ return Mage::getModel('combine/marketplaces_order_customer', $this->_data)->createCustomer();
35	+ }
36	+
37	+ public function getOrderBuilder()
38	+ {
39	+ return Mage::getModel('combine/marketplaces_order_builder', $this->_data);
40	+ }
41	+ }
42	+
43	+

app/code/community/Springbot/Combine/Model/Marketplaces/Payment.php ADDED Viewed

	@@ -0,0 +1,10 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Marketplaces_Payment extends Mage_Payment_Model_Method_Abstract
4	+ {
5	+ protected $_code = 'sbPayment';
6	+
7	+ protected $_canUseCheckout = false;
8	+ protected $_canUseInternal = false;
9	+ protected $_canUseForMultishipping = false;
10	+ }

app/code/community/Springbot/Combine/Model/Marketplaces/Remote/Order.php ADDED Viewed

	@@ -0,0 +1,24 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Marketplaces_Remote_Order extends Springbot_Combine_Model_Cron
4	+ {
5	+ public function _construct()
6	+ {
7	+ $this->_init('combine/marketplaces_remote_order');
8	+ }
9	+
10	+ public function findByIncrementId($id)
11	+ {
12	+ $instance = $this->getCollection()->addFieldToFilter('increment_id', $id)->getFirstItem();
13	+
14	+ # Return null if we get a blank object
15	+ return $instance->getId() == null ? null : $instance;
16	+ }
17	+
18	+ public function getHumanMarketplaceType()
19	+ {
20	+ if($this->getMarketplaceType() == 'amz') {
21	+ return 'Amazon';
22	+ }
23	+ }
24	+ }

app/code/community/Springbot/Combine/Model/Marketplaces/Shipping.php ADDED Viewed

	@@ -0,0 +1,23 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Marketplaces_Shipping
4	+ extends Mage_Shipping_Model_Carrier_Abstract
5	+ implements Mage_Shipping_Model_Carrier_Interface
6	+ {
7	+ protected $_code = 'sbShipping';
8	+
9	+ public function getAllowedMethods()
10	+ {
11	+ return array($this->_code => $this->getConfigData('name'));
12	+ }
13	+
14	+ public function isTrackingAvailable()
15	+ {
16	+ return false;
17	+ }
18	+
19	+ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
20	+ {
21	+ return Mage::getModel('shipping/rate_result');
22	+ }
23	+ }

app/code/community/Springbot/Combine/Model/Mysql4/Action.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Action/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Cron/Count.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Cron/Queue.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Cron/Queue/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Redirect.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Redirect/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Redirect/Order.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Redirect/Order/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Setup.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Trackable.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Mysql4/Trackable/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/AttributeSet.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Category.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Coupon.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Customer.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/CustomerAttributeSet.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Guest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Inventory.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Product.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Purchase.php CHANGED Viewed

	@@ -46,6 +46,8 @@ class Springbot_Combine_Model_Parser_Purchase extends Springbot_Combine_Model_Pa
46	'line_items' => $this->_getLineItems(),
47	'attribute_items' => $this->_getAttributeArray(),
48	'json_data' => $this->_getJsonData(),


49	));
50
51	return parent::_parse();
	@@ -72,6 +74,17 @@ class Springbot_Combine_Model_Parser_Purchase extends Springbot_Combine_Model_Pa
72	return Mage::helper('combine/trackable')->getTrackablesHashByQuote($quoteId);
73	}
74











75	protected function _getLineItems()
76	{
77	if(!isset($this->_lineItems)) {
	@@ -163,4 +176,17 @@ class Springbot_Combine_Model_Parser_Purchase extends Springbot_Combine_Model_Pa
163
164	return $email;
165	}













166	}


46	'line_items' => $this->_getLineItems(),
47	'attribute_items' => $this->_getAttributeArray(),
48	'json_data' => $this->_getJsonData(),
49	+ 'shipments' => $this->_getShipments(),
50	+ 'marketplaces' => $this->_getMarketplacesDetail(),
51	));
52
53	return parent::_parse();

74	return Mage::helper('combine/trackable')->getTrackablesHashByQuote($quoteId);
75	}
76
77	+ protected function _getShipments()
78	+ {
79	+ $shipments = array();
80	+ foreach($this->_purchase->getShipmentsCollection() as $shipment) {
81	+ foreach($shipment->getAllTracks() as $track) {
82	+ $shipments[] = Mage::getModel('combine/parser_purchase_shipment', $track)->getData();
83	+ }
84	+ }
85	+ return empty($shipments) ? null : $shipments;
86	+ }
87	+
88	protected function _getLineItems()
89	{
90	if(!isset($this->_lineItems)) {

176
177	return $email;
178	}
179	+
180	+ private function _getMarketplacesDetail()
181	+ {
182	+ $mpOrder = Mage::getModel('combine/marketplaces_remote_order')
183	+ ->load($this->_purchase->getIncrementId(), 'increment_id');
184	+
185	+ if ($mpOrder) {
186	+ return array(
187	+ 'mp_type' => $mpOrder->getMarketplaceType(),
188	+ 'remote_order_id' => $mpOrder->getRemoteOrderId(),
189	+ );
190	+ }
191	+ }
192	}

app/code/community/Springbot/Combine/Model/Parser/Purchase/Item.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Purchase/Shipment.php ADDED Viewed

	@@ -0,0 +1,48 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Parser_Purchase_Shipment extends Springbot_Combine_Model_Parser
4	+ {
5	+ protected $_accessor = '_shipment';
6	+ protected $_shipment;
7	+ protected $_track;
8	+
9	+ public function __construct(Mage_Sales_Model_Order_Shipment_Track $track)
10	+ {
11	+ $this->_track = $track;
12	+ $this->_shipment = $track->getShipment();
13	+ $this->_parse();
14	+ }
15	+
16	+ protected function _parse()
17	+ {
18	+ $this->_data = array(
19	+ 'tracking_number' => $this->_track->getTrackNumber(),
20	+ 'carrier_code' => $this->_track->getCarrierCode(),
21	+ 'title' => $this->_track->getTitle(),
22	+ 'ship_to' => $this->_getShippingName(),
23	+ 'shipment_status' => $this->_shipment->getShipmentStatus(),
24	+ 'items' => $this->_getShippedItems(),
25	+ );
26	+ }
27	+
28	+ protected function _getShippingName()
29	+ {
30	+ return $this->_shipment->getShippingAddress()->getName();
31	+ }
32	+
33	+ protected function _getShippedItems()
34	+ {
35	+ $data = array();
36	+
37	+ foreach($this->_shipment->getItemsCollection() as $item) {
38	+ $data[] = array(
39	+ 'sku' => $item->getSku(),
40	+ 'name' => $item->getName(),
41	+ 'product_id' => $item->getProductId(),
42	+ 'qty' => $item->getQty(),
43	+ );
44	+ }
45	+
46	+ return $data;
47	+ }
48	+ }

app/code/community/Springbot/Combine/Model/Parser/Quote.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Quote/Item.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Rule.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Parser/Subscriber.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Redirect.php CHANGED Viewed

	@@ -39,7 +39,7 @@ class Springbot_Combine_Model_Redirect extends Mage_Core_Model_Abstract
39	}
40	} catch(Exception $e) {
41	$this->_getResource()->rollBack();
42	- Springbot_Log::error($e);
43	}
44
45	return $this;


39	}
40	} catch(Exception $e) {
41	$this->_getResource()->rollBack();
42	+ Springbot_Log::error($e->getMessage());
43	}
44
45	return $this;

app/code/community/Springbot/Combine/Model/Redirect/Order.php CHANGED Viewed

	@@ -26,7 +26,7 @@ class Springbot_Combine_Model_Redirect_Order extends Mage_Core_Model_Abstract
26	}
27	} catch(Exception $e) {
28	$this->_getResource()->rollBack();
29	- Springbot_Log::error($e);
30	}
31
32	return $this;


26	}
27	} catch(Exception $e) {
28	$this->_getResource()->rollBack();
29	+ Springbot_Log::error($e->getMessage());
30	}
31
32	return $this;

app/code/community/Springbot/Combine/Model/Resource/Abstract.php CHANGED Viewed

	@@ -10,7 +10,7 @@ abstract class Springbot_Combine_Model_Resource_Abstract extends Mage_Core_Model
10	$bind = $this->_convertDatetimesToString($bind);
11	$this->_insertIgnore($table, $bind);
12	} catch (Exception $e) {
13	- Springbot_Log::error($e);
14	}
15	}
16


10	$bind = $this->_convertDatetimesToString($bind);
11	$this->_insertIgnore($table, $bind);
12	} catch (Exception $e) {
13	+ Springbot_Log::error($e->getMessage());
14	}
15	}
16

app/code/community/Springbot/Combine/Model/Resource/Action.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Action/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Cron/Count.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Cron/Count/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Cron/Queue.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Cron/Queue/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Debug.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Marketplaces/Remote/Order.php ADDED Viewed

	@@ -0,0 +1,10 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Resource_Marketplaces_Remote_Order
4	+ extends Springbot_Combine_Model_Resource_Abstract
5	+ {
6	+ public function _construct()
7	+ {
8	+ $this->_init('combine/marketplaces_remote_order', 'id');
9	+ }
10	+ }

app/code/community/Springbot/Combine/Model/Resource/Marketplaces/Remote/Order/Collection.php ADDED Viewed

	@@ -0,0 +1,10 @@


1	+ <?php
2	+
3	+ class Springbot_Combine_Model_Resource_Marketplaces_Remote_Order_Collection
4	+ extends Mage_Core_Model_Mysql4_Collection_Abstract
5	+ {
6	+ public function _construct()
7	+ {
8	+ $this->_init('combine/marketplaces_remote_order');
9	+ }
10	+ }

app/code/community/Springbot/Combine/Model/Resource/Redirect.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Redirect/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Redirect/Order.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Redirect/Order/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Setup.php CHANGED Viewed

	@@ -27,6 +27,7 @@ class Springbot_Combine_Model_Resource_Setup extends Mage_Core_Model_Resource_Se
27	include $fileName;
28	}
29	} catch (Exception $e) {

30	Mage::logException($e);
31	}
32	}
	@@ -48,6 +49,7 @@ class Springbot_Combine_Model_Resource_Setup extends Mage_Core_Model_Resource_Se
48	$this->fetchConfig();
49	} catch (Exception $e) {
50	Mage::logException($e);

51	$this->_setData('type', 'magento')
52	->_setData('error', 'General failure on install.');
53	}


27	include $fileName;
28	}
29	} catch (Exception $e) {
30	+ Springbot_Log::error($e->getMessage());
31	Mage::logException($e);
32	}
33	}

49	$this->fetchConfig();
50	} catch (Exception $e) {
51	Mage::logException($e);
52	+ Springbot_Log::error($e->getMessage());
53	$this->_setData('type', 'magento')
54	->_setData('error', 'General failure on install.');
55	}

app/code/community/Springbot/Combine/Model/Resource/Trackable.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Resource/Trackable/Collection.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Rewrite.php CHANGED Viewed

@@ -2,8 +2,17 @@
             class Springbot_Combine_Model_Rewrite extends Mage_Core_Model_Abstract
+            {
-            -
-            -
                public function createRewrite($store, $idPath, $requestPath, $targetPath) {
                     try {
                         // check if community edition
                         if ($this->isMageCommunity()) {
@@ -20,14 +29,18 @@ class Springbot_Combine_Model_Rewrite extends Mage_Core_Model_Abstract
                                     ->setRequestPath($requestPath)
                                     ->setTargetPath($targetPath)
                                     ->save();
+                            }
+                        }
                         // check if enterprise edition
                         if ($this->isMageEnterprise()) {
                             $existingRewrite = Mage::getModel('enterprise_urlrewrite/redirect')->getCollection()
-            -
                                ->addFieldToFilter($targetPath)
                                 ->getFirstItem();
                             if (!$existingRewrite->getId()) {
                                 Mage::getModel('enterprise_urlrewrite/redirect')
                                     ->setStoreId($store->getStoreId())
@@ -36,10 +49,66 @@ class Springbot_Combine_Model_Rewrite extends Mage_Core_Model_Abstract
                                     ->setRequestPath($requestPath)
                                     ->setTargetPath($targetPath)
                                     ->save();
+                            }
+                        }
                     } catch (Exception $e) {
-            -
                        Springbot_Log::error("Unable to create URL rewrite for store id: " . $requestPath . ' to ' . $targetPath);
+                    }
+                }
@@ -48,8 +117,12 @@ class Springbot_Combine_Model_Rewrite extends Mage_Core_Model_Abstract
+                 *
                  * @return boolean
                  */
-            -
                public function isMageEnterprise() {
-            -
                    return Mage::getConfig()->getModuleConfig('Enterprise_Enterprise') && Mage::getConfig()->getModuleConfig('Enterprise_AdminGws') && Mage::getConfig()->getModuleConfig('Enterprise_Checkout') && Mage::getConfig()->getModuleConfig('Enterprise_Customer');
+                }
                 /**
@@ -57,8 +130,12 @@ class Springbot_Combine_Model_Rewrite extends Mage_Core_Model_Abstract
+                 *
                  * @return boolean
                  */
-            -
                public function isMageProfessional() {
-            -
                    return Mage::getConfig()->getModuleConfig('Enterprise_Enterprise') && !Mage::getConfig()->getModuleConfig('Enterprise_AdminGws') && !Mage::getConfig()->getModuleConfig('Enterprise_Checkout') && !Mage::getConfig()->getModuleConfig('Enterprise_Customer');
+                }
                 /**
@@ -66,8 +143,8 @@ class Springbot_Combine_Model_Rewrite extends Mage_Core_Model_Abstract
+                 *
                  * @return boolean
                  */
-            -
                public function isMageCommunity() {
                     return !$this->isMageEnterprise() && !$this->isMageProfessional();
+                }
-            -
+            }


2
3	class Springbot_Combine_Model_Rewrite extends Mage_Core_Model_Abstract
4	{
5	+ /**
6	+ * Create a new rewrite based on magento version
7	+ *
8	+ * @param Mage_Core_Model_Store $store
9	+ * @param string $idPath
10	+ * @param string $requestPath
11	+ * @param string $targetPath
12	+ * @return boolean
13	+ */
14	+ public function createRewrite($store, $idPath, $requestPath, $targetPath)
15	+ {
16	try {
17	// check if community edition
18	if ($this->isMageCommunity()) {

29	->setRequestPath($requestPath)
30	->setTargetPath($targetPath)
31	->save();
32	+ return true;
33	+ } else {
34	+ return false;
35	}
36	}
37
38	// check if enterprise edition
39	if ($this->isMageEnterprise()) {
40	$existingRewrite = Mage::getModel('enterprise_urlrewrite/redirect')->getCollection()
41	+ ->addFieldToFilter('target_path')
42	->getFirstItem();
43	+
44	if (!$existingRewrite->getId()) {
45	Mage::getModel('enterprise_urlrewrite/redirect')
46	->setStoreId($store->getStoreId())

49	->setRequestPath($requestPath)
50	->setTargetPath($targetPath)
51	->save();
52	+ return true;
53	+ } else {
54	+ return false;
55	+ }
56	+ }
57	+ return false;
58	+ } catch (Exception $e) {
59	+ Springbot_Log::error('Unable to create URL rewrite for store id: ' .
60	+ $store->getStoreId() . ' - ' . $requestPath . ' to ' . $targetPath . '');
61	+ return false;
62	+ }
63	+ }
64	+
65	+ /**
66	+ * Delete a rewrite from the database based on magento version
67	+ *
68	+ * @param int $urlRewriteId the rewrite id
69	+ * @return boolean
70	+ */
71	+ public function deleteRewrite($urlRewriteId)
72	+ {
73	+ try {
74	+ // check if community edition
75	+ if ($this->isMageCommunity()) {
76	+ // check if rewrite exists
77	+ $existingRewrite = Mage::getModel('core/url_rewrite')->load($urlRewriteId);
78	+
79	+ if ($existingRewrite->getStoreId() !== null) {
80	+ $existingRewrite->delete();
81	+ if (Mage::getModel('core/url_rewrite')->load($urlRewriteId)->getStoreId() == null) {
82	+ return true;
83	+ } else {
84	+ return false;
85	+ }
86	+ } else {
87	+ return false;
88	+ }
89	+ }
90	+
91	+ // check if enterprise edition
92	+ if ($this->isMageEnterprise()) {
93	+ // check if rewrite exists
94	+ $existingRewrite = Mage::getModel('enterprise_urlrewrite/redirect')->load($urlRewriteId);
95	+
96	+ if ($existingRewrite->exists()) {
97	+ $existingRewrite->delete();
98	+
99	+ if (!Mage::getModel('enterprise_urlrewrite/redirect')->load($urlRewriteId)->exists()) {
100	+ return true;
101	+ } else {
102	+ return false;
103	+ }
104	+ } else {
105	+ return false;
106	}
107	}
108	+ return false;
109	} catch (Exception $e) {
110	+ Springbot_Log::error("Unable to delete URL rewrite with id: " . $urlRewriteId . ': ' . $e->getMessage());
111	+ return false;
112	}
113	}
114

117	*
118	* @return boolean
119	*/
120	+ public function isMageEnterprise()
121	+ {
122	+ return Mage::getConfig()->getModuleConfig('Enterprise_Enterprise')
123	+ && Mage::getConfig()->getModuleConfig('Enterprise_AdminGws')
124	+ && Mage::getConfig()->getModuleConfig('Enterprise_Checkout')
125	+ && Mage::getConfig()->getModuleConfig('Enterprise_Customer');
126	}
127
128	/**

130	*
131	* @return boolean
132	*/
133	+ public function isMageProfessional()
134	+ {
135	+ return Mage::getConfig()->getModuleConfig('Enterprise_Enterprise')
136	+ && !Mage::getConfig()->getModuleConfig('Enterprise_AdminGws')
137	+ && !Mage::getConfig()->getModuleConfig('Enterprise_Checkout')
138	+ && !Mage::getConfig()->getModuleConfig('Enterprise_Customer');
139	}
140
141	/**

143	*
144	* @return boolean
145	*/
146	+ public function isMageCommunity()
147	+ {
148	return !$this->isMageEnterprise() && !$this->isMageProfessional();
149	}

150	}

app/code/community/Springbot/Combine/Model/System/Config/Source/Harvestertype.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/System/Config/Source/LogFormat.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/System/Config/Source/LogLevel.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/System/Config/Source/Stability.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/System/Config/Source/UrlType.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/Model/Trackable.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/etc/adminhtml.xml CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/etc/config.xml CHANGED Viewed

@@ -2,9 +2,33 @@
             <config>
             	<modules>
             		<Springbot_Combine>
-            -
            			<version>1.4.7.0</version>
             		</Springbot_Combine>
             	</modules>
             	<global>
             		<models>
             			<combine>
@@ -33,6 +57,9 @@
             					<cron_count>
             						<table>springbot_cron_count</table>
             					</cron_count>
             				</entities>
             			</combine_resource>
             		</models>


2	<config>
3	<modules>
4	<Springbot_Combine>
5	+ <version>1.5.2.1</version>
6	</Springbot_Combine>
7	</modules>
8	+ <default>
9	+ <carriers>
10	+ <sbShipping>
11	+ <active>1</active>
12	+ <allowed_methods>sbShipping</allowed_methods>
13	+ <methods>sbShipping</methods>
14	+ <sallowspecific>0</sallowspecific>
15	+ <model>Springbot_Combine_Model_Marketplaces_Shipping</model>
16	+ <name>Amazon Marketplaces Shipping</name>
17	+ <title>Amazon Marketplaces Shipping</title>
18	+ <handling_type>F</handling_type>
19	+ </sbShipping>
20	+ </carriers>
21	+ <payment>
22	+ <sbPayment>
23	+ <active>1</active>
24	+ <model>Springbot_Combine_Model_Marketplaces_Payment</model>
25	+ <order_status>pending</order_status>
26	+ <title>Amazon Marketplaces Payment</title>
27	+ <allowspecific>0</allowspecific>
28	+ <group>offline</group>
29	+ </sbPayment>
30	+ </payment>
31	+ </default>
32	<global>
33	<models>
34	<combine>

57	<cron_count>
58	<table>springbot_cron_count</table>
59	</cron_count>
60	+ <marketplaces_remote_order>
61	+ <table>springbot_mp_remote_order</table>
62	+ </marketplaces_remote_order>
63	</entities>
64	</combine_resource>
65	</models>

app/code/community/Springbot/Combine/etc/system.xml CHANGED Viewed

	@@ -79,15 +79,6 @@
79	<show_in_default>1</show_in_default>
80	<show_in_website>0</show_in_website>
81	</account_password>
82	- <remote_update translate="label">
83	- <label>Allow Remote Update</label>
84	- <frontend_type>select</frontend_type>
85	- <source_model>adminhtml/system_config_source_yesno</source_model>
86	- <sort_order>60</sort_order>
87	- <show_in_default>1</show_in_default>
88	- <show_in_website>0</show_in_website>
89	- <show_in_store>0</show_in_store>
90	- </remote_update>
91	<stability translate="label">
92	<label>Minimum Acceptable Stability</label>
93	<frontend_type>select</frontend_type>


79	<show_in_default>1</show_in_default>
80	<show_in_website>0</show_in_website>
81	</account_password>









82	<stability translate="label">
83	<label>Minimum Acceptable Stability</label>
84	<frontend_type>select</frontend_type>

app/code/community/Springbot/Combine/sql/combine_setup/mysql4-install-1.0.0.70.php CHANGED Viewed

	@@ -12,6 +12,6 @@ try {
12	}
13	}
14	catch (Exception $e) {
15	- Springbot_Log::error($e);
16	}
17	$installer->endSetup();


12	}
13	}
14	catch (Exception $e) {
15	+ Springbot_Log::error($e->getMessage());
16	}
17	$installer->endSetup();

app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.0.0.70-1.0.0.84.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.0.0.84-1.0.0.88.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.0.0.88-1.2.0.0.php CHANGED Viewed

	@@ -28,7 +28,7 @@ try {
28	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
29	");
30	} catch (Exception $e) {
31	- Springbot_Log::error(~~new Exception(~~'Install failed clear and retry'));
32	if (!$session->getSbReinstall()) {
33	$session->setSbReinstall(true);
34	$installer->reinstallSetupScript('1.0.0.70', '1.2.0.0');


28	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
29	");
30	} catch (Exception $e) {
31	+ Springbot_Log::error('Install failed clear and retry: ' . $e->getMessage());
32	if (!$session->getSbReinstall()) {
33	$session->setSbReinstall(true);
34	$installer->reinstallSetupScript('1.0.0.70', '1.2.0.0');

app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.2.0.0-1.2.0.1.php CHANGED Viewed

File without changes

app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.2.0.1-1.2.1.0.php CHANGED Viewed

	@@ -41,7 +41,7 @@ $installer->run("
41	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
42	");
43	} catch (Exception $e) {
44	- Springbot_Log::error('Springbot 1.2.0.0-1.2.1.0 update failed!');
45	}
46
47	$installer->endSetup();


41	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
42	");
43	} catch (Exception $e) {
44	+ Springbot_Log::error('Springbot 1.2.0.0-1.2.1.0 update failed: ' . $e->getMessage());
45	}
46
47	$installer->endSetup();

app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.3.9.9-1.4.0.0.php CHANGED Viewed

	@@ -34,7 +34,7 @@ try {
34
35	} catch (Exception $e) {
36	Springbot_Log::error('Springbot 1.2.1.0-1.4.0.0 update failed!');
37	- Springbot_Log::error(~~new Exception(~~'Install failed clear and retry. ' . $e->getMessage()));
38	if (!$session->getSbReinstall()) {
39	$session->setSbReinstall(true);
40	$installer->reinstallSetupScript('1.2.1.0', '1.4.0.0');
	@@ -44,7 +44,7 @@ try {
44	try {
45	$installer->run("ALTER TABLE `{$installer->getTable('combine/cron_queue')}` ADD COLUMN `next_run_at` DATETIME NULL AFTER `error`;");
46	} catch (Exception $e) {
47	- ~~// Don't do anything~~
48	}
49
50	$installer->endSetup();


34
35	} catch (Exception $e) {
36	Springbot_Log::error('Springbot 1.2.1.0-1.4.0.0 update failed!');
37	+ Springbot_Log::error('Install failed clear and retry. ' . $e->getMessage());
38	if (!$session->getSbReinstall()) {
39	$session->setSbReinstall(true);
40	$installer->reinstallSetupScript('1.2.1.0', '1.4.0.0');

44	try {
45	$installer->run("ALTER TABLE `{$installer->getTable('combine/cron_queue')}` ADD COLUMN `next_run_at` DATETIME NULL AFTER `error`;");
46	} catch (Exception $e) {
47	+ Springbot_Log::error($e->getMessage());
48	}
49
50	$installer->endSetup();

app/code/community/Springbot/Combine/sql/combine_setup/mysql4-upgrade-1.4.7.0-1.5.0.0.php ADDED Viewed

	@@ -0,0 +1,42 @@


1	+ <?php
2	+
3	+ $installer = $this;
4	+ /* @var $installer Springbot_Combine_Model_Resource_Setup */
5	+
6	+ $installer->startSetup();
7	+
8	+ $installer->getConnection()->beginTransaction();
9	+
10	+ $session = Mage::getSingleton('core/session');
11	+
12	+ $table = $installer->getTable('combine/marketplaces_remote_order');
13	+
14	+ try {
15	+ $installStr = "
16	+ CREATE TABLE IF NOT EXISTS `{$table}`
17	+ (
18	+ `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
19	+ `order_id` INT(11) NULL,
20	+ `increment_id` VARCHAR(50) NOT NULL,
21	+ `remote_order_id` VARCHAR(50) NULL,
22	+ `marketplace_type` VARCHAR(50) NULL,
23	+ PRIMARY KEY (`id`),
24	+ UNIQUE KEY `UNQ_REMOTE_ORDER_ID` (`remote_order_id`),
25	+ UNIQUE KEY `UNQ_INCREMENT_ID` (`increment_id`)
26	+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
27	+ ";
28	+
29	+ Springbot_Log::debug($installStr);
30	+
31	+ $installer->run($installStr);
32	+
33	+ } catch (Exception $e) {
34	+ Springbot_Log::error('Springbot 1.4.7.0-1.5.0.0 update failed!');
35	+ Springbot_Log::error(new Exception('Install failed clear and retry. ' . $e->getMessage()));
36	+ if (!$session->getSbReinstall()) {
37	+ $session->setSbReinstall(true);
38	+ $installer->reinstallSetupScript('1.4.7.0', '1.5.0.0');
39	+ }
40	+ }
41	+
42	+ $installer->endSetup();

app/code/community/Springbot/Log.php CHANGED Viewed

	@@ -98,7 +98,7 @@ class Springbot_Log
98	}
99
100
101	- public static function error(~~Exception~~ $e)
102	{
103	if(is_string($e)) {
104	$e = new Exception($e);
	@@ -142,7 +142,12 @@ class Springbot_Log
142
143	public static function getRemoteAddress()
144	{
145	- ~~return~~ ~~isset~~($~~_SERVER['REMOTE_ADDR'])~~ ? ~~$remAddr=$_SERVER[~~'~~REMOTE_ADDR~~'] ~~: null;~~





146	}
147
148	private static function _levelAllowed($level)


98	}
99
100
101	+ public static function error($e)
102	{
103	if(is_string($e)) {
104	$e = new Exception($e);

142
143	public static function getRemoteAddress()
144	{
145	+ if ($remoteIp = Mage::helper('core/http')->getRemoteAddr(true)) {
146	+ return $remoteIp;
147	+ }
148	+ else {
149	+ return null;
150	+ }
151	}
152
153	private static function _levelAllowed($level)

app/code/community/Springbot/Services.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Cmd/Forecast.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Cmd/Halt.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Cmd/Harvest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Cmd/Healthcheck.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Cmd/Update.php DELETED Viewed

@@ -1,66 +0,0 @@
-            -
            <?php
-            -
-            -
            class Springbot_Services_Cmd_Update extends Springbot_Services
-            -
            {
-            -
            	public function run()
-            -
            	{
-            -
            		if (Mage::getStoreConfig('springbot/config/remote_update') || $this->getForce()) {
-            -
            			try {
-            -
            				// Compilation includes configuration file
-            -
            				define('MAGENTO_ROOT', getcwd());
-            -
-            -
            				$compilerConfig = MAGENTO_ROOT . '/includes/config.php';
-            -
            				if (file_exists($compilerConfig)) {
-            -
            					include $compilerConfig;
-            -
            				}
-            -
-            -
            				// Exit if compilation enabled
-            -
            				if (defined('COMPILER_INCLUDE_PATH')) {
-            -
            					$msg = "Compilation appears to be enabled... exiting.";
-            -
            					Springbot_Log::remote($msg);
-            -
            					echo $msg . PHP_EOL;
-            -
            					exit("Compilation appears to be enabled... exiting.");
-            -
            				} else {
-            -
            					Springbot_Log::info("Compilation Status: Disabled");
-            -
            				}
-            -
-            -
            				Springbot_Log::info("Updating Springbot extension");
-            -
-            -
            				$connect = new Springbot_Services_Update_Connect;
-            -
            				$connect->setVersion($this->_getVersion());
-            -
            				$version = $connect->run();
-            -
-            -
            				Springbot_Log::info("Update to version $version.");
-            -
-            -
            				$downloader = new Springbot_Services_Update_Downloader($version);
-            -
            				$archivePath = $downloader->run();
-            -
-            -
            				Springbot_Log::info("Archive downloaded to $archivePath");
-            -
-            -
            				$package = new Springbot_Services_Update_Package($archivePath);
-            -
            				$package->unpack();
-            -
-            -
            				Springbot_Log::info("Archive extracted to {$package->getUnpackedPath()}");
-            -
-            -
            				$installer = new Springbot_Services_Update_Installer($package);
-            -
            				$installer->run();
-            -
-            -
            				Springbot_Log::info("Install was successful. Clearing cache.");
-            -
-            -
            				Mage::getConfig()->cleanCache();
-            -
            			} catch (Exception $e) {
-            -
            				Springbot_Log::error($e);
-            -
            			}
-            -
            			$msg = "Updated to version $version successfully!";
-            -
            			Springbot_Log::remote($msg);
-            -
            			echo $msg . PHP_EOL;
-            -
            		} else {
-            -
            			throw new Exception('Remote update not allowed by configuration! Please enable or use -f param.');
-            -
            		}
-            -
            	}
-            -
-            -
            	protected function _getVersion()
-            -
            	{
-            -
            		return isset($this->_data['version']) ? $this->_data['version'] : null;
-            -
            	}
-            -
            }

app/code/community/Springbot/Services/Harvest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/AttributeSets.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Carts.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Categories.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Coupons.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/CustomerAttributeSets.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Customers.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Guests.php CHANGED Viewed

	@@ -37,7 +37,9 @@ class Springbot_Services_Harvest_Guests extends Springbot_Services_Harvest
37	try {
38	$collection->getSelect()->order('increment_id')->group('customer_email');
39	}
40	- catch (Exception $e) { }


41	}
42
43	return $collection;


37	try {
38	$collection->getSelect()->order('increment_id')->group('customer_email');
39	}
40	+ catch (Exception $e) {
41	+ Springbot_Log::error($e->getMessage());
42	+ }
43	}
44
45	return $collection;

app/code/community/Springbot/Services/Harvest/Inventories.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Products.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Purchases.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Rules.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Harvest/Subscribers.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Log/Installer.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Attribute.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/AttributeSet.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Cart.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Category.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Coupon.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Customer.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Guest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Inventory.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Json.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Jsonstring.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Product.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Purchase.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Rule.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Post/Subscriber.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Registry.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Store/Finalize.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Store/Register.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/ClearCache.php CHANGED Viewed

	@@ -12,6 +12,7 @@ class Springbot_Services_Tasks_ClearCache extends Springbot_Services
12	return true;
13	}
14	catch (Exception $e) {

15	return array(
16	'success' => false,
17	'message' => $e->getMessage()


12	return true;
13	}
14	catch (Exception $e) {
15	+ Springbot_Log::error($e->getMessage());
16	return array(
17	'success' => false,
18	'message' => $e->getMessage()

app/code/community/Springbot/Services/Tasks/ClearJobs.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/ClearStores.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/CreateRewrite.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/Debug.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/DeleteJob.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/DeliverEventLog.php CHANGED Viewed

	@@ -22,7 +22,7 @@ class Springbot_Services_Tasks_DeliverEventLog extends Springbot_Services
22	} catch (Exception $e) {
23	// We can capture this here and keep if from bubbling up.
24	// This api call will fail and get recreated on the next check in
25	- Springbot_Log::error($e);
26	$successful = false;
27	}
28	$this->_releaseLocks();


22	} catch (Exception $e) {
23	// We can capture this here and keep if from bubbling up.
24	// This api call will fail and get recreated on the next check in
25	+ Springbot_Log::error($e->getMessage());
26	$successful = false;
27	}
28	$this->_releaseLocks();

app/code/community/Springbot/Services/Tasks/Forecast.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/GetLog.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/Harvest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/HarvestInventory.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/Healthcheck.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/Jobs.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/KillHarvest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/LaunchFullHarvest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/LaunchPartialHarvest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/PackageUpdate.php DELETED Viewed

@@ -1,13 +0,0 @@
-            -
            <?php
-            -
-            -
            class Springbot_Services_Tasks_PackageUpdate extends Springbot_Services
-            -
            {
-            -
            	public function run()
-            -
            	{
-            -
            		$version = $this->getPackageVersion();
-            -
            		$updater = new Springbot_Services_Cmd_Update();
-            -
            		$updater->setVersion($version);
-            -
            		$updater->run();
-            -
            		return true;
-            -
            	}
-            -
            }

app/code/community/Springbot/Services/Tasks/PluginVersion.php ADDED Viewed

	@@ -0,0 +1,18 @@


1	+ <?php
2	+
3	+ class Springbot_Services_Tasks_PluginVersion extends Springbot_Services
4	+ {
5	+ /**
6	+ * Return the Plugin Version Number. Echo out and throw an Exception if the value is empty.
7	+ *
8	+ * @return array
9	+ */
10	+ public function run()
11	+ {
12	+ $version = array('plugin_version' => (string) Mage::getConfig()->getModuleConfig("Springbot_Combine")->version);
13	+ if (empty($version)) {
14	+ throw new Exception('Plugin version is empty.');
15	+ }
16	+ return $version;
17	+ }
18	+ }

app/code/community/Springbot/Services/Tasks/PostItem.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/Redirects.php ADDED Viewed

	@@ -0,0 +1,159 @@


1	+ <?php
2	+
3	+ class Springbot_Services_Tasks_Redirects extends Springbot_Services
4	+ {
5	+ /**
6	+ * View redirects in a paginated collection
7	+ * @return array
8	+ */
9	+ public function run()
10	+ {
11	+ $request = Mage::app()->getRequest();
12	+
13	+ switch ($request->getParam('action')) {
14	+ case null:
15	+ return $this->view();
16	+ break;
17	+ case 'view':
18	+ return $this->view();
19	+ break;
20	+ case 'create':
21	+ return $this->create($request);
22	+ break;
23	+ case 'delete':
24	+ return $this->delete($request->getParam('id'));
25	+ break;
26	+ default:
27	+ return $this->getMessage('error', 'Invalid action.');
28	+ break;
29	+ }
30	+ }
31	+
32	+ /**
33	+ * View a paginated array of redirects
34	+ * @return array
35	+ */
36	+ public function view()
37	+ {
38	+ $combineRewriteModel = Mage::getModel('combine/rewrite');
39	+ $pageSize = ($this->getData('pageSize')) ? $this->getData('pageSize') : 10;
40	+
41	+ if (!$page = $this->getData('page')) {
42	+ $page = 1;
43	+ }
44	+
45	+ if ($combineRewriteModel->isMageCommunity()) {
46	+ $model = Mage::getModel('core/url_rewrite');
47	+ return $this->getPaginatedArray($model, $page, $pageSize);
48	+ } elseif ($combineRewriteModel->isMageEnterprise()) {
49	+ $model = Mage::getModel('enterprise_urlrewrite/redirect');
50	+ return $this->getPaginatedArray($model, $page, $pageSize);
51	+ } else {
52	+ return $this->getMessage('error', 'Unable to determine Magento version');
53	+ }
54	+ }
55	+
56	+ /**
57	+ * Create a new redirect
58	+ * @param Mage_Api2_Model_Request $request
59	+ * @return array
60	+ */
61	+ public function create($request)
62	+ {
63	+ $store = Mage::getModel('core/store')->load($request->getParam('store_id'));
64	+ $createRewrite = Mage::getModel('combine/rewrite')->createRewrite(
65	+ $store,
66	+ $request->getParam('id_path'),
67	+ $request->getParam('source'),
68	+ $request->getParam('target')
69	+ );
70	+
71	+ if ($createRewrite) {
72	+ return $this->getMessage('success', 'Redirect added successfully.');
73	+ } else {
74	+ return $this->getMessage('error', 'Unable to create redirect.');
75	+ }
76	+ }
77	+
78	+ /**
79	+ * Delete a redirect from the database
80	+ * @param integer $rewriteUrlId
81	+ * @return array
82	+ */
83	+ public function delete($rewriteUrlId)
84	+ {
85	+ $combineRewriteModel = Mage::getModel('combine/rewrite');
86	+ if ($combineRewriteModel->deleteRewrite($rewriteUrlId)) {
87	+ return $this->getMessage('success', 'Redirect deleted for id: ' . $rewriteUrlId);
88	+ } else {
89	+ return $this->getMessage('error', 'Unable to delete redirect for id: ' . $rewriteUrlId);
90	+ }
91	+ }
92	+
93	+ /**
94	+ * Create a paginated area based on the model, the page to view, and the number of items on eah page
95	+ *
96	+ * @param Mage_Core_Model_Abstract $model The model to paginate items from.
97	+ * @param integer $page The current page number.
98	+ * @param integer $pageSize The number of items on each page.
99	+ * @return array An array with the count of items and a nested array containing those items paginated.
100	+ */
101	+ public function getPaginatedArray($model, $page = 1, $pageSize = 10)
102	+ {
103	+ $collection = $model->getCollection();
104	+ $totalItems = $collection->count();
105	+ $pages = ceil($totalItems / $pageSize);
106	+ $page = ($page > $pages) ? $pages : $page;
107	+ $offset = ($page - 1) * $pageSize;
108	+ $itemsArray = array('totalRecords' => (int) $totalItems, 'items' => array());
109	+
110	+ if ($model->getResourceName() == 'core/url_rewrite') {
111	+ foreach ($collection as $urlRewrite) {
112	+ $item = array(
113	+ 'id' => (int) $urlRewrite->getUrlRewriteId(),
114	+ 'store_id' => (int) $urlRewrite->getStoreId(),
115	+ 'identifier' => $urlRewrite->getIdPath(),
116	+ 'request_path' => $urlRewrite->getRequestPath(),
117	+ 'target_path' => $urlRewrite->getTargetPath(),
118	+ 'options' => $urlRewrite->getOptions(),
119	+ );
120	+ $itemsArray['items'][] = $item;
121	+ }
122	+ } elseif ($model->getResourceName() == 'enterprise_urlrewrite/redirect') {
123	+ foreach ($collection as $redirect) {
124	+ $rewrite = Mage::getModel('enterprise_urlrewrite/url_rewrite')
125	+ ->loadByRequestPath($redirect->getIdentifier())
126	+ ->getCollection()
127	+ ->addFieldToFilter('store_id', $redirect->getStoreId())
128	+ ->getFirstItem();
129	+
130	+ $item = array(
131	+ 'id' => (int) $redirect->getRedirectId(),
132	+ 'store_id' => (int) $redirect->getStoreId(),
133	+ 'identifier' => $redirect->getIdentifier(),
134	+ 'request_path' => $rewrite->getRequestPath(),
135	+ 'target_path' => $rewrite->getTargetPath(),
136	+ 'options' => $redirect->getOptions(),
137	+ );
138	+
139	+ $itemsArray['items'][] = $item;
140	+ }
141	+ }
142	+ $itemsArray['items'] = array_slice($itemsArray['items'], $offset, $pageSize);
143	+ return $itemsArray;
144	+ }
145	+
146	+ /**
147	+ * Return a status message
148	+ * @param string $status
149	+ * @param string $msg
150	+ * @return array
151	+ */
152	+ public static function getMessage($status, $msg)
153	+ {
154	+ return array(
155	+ 'status' => $status,
156	+ 'message' => $msg
157	+ );
158	+ }
159	+ }

app/code/community/Springbot/Services/Tasks/RegisterStores.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/ResetRetries.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/ResumeHarvest.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/Run.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/SetVar.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/Stores.php ADDED Viewed

	@@ -0,0 +1,33 @@


1	+ <?php
2	+
3	+ class Springbot_Services_Tasks_Stores extends Springbot_Services
4	+ {
5	+ public function run()
6	+ {
7	+ $stores = [];
8	+ $helper = Mage::helper('combine/store');
9	+
10	+ foreach (Mage::app()->getWebsites() as $website) {
11	+ foreach ($website->getGroups() as $group) {
12	+ foreach ($group->getStores() as $store) {
13	+ $helper->setStore($store);
14	+ $sbStoreId = $helper->getSpringbotStoreId();
15	+ $sbStoreGuid = $helper->getGuid();
16	+
17	+ $stores[] = array(
18	+ "name" => $store->getName(),
19	+ "code" => $store->getCode(),
20	+ "url" => $store->getBaseUrl('link'),
21	+ "secure_url" => $store->getBaseUrl('link', true),
22	+ "media_url" => $store->getBaseUrl('media'),
23	+ "website_id" => (int) $store->getWebsiteId(),
24	+ "magento_store_id" => (int) $helper->getStoreId(),
25	+ "springbot_store_id" => (isset($sbStoreId) ? (int) $sbStoreId : null),
26	+ "springbot_store_guid" => (isset($sbStoreGuid) ? $sbStoreGuid : null)
27	+ );
28	+ }
29	+ }
30	+ }
31	+ return $stores;
32	+ }
33	+ }

app/code/community/Springbot/Services/Tasks/UnlockJobs.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Tasks/ViewConfig.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Update/Abstract.php DELETED Viewed

@@ -1,49 +0,0 @@
-            -
            <?php
-            -
-            -
            class Springbot_Services_Update_Abstract
-            -
            {
-            -
            	protected $_version;
-            -
-            -
            	const CHANNELS_XML = "channels.xml";
-            -
            	const CHANNEL_XML  = "channel.xml";
-            -
            	const PACKAGES_XML = "packages.xml";
-            -
            	const RELEASES_XML = "releases.xml";
-            -
            	const PACKAGE_XML  = "package.xml";
-            -
            	const EXT          = "tgz";
-            -
-            -
            	protected $_channelUrl = 'http://connect20.magentocommerce.com/community';
-            -
            	protected $_package = 'Springbot';
-            -
-            -
            	public function get($uri = '')
-            -
            	{
-            -
            		$url = "{$this->_channelUrl}/{$this->_package}/{$uri}";
-            -
            		return $this->_getClient($url)->request();
-            -
            	}
-            -
-            -
            	protected function _getClient($url)
-            -
            	{
-            -
            		$this->_client = new Zend_Http_Client($url);
-            -
            		return $this->_client;
-            -
            	}
-            -
-            -
            	public function parse($xml)
-            -
            	{
-            -
            		try {
-            -
            			$xml = simplexml_load_string($xml);
-            -
            		} catch (Exception $e) {
-            -
            			throw new Exception ('Releases not valid XML! Please check connection.');
-            -
            		}
-            -
            		return $xml;
-            -
            	}
-            -
-            -
            	public function getVersion()
-            -
            	{
-            -
            		return $this->_version;
-            -
            	}
-            -
-            -
            	public function setVersion($version)
-            -
            	{
-            -
            		$this->_version = $version;
-            -
            		return $this;
-            -
            	}
-            -
            }

app/code/community/Springbot/Services/Update/Connect.php DELETED Viewed

@@ -1,119 +0,0 @@
-            -
            <?php
-            -
-            -
            class Springbot_Services_Update_Connect extends Springbot_Services_Update_Abstract
-            -
            {
-            -
            	protected $_allowedStability;
-            -
-            -
            	public function run()
-            -
            	{
-            -
            		try {
-            -
            			$this->_releases = $this->getConnectReleases();
-            -
            			$toInstall = $this->getReleaseToInstall();
-            -
            		} catch(Exception $e) {
-            -
            			Springbot_Log::error($e);
-            -
            			exit;
-            -
            		}
-            -
            		return $toInstall->v;
-            -
            	}
-            -
-            -
            	public function getConnectReleases()
-            -
            	{
-            -
            		$response = $this->get(self::RELEASES_XML);
-            -
            		$code = $response->getStatus();
-            -
-            -
            		if($code == 200) {
-            -
            			$xml = $response->getBody();
-            -
            			$parsed = $this->parse($xml);
-            -
            			$this->_releases = $parsed->r;
-            -
            		}
-            -
-            -
            		if(!$this->_releases) {
-            -
            			throw new Exception ("Server returned with status of {$code} when fetching releases. Please check connection.");
-            -
            		}
-            -
            		return $this->_releases;
-            -
            	}
-            -
-            -
            	public function getReleaseToInstall()
-            -
            	{
-            -
            		$version = $this->getVersion();
-            -
            		return $this->getRelease($version);
-            -
            	}
-            -
-            -
            	public function getRelease($version = null)
-            -
            	{
-            -
            		$releases = $this->getSortedReleases();
-            -
-            -
            		if(is_null($version)) {
-            -
            			return $releases[0];
-            -
            		} else {
-            -
            			foreach($releases as $release) {
-            -
            				if($release->v == $version) {
-            -
            					return $release;
-            -
            				}
-            -
            			}
-            -
            		}
-            -
            		throw new Exception('Release number not found!');
-            -
            	}
-            -
-            -
            	public function getLatest()
-            -
            	{
-            -
            		$releases = $this->getSortedReleases();
-            -
            		return $releases[0];
-            -
            	}
-            -
-            -
            	public function getLatestVersion()
-            -
            	{
-            -
            		if(!isset($this->_latest)) {
-            -
            			$this->_latest = $this->getLatest();
-            -
            		}
-            -
            		return $this->_latest->v;
-            -
            	}
-            -
-            -
            	public function getReleases()
-            -
            	{
-            -
            		if(!isset($this->_releases)) {
-            -
            			$this->_releases = $this->getConnectReleases();
-            -
            		}
-            -
            		return $this->_releases;
-            -
            	}
-            -
-            -
            	public function getSortedReleases()
-            -
            	{
-            -
            		$releases = array();
-            -
            		foreach($this->getReleases() as $release) {
-            -
            			if($this->allowStability($release)) {
-            -
            				$releases[] = $release;
-            -
            			}
-            -
            		}
-            -
-            -
            		if(count($releases) < 1) {
-            -
            			throw new Exception ('No releases found!');
-            -
            		}
-            -
-            -
            		usort($releases, array($this, '_sortReleasesCallback'));
-            -
            		return array_reverse($releases);
-            -
            	}
-            -
-            -
            	public function allowStability($release)
-            -
            	{
-            -
            		if($this->_getAllowedStability() == $release->s) {
-            -
            			return true;
-            -
            		} else if ($release->s == 'stable') {
-            -
            			return true;
-            -
            		}
-            -
            		return false;
-            -
            	}
-            -
-            -
            	protected function _getAllowedStability()
-            -
            	{
-            -
            		if(!$this->_allowedStability) {
-            -
            			$this->_allowedStability = Mage::getStoreConfig('springbot/config/stability');
-            -
            		}
-            -
            		return $this->_allowedStability;
-            -
            	}
-            -
-            -
            	protected function _sortReleasesCallback($a, $b)
-            -
            	{
-            -
            		return version_compare($a->v,$b->v);
-            -
            	}
-            -
            }

app/code/community/Springbot/Services/Update/Downloader.php DELETED Viewed

@@ -1,63 +0,0 @@
-            -
            <?php
-            -
-            -
            class Springbot_Services_Update_Downloader extends Springbot_Services_Update_Abstract
-            -
            {
-            -
            	protected $_version;
-            -
-            -
            	public function __construct($version)
-            -
            	{
-            -
            		$this->_version = $version;
-            -
            	}
-            -
-            -
            	public function run()
-            -
            	{
-            -
            		$checksum = $this->getRemoteContents('checksum');
-            -
            		$archive = $this->getRemoteContents('archive');
-            -
-            -
            		if($checksum !== md5($archive)) {
-            -
            			throw new Exception('Remote archive does not match checksum!');
-            -
            		}
-            -
-            -
            		return $this->putFile($archive);
-            -
            	}
-            -
-            -
            	public function putFile($archive)
-            -
            	{
-            -
            		$file = Mage::getModel('combine/file_io');
-            -
            		$file->write($this->_getFilename(), $archive);
-            -
            		return $file->getFilename();
-            -
            	}
-            -
-            -
            	public function getRemoteContents($type)
-            -
            	{
-            -
            		$response = $this->get($this->{'_get' . ucfirst($type) . 'Uri'}());
-            -
-            -
            		if($response->getStatus() == 200) {
-            -
            			$body = $response->getBody();
-            -
            		} else {
-            -
            			throw new Exception("Could not get {$type}!");
-            -
            		}
-            -
            		return $body;
-            -
            	}
-            -
-            -
            	public function setVersion($version)
-            -
            	{
-            -
            		$this->_version = $version;
-            -
            		return $this;
-            -
            	}
-            -
-            -
            	protected function _getFilename()
-            -
            	{
-            -
            		return "{$this->_package}-{$this->_version}.tgz";
-            -
            	}
-            -
-            -
            	protected function _getArchiveUri()
-            -
            	{
-            -
            		return "{$this->_version}/{$this->_package}-{$this->_version}.tgz";
-            -
            	}
-            -
-            -
            	protected function _getChecksumUri()
-            -
            	{
-            -
            		return "{$this->_version}/checksum";
-            -
            	}
-            -
            }

app/code/community/Springbot/Services/Update/Installer.php DELETED Viewed

@@ -1,57 +0,0 @@
-            -
            <?php
-            -
-            -
            class Springbot_Services_Update_Installer extends Springbot_Services_Update_Abstract
-            -
            {
-            -
            	protected $_package;
-            -
-            -
            	const DIRMODE = 0755;
-            -
            	const FILEMODE = 0644;
-            -
-            -
            	public function __construct(Springbot_Services_Update_Package $package = null)
-            -
            	{
-            -
            		if(is_null($package)) {
-            -
            			throw new Exception('Package object required!');
-            -
            		}
-            -
            		$this->_package = $package;
-            -
            	}
-            -
-            -
            	public function run()
-            -
            	{
-            -
            		try {
-            -
            			foreach($this->getPackageContents() as $file) {
-            -
            				Springbot_Log::info("Put $file");
-            -
            				$this->putFile($file);
-            -
            			}
-            -
            		} catch (Exception $e) {
-            -
            			Springbot_Log::error($e);
-            -
            		}
-            -
            		$this->_package->cleanUp();
-            -
            	}
-            -
-            -
            	public function getPackageContents()
-            -
            	{
-            -
            		return $this->_package->getContents();
-            -
            	}
-            -
-            -
            	public function getInstallPath($file)
-            -
            	{
-            -
            		$realPath = realpath($file);
-            -
            		return empty($realPath) ? Mage::getBaseDir() . DS . $file : $realPath;
-            -
            	}
-            -
-            -
            	public function putFile($file)
-            -
            	{
-            -
            		$source = $this->_package->getTempFilePath($file);
-            -
            		$dir = dirname($this->getInstallPath($file));
-            -
            		$dest = $dir . DS . basename($file);
-            -
            		@mkdir($dir, self::DIRMODE, true);
-            -
            		if(is_file($source)) {
-            -
            			Springbot_Log::info("Copy $source to $dest");
-            -
            			@copy($source, $dest);
-            -
            			@chmod($dest, self::FILEMODE);
-            -
            		} else {
-            -
            			Springbot_Log::info("Creating directory $source");
-            -
            			@mkdir($source);
-            -
            		}
-            -
            	}
-            -
            }

app/code/community/Springbot/Services/Update/Package.php DELETED Viewed

@@ -1,148 +0,0 @@
-            -
            <?php
-            -
-            -
            class Springbot_Services_Update_Package extends Springbot_Services_Update_Abstract
-            -
            {
-            -
            	const PACKAGE_XML = 'package.xml';
-            -
-            -
            	protected $_archivePath;
-            -
            	protected $_unpackedPath;
-            -
            	protected $_contents;
-            -
            	protected $_targetMap = array(
-            -
            		"magelocal"     => "./app/code/local",
-            -
            		"magecommunity" => "./app/code/community",
-            -
            		"magecore"      => "./app/code/core",
-            -
            		"magedesign"    => "./app/design",
-            -
            		"mageetc"       => "./app/etc",
-            -
            		"magelib"       => "./lib",
-            -
            		"magelocale"    => "./app/locale",
-            -
            		"magemedia"     => "./media",
-            -
            		"mageskin"      => "./skin",
-            -
            		"mageweb"       => ".",
-            -
            		"magetest"      => "./tests",
-            -
            		"mage"          => ".",
-            -
            	);
-            -
-            -
            	public function __construct($path = null)
-            -
            	{
-            -
            		if(!$path) {
-            -
            			throw new Exception('Path requried!');
-            -
            		}
-            -
            		$this->_archivePath = $path;
-            -
            	}
-            -
-            -
            	public function unpack()
-            -
            	{
-            -
            		try {
-            -
            			$this->_unpackedPath = $this->_readyPath();
-            -
            			$this->_cmdTar($this->getArchivePath(), $this->_unpackedPath);
-            -
            		} catch (Exception $e) {
-            -
            			Springbot_Log::error($e);
-            -
            		}
-            -
            	}
-            -
-            -
            	public function cleanUp()
-            -
            	{
-            -
            		@unlink($this->_archivePath);
-            -
            		$this->_rmDir($this->_unpackedPath);
-            -
            	}
-            -
-            -
            	public function getContents()
-            -
            	{
-            -
            		if(!isset($this->_contents)) {
-            -
            			$this->_prepareContents();
-            -
            		}
-            -
            		return $this->_contents;
-            -
            	}
-            -
-            -
            	public function getTempFilePath($file)
-            -
            	{
-            -
            		return realpath($this->getTempOutPath() . DS . $file);
-            -
            	}
-            -
-            -
            	public function getTempOutPath()
-            -
            	{
-            -
            		return Mage::getBaseDir('tmp') . DS . $this->getVersionNumber();
-            -
            	}
-            -
-            -
            	public function getVersionNumber()
-            -
            	{
-            -
            		return basename($this->_archivePath, '.' . self::EXT);
-            -
            	}
-            -
-            -
            	public function getArchivePath()
-            -
            	{
-            -
            		return $this->_archivePath;
-            -
            	}
-            -
-            -
            	public function getUnpackedPath()
-            -
            	{
-            -
            		return $this->_unpackedPath;
-            -
            	}
-            -
-            -
            	protected function _rmDir($dirPath)
-            -
            	{
-            -
            		foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dirPath, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::CHILD_FIRST) as $path) {
-            -
            			$path->isFile() ? unlink($path->getPathname()) : rmdir($path->getPathname());
-            -
            		}
-            -
            		rmdir($dirPath);
-            -
            	}
-            -
-            -
            	protected function _prepareContents()
-            -
            	{
-            -
            		$xml = $this->_getPackageXml();
-            -
            		if(!isset($xml->contents->target)) {
-            -
            			return $this->_contents;
-            -
            		}
-            -
            		foreach($xml->contents->target as $target) {
-            -
            			$targetUri = $this->_getTargetPath($target['name']);
-            -
            			$this->_getList($target, $targetUri);
-            -
            		}
-            -
            		return $this->_contents;
-            -
            	}
-            -
-            -
            	protected function _getTargetPath($name)
-            -
            	{
-            -
            		$name = (string) $name;
-            -
            		return isset($this->_targetMap[$name]) ? $this->_targetMap[$name] : '';
-            -
            	}
-            -
-            -
            	protected function _getList($parent, $path)
-            -
            	{
-            -
            		if (count($parent) == 0) {
-            -
            			$this->_contents[] = $path;
-            -
            		} else {
-            -
            			foreach($parent as $_content) {
-            -
            				$this->_getList($_content, ($path ? $path . DS : '')  . $_content['name']);
-            -
            			}
-            -
            		}
-            -
            	}
-            -
-            -
            	protected function _readyPath()
-            -
            	{
-            -
            		$path = $this->getTempOutPath();
-            -
            		@mkdir($path, 0777, true);
-            -
            		if(!is_writable($path)) {
-            -
            			throw new Exception('Created extraction directory not writable!');
-            -
            		}
-            -
            		return $path;
-            -
            	}
-            -
-            -
            	protected function _cmdTar($file, $out)
-            -
            	{
-            -
            		Springbot_Cli::spawn("tar -zxf $file -C $out");
-            -
            		if($this->_empty($out)) {
-            -
            			throw new Exception('Tar empty!');
-            -
            		}
-            -
            		return $out;
-            -
            	}
-            -
-            -
            	protected function _empty($dir)
-            -
            	{
-            -
            		return !count(glob("$dir/*"));
-            -
            	}
-            -
-            -
            	protected function _getPackageXml()
-            -
            	{
-            -
            		return simplexml_load_file($this->getUnpackedPath() . DS . self::PACKAGE_XML);
-            -
            	}
-            -
            }

app/code/community/Springbot/Services/Work/Cleanup.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Work/Manager.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Work/Report.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Work/Restart.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Work/Runner.php CHANGED Viewed

File without changes

app/code/community/Springbot/Services/Work/Stop.php CHANGED Viewed

File without changes

app/code/community/Springbot/Shadow/Block/Action/View.php CHANGED Viewed

File without changes

app/code/community/Springbot/Shadow/Block/Async.php CHANGED Viewed

File without changes

app/code/community/Springbot/Shadow/Controller/Action.php CHANGED Viewed

File without changes

app/code/community/Springbot/Shadow/Helper/Data.php CHANGED Viewed

File without changes

app/code/community/Springbot/Shadow/Helper/Prattler.php CHANGED Viewed

File without changes

app/code/community/Springbot/Shadow/Model/Listeners/Observer.php CHANGED Viewed

	@@ -11,7 +11,7 @@ class Springbot_Shadow_Model_Listeners_Observer {
11	}
12	}
13	catch (Exception $e) {
14	- Springbot_Log::error($e);
15	}
16	return;
17	}


11	}
12	}
13	catch (Exception $e) {
14	+ Springbot_Log::error($e->getMessage());
15	}
16	return;
17	}

app/code/community/Springbot/Shadow/controllers/ActionController.php CHANGED Viewed

	@@ -6,7 +6,7 @@ class Springbot_Shadow_ActionController extends Springbot_Shadow_Controller_Acti
6	$params = $this->getRequest()->getParams();
7
8	$params['type'] = 'view';
9	- $params['visitor_ip'] = Mage::helper('core/http')->getRemoteAddr(~~true~~);
10
11	Springbot_Boss::insertEvent($params);
12


6	$params = $this->getRequest()->getParams();
7
8	$params['type'] = 'view';
9	+ $params['visitor_ip'] = (string)ip2long(Mage::helper('core/http')->getRemoteAddr());
10
11	Springbot_Boss::insertEvent($params);
12

app/code/community/Springbot/Shadow/controllers/IndexController.php CHANGED Viewed

	@@ -53,6 +53,7 @@ class Springbot_Shadow_IndexController extends Springbot_Shadow_Controller_Actio
53	}
54
55	} catch (Exception $e) {

56	$helper = Mage::helper('shadow/prattler');
57	$this->getResponse()->setHeader('Content-type', 'application/json');
58	$this->getResponse()->setBody(json_encode($helper->getExceptionResponse($e)));


53	}
54
55	} catch (Exception $e) {
56	+ Springbot_Log::error($e->getMessage());
57	$helper = Mage::helper('shadow/prattler');
58	$this->getResponse()->setHeader('Content-type', 'application/json');
59	$this->getResponse()->setBody(json_encode($helper->getExceptionResponse($e)));

app/code/community/Springbot/Shadow/etc/config.xml CHANGED Viewed

File without changes

app/code/community/Springbot/Util/Caller.php CHANGED Viewed

File without changes

app/code/community/Springbot/Util/Categories.php CHANGED Viewed

File without changes

app/code/community/Springbot/Util/Log/Rollover.php CHANGED Viewed

File without changes

app/code/community/Springbot/Util/Logger.php CHANGED Viewed

	@@ -46,6 +46,7 @@ class Springbot_Util_Logger
46	self::$_loggers[$file]->log($message, $level, $extras);
47	}
48	catch (Exception $e) {

49	}
50	}
51


46	self::$_loggers[$file]->log($message, $level, $extras);
47	}
48	catch (Exception $e) {
49	+ Springbot_Log::error($e->getMessage());
50	}
51	}
52

app/code/community/Springbot/Util/Partition.php CHANGED Viewed

File without changes

app/design/adminhtml/default/default/layout/bmbleb.xml CHANGED Viewed

	@@ -1,6 +1,10 @@
1	<?xml version="1.0"?>
2	<layout>
3	-




4	<adminhtml_bmbleb_index_index>
5	<reference name="head">
6	<action method="addCss"><stylesheet>bmbleb/bmbleb.css</stylesheet></action>
	@@ -123,5 +127,4 @@
123	<block type="bmbleb/adminhtml_notifications" name="bmbleb_notifications" template="bmbleb/notifications.phtml"/>
124	</reference>
125	</default>
126	-
127	</layout>


1	<?xml version="1.0"?>
2	<layout>
3	+ <adminhtml_sales_order_view>
4	+ <reference name="order_info">
5	+ <block type="bmbleb/adminhtml_order_marketplaces" name="bmbleb.order.marketplaces" template="bmbleb/order/marketplaces.phtml" before="order_history" />
6	+ </reference>
7	+ </adminhtml_sales_order_view>
8	<adminhtml_bmbleb_index_index>
9	<reference name="head">
10	<action method="addCss"><stylesheet>bmbleb/bmbleb.css</stylesheet></action>

127	<block type="bmbleb/adminhtml_notifications" name="bmbleb_notifications" template="bmbleb/notifications.phtml"/>
128	</reference>
129	</default>

130	</layout>

app/design/adminhtml/default/default/template/bmbleb/auth.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/dashboard_loggedout.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/help/index.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/index/messages.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/index/terms.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/jobs.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/jobs/status.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/login.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/logout.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/logs/index.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/notifications.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/order/marketplaces.phtml ADDED Viewed

	@@ -0,0 +1,23 @@


1	+ <?php $order = $this->getOrder() ?>
2	+ <?php $mpOrder = $this->getMarketplacesOrder() ?>
3	+ <div class="box-left">
4	+ <!--Marketplaces Detail-->
5	+ <div class="entry-edit">
6	+ <div class="entry-edit-head">
7	+ <h4 class="icon-head head-account">Marketplaces Detail</h4>
8	+ </div>
9	+ <div class="fieldset">
10	+ <table cellspacing="0" class="form-list">
11	+ <tr>
12	+ <td class="label"><label><?php echo $this->__('Marketplace') ?></label></td>
13	+ <td class="value"><strong><?php echo $mpOrder->getHumanMarketplaceType() ?></strong></td>
14	+ </tr>
15	+ <tr>
16	+ <td class="label"><label><?php echo $this->__('Remote Order Id') ?></label></td>
17	+ <td class="value"><strong><a href="https://sellercentral.amazon.com/gp/orders-v2/details/ref=ag_orddet_cont_myo?ie=UTF8&orderID=<?php echo $mpOrder->getRemoteOrderId() ?>" target="_blank"><?php echo $mpOrder->getRemoteOrderId() ?></a></strong></td>
18	+ </tr>
19	+ </table>
20	+ </div>
21	+ </div>
22	+ </div>
23	+ <div class="clear"></div>

app/design/adminhtml/default/default/template/bmbleb/problems/index.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/status.phtml CHANGED Viewed

File without changes

app/design/adminhtml/default/default/template/bmbleb/tabs.phtml CHANGED Viewed

File without changes

app/design/frontend/base/default/layout/shadow.xml CHANGED Viewed

File without changes

app/design/frontend/base/default/template/shadow/async.phtml CHANGED Viewed

File without changes

app/design/frontend/base/default/template/shadow/conversion.phtml CHANGED Viewed

	@@ -17,7 +17,7 @@
17	);
18
19	} catch (Exception $e) {
20	- Springbot_Log::error($e);
21	}
22	?>
23


17	);
18
19	} catch (Exception $e) {
20	+ Springbot_Log::error($e->getMessage());
21	}
22	?>
23

app/etc/modules/Springbot.xml CHANGED Viewed

@@ -1,21 +1,25 @@
             <?xml version="1.0"?>
             <config>
-            -
                <modules>
-            -
            	   <Springbot_Bmbleb>
-            -
                        <active>true</active>
-            -
                        <codePool>community</codePool>
-            -
                    </Springbot_Bmbleb>
-            -
                    <Springbot_BoneCollector>
-            -
                        <active>true</active>
-            -
                        <codePool>community</codePool>
-            -
                    </Springbot_BoneCollector>
-            -
            	    <Springbot_Combine>
-            -
                        <active>true</active>
-            -
                        <codePool>community</codePool>
-            -
                    </Springbot_Combine>
-            -
            	    <Springbot_Shadow>
-            -
                        <active>true</active>
-            -
                        <codePool>community</codePool>
-            -
                    </Springbot_Shadow>
-            -
                </modules>
             </config>


1	<?xml version="1.0"?>
2	<config>
3	+ <modules>
4	+ <Springbot_Bmbleb>
5	+ <active>true</active>
6	+ <codePool>community</codePool>
7	+ </Springbot_Bmbleb>
8	+ <Springbot_BoneCollector>
9	+ <active>true</active>
10	+ <codePool>community</codePool>
11	+ </Springbot_BoneCollector>
12	+ <Springbot_Combine>
13	+ <active>true</active>
14	+ <codePool>community</codePool>
15	+ </Springbot_Combine>
16	+ <Springbot_Shadow>
17	+ <active>true</active>
18	+ <codePool>community</codePool>
19	+ </Springbot_Shadow>
20	+ <Springbot_Api>
21	+ <active>true</active>
22	+ <codePool>community</codePool>
23	+ </Springbot_Api>
24	+ </modules>
25	</config>

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Springbot</name>
4	- <version>1.4.7.0</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/OSL-3.0">Open Software License v3.0 (OSL-3.0)</license>
7	<channel>community</channel>
	@@ -47,13 +47,12 @@
47	Proclivity to Buy Alerts example: Sally Avalon bought a house recently
48
49	For support information, features and pricing and more details visit springbot.com </description>
50	- <notes>~~Create~~ ~~dynamic~~ ~~URL rewrites~~
51	- ~~Report~~ ~~checkout~~ ~~success page URL ~~
52	- Fix Enterprise harvest bug</notes>
53	<authors><author><name>Springbot Integrations Team</name><user>Springbot</user><email>magento@springbot.com</email></author></authors>
54	- <date>~~2015~~-11-19</date>
55	- <time>23:24:20</time>
56	- <contents><target name="magecommunity"><dir name="Springbot"><dir name="Shadow"><dir name="Block"><dir name="Action"><file name="View.php" hash="c565170f40e3e26d30d7464ce83aa1cf"/></dir><file name="Async.php" hash="0d203fe1a722f7045029613a0e97bfc2"/></dir><dir name="Controller"><file name="Action.php" hash="5dc41d4ddf12a468fb23fc757ef49a95"/></dir><dir name="Helper"><file name="Data.php" hash="82089d4cfecee69628ae9d627ad2de0c"/><file name="Prattler.php" hash="e2658c19a182bd5cc9948eccc024ad21"/></dir><dir name="Model"><dir name="Listeners"><file name="Observer.php" hash="e5b827a61c3b04fdb73e38a424d167eb"/></dir></dir><dir name="controllers"><file name="ActionController.php" hash="008ffa5ad753c092650b5686ea24fffe"/><file name="IndexController.php" hash="2a540da33a64c7307af981abca0d4558"/></dir><dir name="etc"><file name="config.xml" hash="b1717e37375197b449c0736adff99d87"/></dir></dir><dir name="Services"><dir name="Cmd"><file name="Forecast.php" hash="efaeb6ca5b2667b30929b223cddfb044"/><file name="Halt.php" hash="85c85ae257e9b86d0fb10fb46060fea3"/><file name="Harvest.php" hash="4330b805baf9ab761fad94a22652972c"/><file name="Healthcheck.php" hash="b1c26cd3e54c303c7c6d73e5accf2e18"/><file name="Update.php" hash="08149ecedc0ac3f02e5ca86fa1eec6c9"/></dir><dir name="Harvest"><file name="AttributeSets.php" hash="95610f6fd6323e0473589c01051781f2"/><file name="Carts.php" hash="ecaf8583962fc63e49cf069d73eb22bf"/><file name="Categories.php" hash="acfe9c8dc9a02992a058015e8aaf9311"/><file name="Coupons.php" hash="5190a1669b0b4ef10222843451e9dc36"/><file name="CustomerAttributeSets.php" hash="7c3a0bed9f841900f692f5a17e7c6e8f"/><file name="Customers.php" hash="3d57c8238976554081176e249f2e7f4b"/><file name="Guests.php" hash="e0f6d955ba9bc3f020cc95f3083913ad"/><file name="Inventories.php" hash="d5a78ead8d37188df6286d4697b25f76"/><file name="Products.php" hash="087d01eddc45b4a30c4aa7dba5cc5dce"/><file name="Purchases.php" hash="a3d76ae1a2ea514fcce5ca2607ddf5a4"/><file name="Rules.php" hash="355ecad7266987a391ceca9d2eb0244f"/><file name="Subscribers.php" hash="a8b0d7197580bd9f3de7b10f9c6dc7ca"/></dir><file name="Harvest.php" hash="af3b9604c7b9d7da76cffe846dc34d70"/><dir name="Log"><file name="Installer.php" hash="342706712eb2731ea27aeec993fd2d7f"/></dir><dir name="Post"><file name="Attribute.php" hash="e0a283984de84bc16d5f89a893a8dc83"/><file name="AttributeSet.php" hash="c8f66b5a189125a63e834196402b709a"/><file name="Cart.php" hash="26d33fb887417e46d3ba3e46badc04a3"/><file name="Category.php" hash="0645d5eb9bb790f25e29666bc3a703e0"/><file name="Coupon.php" hash="6b8b49327874ce431f6100b6917ba21f"/><file name="Customer.php" hash="d2f018919afdb7d49617e6b9ac7d2760"/><file name="Guest.php" hash="3b7ee9f0e274340713d8c4302d01b361"/><file name="Inventory.php" hash="a003e45720f7527d29a5678596e4e843"/><file name="Json.php" hash="86a5f26aa5367d8c4c66d278e4c02546"/><file name="Jsonstring.php" hash="9dfb5761d1a7835bf35040a073fa8fc4"/><file name="Product.php" hash="5ec9cbf29df156da09d17e1b6526f53d"/><file name="Purchase.php" hash="0b924c8e5d8f7018eb335ba9fb6d63dd"/><file name="Rule.php" hash="fa038fa414a176d960ed6470c7b7b4cd"/><file name="Subscriber.php" hash="88c5dbcaae805866595217eedbbf5f34"/></dir><file name="Post.php" hash="df9bf80bee670259f3a54e3308d0dbd3"/><file name="Registry.php" hash="d54afde887b72e79ae36ab11766ec5c9"/><dir name="Store"><file name="Finalize.php" hash="e840d2c2dbe813f259b92feba8173b52"/><file name="Register.php" hash="72ae8d75c11dc1c0635c799e284ecb2d"/></dir><dir name="Tasks"><file name="ClearCache.php" hash="17ee105f79d9a71c13ecdd6de2787cdc"/><file name="ClearJobs.php" hash="380740a54aa4d79a89d2c67f06724a31"/><file name="ClearStores.php" hash="33e216186c56bde7e558cd828e90dda0"/><file name="CreateRewrite.php" hash="fe937a07db1b9e415f97cfc22a49c437"/><file name="Debug.php" hash="41a522394c2b9375393d81bb3ab206cc"/><file name="DeleteJob.php" hash="be2a2be88290cc3e9bc54c59e22254b5"/><file name="DeliverEventLog.php" hash="18ffe64d10e90819b5e141fc471c0951"/><file name="Forecast.php" hash="caaf18be7fe387a4eba5a77eb0db2c12"/><file name="GetLog.php" hash="d850bba9f90b134f884d8d7a36730a26"/><file name="Harvest.php" hash="f71f97f078a081425c8848ba435d3b16"/><file name="HarvestInventory.php" hash="570d3aba5ac28b397d601d21f070415e"/><file name="Healthcheck.php" hash="63fdc080533ab8dff8d0949dd6ef4a3b"/><file name="Jobs.php" hash="9df9611445f9ab4a7a6d4b4e79f6b681"/><file name="KillHarvest.php" hash="a757f35956e4565b597522168109071c"/><file name="LaunchFullHarvest.php" hash="e5271dbfa422a90f4c4dda7362cb68f3"/><file name="LaunchPartialHarvest.php" hash="9c5aa7792fe9a3b98f9de9f4b59e3866"/><file name="PackageUpdate.php" hash="cb88473eea4e15760a4fa7c0aba83ddb"/><file name="PostItem.php" hash="54b4bac0b26b8b0e06df1d6da1ea7a91"/><file name="RegisterStores.php" hash="c054ef31b9c28efc5a18ee2ddf31c512"/><file name="ResetRetries.php" hash="bf00fe101b69a78955dc9a6d054e7ba7"/><file name="ResumeHarvest.php" hash="c9ba7b36e2b16dd1d1d947fc83a0ce5e"/><file name="Run.php" hash="c6892d3f812d5085b284d3501211bd5d"/><file name="SetVar.php" hash="93a0afb5e5c32536f430fc3b58b72995"/><file name="UnlockJobs.php" hash="9bf4b725445897ab2842bcb97e344e0c"/><file name="ViewConfig.php" hash="cc60cbc3d2212576301b13b0b286c618"/></dir><file name="Tasks.php" hash="173bdc5c586a0f5d41528cdbd2fff70b"/><dir name="Update"><file name="Abstract.php" hash="7b9a1d36b4486e250587820731b7fb7c"/><file name="Connect.php" hash="3e4366a42e563ec3406a0fcb9a5f77bf"/><file name="Downloader.php" hash="934ef5788acb45ce94e0a32c1d705df1"/><file name="Installer.php" hash="a09ec2e9f7bbf12c117c8950e46072b0"/><file name="Package.php" hash="60ec01b28a2ded244bf6d4a971918bd5"/></dir><dir name="Work"><file name="Cleanup.php" hash="100fef130220e91dc255b5e0f30c37f1"/><file name="Manager.php" hash="9dbdfb717865b7724f4ffd38b3ec866e"/><file name="Report.php" hash="8a3eec618fe3b04a3514dc302c4c5a0f"/><file name="Restart.php" hash="d55e811fbba86348890b4047fa5a579f"/><file name="Runner.php" hash="c0ced9ce83e5e51b4ba5f10bb46760af"/><file name="Stop.php" hash="db97407b43396f0adf44a2354a23a0a5"/></dir></dir><dir name="Util"><file name="Caller.php" hash="4fcc265eb1a58fed5c3b404ec864514b"/><file name="Categories.php" hash="1292843306c38d9593902616e04320a6"/><dir name="Log"><file name="Rollover.php" hash="6ad4bd93adb7e906c1de5a05a2871ea8"/></dir><file name="Logger.php" hash="59abca8cb07ef933ca8ef2ac824591b5"/><file name="Partition.php" hash="b9296b086003ba58ba12f8b8b0373c50"/></dir><file name="Services.php" hash="b9f0a869c089aa0ce4e111813827e0b0"/><dir name="Bmbleb"><dir name="Block"><dir name="Adminhtml"><file name="Auth.php" hash="7dc661bbe9ec85f700a22b319981114d"/><dir name="Bmbleb"><dir name="Login"><file name="Form.php" hash="854c89ce2d4a2a7a9bf320cf171fc97d"/></dir><file name="Login.php" hash="7232e8225f5b21de5675c0d84cb452bd"/></dir><file name="Connected.php" hash="833cef8e351f5efa7a4d104b1c51ca7f"/><file name="Help.php" hash="b280b3292ed778140b751b6426ef56fb"/><dir name="Index"><file name="Messages.php" hash="1e247e31194447de32e54f49dafc3ccc"/><file name="Terms.php" hash="739e5a9ebe204f1f9ac433557c994ae6"/></dir><file name="Index.php" hash="eb7bbef5fa26a53748596e145c3677c4"/><dir name="Jobs"><file name="Grid.php" hash="67255d982ac3d50b38d7a2a525c2b922"/><file name="Status.php" hash="f1b197bf6fdc392bed93ff0734a54ad6"/></dir><file name="Jobs.php" hash="84801c6008802496e168e763a7e6d71f"/><file name="Login.php" hash="2e4d8baead482d404ed40f7d5f3d902c"/><file name="Logout.php" hash="b75af51891b751b9d070e1e784dd6914"/><file name="Logs.php" hash="686e958b553c1e3fcf74841eab30fffb"/><file name="Notifications.php" hash="a7c4dbd015d0a529af2b6430315e3db3"/><file name="Status.php" hash="9b67a20f0ee00608029d24850cefda4d"/><file name="Tabs.php" hash="6f93d5c6bd5208a99637c06118c6c630"/></dir></dir><dir name="Helper"><file name="Account.php" hash="c41f40e6f58abd3b8486e0e92cc079d8"/><file name="Data.php" hash="dca14b137de1e2734a377ca645eeddbe"/><file name="PluginStatus.php" hash="9de073079a7ee90a43acd9807a4adc56"/></dir><dir name="Model"><file name="Bmbleb.php" hash="700d11c3006f2dcd2e80cd8bbbab15f9"/><file name="Status.php" hash="9409d26c7884be6b8075ba97dbf71f78"/><file name="Sync.php" hash="a800b6064a88f37957392cd967f2b3cb"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Bmbleb"><file name="HelpController.php" hash="cda8111aaec6f9155aac1f2e0afb8b32"/><file name="IndexController.php" hash="6c7138ac88c3ae9666a3637a7fb25768"/><file name="JobsController.php" hash="91d42c69ed10a2743e3be8a962227b59"/><file name="LoginController.php" hash="cf255c1a2591f6d99c5857826e7d8f40"/><file name="LogsController.php" hash="d31f21a550cac8b5bfa5af6b6bdfd412"/><file name="SettingsController.php" hash="8bce329eed695d7403e874b73fe30ceb"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="fab6376b0991e28e88a9fa14c1d54bd0"/></dir></dir><file name="Boss.php" hash="056f9eff87e5f7e76eab289596309829"/><file name="Cli.php" hash="6aef5d4fd8fbda6351338ab313d930ce"/><file name="Log.php" hash="5ab61d7cf21805adb8f826f83b9bf7b1"/><dir name="Combine"><dir name="Helper"><file name="Attributes.php" hash="5fb06e7cc89bb710039a79fb16e2a998"/><file name="Cart.php" hash="07ce5f461ecded3b9b00ed5c30faa266"/><file name="Data.php" hash="bba3915380a71aaacacc306f10396ef1"/><file name="Harvest.php" hash="ca563e641e167cc6f813c66300984ec2"/><file name="Parser.php" hash="480f573160e775654555022a5fee1450"/><file name="Redirect.php" hash="085d1e1b428218f290c690f2cbe42d6d"/><file name="Store.php" hash="8db94d157d7e497e7612844da43a6c11"/><file name="Trackable.php" hash="a042cb0d176730ec87353b1c5c6d21f7"/></dir><dir name="Model"><file name="Action.php" hash="6375461263bdf7fe26e71235d2449c21"/><file name="Api.php" hash="978590ad36b4d6ad6b3a14742f8bb31c"/><dir name="Cron"><file name="Count.php" hash="57552740b6ffdd9a4e879191a51043b0"/><dir name="Manager"><file name="Status.php" hash="aeb4445bc2d4b1b7e0e19c09172f0483"/></dir><dir name="Queue"><dir name="Batch"><file name="Row.php" hash="25f4ed809a9190f5d41c6c210cd8a537"/></dir><file name="Batch.php" hash="fa905d2781aab5881e881e3b12d25e0c"/></dir><file name="Queue.php" hash="455babdbaa841a12b74a3485871e7eeb"/><file name="Worker.php" hash="8b5040f1c5c5b3221542e739dc951de7"/></dir><file name="Cron.php" hash="40f2bc9634610f4ed5464de48630ce16"/><dir name="File"><file name="Io.php" hash="6d1f79eaf45897bf0525b0f3f3ac69d2"/><file name="Path.php" hash="24900b670c07fcdc4e54bae585f20002"/></dir><dir name="Harvest"><file name="AttributeSets.php" hash="479dfb30912b74183b396fa4e62323b2"/><file name="Carts.php" hash="0b303b2b7d4458a9a0cbf0653b9d660f"/><file name="Categories.php" hash="fd5f13ad449a320616569f64c82327ff"/><file name="Coupons.php" hash="14112f9063bbf20cea7ff3649f238524"/><file name="CustomerAttributeSets.php" hash="044f426226165ee86b0f822c00ec7712"/><file name="Customers.php" hash="c7850418a39abf09c10fbfafcb96f8e1"/><file name="Guests.php" hash="3685b3220b724e518dc83daad015577f"/><file name="Inventories.php" hash="15dc9f8c38dd7ab626eb3154c6b1b0f2"/><file name="Products.php" hash="da471abcc04837391b5270464164aefd"/><file name="Purchases.php" hash="427d38d1f6579f63730aa6bdf6b7bba4"/><file name="Rules.php" hash="fd1789174225c4ed6ad1e1137fe2aee5"/><file name="Subscribers.php" hash="e499e299612a6e2ce07ee19228cf43c5"/></dir><file name="Harvest.php" hash="14f7ffc01ad04b2d78d313f55ab765c2"/><dir name="Mysql4"><dir name="Action"><file name="Collection.php" hash="830a7db2ea307d594fe945701654d883"/></dir><file name="Action.php" hash="5b18cc8842c83d981575b7b2de496f66"/><dir name="Cron"><file name="Count.php" hash="acbbb7ec28afbbe98101f5d114cb30b3"/><dir name="Queue"><file name="Collection.php" hash="b26806c9e7cefd052bb784f5a6ce814c"/></dir><file name="Queue.php" hash="4add10644bfc94b88ef5042b23c82ae7"/></dir><dir name="Redirect"><file name="Collection.php" hash="3bbe4f8729c603f8d8131154a0a117c1"/><dir name="Order"><file name="Collection.php" hash="88c0cfcce31b0eed8c035dee4e7e86df"/></dir><file name="Order.php" hash="852bea330edac3372ec5c168111301a8"/></dir><file name="Redirect.php" hash="842e4ba35c6b049c8eaa64704588ca76"/><file name="Setup.php" hash="3fdec335980846a4c3adbc6f4e3478eb"/><dir name="Trackable"><file name="Collection.php" hash="8799c5bf630d267b551cf9dba986cbb0"/></dir><file name="Trackable.php" hash="b38749697b641874b42dceae38ab4a30"/></dir><dir name="Parser"><file name="AttributeSet.php" hash="9ae4013d42da5de0e9c8492fb29cd8d6"/><file name="Category.php" hash="0c3c71ff784307b9120d7cf781005069"/><file name="Coupon.php" hash="a66b3d4c8397610863cd74e35cbd5b62"/><file name="Customer.php" hash="99233c3da1eb28f1ec15e20e837d764a"/><file name="CustomerAttributeSet.php" hash="1b51f9300a9ee102872ff9d7f9bbccbc"/><file name="Guest.php" hash="002c900d3722f761e3e3ac63be84014f"/><file name="Inventory.php" hash="6f9ea827ee304f72b13bce3d7316efbc"/><file name="Product.php" hash="7e0fa4a55ca45fc876e588442cce72eb"/><dir name="Purchase"><file name="Item.php" hash="ca7facc8c81504ea990fdb1feeba64dd"/></dir><file name="Purchase.php" hash="ec3929b9e1a0df0e5816c1558391dcdc"/><dir name="Quote"><file name="Item.php" hash="37cbc74a49a16e67e02f421978e1741f"/></dir><file name="Quote.php" hash="fa0e008c67f15d1a4c7866a407aaaeaf"/><file name="Rule.php" hash="0a0f70172aeff0e5157f2f1652c3ae09"/><file name="Subscriber.php" hash="357aae3d07af49ad69e6df273ae2548b"/></dir><file name="Parser.php" hash="2e10487d6e00e3d2c3ec075c68e25d52"/><dir name="Redirect"><file name="Order.php" hash="5ca85ca596ef6e45468c8a12cee72614"/></dir><file name="Redirect.php" hash="05dddaa1e9c17c4c79d70d63b56ed454"/><dir name="Resource"><file name="Abstract.php" hash="61dfb714347611c6cf934b1d2360bfe3"/><dir name="Action"><file name="Collection.php" hash="22e278b8cbc5d18d4faa48c4f224d145"/></dir><file name="Action.php" hash="83b00531db5ec3a51ea7c0fc65a1d083"/><dir name="Cron"><dir name="Count"><file name="Collection.php" hash="c5cb4ab406c1d008c1bc22bb95b3ba28"/></dir><file name="Count.php" hash="6a356b5d92b509945c4567f479b9bfdd"/><dir name="Queue"><file name="Collection.php" hash="e6655bdbc5920eeb9178adfcb905ac36"/></dir><file name="Queue.php" hash="f9eae90970e4d935b5e5335c8e57e71b"/></dir><file name="Debug.php" hash="976156dc1ff783a26174bdac79decde2"/><dir name="Redirect"><file name="Collection.php" hash="df6662f064b3170aab46d69d42c514a3"/><dir name="Order"><file name="Collection.php" hash="162359ed9499b6f976f5c341fd0585c3"/></dir><file name="Order.php" hash="7ea4477380a5215dc0efe561ede359d9"/></dir><file name="Redirect.php" hash="d239af442388bb9fa80db81a7fc43711"/><file name="Setup.php" hash="0405c44c124f19619ccc9f429d781d44"/><dir name="Trackable"><file name="Collection.php" hash="6f060c3537b49710302e38e881885a69"/></dir><file name="Trackable.php" hash="764b0d21c492dd69b9f85ae3c647666e"/></dir><file name="Rewrite.php" hash="376b6817edac2503d21b1b5a4d84809a"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Harvestertype.php" hash="2f8c8f285df356013c15c1441bb5de3e"/><file name="LogFormat.php" hash="828680dafe5a7042221900cb6d9dfa17"/><file name="LogLevel.php" hash="b86c793ca04205f045efd9ea42d02a10"/><file name="Stability.php" hash="830e5bc4e8ce9657221224dbaf99cee6"/><file name="UrlType.php" hash="28f9a5bc024afe5526685d429a751ad8"/></dir></dir></dir><file name="Trackable.php" hash="9a78a576f6df1d2c535200b9c6069ba8"/></dir><dir name="etc"><file name="adminhtml.xml" hash="794fc8a1d67ac3e6b5d71c707a0c7cad"/><file name="config.xml" hash="27547a613c2d307e2e51368a30f1eef0"/><file name="system.xml" hash="48a3a0199a5328bc44950c5abcdc2de6"/></dir><dir name="sql"><dir name="combine_setup"><file name="mysql4-install-1.0.0.70.php" hash="425be4a54012cd64753ee1a216255d67"/><file name="mysql4-upgrade-1.0.0.70-1.0.0.84.php" hash="e51deaff9e65f43483ab00573605329d"/><file name="mysql4-upgrade-1.0.0.84-1.0.0.88.php" hash="89bd8a585c0d351aae6838ace48f608d"/><file name="mysql4-upgrade-1.0.0.88-1.2.0.0.php" hash="4779a5072d23ebdb27177de0dfd19f5d"/><file name="mysql4-upgrade-1.2.0.0-1.2.0.1.php" hash="01a7ef2466b9f676884db4d7a7c562a9"/><file name="mysql4-upgrade-1.2.0.1-1.2.1.0.php" hash="dbba441ac757db26289f21443a948f6b"/><file name="mysql4-upgrade-1.3.9.9-1.4.0.0.php" hash="5b5e0602bdcd48263bdf4e25b17d95b5"/></dir></dir></dir><dir name="BoneCollector"><dir name="Model"><file name="HarvestAbstract.php" hash="fecaefad7d4fc279e3a54b4c8cac54ae"/><dir name="HarvestAttribute"><file name="Observer.php" hash="26d016ab4fae05872aa46b6abdc3e562"/></dir><dir name="HarvestCart"><file name="Observer.php" hash="ae4c5e0cf7b764419ffb36710388ecfd"/></dir><dir name="HarvestCategory"><file name="Observer.php" hash="7ddb0b58b301863c1e46dd2db3628db8"/></dir><dir name="HarvestCustomer"><file name="Observer.php" hash="a20e21f1033dc35025ab9b402d6574bc"/></dir><dir name="HarvestInventoryItem"><file name="Observer.php" hash="b6005e059d893ccc4432ea5c22c55a8a"/></dir><dir name="HarvestProduct"><file name="Observer.php" hash="73eac87240083709cb5c746b81afe44f"/></dir><dir name="HarvestPurchase"><file name="Observer.php" hash="d64f1b84c73d3eeac1f89e606d8a0f7d"/></dir><dir name="HarvestRule"><file name="Observer.php" hash="49f369f960101ec66458f8dbe7972e40"/></dir><dir name="HarvestSubscriber"><file name="Observer.php" hash="5b64106296e9d0045610c69ed0c9be4b"/></dir></dir><dir name="etc"><file name="config.xml" hash="b1a43d80a3326ef2c26f20660d7f0a3b"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Springbot.xml" hash="69a4e2c056502cd8539b4f66a2c8b1bc"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="bmbleb.xml" hash="8e8c9c971859feda79f2305f948c28fc"/></dir><dir name="template"><dir name="bmbleb"><file name="auth.phtml" hash="bf509b53c49cd69ec3ea60e3effe69c3"/><file name="dashboard_loggedout.phtml" hash="19281143b19a544d4e3072dc754ada2d"/><dir name="help"><file name="index.phtml" hash="e9d3f11c623c735c3e699e406ff9e0e7"/></dir><dir name="index"><file name="messages.phtml" hash="fcbbb47d2cc30c493ed2316a8b888f5d"/><file name="terms.phtml" hash="dfff1182d2fe7d8eee69b9b302c4cbc7"/></dir><dir name="jobs"><file name="status.phtml" hash="77f0b0ae7c3c6c42031675cfc959e270"/></dir><file name="jobs.phtml" hash="961ac83f56bf8703dbc433894da4933e"/><file name="login.phtml" hash="0a1a20dfaffe8646bb56323ab811d46a"/><file name="logout.phtml" hash="09b92790c5e124a01086d6929ed7e8de"/><dir name="logs"><file name="index.phtml" hash="d7ca20d89a393bbc8cd31e98f73c0ea9"/></dir><file name="notifications.phtml" hash="45f8767a090a4f7a7e177151bbc43f4f"/><dir name="problems"><file name="index.phtml" hash="b6ad14ab59fc3a06fda655d57faeab23"/></dir><file name="status.phtml" hash="1acc630a6549b234bc1fa5923e04b8ce"/><file name="tabs.phtml" hash="779c335a284b9bab18b36859011d673f"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="shadow.xml" hash="3f29bebbcf7e42c57dcac9150c6b7d68"/></dir><dir name="template"><dir name="shadow"><file name="async.phtml" hash="af147801ed74d45bb0580b0bb69ce0fd"/><file name="conversion.phtml" hash="070ea7ab18e823ecf49b4db16659c025"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="bmbleb"><file name="bmbleb.css" hash="d929b5f42085c25b86101379f286f55f"/><dir name="images"><file name="arrows_up-down-large.png" hash="72c27995e1ab1d182891dad0a4d1dae2"/><file name="bmb-ctl.png" hash="de59a694a82b8699560df5146b2e315f"/><file name="check.png" hash="126f33ed483549e79a16186b7499c190"/><file name="grn-bg.png" hash="f681a524e2b4561dbe94152a2d24d60b"/><file name="h3-bg.png" hash="b93df0b0bdba8e8f6e0a07cc31fcc180"/><file name="icon-alert.png" hash="ac2e70efdcebc3813222d0d3ee62a6d9"/><file name="icon-bmbleb.png" hash="fb5574b5e63ee33b84eee26b3d8ef8e3"/><file name="icon-insights.png" hash="725fd29fe1b705e358c9080408693d3d"/><file name="icon-status.png" hash="bd13429f23166a6d431739010ea1b2cd"/><file name="left-ico1.png" hash="7d188f5e6021569750756f58067f0a3b"/><file name="left-ico2.png" hash="d2f6379a73290a8ffa4cb3e19a809d25"/><file name="left-ico3.png" hash="73bc75f7a746e54a75f14eda7a28a6b9"/><file name="left-ico4.png" hash="1da2c26187fed26b6c61599682b2dc4b"/><file name="left-ico5.png" hash="ada61cb32805f2cb8e8dace46361613e"/><file name="left-ico6.png" hash="1e62822267f72589ffa0771352a002da"/><file name="left-ico7.png" hash="16118412d581f0c83ce45c44f62f25a1"/><file name="left-ico8.png" hash="c7de2fe523c892b432b575648cc05631"/><file name="left-ico_demographics.png" hash="3fe23a2dea68f6c65114f248a8bdaa5e"/><file name="login-icn-b.png" hash="64e72070f595e215ece79736ac77ee2f"/><file name="login-icn.png" hash="6142cc2fc8ee2d1c40bf3c8f9ac1fa85"/><file name="logo.png" hash="8fb783f7d68fca3914123f56b8c066a4"/><file name="orng-bg.png" hash="074a6912ca2a139df537e3d15b6bc9b2"/><file name="plugin_dashboard_syncing.jpg" hash="8511648541f6f1b96ff1c53dda3a439b"/><file name="register.png" hash="f73fe51cf7df27ab11089385fa50714e"/><file name="registration-bg-25.png" hash="9d2cf77619cc8fce3ae4d44b0aae30c1"/><file name="registration-bg-50.png" hash="99942fdc8c3f88b0d4b09f87c9e39045"/><file name="registration-bg.png" hash="96365b39495e56ffe491dd9930fe221d"/><file name="spinner.gif" hash="add667817f25bce331a213ab3cc9621f"/><file name="springbot-ctl.png" hash="de59a694a82b8699560df5146b2e315f"/><file name="submit-btn-bg.png" hash="d98aa287b7b73dad9f780b22cb53fbdb"/><file name="sync_icon.png" hash="cb12f2e8943c8e324e3456375f953c86"/><file name="white-check.png" hash="126f33ed483549e79a16186b7499c190"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="shell"><file name="springbot.php" hash="80f11ae5dc3839faf9d99df8c5a071d1"/></dir></target></contents>
57	<compatible/>
58	- <dependencies><required><php><min>5.2.0</min><max>8.0.0</max></php></required></dependencies>
59	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>Springbot</name>
4	+ <version>1.5.2.1</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/OSL-3.0">Open Software License v3.0 (OSL-3.0)</license>
7	<channel>community</channel>

47	Proclivity to Buy Alerts example: Sally Avalon bought a house recently
48
49	For support information, features and pricing and more details visit springbot.com </description>
50	+ <notes>Refactor existing code
51	+ Amazon Order Sync</notes>

52	<authors><author><name>Springbot Integrations Team</name><user>Springbot</user><email>magento@springbot.com</email></author></authors>
53	+ <date>2016-07-25</date>
54	+ <time>22:21:15</time>
55	+ <contents><target name="magecommunity"><dir name="Springbot"><dir name="Shadow"><dir name="Block"><dir name="Action"><file name="View.php" hash="c565170f40e3e26d30d7464ce83aa1cf"/></dir><file name="Async.php" hash="0d203fe1a722f7045029613a0e97bfc2"/></dir><dir name="Controller"><file name="Action.php" hash="5dc41d4ddf12a468fb23fc757ef49a95"/></dir><dir name="Helper"><file name="Data.php" hash="82089d4cfecee69628ae9d627ad2de0c"/><file name="Prattler.php" hash="e2658c19a182bd5cc9948eccc024ad21"/></dir><dir name="Model"><dir name="Listeners"><file name="Observer.php" hash="ea89c307b28795d568366b48a8986240"/></dir></dir><dir name="controllers"><file name="ActionController.php" hash="ea69946850d6aa24d14c6df26541ecaf"/><file name="IndexController.php" hash="07ec0cd97882eb37b157a6c6eaf8b656"/></dir><dir name="etc"><file name="config.xml" hash="b1717e37375197b449c0736adff99d87"/></dir></dir><dir name="Services"><dir name="Cmd"><file name="Forecast.php" hash="efaeb6ca5b2667b30929b223cddfb044"/><file name="Halt.php" hash="85c85ae257e9b86d0fb10fb46060fea3"/><file name="Harvest.php" hash="4330b805baf9ab761fad94a22652972c"/><file name="Healthcheck.php" hash="b1c26cd3e54c303c7c6d73e5accf2e18"/></dir><dir name="Harvest"><file name="AttributeSets.php" hash="95610f6fd6323e0473589c01051781f2"/><file name="Carts.php" hash="ecaf8583962fc63e49cf069d73eb22bf"/><file name="Categories.php" hash="acfe9c8dc9a02992a058015e8aaf9311"/><file name="Coupons.php" hash="5190a1669b0b4ef10222843451e9dc36"/><file name="CustomerAttributeSets.php" hash="7c3a0bed9f841900f692f5a17e7c6e8f"/><file name="Customers.php" hash="3d57c8238976554081176e249f2e7f4b"/><file name="Guests.php" hash="4a806542ae8aad1781a7222052ba1595"/><file name="Inventories.php" hash="d5a78ead8d37188df6286d4697b25f76"/><file name="Products.php" hash="087d01eddc45b4a30c4aa7dba5cc5dce"/><file name="Purchases.php" hash="a3d76ae1a2ea514fcce5ca2607ddf5a4"/><file name="Rules.php" hash="355ecad7266987a391ceca9d2eb0244f"/><file name="Subscribers.php" hash="a8b0d7197580bd9f3de7b10f9c6dc7ca"/></dir><file name="Harvest.php" hash="af3b9604c7b9d7da76cffe846dc34d70"/><dir name="Log"><file name="Installer.php" hash="342706712eb2731ea27aeec993fd2d7f"/></dir><dir name="Post"><file name="Attribute.php" hash="e0a283984de84bc16d5f89a893a8dc83"/><file name="AttributeSet.php" hash="c8f66b5a189125a63e834196402b709a"/><file name="Cart.php" hash="26d33fb887417e46d3ba3e46badc04a3"/><file name="Category.php" hash="0645d5eb9bb790f25e29666bc3a703e0"/><file name="Coupon.php" hash="6b8b49327874ce431f6100b6917ba21f"/><file name="Customer.php" hash="d2f018919afdb7d49617e6b9ac7d2760"/><file name="Guest.php" hash="3b7ee9f0e274340713d8c4302d01b361"/><file name="Inventory.php" hash="a003e45720f7527d29a5678596e4e843"/><file name="Json.php" hash="86a5f26aa5367d8c4c66d278e4c02546"/><file name="Jsonstring.php" hash="9dfb5761d1a7835bf35040a073fa8fc4"/><file name="Product.php" hash="5ec9cbf29df156da09d17e1b6526f53d"/><file name="Purchase.php" hash="0b924c8e5d8f7018eb335ba9fb6d63dd"/><file name="Rule.php" hash="fa038fa414a176d960ed6470c7b7b4cd"/><file name="Subscriber.php" hash="88c5dbcaae805866595217eedbbf5f34"/></dir><file name="Post.php" hash="df9bf80bee670259f3a54e3308d0dbd3"/><file name="Registry.php" hash="d54afde887b72e79ae36ab11766ec5c9"/><dir name="Store"><file name="Finalize.php" hash="e840d2c2dbe813f259b92feba8173b52"/><file name="Register.php" hash="72ae8d75c11dc1c0635c799e284ecb2d"/></dir><dir name="Tasks"><file name="ClearCache.php" hash="5653a49dbb7743ffc967640c933976a1"/><file name="ClearJobs.php" hash="380740a54aa4d79a89d2c67f06724a31"/><file name="ClearStores.php" hash="33e216186c56bde7e558cd828e90dda0"/><file name="CreateRewrite.php" hash="fe937a07db1b9e415f97cfc22a49c437"/><file name="Debug.php" hash="41a522394c2b9375393d81bb3ab206cc"/><file name="DeleteJob.php" hash="be2a2be88290cc3e9bc54c59e22254b5"/><file name="DeliverEventLog.php" hash="97d4b71f3ae619503dc82420e862826c"/><file name="Forecast.php" hash="caaf18be7fe387a4eba5a77eb0db2c12"/><file name="GetLog.php" hash="d850bba9f90b134f884d8d7a36730a26"/><file name="Harvest.php" hash="f71f97f078a081425c8848ba435d3b16"/><file name="HarvestInventory.php" hash="570d3aba5ac28b397d601d21f070415e"/><file name="Healthcheck.php" hash="63fdc080533ab8dff8d0949dd6ef4a3b"/><file name="Jobs.php" hash="9df9611445f9ab4a7a6d4b4e79f6b681"/><file name="KillHarvest.php" hash="a757f35956e4565b597522168109071c"/><file name="LaunchFullHarvest.php" hash="e5271dbfa422a90f4c4dda7362cb68f3"/><file name="LaunchPartialHarvest.php" hash="9c5aa7792fe9a3b98f9de9f4b59e3866"/><file name="PluginVersion.php" hash="4139fe90a74f4d6531243fcacf22777a"/><file name="PostItem.php" hash="54b4bac0b26b8b0e06df1d6da1ea7a91"/><file name="Redirects.php" hash="357b3008bbc9967cef73ad055c89e16e"/><file name="RegisterStores.php" hash="c054ef31b9c28efc5a18ee2ddf31c512"/><file name="ResetRetries.php" hash="bf00fe101b69a78955dc9a6d054e7ba7"/><file name="ResumeHarvest.php" hash="c9ba7b36e2b16dd1d1d947fc83a0ce5e"/><file name="Run.php" hash="c6892d3f812d5085b284d3501211bd5d"/><file name="SetVar.php" hash="93a0afb5e5c32536f430fc3b58b72995"/><file name="Stores.php" hash="d444cd05f1487945528e3f1e7bb01bb5"/><file name="UnlockJobs.php" hash="9bf4b725445897ab2842bcb97e344e0c"/><file name="ViewConfig.php" hash="cc60cbc3d2212576301b13b0b286c618"/></dir><file name="Tasks.php" hash="173bdc5c586a0f5d41528cdbd2fff70b"/><dir name="Work"><file name="Cleanup.php" hash="100fef130220e91dc255b5e0f30c37f1"/><file name="Manager.php" hash="9dbdfb717865b7724f4ffd38b3ec866e"/><file name="Report.php" hash="8a3eec618fe3b04a3514dc302c4c5a0f"/><file name="Restart.php" hash="d55e811fbba86348890b4047fa5a579f"/><file name="Runner.php" hash="c0ced9ce83e5e51b4ba5f10bb46760af"/><file name="Stop.php" hash="db97407b43396f0adf44a2354a23a0a5"/></dir></dir><dir name="Util"><file name="Caller.php" hash="4fcc265eb1a58fed5c3b404ec864514b"/><file name="Categories.php" hash="1292843306c38d9593902616e04320a6"/><dir name="Log"><file name="Rollover.php" hash="6ad4bd93adb7e906c1de5a05a2871ea8"/></dir><file name="Logger.php" hash="e6e82bcb3124fce31aa62425ce3d17e6"/><file name="Partition.php" hash="b9296b086003ba58ba12f8b8b0373c50"/></dir><file name="Services.php" hash="b9f0a869c089aa0ce4e111813827e0b0"/><dir name="Bmbleb"><dir name="Block"><dir name="Adminhtml"><file name="Auth.php" hash="7dc661bbe9ec85f700a22b319981114d"/><dir name="Bmbleb"><dir name="Login"><file name="Form.php" hash="04a552a32d4f4079fa4f4960f8fbf8ff"/></dir><file name="Login.php" hash="7232e8225f5b21de5675c0d84cb452bd"/></dir><file name="Connected.php" hash="833cef8e351f5efa7a4d104b1c51ca7f"/><file name="Help.php" hash="b280b3292ed778140b751b6426ef56fb"/><dir name="Index"><file name="Messages.php" hash="1e247e31194447de32e54f49dafc3ccc"/><file name="Terms.php" hash="739e5a9ebe204f1f9ac433557c994ae6"/></dir><file name="Index.php" hash="eb7bbef5fa26a53748596e145c3677c4"/><dir name="Jobs"><file name="Grid.php" hash="67255d982ac3d50b38d7a2a525c2b922"/><file name="Status.php" hash="f1b197bf6fdc392bed93ff0734a54ad6"/></dir><file name="Jobs.php" hash="84801c6008802496e168e763a7e6d71f"/><file name="Login.php" hash="2e4d8baead482d404ed40f7d5f3d902c"/><file name="Logout.php" hash="b75af51891b751b9d070e1e784dd6914"/><file name="Logs.php" hash="686e958b553c1e3fcf74841eab30fffb"/><file name="Notifications.php" hash="9643c809802b0596de2fb5fb12b9674e"/><dir name="Order"><file name="Marketplaces.php" hash="cf241263dc2d6b74b53b54a2d1500a49"/></dir><file name="Status.php" hash="9b67a20f0ee00608029d24850cefda4d"/><file name="Tabs.php" hash="6f93d5c6bd5208a99637c06118c6c630"/></dir></dir><dir name="Helper"><file name="Account.php" hash="c41f40e6f58abd3b8486e0e92cc079d8"/><file name="Data.php" hash="dca14b137de1e2734a377ca645eeddbe"/><file name="PluginStatus.php" hash="9de073079a7ee90a43acd9807a4adc56"/></dir><dir name="Model"><file name="Bmbleb.php" hash="700d11c3006f2dcd2e80cd8bbbab15f9"/><file name="Observer.php" hash="675a90ca08e7b8cd87656d15513e7bb0"/><file name="Status.php" hash="9409d26c7884be6b8075ba97dbf71f78"/><file name="Sync.php" hash="a800b6064a88f37957392cd967f2b3cb"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Bmbleb"><file name="HelpController.php" hash="cda8111aaec6f9155aac1f2e0afb8b32"/><file name="IndexController.php" hash="174d93cdc2d881f2f183e69a8ad151d5"/><file name="JobsController.php" hash="1feb95dd4b477910165a250826e49145"/><file name="LoginController.php" hash="6b56c101ddd0316d9a8f1e832c27683f"/><file name="LogsController.php" hash="d31f21a550cac8b5bfa5af6b6bdfd412"/><file name="SettingsController.php" hash="8bce329eed695d7403e874b73fe30ceb"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="dd106e93b300a7d872498397f6135d21"/></dir></dir><file name="Boss.php" hash="446dbbf01f05f72328cbc033769e2354"/><file name="Cli.php" hash="36bb25a8314c24e5aa49df8b78111a55"/><file name="Log.php" hash="172ef37dda5b5e495e97872ef48754c4"/><dir name="Combine"><dir name="Helper"><file name="Attributes.php" hash="b3cedc8aecd0c57f4ed4aa8a0158caa1"/><file name="Cart.php" hash="07ce5f461ecded3b9b00ed5c30faa266"/><file name="Data.php" hash="bba3915380a71aaacacc306f10396ef1"/><file name="Harvest.php" hash="dabc1f514d2378d2b723856c732b1253"/><file name="Marketplaces.php" hash="5b080bf0649759b563a90ae5992091fd"/><file name="Parser.php" hash="480f573160e775654555022a5fee1450"/><file name="Redirect.php" hash="92ffe4e71329c1418143d295ae71d18a"/><file name="Store.php" hash="8db94d157d7e497e7612844da43a6c11"/><file name="Trackable.php" hash="a042cb0d176730ec87353b1c5c6d21f7"/></dir><dir name="Model"><file name="Action.php" hash="6375461263bdf7fe26e71235d2449c21"/><file name="Api.php" hash="1c38e0ef61c84be1bf997b7143238f27"/><dir name="Cron"><file name="Count.php" hash="57552740b6ffdd9a4e879191a51043b0"/><dir name="Manager"><file name="Status.php" hash="aeb4445bc2d4b1b7e0e19c09172f0483"/></dir><dir name="Queue"><dir name="Batch"><file name="Row.php" hash="25f4ed809a9190f5d41c6c210cd8a537"/></dir><file name="Batch.php" hash="fa905d2781aab5881e881e3b12d25e0c"/></dir><file name="Queue.php" hash="52fae6cb137515dd59f0e8a612a90adb"/><file name="Worker.php" hash="4a825f89f340c34cd5feff2cfb859a7a"/></dir><file name="Cron.php" hash="92641d27ee653b22eeb9f6b995abde0b"/><dir name="File"><file name="Io.php" hash="6d1f79eaf45897bf0525b0f3f3ac69d2"/><file name="Path.php" hash="24900b670c07fcdc4e54bae585f20002"/></dir><dir name="Harvest"><file name="AttributeSets.php" hash="479dfb30912b74183b396fa4e62323b2"/><file name="Carts.php" hash="0b303b2b7d4458a9a0cbf0653b9d660f"/><file name="Categories.php" hash="fd5f13ad449a320616569f64c82327ff"/><file name="Coupons.php" hash="14112f9063bbf20cea7ff3649f238524"/><file name="CustomerAttributeSets.php" hash="044f426226165ee86b0f822c00ec7712"/><file name="Customers.php" hash="c7850418a39abf09c10fbfafcb96f8e1"/><file name="Guests.php" hash="3685b3220b724e518dc83daad015577f"/><file name="Inventories.php" hash="15dc9f8c38dd7ab626eb3154c6b1b0f2"/><file name="Products.php" hash="da471abcc04837391b5270464164aefd"/><file name="Purchases.php" hash="427d38d1f6579f63730aa6bdf6b7bba4"/><file name="Rules.php" hash="fd1789174225c4ed6ad1e1137fe2aee5"/><file name="Subscribers.php" hash="e499e299612a6e2ce07ee19228cf43c5"/></dir><file name="Harvest.php" hash="73e9f8c899fab89ef9ce90f8acfe9de7"/><dir name="Marketplaces"><dir name="Order"><file name="Builder.php" hash="e4e8853504ba73123ab9d0df22748c2c"/><file name="Customer.php" hash="83e02326c7a00f3df20f217d7ce3ea9e"/><file name="Item.php" hash="8f285f1648bf52b9fa95dfa3c68d3011"/><file name="Parser.php" hash="55dad7d4feb487f3c8d3094423245cde"/></dir><file name="OrderService.php" hash="28251d154f69ea6ba31a6768f8753492"/><file name="Payment.php" hash="f3accd929ab4ddbc1ae4872a20c705a8"/><dir name="Remote"><file name="Order.php" hash="c687a441bc08ed2e967e30a2c0235624"/></dir><file name="Shipping.php" hash="f4aa773729c7058c9789537c8da79694"/></dir><dir name="Mysql4"><dir name="Action"><file name="Collection.php" hash="830a7db2ea307d594fe945701654d883"/></dir><file name="Action.php" hash="5b18cc8842c83d981575b7b2de496f66"/><dir name="Cron"><file name="Count.php" hash="acbbb7ec28afbbe98101f5d114cb30b3"/><dir name="Queue"><file name="Collection.php" hash="b26806c9e7cefd052bb784f5a6ce814c"/></dir><file name="Queue.php" hash="4add10644bfc94b88ef5042b23c82ae7"/></dir><dir name="Redirect"><file name="Collection.php" hash="3bbe4f8729c603f8d8131154a0a117c1"/><dir name="Order"><file name="Collection.php" hash="88c0cfcce31b0eed8c035dee4e7e86df"/></dir><file name="Order.php" hash="852bea330edac3372ec5c168111301a8"/></dir><file name="Redirect.php" hash="842e4ba35c6b049c8eaa64704588ca76"/><file name="Setup.php" hash="3fdec335980846a4c3adbc6f4e3478eb"/><dir name="Trackable"><file name="Collection.php" hash="8799c5bf630d267b551cf9dba986cbb0"/></dir><file name="Trackable.php" hash="b38749697b641874b42dceae38ab4a30"/></dir><dir name="Parser"><file name="AttributeSet.php" hash="9ae4013d42da5de0e9c8492fb29cd8d6"/><file name="Category.php" hash="0c3c71ff784307b9120d7cf781005069"/><file name="Coupon.php" hash="a66b3d4c8397610863cd74e35cbd5b62"/><file name="Customer.php" hash="99233c3da1eb28f1ec15e20e837d764a"/><file name="CustomerAttributeSet.php" hash="1b51f9300a9ee102872ff9d7f9bbccbc"/><file name="Guest.php" hash="002c900d3722f761e3e3ac63be84014f"/><file name="Inventory.php" hash="6f9ea827ee304f72b13bce3d7316efbc"/><file name="Product.php" hash="7e0fa4a55ca45fc876e588442cce72eb"/><dir name="Purchase"><file name="Item.php" hash="ca7facc8c81504ea990fdb1feeba64dd"/><file name="Shipment.php" hash="15f75c4443f41ed79fed37611912ce6d"/></dir><file name="Purchase.php" hash="d718ed744e15b9faaec2eaf3c2fb7b3b"/><dir name="Quote"><file name="Item.php" hash="37cbc74a49a16e67e02f421978e1741f"/></dir><file name="Quote.php" hash="fa0e008c67f15d1a4c7866a407aaaeaf"/><file name="Rule.php" hash="0a0f70172aeff0e5157f2f1652c3ae09"/><file name="Subscriber.php" hash="357aae3d07af49ad69e6df273ae2548b"/></dir><file name="Parser.php" hash="2e10487d6e00e3d2c3ec075c68e25d52"/><dir name="Redirect"><file name="Order.php" hash="e3ada1549e933dc4d247416c86f44266"/></dir><file name="Redirect.php" hash="9cb73f08f55f70335b1434c5a917ba1a"/><dir name="Resource"><file name="Abstract.php" hash="dfb049670e71971990e7920952fc9a39"/><dir name="Action"><file name="Collection.php" hash="22e278b8cbc5d18d4faa48c4f224d145"/></dir><file name="Action.php" hash="83b00531db5ec3a51ea7c0fc65a1d083"/><dir name="Cron"><dir name="Count"><file name="Collection.php" hash="c5cb4ab406c1d008c1bc22bb95b3ba28"/></dir><file name="Count.php" hash="6a356b5d92b509945c4567f479b9bfdd"/><dir name="Queue"><file name="Collection.php" hash="e6655bdbc5920eeb9178adfcb905ac36"/></dir><file name="Queue.php" hash="f9eae90970e4d935b5e5335c8e57e71b"/></dir><file name="Debug.php" hash="976156dc1ff783a26174bdac79decde2"/><dir name="Marketplaces"><dir name="Remote"><dir name="Order"><file name="Collection.php" hash="f94042d6a8ed87de18e64776f8aa0caf"/></dir><file name="Order.php" hash="08dfd41765ce0045b25bfb1e76a7aaac"/></dir></dir><dir name="Redirect"><file name="Collection.php" hash="df6662f064b3170aab46d69d42c514a3"/><dir name="Order"><file name="Collection.php" hash="162359ed9499b6f976f5c341fd0585c3"/></dir><file name="Order.php" hash="7ea4477380a5215dc0efe561ede359d9"/></dir><file name="Redirect.php" hash="d239af442388bb9fa80db81a7fc43711"/><file name="Setup.php" hash="3177eb8b02a951e0b988abcfd3eb92a1"/><dir name="Trackable"><file name="Collection.php" hash="6f060c3537b49710302e38e881885a69"/></dir><file name="Trackable.php" hash="764b0d21c492dd69b9f85ae3c647666e"/></dir><file name="Rewrite.php" hash="a10802e5fa677fc9e6c106ef32a615c8"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Harvestertype.php" hash="2f8c8f285df356013c15c1441bb5de3e"/><file name="LogFormat.php" hash="828680dafe5a7042221900cb6d9dfa17"/><file name="LogLevel.php" hash="b86c793ca04205f045efd9ea42d02a10"/><file name="Stability.php" hash="830e5bc4e8ce9657221224dbaf99cee6"/><file name="UrlType.php" hash="28f9a5bc024afe5526685d429a751ad8"/></dir></dir></dir><file name="Trackable.php" hash="9a78a576f6df1d2c535200b9c6069ba8"/></dir><dir name="etc"><file name="adminhtml.xml" hash="794fc8a1d67ac3e6b5d71c707a0c7cad"/><file name="config.xml" hash="2e2c8ba7c027001899924bf7b8c8ef13"/><file name="system.xml" hash="29876070fa3148b4905477207c5b8bb9"/></dir><dir name="sql"><dir name="combine_setup"><file name="mysql4-install-1.0.0.70.php" hash="a2039a52ee797d6b7bb059a778964e37"/><file name="mysql4-upgrade-1.0.0.70-1.0.0.84.php" hash="e51deaff9e65f43483ab00573605329d"/><file name="mysql4-upgrade-1.0.0.84-1.0.0.88.php" hash="89bd8a585c0d351aae6838ace48f608d"/><file name="mysql4-upgrade-1.0.0.88-1.2.0.0.php" hash="6935370d864865461a4d3c3c4f5f7852"/><file name="mysql4-upgrade-1.2.0.0-1.2.0.1.php" hash="01a7ef2466b9f676884db4d7a7c562a9"/><file name="mysql4-upgrade-1.2.0.1-1.2.1.0.php" hash="46028e3aafb6558e2e15bef932468cb4"/><file name="mysql4-upgrade-1.3.9.9-1.4.0.0.php" hash="6db20f53ea3551243dc024aa207aaaa7"/><file name="mysql4-upgrade-1.4.7.0-1.5.0.0.php" hash="0251b062192af9015dc20f9261795f06"/></dir></dir></dir><dir name="BoneCollector"><dir name="Model"><file name="HarvestAbstract.php" hash="fecaefad7d4fc279e3a54b4c8cac54ae"/><dir name="HarvestAttribute"><file name="Observer.php" hash="e54c6434c56db411d1a95f55eacc1a7b"/></dir><dir name="HarvestCart"><file name="Observer.php" hash="c4bf9096fce93dc167a7204d3eaa4c24"/></dir><dir name="HarvestCategory"><file name="Observer.php" hash="2072d69344379f4de67b60c209a24875"/></dir><dir name="HarvestCustomer"><file name="Observer.php" hash="e99f1e144447b794f821e41abffb5b7e"/></dir><dir name="HarvestInventoryItem"><file name="Observer.php" hash="df82aade901d3098695d26ed5697455f"/></dir><dir name="HarvestProduct"><file name="Observer.php" hash="30d353b22e2a5e61374e4c679fed6da9"/></dir><dir name="HarvestPurchase"><file name="Observer.php" hash="78ed47e474ddebd7e48527df3b4c7b1f"/></dir><dir name="HarvestRule"><file name="Observer.php" hash="3511954dd9842dcc1defa0c0237b4b49"/></dir><dir name="HarvestSubscriber"><file name="Observer.php" hash="4fa55a9ad34b47118c8aa43d55fa383b"/></dir></dir><dir name="etc"><file name="config.xml" hash="b1a43d80a3326ef2c26f20660d7f0a3b"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Springbot.xml" hash="1376424af56bb8add0a97f9f8da2ba93"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="bmbleb.xml" hash="69aa1b64c5349cbb53fcdc385b0adce4"/></dir><dir name="template"><dir name="bmbleb"><file name="auth.phtml" hash="bf509b53c49cd69ec3ea60e3effe69c3"/><file name="dashboard_loggedout.phtml" hash="19281143b19a544d4e3072dc754ada2d"/><dir name="help"><file name="index.phtml" hash="e9d3f11c623c735c3e699e406ff9e0e7"/></dir><dir name="index"><file name="messages.phtml" hash="fcbbb47d2cc30c493ed2316a8b888f5d"/><file name="terms.phtml" hash="dfff1182d2fe7d8eee69b9b302c4cbc7"/></dir><dir name="jobs"><file name="status.phtml" hash="77f0b0ae7c3c6c42031675cfc959e270"/></dir><file name="jobs.phtml" hash="961ac83f56bf8703dbc433894da4933e"/><file name="login.phtml" hash="0a1a20dfaffe8646bb56323ab811d46a"/><file name="logout.phtml" hash="09b92790c5e124a01086d6929ed7e8de"/><dir name="logs"><file name="index.phtml" hash="d7ca20d89a393bbc8cd31e98f73c0ea9"/></dir><file name="notifications.phtml" hash="45f8767a090a4f7a7e177151bbc43f4f"/><dir name="order"><file name="marketplaces.phtml" hash="03857d6c46acb08886cb597e6f3ba5e5"/></dir><dir name="problems"><file name="index.phtml" hash="b6ad14ab59fc3a06fda655d57faeab23"/></dir><file name="status.phtml" hash="1acc630a6549b234bc1fa5923e04b8ce"/><file name="tabs.phtml" hash="779c335a284b9bab18b36859011d673f"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="shadow.xml" hash="3f29bebbcf7e42c57dcac9150c6b7d68"/></dir><dir name="template"><dir name="shadow"><file name="async.phtml" hash="af147801ed74d45bb0580b0bb69ce0fd"/><file name="conversion.phtml" hash="c1eff343cf8d9a2189caaf1387ddc225"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="bmbleb"><file name="bmbleb.css" hash="d929b5f42085c25b86101379f286f55f"/><dir name="images"><file name="arrows_up-down-large.png" hash="72c27995e1ab1d182891dad0a4d1dae2"/><file name="bmb-ctl.png" hash="de59a694a82b8699560df5146b2e315f"/><file name="check.png" hash="126f33ed483549e79a16186b7499c190"/><file name="grn-bg.png" hash="f681a524e2b4561dbe94152a2d24d60b"/><file name="h3-bg.png" hash="b93df0b0bdba8e8f6e0a07cc31fcc180"/><file name="icon-alert.png" hash="ac2e70efdcebc3813222d0d3ee62a6d9"/><file name="icon-bmbleb.png" hash="fb5574b5e63ee33b84eee26b3d8ef8e3"/><file name="icon-insights.png" hash="725fd29fe1b705e358c9080408693d3d"/><file name="icon-status.png" hash="bd13429f23166a6d431739010ea1b2cd"/><file name="left-ico1.png" hash="7d188f5e6021569750756f58067f0a3b"/><file name="left-ico2.png" hash="d2f6379a73290a8ffa4cb3e19a809d25"/><file name="left-ico3.png" hash="73bc75f7a746e54a75f14eda7a28a6b9"/><file name="left-ico4.png" hash="1da2c26187fed26b6c61599682b2dc4b"/><file name="left-ico5.png" hash="ada61cb32805f2cb8e8dace46361613e"/><file name="left-ico6.png" hash="1e62822267f72589ffa0771352a002da"/><file name="left-ico7.png" hash="16118412d581f0c83ce45c44f62f25a1"/><file name="left-ico8.png" hash="c7de2fe523c892b432b575648cc05631"/><file name="left-ico_demographics.png" hash="3fe23a2dea68f6c65114f248a8bdaa5e"/><file name="login-icn-b.png" hash="64e72070f595e215ece79736ac77ee2f"/><file name="login-icn.png" hash="6142cc2fc8ee2d1c40bf3c8f9ac1fa85"/><file name="logo.png" hash="8fb783f7d68fca3914123f56b8c066a4"/><file name="orng-bg.png" hash="074a6912ca2a139df537e3d15b6bc9b2"/><file name="plugin_dashboard_syncing.jpg" hash="8511648541f6f1b96ff1c53dda3a439b"/><file name="register.png" hash="f73fe51cf7df27ab11089385fa50714e"/><file name="registration-bg-25.png" hash="9d2cf77619cc8fce3ae4d44b0aae30c1"/><file name="registration-bg-50.png" hash="99942fdc8c3f88b0d4b09f87c9e39045"/><file name="registration-bg.png" hash="96365b39495e56ffe491dd9930fe221d"/><file name="spinner.gif" hash="add667817f25bce331a213ab3cc9621f"/><file name="springbot-ctl.png" hash="de59a694a82b8699560df5146b2e315f"/><file name="submit-btn-bg.png" hash="d98aa287b7b73dad9f780b22cb53fbdb"/><file name="sync_icon.png" hash="cb12f2e8943c8e324e3456375f953c86"/><file name="white-check.png" hash="126f33ed483549e79a16186b7499c190"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="shell"><file name="springbot.php" hash="4b36425179a2db3bf63cf706f4989f80"/></dir></target></contents>
56	<compatible/>
57	+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
58	</package>

shell/springbot.php CHANGED Viewed

	@@ -30,7 +30,7 @@ class Springbot_Shell
30	echo $ret;
31	}
32	catch (Exception $e) {
33	- Springbot_Log::error($e);
34	echo $e->getMessage() . PHP_EOL;
35	exit(1);
36	}
	@@ -71,7 +71,7 @@ class Springbot_Shell
71	}
72	}
73	catch (Exception $e) {
74	- Springbot_Log::error($e);
75	$this->_usage();
76	exit;
77	}


30	echo $ret;
31	}
32	catch (Exception $e) {
33	+ Springbot_Log::error($e->getMessage());
34	echo $e->getMessage() . PHP_EOL;
35	exit(1);
36	}

71	}
72	}
73	catch (Exception $e) {
74	+ Springbot_Log::error($e->getMessage());
75	$this->_usage();
76	exit;
77	}

skin/adminhtml/default/default/bmbleb/bmbleb.css CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/arrows_up-down-large.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/bmb-ctl.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/check.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/grn-bg.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/h3-bg.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/icon-alert.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/icon-bmbleb.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/icon-insights.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/icon-status.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico1.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico2.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico3.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico4.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico5.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico6.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico7.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico8.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/left-ico_demographics.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/login-icn-b.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/login-icn.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/logo.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/orng-bg.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/plugin_dashboard_syncing.jpg CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/register.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/registration-bg-25.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/registration-bg-50.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/registration-bg.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/spinner.gif CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/springbot-ctl.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/submit-btn-bg.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/sync_icon.png CHANGED Viewed

File without changes

skin/adminhtml/default/default/bmbleb/images/white-check.png CHANGED Viewed

File without changes