From 0b69bad9968ce2650f6dffd7df703cd33e7f38af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 22 Jan 2014 18:57:02 +0100 Subject: [PATCH] [RENAME] payment_acquirer_* -> payment_ * bzr revid: tde@openerp.com-20140122175702-1h1e51z4njt4s70w --- .../{payment_acquirer => payment}/__init__.py | 0 .../__openerp__.py | 0 .../doc/changelog.rst | 0 .../doc/index.rst | 0 .../models/__init__.py | 0 .../models/payment_acquirer.py | 4 ++-- .../security/ir.model.access.csv | 0 .../static/description/icon.png | Bin .../tests/__init__.py | 0 .../tests/common.py | 0 .../views/payment_acquirer.xml | 0 .../__init__.py | 0 .../__openerp__.py | 0 .../controllers/__init__.py | 0 .../controllers/main.py | 0 .../data/adyen.xml | 0 .../doc/changelog.rst | 0 .../doc/index.rst | 0 .../models/__init__.py | 0 .../models/adyen.py | 4 ++-- .../static/description/icon.png | Bin .../static/src/img/adyen_icon.png | Bin .../static/src/img/logo.png | Bin .../tests/__init__.py | 0 .../tests/test_adyen.py | 20 +++++++++--------- .../views/adyen.xml | 2 +- .../views/payment_acquirer.xml | 0 .../__init__.py | 0 .../__openerp__.py | 0 .../controllers/__init__.py | 0 .../controllers/main.py | 0 .../data/__init__.py | 0 .../data/ogone.py | 0 .../data/ogone.xml | 0 .../doc/changelog.rst | 0 .../doc/index.rst | 0 .../models/__init__.py | 0 .../models/ogone.py | 6 +++--- .../static/description/icon.png | Bin .../static/src/img/ogone_icon.png | Bin .../tests/__init__.py | 0 .../tests/test_ogone.py | 10 ++++----- .../views/ogone.xml | 2 +- .../views/payment_acquirer.xml | 0 .../__init__.py | 0 .../__openerp__.py | 0 .../controllers/__init__.py | 0 .../controllers/main.py | 0 .../data/paypal.xml | 0 .../doc/changelog.rst | 0 .../doc/index.rst | 0 .../models/__init__.py | 0 .../models/paypal.py | 8 +++---- .../static/description/icon.png | Bin .../static/src/img/paypal_icon.png | Bin .../static/src/img/paypal_logo.png | Bin .../tests/__init__.py | 0 .../tests/test_paypal.py | 11 +++++----- .../views/payment_acquirer.xml | 0 .../views/paypal.xml | 2 +- .../__init__.py | 0 .../__openerp__.py | 0 .../controllers/__init__.py | 0 .../controllers/main.py | 0 .../data/transfer.xml | 0 .../doc/changelog.rst | 0 .../doc/index.rst | 0 .../models/__init__.py | 0 .../models/payment_acquirer.py | 2 +- .../static/description/icon.png | Bin .../static/src/img/transfer_icon.png | Bin .../views/transfer.xml | 2 +- addons/website_sale/__openerp__.py | 2 +- 73 files changed, 37 insertions(+), 38 deletions(-) rename addons/{payment_acquirer => payment}/__init__.py (100%) rename addons/{payment_acquirer => payment}/__openerp__.py (100%) rename addons/{payment_acquirer => payment}/doc/changelog.rst (100%) rename addons/{payment_acquirer => payment}/doc/index.rst (100%) rename addons/{payment_acquirer => payment}/models/__init__.py (100%) rename addons/{payment_acquirer => payment}/models/payment_acquirer.py (99%) rename addons/{payment_acquirer => payment}/security/ir.model.access.csv (100%) rename addons/{payment_acquirer => payment}/static/description/icon.png (100%) rename addons/{payment_acquirer => payment}/tests/__init__.py (100%) rename addons/{payment_acquirer => payment}/tests/common.py (100%) rename addons/{payment_acquirer => payment}/views/payment_acquirer.xml (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/__init__.py (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/__openerp__.py (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/controllers/__init__.py (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/controllers/main.py (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/data/adyen.xml (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/doc/changelog.rst (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/doc/index.rst (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/models/__init__.py (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/models/adyen.py (97%) rename addons/{payment_acquirer_adyen => payment_adyen}/static/description/icon.png (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/static/src/img/adyen_icon.png (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/static/src/img/logo.png (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/tests/__init__.py (100%) rename addons/{payment_acquirer_adyen => payment_adyen}/tests/test_adyen.py (83%) rename addons/{payment_acquirer_adyen => payment_adyen}/views/adyen.xml (94%) rename addons/{payment_acquirer_adyen => payment_adyen}/views/payment_acquirer.xml (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/__init__.py (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/__openerp__.py (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/controllers/__init__.py (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/controllers/main.py (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/data/__init__.py (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/data/ogone.py (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/data/ogone.xml (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/doc/changelog.rst (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/doc/index.rst (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/models/__init__.py (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/models/ogone.py (98%) rename addons/{payment_acquirer_ogone => payment_ogone}/static/description/icon.png (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/static/src/img/ogone_icon.png (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/tests/__init__.py (100%) rename addons/{payment_acquirer_ogone => payment_ogone}/tests/test_ogone.py (95%) rename addons/{payment_acquirer_ogone => payment_ogone}/views/ogone.xml (96%) rename addons/{payment_acquirer_ogone => payment_ogone}/views/payment_acquirer.xml (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/__init__.py (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/__openerp__.py (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/controllers/__init__.py (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/controllers/main.py (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/data/paypal.xml (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/doc/changelog.rst (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/doc/index.rst (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/models/__init__.py (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/models/paypal.py (97%) rename addons/{payment_acquirer_paypal => payment_paypal}/static/description/icon.png (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/static/src/img/paypal_icon.png (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/static/src/img/paypal_logo.png (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/tests/__init__.py (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/tests/test_paypal.py (95%) rename addons/{payment_acquirer_paypal => payment_paypal}/views/payment_acquirer.xml (100%) rename addons/{payment_acquirer_paypal => payment_paypal}/views/paypal.xml (95%) rename addons/{payment_acquirer_transfer => payment_transfer}/__init__.py (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/__openerp__.py (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/controllers/__init__.py (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/controllers/main.py (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/data/transfer.xml (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/doc/changelog.rst (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/doc/index.rst (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/models/__init__.py (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/models/payment_acquirer.py (95%) rename addons/{payment_acquirer_transfer => payment_transfer}/static/description/icon.png (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/static/src/img/transfer_icon.png (100%) rename addons/{payment_acquirer_transfer => payment_transfer}/views/transfer.xml (89%) diff --git a/addons/payment_acquirer/__init__.py b/addons/payment/__init__.py similarity index 100% rename from addons/payment_acquirer/__init__.py rename to addons/payment/__init__.py diff --git a/addons/payment_acquirer/__openerp__.py b/addons/payment/__openerp__.py similarity index 100% rename from addons/payment_acquirer/__openerp__.py rename to addons/payment/__openerp__.py diff --git a/addons/payment_acquirer/doc/changelog.rst b/addons/payment/doc/changelog.rst similarity index 100% rename from addons/payment_acquirer/doc/changelog.rst rename to addons/payment/doc/changelog.rst diff --git a/addons/payment_acquirer/doc/index.rst b/addons/payment/doc/index.rst similarity index 100% rename from addons/payment_acquirer/doc/index.rst rename to addons/payment/doc/index.rst diff --git a/addons/payment_acquirer/models/__init__.py b/addons/payment/models/__init__.py similarity index 100% rename from addons/payment_acquirer/models/__init__.py rename to addons/payment/models/__init__.py diff --git a/addons/payment_acquirer/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py similarity index 99% rename from addons/payment_acquirer/models/payment_acquirer.py rename to addons/payment/models/payment_acquirer.py index 3bf18b64be0..1a7afc3031d 100644 --- a/addons/payment_acquirer/models/payment_acquirer.py +++ b/addons/payment/models/payment_acquirer.py @@ -28,8 +28,8 @@ class PaymentAcquirer(osv.Model): to have required fields that depend on a specific acquirer. Each acquirer has a link to an ir.ui.view record that is a template of - a button used to display the payment form. See examples in ``payment_acquirer_ogone`` - and ``payment_acquirer_paypal`` modules. + a button used to display the payment form. See examples in ``payment_ogone`` + and ``payment_paypal`` modules. Methods that should be added in an acquirer-specific implementation: diff --git a/addons/payment_acquirer/security/ir.model.access.csv b/addons/payment/security/ir.model.access.csv similarity index 100% rename from addons/payment_acquirer/security/ir.model.access.csv rename to addons/payment/security/ir.model.access.csv diff --git a/addons/payment_acquirer/static/description/icon.png b/addons/payment/static/description/icon.png similarity index 100% rename from addons/payment_acquirer/static/description/icon.png rename to addons/payment/static/description/icon.png diff --git a/addons/payment_acquirer/tests/__init__.py b/addons/payment/tests/__init__.py similarity index 100% rename from addons/payment_acquirer/tests/__init__.py rename to addons/payment/tests/__init__.py diff --git a/addons/payment_acquirer/tests/common.py b/addons/payment/tests/common.py similarity index 100% rename from addons/payment_acquirer/tests/common.py rename to addons/payment/tests/common.py diff --git a/addons/payment_acquirer/views/payment_acquirer.xml b/addons/payment/views/payment_acquirer.xml similarity index 100% rename from addons/payment_acquirer/views/payment_acquirer.xml rename to addons/payment/views/payment_acquirer.xml diff --git a/addons/payment_acquirer_adyen/__init__.py b/addons/payment_adyen/__init__.py similarity index 100% rename from addons/payment_acquirer_adyen/__init__.py rename to addons/payment_adyen/__init__.py diff --git a/addons/payment_acquirer_adyen/__openerp__.py b/addons/payment_adyen/__openerp__.py similarity index 100% rename from addons/payment_acquirer_adyen/__openerp__.py rename to addons/payment_adyen/__openerp__.py diff --git a/addons/payment_acquirer_adyen/controllers/__init__.py b/addons/payment_adyen/controllers/__init__.py similarity index 100% rename from addons/payment_acquirer_adyen/controllers/__init__.py rename to addons/payment_adyen/controllers/__init__.py diff --git a/addons/payment_acquirer_adyen/controllers/main.py b/addons/payment_adyen/controllers/main.py similarity index 100% rename from addons/payment_acquirer_adyen/controllers/main.py rename to addons/payment_adyen/controllers/main.py diff --git a/addons/payment_acquirer_adyen/data/adyen.xml b/addons/payment_adyen/data/adyen.xml similarity index 100% rename from addons/payment_acquirer_adyen/data/adyen.xml rename to addons/payment_adyen/data/adyen.xml diff --git a/addons/payment_acquirer_adyen/doc/changelog.rst b/addons/payment_adyen/doc/changelog.rst similarity index 100% rename from addons/payment_acquirer_adyen/doc/changelog.rst rename to addons/payment_adyen/doc/changelog.rst diff --git a/addons/payment_acquirer_adyen/doc/index.rst b/addons/payment_adyen/doc/index.rst similarity index 100% rename from addons/payment_acquirer_adyen/doc/index.rst rename to addons/payment_adyen/doc/index.rst diff --git a/addons/payment_acquirer_adyen/models/__init__.py b/addons/payment_adyen/models/__init__.py similarity index 100% rename from addons/payment_acquirer_adyen/models/__init__.py rename to addons/payment_adyen/models/__init__.py diff --git a/addons/payment_acquirer_adyen/models/adyen.py b/addons/payment_adyen/models/adyen.py similarity index 97% rename from addons/payment_acquirer_adyen/models/adyen.py rename to addons/payment_adyen/models/adyen.py index 761381d415c..80103f50dae 100644 --- a/addons/payment_acquirer_adyen/models/adyen.py +++ b/addons/payment_adyen/models/adyen.py @@ -10,8 +10,8 @@ import hmac import logging import urlparse -from openerp.addons.payment_acquirer.models.payment_acquirer import ValidationError -from openerp.addons.payment_acquirer_adyen.controllers.main import AdyenController +from openerp.addons.payment.models.payment_acquirer import ValidationError +from openerp.addons.payment_adyen.controllers.main import AdyenController from openerp.osv import osv, fields from openerp.tools import float_round diff --git a/addons/payment_acquirer_adyen/static/description/icon.png b/addons/payment_adyen/static/description/icon.png similarity index 100% rename from addons/payment_acquirer_adyen/static/description/icon.png rename to addons/payment_adyen/static/description/icon.png diff --git a/addons/payment_acquirer_adyen/static/src/img/adyen_icon.png b/addons/payment_adyen/static/src/img/adyen_icon.png similarity index 100% rename from addons/payment_acquirer_adyen/static/src/img/adyen_icon.png rename to addons/payment_adyen/static/src/img/adyen_icon.png diff --git a/addons/payment_acquirer_adyen/static/src/img/logo.png b/addons/payment_adyen/static/src/img/logo.png similarity index 100% rename from addons/payment_acquirer_adyen/static/src/img/logo.png rename to addons/payment_adyen/static/src/img/logo.png diff --git a/addons/payment_acquirer_adyen/tests/__init__.py b/addons/payment_adyen/tests/__init__.py similarity index 100% rename from addons/payment_acquirer_adyen/tests/__init__.py rename to addons/payment_adyen/tests/__init__.py diff --git a/addons/payment_acquirer_adyen/tests/test_adyen.py b/addons/payment_adyen/tests/test_adyen.py similarity index 83% rename from addons/payment_acquirer_adyen/tests/test_adyen.py rename to addons/payment_adyen/tests/test_adyen.py index 14b5f8fd5e5..c071e682a3d 100644 --- a/addons/payment_acquirer_adyen/tests/test_adyen.py +++ b/addons/payment_adyen/tests/test_adyen.py @@ -3,9 +3,9 @@ from lxml import objectify import urlparse -from openerp.addons.payment_acquirer.models.payment_acquirer import ValidationError -from openerp.addons.payment_acquirer.tests.common import PaymentAcquirerCommon -from openerp.addons.payment_acquirer_adyen.controllers.main import AdyenController +from openerp.addons.payment.models.payment_acquirer import ValidationError +from openerp.addons.payment.tests.common import PaymentAcquirerCommon +from openerp.addons.payment_adyen.controllers.main import AdyenController from openerp.osv.orm import except_orm from openerp.tools import mute_logger @@ -18,7 +18,7 @@ class AdyenCommon(PaymentAcquirerCommon): self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url') # get the adyen account - model, self.adyen_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_acquirer_adyen', 'payment_acquirer_adyen') + model, self.adyen_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_adyen', 'payment_acquirer_adyen') # some CC (always use expiration date 06 / 2016, cvc 737, cid 7373 (amex)) self.amex = (('370000000000002', '7373')) @@ -84,12 +84,12 @@ class AdyenForm(AdyenCommon): 'adyen: wrong value for input %s: received %s instead of %s' % (form_input.get('name'), form_input.get('value'), form_values[form_input.get('name')]) ) - @mute_logger('openerp.addons.payment_acquirer_paypal.models.paypal', 'ValidationError') - def test_20_paypal_form_management(self): - cr, uid, context = self.cr, self.uid, {} - # be sure not to do stupid things - adyen = self.payment_acquirer.browse(self.cr, self.uid, self.adyen_id, None) - self.assertEqual(adyen.env, 'test', 'test without test env') + # @mute_logger('openerp.addons.payment_adyen.models.adyen', 'ValidationError') + # def test_20_paypal_form_management(self): + # cr, uid, context = self.cr, self.uid, {} + # # be sure not to do stupid things + # adyen = self.payment_acquirer.browse(self.cr, self.uid, self.adyen_id, None) + # self.assertEqual(adyen.env, 'test', 'test without test env') # {'authResult': u'AUTHORISED', # 'merchantReference': u'SO014', diff --git a/addons/payment_acquirer_adyen/views/adyen.xml b/addons/payment_adyen/views/adyen.xml similarity index 94% rename from addons/payment_acquirer_adyen/views/adyen.xml rename to addons/payment_adyen/views/adyen.xml index 5fcd7c8eb80..7f61a93b120 100644 --- a/addons/payment_acquirer_adyen/views/adyen.xml +++ b/addons/payment_adyen/views/adyen.xml @@ -22,7 +22,7 @@ diff --git a/addons/payment_acquirer_adyen/views/payment_acquirer.xml b/addons/payment_adyen/views/payment_acquirer.xml similarity index 100% rename from addons/payment_acquirer_adyen/views/payment_acquirer.xml rename to addons/payment_adyen/views/payment_acquirer.xml diff --git a/addons/payment_acquirer_ogone/__init__.py b/addons/payment_ogone/__init__.py similarity index 100% rename from addons/payment_acquirer_ogone/__init__.py rename to addons/payment_ogone/__init__.py diff --git a/addons/payment_acquirer_ogone/__openerp__.py b/addons/payment_ogone/__openerp__.py similarity index 100% rename from addons/payment_acquirer_ogone/__openerp__.py rename to addons/payment_ogone/__openerp__.py diff --git a/addons/payment_acquirer_ogone/controllers/__init__.py b/addons/payment_ogone/controllers/__init__.py similarity index 100% rename from addons/payment_acquirer_ogone/controllers/__init__.py rename to addons/payment_ogone/controllers/__init__.py diff --git a/addons/payment_acquirer_ogone/controllers/main.py b/addons/payment_ogone/controllers/main.py similarity index 100% rename from addons/payment_acquirer_ogone/controllers/main.py rename to addons/payment_ogone/controllers/main.py diff --git a/addons/payment_acquirer_ogone/data/__init__.py b/addons/payment_ogone/data/__init__.py similarity index 100% rename from addons/payment_acquirer_ogone/data/__init__.py rename to addons/payment_ogone/data/__init__.py diff --git a/addons/payment_acquirer_ogone/data/ogone.py b/addons/payment_ogone/data/ogone.py similarity index 100% rename from addons/payment_acquirer_ogone/data/ogone.py rename to addons/payment_ogone/data/ogone.py diff --git a/addons/payment_acquirer_ogone/data/ogone.xml b/addons/payment_ogone/data/ogone.xml similarity index 100% rename from addons/payment_acquirer_ogone/data/ogone.xml rename to addons/payment_ogone/data/ogone.xml diff --git a/addons/payment_acquirer_ogone/doc/changelog.rst b/addons/payment_ogone/doc/changelog.rst similarity index 100% rename from addons/payment_acquirer_ogone/doc/changelog.rst rename to addons/payment_ogone/doc/changelog.rst diff --git a/addons/payment_acquirer_ogone/doc/index.rst b/addons/payment_ogone/doc/index.rst similarity index 100% rename from addons/payment_acquirer_ogone/doc/index.rst rename to addons/payment_ogone/doc/index.rst diff --git a/addons/payment_acquirer_ogone/models/__init__.py b/addons/payment_ogone/models/__init__.py similarity index 100% rename from addons/payment_acquirer_ogone/models/__init__.py rename to addons/payment_ogone/models/__init__.py diff --git a/addons/payment_acquirer_ogone/models/ogone.py b/addons/payment_ogone/models/ogone.py similarity index 98% rename from addons/payment_acquirer_ogone/models/ogone.py rename to addons/payment_ogone/models/ogone.py index 17726beefd6..1cbd3a53666 100644 --- a/addons/payment_acquirer_ogone/models/ogone.py +++ b/addons/payment_ogone/models/ogone.py @@ -9,9 +9,9 @@ from urllib import urlencode import urllib2 import urlparse -from openerp.addons.payment_acquirer.models.payment_acquirer import ValidationError -from openerp.addons.payment_acquirer_ogone.controllers.main import OgoneController -from openerp.addons.payment_acquirer_ogone.data import ogone +from openerp.addons.payment.models.payment_acquirer import ValidationError +from openerp.addons.payment_ogone.controllers.main import OgoneController +from openerp.addons.payment_ogone.data import ogone from openerp.osv import osv, fields from openerp.tools import float_round from openerp.tools.float_utils import float_compare diff --git a/addons/payment_acquirer_ogone/static/description/icon.png b/addons/payment_ogone/static/description/icon.png similarity index 100% rename from addons/payment_acquirer_ogone/static/description/icon.png rename to addons/payment_ogone/static/description/icon.png diff --git a/addons/payment_acquirer_ogone/static/src/img/ogone_icon.png b/addons/payment_ogone/static/src/img/ogone_icon.png similarity index 100% rename from addons/payment_acquirer_ogone/static/src/img/ogone_icon.png rename to addons/payment_ogone/static/src/img/ogone_icon.png diff --git a/addons/payment_acquirer_ogone/tests/__init__.py b/addons/payment_ogone/tests/__init__.py similarity index 100% rename from addons/payment_acquirer_ogone/tests/__init__.py rename to addons/payment_ogone/tests/__init__.py diff --git a/addons/payment_acquirer_ogone/tests/test_ogone.py b/addons/payment_ogone/tests/test_ogone.py similarity index 95% rename from addons/payment_acquirer_ogone/tests/test_ogone.py rename to addons/payment_ogone/tests/test_ogone.py index be1f534ea74..cc76dd4eed6 100644 --- a/addons/payment_acquirer_ogone/tests/test_ogone.py +++ b/addons/payment_ogone/tests/test_ogone.py @@ -4,9 +4,9 @@ from lxml import objectify import time import urlparse -from openerp.addons.payment_acquirer.models.payment_acquirer import ValidationError -from openerp.addons.payment_acquirer.tests.common import PaymentAcquirerCommon -from openerp.addons.payment_acquirer_ogone.controllers.main import OgoneController +from openerp.addons.payment.models.payment_acquirer import ValidationError +from openerp.addons.payment.tests.common import PaymentAcquirerCommon +from openerp.addons.payment_ogone.controllers.main import OgoneController from openerp.tools import mute_logger @@ -18,7 +18,7 @@ class OgonePayment(PaymentAcquirerCommon): self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url') # get the adyen account - model, self.ogone_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_acquirer_ogone', 'payment_acquirer_ogone') + model, self.ogone_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_ogone', 'payment_acquirer_ogone') def test_10_ogone_form_render(self): cr, uid, context = self.cr, self.uid, {} @@ -105,7 +105,7 @@ class OgonePayment(PaymentAcquirerCommon): 'ogone: wrong value for form input %s: received %s instead of %s' % (form_input.get('name'), form_input.get('value'), form_values[form_input.get('name')]) ) - @mute_logger('openerp.addons.payment_acquirer_ogone.models.ogone', 'ValidationError') + @mute_logger('openerp.addons.payment_ogone.models.ogone', 'ValidationError') def test_20_ogone_form_management(self): cr, uid, context = self.cr, self.uid, {} # be sure not to do stupid thing diff --git a/addons/payment_acquirer_ogone/views/ogone.xml b/addons/payment_ogone/views/ogone.xml similarity index 96% rename from addons/payment_acquirer_ogone/views/ogone.xml rename to addons/payment_ogone/views/ogone.xml index df26cce9528..03e4523f9a8 100644 --- a/addons/payment_acquirer_ogone/views/ogone.xml +++ b/addons/payment_ogone/views/ogone.xml @@ -43,7 +43,7 @@ diff --git a/addons/payment_acquirer_ogone/views/payment_acquirer.xml b/addons/payment_ogone/views/payment_acquirer.xml similarity index 100% rename from addons/payment_acquirer_ogone/views/payment_acquirer.xml rename to addons/payment_ogone/views/payment_acquirer.xml diff --git a/addons/payment_acquirer_paypal/__init__.py b/addons/payment_paypal/__init__.py similarity index 100% rename from addons/payment_acquirer_paypal/__init__.py rename to addons/payment_paypal/__init__.py diff --git a/addons/payment_acquirer_paypal/__openerp__.py b/addons/payment_paypal/__openerp__.py similarity index 100% rename from addons/payment_acquirer_paypal/__openerp__.py rename to addons/payment_paypal/__openerp__.py diff --git a/addons/payment_acquirer_paypal/controllers/__init__.py b/addons/payment_paypal/controllers/__init__.py similarity index 100% rename from addons/payment_acquirer_paypal/controllers/__init__.py rename to addons/payment_paypal/controllers/__init__.py diff --git a/addons/payment_acquirer_paypal/controllers/main.py b/addons/payment_paypal/controllers/main.py similarity index 100% rename from addons/payment_acquirer_paypal/controllers/main.py rename to addons/payment_paypal/controllers/main.py diff --git a/addons/payment_acquirer_paypal/data/paypal.xml b/addons/payment_paypal/data/paypal.xml similarity index 100% rename from addons/payment_acquirer_paypal/data/paypal.xml rename to addons/payment_paypal/data/paypal.xml diff --git a/addons/payment_acquirer_paypal/doc/changelog.rst b/addons/payment_paypal/doc/changelog.rst similarity index 100% rename from addons/payment_acquirer_paypal/doc/changelog.rst rename to addons/payment_paypal/doc/changelog.rst diff --git a/addons/payment_acquirer_paypal/doc/index.rst b/addons/payment_paypal/doc/index.rst similarity index 100% rename from addons/payment_acquirer_paypal/doc/index.rst rename to addons/payment_paypal/doc/index.rst diff --git a/addons/payment_acquirer_paypal/models/__init__.py b/addons/payment_paypal/models/__init__.py similarity index 100% rename from addons/payment_acquirer_paypal/models/__init__.py rename to addons/payment_paypal/models/__init__.py diff --git a/addons/payment_acquirer_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py similarity index 97% rename from addons/payment_acquirer_paypal/models/paypal.py rename to addons/payment_paypal/models/paypal.py index 32e17711bef..42605275179 100644 --- a/addons/payment_acquirer_paypal/models/paypal.py +++ b/addons/payment_paypal/models/paypal.py @@ -10,8 +10,8 @@ import urlparse import urllib import urllib2 -from openerp.addons.payment_acquirer.models.payment_acquirer import ValidationError -from openerp.addons.payment_acquirer_paypal.controllers.main import PaypalController +from openerp.addons.payment.models.payment_acquirer import ValidationError +from openerp.addons.payment_paypal.controllers.main import PaypalController from openerp.osv import osv, fields from openerp.tools.float_utils import float_compare @@ -25,8 +25,8 @@ class AcquirerPaypal(osv.Model): """ Paypal URLS """ if env == 'prod': return { - 'paypal_form_url': 'https://www.sandbox.paypal.com/cgi-bin/webscr', - 'paypal_rest_url': 'https://api.sandbox.paypal.com/v1/oauth2/token', + 'paypal_form_url': 'https://www.paypal.com/cgi-bin/webscr', + 'paypal_rest_url': 'https://api.paypal.com/v1/oauth2/token', } else: return { diff --git a/addons/payment_acquirer_paypal/static/description/icon.png b/addons/payment_paypal/static/description/icon.png similarity index 100% rename from addons/payment_acquirer_paypal/static/description/icon.png rename to addons/payment_paypal/static/description/icon.png diff --git a/addons/payment_acquirer_paypal/static/src/img/paypal_icon.png b/addons/payment_paypal/static/src/img/paypal_icon.png similarity index 100% rename from addons/payment_acquirer_paypal/static/src/img/paypal_icon.png rename to addons/payment_paypal/static/src/img/paypal_icon.png diff --git a/addons/payment_acquirer_paypal/static/src/img/paypal_logo.png b/addons/payment_paypal/static/src/img/paypal_logo.png similarity index 100% rename from addons/payment_acquirer_paypal/static/src/img/paypal_logo.png rename to addons/payment_paypal/static/src/img/paypal_logo.png diff --git a/addons/payment_acquirer_paypal/tests/__init__.py b/addons/payment_paypal/tests/__init__.py similarity index 100% rename from addons/payment_acquirer_paypal/tests/__init__.py rename to addons/payment_paypal/tests/__init__.py diff --git a/addons/payment_acquirer_paypal/tests/test_paypal.py b/addons/payment_paypal/tests/test_paypal.py similarity index 95% rename from addons/payment_acquirer_paypal/tests/test_paypal.py rename to addons/payment_paypal/tests/test_paypal.py index 00dbe869e14..01f40ddd094 100644 --- a/addons/payment_acquirer_paypal/tests/test_paypal.py +++ b/addons/payment_paypal/tests/test_paypal.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -from openerp.addons.payment_acquirer.models.payment_acquirer import ValidationError -from openerp.addons.payment_acquirer.tests.common import PaymentAcquirerCommon -from openerp.addons.payment_acquirer_paypal.controllers.main import PaypalController -from openerp.osv.orm import except_orm +from openerp.addons.payment.models.payment_acquirer import ValidationError +from openerp.addons.payment.tests.common import PaymentAcquirerCommon +from openerp.addons.payment_paypal.controllers.main import PaypalController from openerp.tools import mute_logger from lxml import objectify @@ -18,7 +17,7 @@ class PaypalCommon(PaymentAcquirerCommon): self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url') # get the paypal account - model, self.paypal_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_acquirer_paypal', 'payment_acquirer_paypal') + model, self.paypal_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_paypal', 'payment_acquirer_paypal') # tde+seller@openerp.com - tde+buyer@openerp.com - tde+buyer-it@openerp.com # some CC @@ -152,7 +151,7 @@ class PaypalForm(PaypalCommon): self.assertEqual(form_input.get('value'), '1.56', 'paypal: wrong computed fees') self.assertTrue(handling_found, 'paypal: fees_active did not add handling input in rendered form') - @mute_logger('openerp.addons.payment_acquirer_paypal.models.paypal', 'ValidationError') + @mute_logger('openerp.addons.payment_paypal.models.paypal', 'ValidationError') def test_20_paypal_form_management(self): cr, uid, context = self.cr, self.uid, {} # be sure not to do stupid things diff --git a/addons/payment_acquirer_paypal/views/payment_acquirer.xml b/addons/payment_paypal/views/payment_acquirer.xml similarity index 100% rename from addons/payment_acquirer_paypal/views/payment_acquirer.xml rename to addons/payment_paypal/views/payment_acquirer.xml diff --git a/addons/payment_acquirer_paypal/views/paypal.xml b/addons/payment_paypal/views/paypal.xml similarity index 95% rename from addons/payment_acquirer_paypal/views/paypal.xml rename to addons/payment_paypal/views/paypal.xml index 631d3832274..225ba40ee3a 100644 --- a/addons/payment_acquirer_paypal/views/paypal.xml +++ b/addons/payment_paypal/views/paypal.xml @@ -33,7 +33,7 @@ diff --git a/addons/payment_acquirer_transfer/__init__.py b/addons/payment_transfer/__init__.py similarity index 100% rename from addons/payment_acquirer_transfer/__init__.py rename to addons/payment_transfer/__init__.py diff --git a/addons/payment_acquirer_transfer/__openerp__.py b/addons/payment_transfer/__openerp__.py similarity index 100% rename from addons/payment_acquirer_transfer/__openerp__.py rename to addons/payment_transfer/__openerp__.py diff --git a/addons/payment_acquirer_transfer/controllers/__init__.py b/addons/payment_transfer/controllers/__init__.py similarity index 100% rename from addons/payment_acquirer_transfer/controllers/__init__.py rename to addons/payment_transfer/controllers/__init__.py diff --git a/addons/payment_acquirer_transfer/controllers/main.py b/addons/payment_transfer/controllers/main.py similarity index 100% rename from addons/payment_acquirer_transfer/controllers/main.py rename to addons/payment_transfer/controllers/main.py diff --git a/addons/payment_acquirer_transfer/data/transfer.xml b/addons/payment_transfer/data/transfer.xml similarity index 100% rename from addons/payment_acquirer_transfer/data/transfer.xml rename to addons/payment_transfer/data/transfer.xml diff --git a/addons/payment_acquirer_transfer/doc/changelog.rst b/addons/payment_transfer/doc/changelog.rst similarity index 100% rename from addons/payment_acquirer_transfer/doc/changelog.rst rename to addons/payment_transfer/doc/changelog.rst diff --git a/addons/payment_acquirer_transfer/doc/index.rst b/addons/payment_transfer/doc/index.rst similarity index 100% rename from addons/payment_acquirer_transfer/doc/index.rst rename to addons/payment_transfer/doc/index.rst diff --git a/addons/payment_acquirer_transfer/models/__init__.py b/addons/payment_transfer/models/__init__.py similarity index 100% rename from addons/payment_acquirer_transfer/models/__init__.py rename to addons/payment_transfer/models/__init__.py diff --git a/addons/payment_acquirer_transfer/models/payment_acquirer.py b/addons/payment_transfer/models/payment_acquirer.py similarity index 95% rename from addons/payment_acquirer_transfer/models/payment_acquirer.py rename to addons/payment_transfer/models/payment_acquirer.py index 2f72214e4e6..01f0f25f740 100644 --- a/addons/payment_acquirer_transfer/models/payment_acquirer.py +++ b/addons/payment_transfer/models/payment_acquirer.py @@ -1,6 +1,6 @@ # -*- coding: utf-'8' "-*-" -from openerp.addons.payment_acquirer.models.payment_acquirer import ValidationError +from openerp.addons.payment.models.payment_acquirer import ValidationError from openerp.osv import osv from openerp.tools.float_utils import float_compare diff --git a/addons/payment_acquirer_transfer/static/description/icon.png b/addons/payment_transfer/static/description/icon.png similarity index 100% rename from addons/payment_acquirer_transfer/static/description/icon.png rename to addons/payment_transfer/static/description/icon.png diff --git a/addons/payment_acquirer_transfer/static/src/img/transfer_icon.png b/addons/payment_transfer/static/src/img/transfer_icon.png similarity index 100% rename from addons/payment_acquirer_transfer/static/src/img/transfer_icon.png rename to addons/payment_transfer/static/src/img/transfer_icon.png diff --git a/addons/payment_acquirer_transfer/views/transfer.xml b/addons/payment_transfer/views/transfer.xml similarity index 89% rename from addons/payment_acquirer_transfer/views/transfer.xml rename to addons/payment_transfer/views/transfer.xml index f9829759340..01de4a28934 100644 --- a/addons/payment_acquirer_transfer/views/transfer.xml +++ b/addons/payment_transfer/views/transfer.xml @@ -13,7 +13,7 @@ diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py index 08257226777..b367fcc0bfc 100644 --- a/addons/website_sale/__openerp__.py +++ b/addons/website_sale/__openerp__.py @@ -9,7 +9,7 @@ OpenERP E-Commerce """, 'author': 'OpenERP SA', - 'depends': ['website', 'sale', 'payment_acquirer'], + 'depends': ['website', 'sale', 'payment'], 'data': [ 'data/website_sale_data.xml', 'views/website_sale.xml',