Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing Mysql4 classes and their uses. closes #1089 #1092

Merged
merged 15 commits into from
Oct 28, 2019

Conversation

roberto-ebizmarts
Copy link
Collaborator

@roberto-ebizmarts roberto-ebizmarts commented Oct 7, 2019

Replacing Mysql4 classes and their uses.
Removing Ebizmarts/MailChimp/Model/Mysql4 directory.
Creating Ebizmarts/MailChimp/Model/Resource directory.
ref. #779
closes #1089

Fixing unnecessary semicolon: "templateData = {;" in array_dropdown.phtml
…elop' of github.com:mailchimp/mc-magento into Mysql4_classes_are_obsolete_for_M1.6+_#1089

# Conflicts:
#	app/code/community/Ebizmarts/MailChimp/Helper/Data.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Products.php
#	app/code/community/Ebizmarts/MailChimp/controllers/Adminhtml/MailchimperrorsController.php
#	shell/getMailchimpResponse.php
Replacing Mysql4 clases to Resource clases from new Ebizmarts/MailChimp/Model/Resource directory.
Modifying test classes which uses Mysql4 classes.
@roberto-ebizmarts roberto-ebizmarts self-assigned this Oct 7, 2019
@roberto-ebizmarts roberto-ebizmarts changed the title Replacing Mysql4 classes and their uses closes #1089 Replacing Mysql4 classes and their uses. closes #1089 Oct 7, 2019
roberto-ebizmarts and others added 11 commits October 7, 2019 17:38
…M1.6+_#1089

# Conflicts:
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
…elop' of github.com:mailchimp/mc-magento into Mysql4_classes_are_obsolete_for_M1.6+_#1089

# Conflicts:
#	app/code/community/Ebizmarts/MailChimp/Helper/Data.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Carts.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Customers.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Orders.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Products.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/PromoCodes.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/PromoRules.php
#	dev/tests/mailchimp/tests/app/Ebizmarts/MailChimp/Helper/DataTest.php
#	dev/tests/mailchimp/tests/app/Ebizmarts/MailChimp/Model/Api/CustomersTest.php
#	dev/tests/mailchimp/tests/app/Ebizmarts/MailChimp/Model/Api/ProductsTest.php
…_classes_are_obsolete_for_M1.6+_#1089

# Conflicts:
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
#	dev/tests/mailchimp/tests/app/Ebizmarts/MailChimp/Model/Api/OrdersTest.php
…M1.6+_#1089' into Mysql4_classes_are_obsolete_for_M1.6+_#1089
…_classes_are_obsolete_for_M1.6+_#1089

# Conflicts:
#	app/code/community/Ebizmarts/MailChimp/Helper/Data.php
#	app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
#	app/design/adminhtml/default/default/template/ebizmarts/mailchimp/system/config/form/field/array_dropdown.phtml
#	dev/tests/mailchimp/tests/app/Ebizmarts/MailChimp/Model/Api/OrdersTest.php
…M1.6+_#1089' into Mysql4_classes_are_obsolete_for_M1.6+_#1089
@roberto-ebizmarts roberto-ebizmarts merged commit 9df9cf5 into develop Oct 28, 2019
@roberto-ebizmarts roberto-ebizmarts deleted the Mysql4_classes_are_obsolete_for_M1.6+_#1089 branch October 28, 2019 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mysql4 classes are obsolete for M1.6+
2 participants