Merge lp:~brendan-clune/openerp-connector-magento/openerp-connector-magento-paypal-authorized-fix into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

Proposed by Brendan Clune (Logic Supply)
Status: Merged
Approved by: Guewen Baconnier @ Camptocamp
Approved revision: 932
Merged at revision: 934
Proposed branch: lp:~brendan-clune/openerp-connector-magento/openerp-connector-magento-paypal-authorized-fix
Merge into: lp:~openerp-connector-core-editors/openerp-connector-magento/7.0
Diff against target: 11 lines (+1/-1)
1 file modified
magentoerpconnect/ (+1/-1)
To merge this branch: bzr merge lp:~brendan-clune/openerp-connector-magento/openerp-connector-magento-paypal-authorized-fix
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review Approve
Review via email:

Description of the change

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

I don't know precisely how this work on Magento actually but I trust you totally.


review: Approve (code review)
Revision history for this message
Brendan Clune (Logic Supply) (brendan-clune) wrote :

Thanks! We shipped this to production today and can confirm it works on a live PayPal environment on Magento CE

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'magentoerpconnect/'
2--- magentoerpconnect/ 2013-11-08 14:16:29 +0000
3+++ magentoerpconnect/ 2013-11-18 15:15:33 +0000
4@@ -291,7 +291,7 @@
6 def _rule_authorized(self, record, method):
7 """ Import the order only if payment has been authorized. """
8- if not record.get('payment', {}).get('amount_authorized'):
9+ if not record.get('payment', {}).get('base_amount_authorized'):
10 raise OrderImportRuleRetry('The order has not been authorized.\n'
11 'The import will be retried later.')