[IMP] payment: renamed env field to environment, to avoid conflicts

with the incoming new API.

bzr revid: tde@openerp.com-20140416121055-01ygh1zer7cfv98a

addons/payment/models/payment_acquirer.py

@@ -69,9 +69,9 @@ class PaymentAcquirer(osv.Model):
             string='Process Method',
             help='Static payments are payments like transfer, that require manual steps.'),
         'view_template_id': fields.many2one('ir.ui.view', 'Form Button Template', required=True),
-        'env': fields.selection(
+        'environment': fields.selection(
             [('test', 'Test'), ('prod', 'Production')],
-            string='Environment'),
+            string='Environment', oldname='env'),
         'website_published': fields.boolean(
             'Visible in Portal / Website',
             help="Make this payment acquirer available (Customer invoices, etc.)"),
@@ -85,7 +85,7 @@ class PaymentAcquirer(osv.Model):
 
     _defaults = {
         'company_id': lambda self, cr, uid, obj, ctx=None: self.pool['res.users'].browse(cr, uid, uid).company_id.id,
-        'env': 'test',
+        'environment': 'test',
         'validation': 'automatic',
         'website_published': True,
     }

addons/payment/views/payment_acquirer.xml

@@ -19,7 +19,7 @@
                                 <field name="provider"/>
                                 <field name="company_id"/>
                                 <field name="website_published"/>
-                                <field name="env"/>
+                                <field name="environment"/>
                             </group>
                             <group>
                                 <field name="fees_active"/>
@@ -70,7 +70,7 @@
                     <field name="name"/>
                     <field name="provider"/>
                     <field name="website_published"/>
-                    <field name="env"/>
+                    <field name="environment"/>
                 </tree>
             </field>
         </record>

addons/payment_adyen/data/adyen.xml

@@ -7,7 +7,7 @@
             <field name="provider">adyen</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="adyen_acquirer_button"/>
-            <field name="env">test</field>
+            <field name="environment">test</field>
             <field name="pre_msg"><![CDATA[
 <p>You will be redirected to the Adyen website after cliking on the payment button.</p>]]></field>
             <field name="adyen_merchant_account">dummy</field>

addons/payment_adyen/models/adyen.py

@@ -21,13 +21,13 @@ _logger = logging.getLogger(__name__)
 class AcquirerAdyen(osv.Model):
     _inherit = 'payment.acquirer'
 
-    def _get_adyen_urls(self, cr, uid, env, context=None):
+    def _get_adyen_urls(self, cr, uid, environment, context=None):
         """ Adyen URLs
 
          - yhpp: hosted payment page: pay.shtml for single, select.shtml for multiple
         """
         return {
-            'adyen_form_url': 'https://%s.adyen.com/hpp/pay.shtml' % env,
+            'adyen_form_url': 'https://%s.adyen.com/hpp/pay.shtml' % environment,
         }
 
     def _get_providers(self, cr, uid, context=None):
@@ -97,7 +97,7 @@ class AcquirerAdyen(osv.Model):
 
     def adyen_get_form_action_url(self, cr, uid, id, context=None):
         acquirer = self.browse(cr, uid, id, context=context)
-        return self._get_adyen_urls(cr, uid, acquirer.env, context=context)['adyen_form_url']
+        return self._get_adyen_urls(cr, uid, acquirer.environment, context=context)['adyen_form_url']
 
 
 class TxAdyen(osv.Model):

addons/payment_adyen/tests/test_adyen.py

@@ -49,7 +49,7 @@ class AdyenForm(AdyenCommon):
         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')
+        self.assertEqual(adyen.environment, 'test', 'test without test environment')
 
         # ----------------------------------------
         # Test: button direct rendering

addons/payment_ogone/data/ogone.xml

@@ -7,7 +7,7 @@
             <field name="provider">ogone</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="ogone_acquirer_button"/>
-            <field name="env">test</field>
+            <field name="environment">test</field>
             <field name="pre_msg"><![CDATA[
 <p>You will be redirected to the Ogone website after cliking on the payment button.</p>]]></field>
             <field name='ogone_pspid'>dummy</field>

addons/payment_ogone/models/ogone.py

@@ -22,7 +22,7 @@ _logger = logging.getLogger(__name__)
 class PaymentAcquirerOgone(osv.Model):
     _inherit = 'payment.acquirer'
 
-    def _get_ogone_urls(self, cr, uid, env, context=None):
+    def _get_ogone_urls(self, cr, uid, environment, context=None):
         """ Ogone URLS:
 
          - standard order: POST address for form-based
@@ -30,10 +30,10 @@ class PaymentAcquirerOgone(osv.Model):
         @TDETODO: complete me
         """
         return {
-            'ogone_standard_order_url': 'https://secure.ogone.com/ncol/%s/orderstandard_utf8.asp' % (env,),
+            'ogone_standard_order_url': 'https://secure.ogone.com/ncol/%s/orderstandard_utf8.asp' % (environment,),
-            'ogone_direct_order_url': 'https://secure.ogone.com/ncol/%s/orderdirect_utf8.asp' % (env,),
+            'ogone_direct_order_url': 'https://secure.ogone.com/ncol/%s/orderdirect_utf8.asp' % (environment,),
-            'ogone_direct_query_url': 'https://secure.ogone.com/ncol/%s/querydirect_utf8.asp' % (env,),
+            'ogone_direct_query_url': 'https://secure.ogone.com/ncol/%s/querydirect_utf8.asp' % (environment,),
-            'ogone_afu_agree_url': 'https://secure.ogone.com/ncol/%s/AFU_agree.asp' % (env,),
+            'ogone_afu_agree_url': 'https://secure.ogone.com/ncol/%s/AFU_agree.asp' % (environment,),
         }
 
     def _get_providers(self, cr, uid, context=None):
@@ -110,7 +110,7 @@ class PaymentAcquirerOgone(osv.Model):
 
     def ogone_get_form_action_url(self, cr, uid, id, context=None):
         acquirer = self.browse(cr, uid, id, context=context)
-        return self._get_ogone_urls(cr, uid, acquirer.env, context=context)['ogone_standard_order_url']
+        return self._get_ogone_urls(cr, uid, acquirer.environment, context=context)['ogone_standard_order_url']
 
 
 class PaymentTxOgone(osv.Model):
@@ -351,7 +351,7 @@ class PaymentTxOgone(osv.Model):
             PSWD=tx.acquirer_id.ogone_password,
             ID=payid,
         )
-        query_direct_url = 'https://secure.ogone.com/ncol/%s/querydirect.asp' % (tx.acquirer_id.env,)
+        query_direct_url = 'https://secure.ogone.com/ncol/%s/querydirect.asp' % (tx.acquirer_id.environment,)
 
         tries = 2
         tx_done = False

addons/payment_ogone/tests/test_ogone.py

@@ -24,7 +24,7 @@ class OgonePayment(PaymentAcquirerCommon):
         cr, uid, context = self.cr, self.uid, {}
         # be sure not to do stupid thing
         ogone = self.payment_acquirer.browse(self.cr, self.uid, self.ogone_id, None)
-        self.assertEqual(ogone.env, 'test', 'test without test env')
+        self.assertEqual(ogone.environment, 'test', 'test without test environment')
 
         # ----------------------------------------
         # Test: button direct rendering + shasign
@@ -110,7 +110,7 @@ class OgonePayment(PaymentAcquirerCommon):
         cr, uid, context = self.cr, self.uid, {}
         # be sure not to do stupid thing
         ogone = self.payment_acquirer.browse(self.cr, self.uid, self.ogone_id, None)
-        self.assertEqual(ogone.env, 'test', 'test without test env')
+        self.assertEqual(ogone.environment, 'test', 'test without test environment')
 
         # typical data posted by ogone after client has successfully paid
         ogone_post_data = {
@@ -174,7 +174,7 @@ class OgonePayment(PaymentAcquirerCommon):
         cr, uid, context = self.cr, self.uid, {}
         # be sure not to do stupid thing
         ogone = self.payment_acquirer.browse(self.cr, self.uid, self.ogone_id, None)
-        self.assertEqual(ogone.env, 'test', 'test without test env')
+        self.assertEqual(ogone.environment, 'test', 'test without test environment')
 
         # create a new draft tx
         tx_id = self.payment_transaction.create(

addons/payment_paypal/data/paypal.xml

@@ -7,7 +7,7 @@
             <field name="provider">paypal</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="paypal_acquirer_button"/>
-            <field name="env">test</field>
+            <field name="environment">test</field>
             <field name="pre_msg"><![CDATA[
 <p>You will be redirected to the Paypal website after cliking on the payment button.</p>]]></field>
             <field name="paypal_email_account">dummy</field>

addons/payment_paypal/models/paypal.py

@@ -21,9 +21,9 @@ _logger = logging.getLogger(__name__)
 class AcquirerPaypal(osv.Model):
     _inherit = 'payment.acquirer'
 
-    def _get_paypal_urls(self, cr, uid, env, context=None):
+    def _get_paypal_urls(self, cr, uid, environment, context=None):
         """ Paypal URLS """
-        if env == 'prod':
+        if environment == 'prod':
             return {
                 'paypal_form_url': 'https://www.paypal.com/cgi-bin/webscr',
                 'paypal_rest_url': 'https://api.paypal.com/v1/oauth2/token',
@@ -131,7 +131,7 @@ class AcquirerPaypal(osv.Model):
 
     def paypal_get_form_action_url(self, cr, uid, id, context=None):
         acquirer = self.browse(cr, uid, id, context=context)
-        return self._get_paypal_urls(cr, uid, acquirer.env, context=context)['paypal_form_url']
+        return self._get_paypal_urls(cr, uid, acquirer.environment, context=context)['paypal_form_url']
 
     def _paypal_s2s_get_access_token(self, cr, uid, ids, context=None):
         """
@@ -143,7 +143,7 @@ class AcquirerPaypal(osv.Model):
         parameters = werkzeug.url_encode({'grant_type': 'client_credentials'})
 
         for acquirer in self.browse(cr, uid, ids, context=context):
-            tx_url = self._get_paypal_urls(cr, uid, acquirer.env)['paypal_rest_url']
+            tx_url = self._get_paypal_urls(cr, uid, acquirer.environment)['paypal_rest_url']
             request = urllib2.Request(tx_url, parameters)
 
             # add other headers (https://developer.paypal.com/webapps/developer/docs/integration/direct/make-your-first-call/)

addons/payment_paypal/tests/test_paypal.py

@@ -39,7 +39,7 @@ class PaypalServer2Server(PaypalCommon):
         cr, uid, context = self.cr, self.uid, {}
         # be sure not to do stupid things
         paypal = self.payment_acquirer.browse(self.cr, self.uid, self.paypal_id, None)
-        self.assertEqual(paypal.env, 'test', 'test without test env')
+        self.assertEqual(paypal.environment, 'test', 'test without test environment')
 
         res = self.payment_acquirer._paypal_s2s_get_access_token(cr, uid, [self.paypal_id], context=context)
         self.assertTrue(res[self.paypal_id] is not False, 'paypal: did not generate access token')
@@ -73,7 +73,7 @@ class PaypalForm(PaypalCommon):
         # be sure not to do stupid things
         self.payment_acquirer.write(cr, uid, self.paypal_id, {'fees_active': False}, context)
         paypal = self.payment_acquirer.browse(cr, uid, self.paypal_id, context)
-        self.assertEqual(paypal.env, 'test', 'test without test env')
+        self.assertEqual(paypal.environment, 'test', 'test without test environment')
 
         # ----------------------------------------
         # Test: button direct rendering
@@ -122,7 +122,7 @@ class PaypalForm(PaypalCommon):
         cr, uid, context = self.cr, self.uid, {}
         # be sure not to do stupid things
         paypal = self.payment_acquirer.browse(self.cr, self.uid, self.paypal_id, None)
-        self.assertEqual(paypal.env, 'test', 'test without test env')
+        self.assertEqual(paypal.environment, 'test', 'test without test environment')
 
         # update acquirer: compute fees
         self.payment_acquirer.write(cr, uid, self.paypal_id, {
@@ -156,7 +156,7 @@ class PaypalForm(PaypalCommon):
         cr, uid, context = self.cr, self.uid, {}
         # be sure not to do stupid things
         paypal = self.payment_acquirer.browse(cr, uid, self.paypal_id, context)
-        self.assertEqual(paypal.env, 'test', 'test without test env')
+        self.assertEqual(paypal.environment, 'test', 'test without test environment')
 
         # typical data posted by paypal after client has successfully paid
         paypal_post_data = {

addons/payment_transfer/data/transfer.xml

@@ -8,7 +8,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="transfer_acquirer_button"/>
             <field name="validation">manual</field>
-            <field name="env">test</field>
+            <field name="environment">test</field>
             <field name="website_published" eval="True"/>
             <field name="pre_msg"><![CDATA[
 <p>Transfer information will be provided after choosing the payment mode.</p>]]>