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.

Sign up for GitHub

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

Jump to bottom

Master #1

Open
wants to merge 1,102 commits into
base: budsies
Choose a base branch
from
Open

Master #1

wants to merge 1,102 commits into from

Conversation

gorbunovav
Copy link

No description provided.

luciaebizmarts and others added 30 commits February 22, 2019 14:02
@luciaebizmarts
closes mailchimp#598 modified the function cleanProductImagesCacheAft…
3fcc6c0 
…er now send the message for the warning and adapted the testCleanProductImagesCacheAfter to the changes
@luciaebizmarts
Merge pull request mailchimp#890 from mailchimp/Removed_event_control…
727347b 
…ler_front_init_before

Removed event controller front init before
@brian-ebizmarts
Function getMergeVars modified to get dropdown option text instead va…
6b2ab34 
…lue id. Closes mailchimp#885
@brian-ebizmarts
Rename variable attrId to attrValue. Closes mailchimp#885
7daf1f9
@brian-ebizmarts
Coding standards. Closes mailchimp#885
27d701a
@brian-ebizmarts
Merge pull request mailchimp#893 from mailchimp/issue885
9c6bc0f 
Function getMergeVars modified to get dropdown option text instead value id. Closes mailchimp#885
@luciaebizmarts
closes mailchimp#892 removed getByEmail from the function _getCustome…
36df9d1 
…r in the class Ebizmarts_MailChimp_Model_Api_Carts
@luciaebizmarts
closes mailchimp#892 implemented test for the function _getCustomer
f5f4f7c
@luciaebizmarts
closes mailchimp#892 changed how set the id of the customer in the fu…
fd2126f 
…nction _buildCustomerData on the class Ebizmarts_MailChimp_Model_Api_Customers
@luciaebizmarts
closes mailchimp#892 removed the API call to mailchimp in the functio…
8143b4e 
…n GeneratePOSTPayload on the class Ebizmarts_MailChimp_Model_Api_Orders
@luciaebizmarts
closes mailchimp#892 implemented test for the function GeneratePOSTPa…
67c7e13 
…yload
@luciaebizmarts
Merge branch 'develop' of github.com:mailchimp/mc-magento into Avoid_…
b62b5a1 
…getByEmail_calls_when_sending_Orders_and_Carts_to_Mailchimp
@luciaebizmarts
closes mailchimp#892 implemented test for the function GeneratePOSTPa…
8919dca 
…yload
@luciaebizmarts
closes mailchimp#892 adapted the function GeneratePOSTPayload on the …
91f055f 
…class Ebizmarts_MailChimp_Model_Api_Orders for the test
@luciaebizmarts
closes mailchimp#892 fixed testGeneratePOSTPayload
53d4829
@luciaebizmarts
closes mailchimp#892 fixed testGeneratePOSTPayload
11fcc77
@luciaebizmarts
closes mailchimp#892 fixed testGeneratePOSTPayload
74f093d
@luciaebizmarts
closes mailchimp#892 fixed testGeneratePOSTPayload
89ef76e
@luciaebizmarts
closes mailchimp#892 implemented test makeCarts
72dd88c
@luciaebizmarts
closes mailchimp#892 adapted function makeCarts for test
5b8ba48
@luciaebizmarts
closes mailchimp#892 implemented test makeCarts without mock the func…
154250e 
…tion getCustomers
@luciaebizmarts
closes mailchimp#887 created the constant ECOMMERCE_XML_INCLUDING_TAX…
88e37b4 
…ES in the file Ebizmarts_MailChimp_Model_Config
@luciaebizmarts
closes mailchimp#887 created the source IncluidingTaxes.php
1a17b62
@luciaebizmarts
closes mailchimp#887 added the comboBox for includeTaxes in the file …
b33fdf0 
…system.xml
@luciaebizmarts
closes mailchimp#887 created the function isIncludeTaxesEnabled in th…
fd2911b 
…e helper
@luciaebizmarts
closes mailchimp#887 removed the const YES and NO from IncludingTxes.php
805c6c9
@luciaebizmarts
closes mailchimp#887 removed the condition from isIncludeTaxesEnabled…
a8ecda4 
… in the helper
@luciaebizmarts
closes mailchimp#887 changed the path to ECOMMERCE_XML_INCLUDE_TAXES …
cdf0d3d 
…in the IncludingTxes.php
@luciaebizmarts
closes mailchimp#887 changed the path to ECOMMERCE_XML_INCLUDE_TAXES …
29622dd 
…in the file Config.php and system.xml
@luciaebizmarts
closes mailchimp#887 removed logs from Data.php
68d62c8
Santiagoebizmarts and others added 30 commits April 10, 2019 11:28
@Santiagoebizmarts
Disable ecommerce section if the configured stoer is deleted. mailchi…
2742f7d 
…mp#652
@Santiagoebizmarts
Fix tests. mailchimp#652
e7a0f39
@Santiagoebizmarts
Added translations and removed comments. mailchimp#652
2ea5d41
@Santiagoebizmarts
Added translations and removed comments. mailchimp#652
ad13d2d
@Santiagoebizmarts
Remove extra newlines
e64bde9
@Santiagoebizmarts
Merge pull request mailchimp#903 from mailchimp/Issue652
764ff88 
Issue652
@Santiagoebizmarts
Bump version and update changelog
ebb2c22
@luciaebizmarts
mailchimp#938 added missed function at observer and fixed error in Ca…
551d69f 
…rts.php
@luciaebizmarts
mailchimp#938 fixed notice in system.log
0ce4261
@luciaebizmarts
Merge branch 'pre-release/1.1.16' of https://github.com/mailchimp/mc-…
85a7214 
…magento into issue_938
@luciaebizmarts
mailchimp#938 fixed error in test
461a6b3
@luciaebizmarts
mailchimp#938 fixed error in test
c1f32cf
@luciaebizmarts
mailchimp#938 fixed error
d4863e0
@luciaebizmarts
mailchimp#938 fixed error
c226365
@luciaebizmarts
Merge pull request mailchimp#939 from mailchimp/issue_938
ffe35ad 
Missed function at observer at pre-release 1.1.16
@luciaebizmarts
mailchimp#938 fixed notice in system.log and testSaveProductAfter and…
44b684c 
… error in file Carts.php
@luciaebizmarts
Merge pull request mailchimp#942 from mailchimp/issue_938
c2ac179 
Missed function at observerin develop branch
@luciaebizmarts
mailchimp#943 fixed bad error syncing order with disabled product
e38f6c5
@luciaebizmarts
Merge pull request mailchimp#944 from mailchimp/issue
8901376 
Error syncing order with disabled product
@Santiagoebizmarts
Bump version.
bb2ae4e
@Santiagoebizmarts
Merge branch 'master' into pre-release/1.1.16
7a5c518
@Santiagoebizmarts
Merge pull request mailchimp#948 from mailchimp/pre-release/1.1.16
c0ffad9 
Pre release/1.1.16
@Santiagoebizmarts
Merge branch 'develop' into master
c5f0a30
@Santiagoebizmarts
Fix store not saved problem.
d14e041
@Santiagoebizmarts
Fix error message.
8e000ab
@Santiagoebizmarts
Fix test.
ffaa68b
@Santiagoebizmarts
Merge branch 'master' into pre-release/1.1.16
d314f4a
@Santiagoebizmarts
Fix typo.
0b6dfbd
@Santiagoebizmarts
Merge remote-tracking branch 'origin/pre-release/1.1.16' into pre-rel…
a2114c2 
…ease/1.1.16
@Santiagoebizmarts
Merge pull request mailchimp#950 from mailchimp/pre-release/1.1.16
8e5fdee 
Patch for store configuration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@gorbunovav @luciaebizmarts @brian-ebizmarts @Santiagoebizmarts @seansan @alexjamesbrown