diff --git a/addons/payment_adyen/models/adyen.py b/addons/payment_adyen/models/adyen.py index 989862c3992..4facd11be17 100644 --- a/addons/payment_adyen/models/adyen.py +++ b/addons/payment_adyen/models/adyen.py @@ -104,10 +104,6 @@ class AcquirerAdyen(osv.Model): class TxAdyen(osv.Model): _inherit = 'payment.transaction' - _columns = { - 'adyen_psp_reference': fields.char('Adyen PSP Reference'), - } - # -------------------------------------------------- # FORM RELATED METHODS # -------------------------------------------------- @@ -160,7 +156,7 @@ class TxAdyen(osv.Model): if status == 'AUTHORISED': tx.write({ 'state': 'done', - 'adyen_psp_reference': data.get('pspReference'), + 'acquirer_reference': data.get('pspReference'), # 'date_validate': data.get('payment_date', fields.datetime.now()), # 'paypal_txn_type': data.get('express_checkout') }) @@ -168,7 +164,7 @@ class TxAdyen(osv.Model): elif status == 'PENDING': tx.write({ 'state': 'pending', - 'adyen_psp_reference': data.get('pspReference'), + 'acquirer_reference': data.get('pspReference'), }) return True else: diff --git a/addons/payment_adyen/views/payment_acquirer.xml b/addons/payment_adyen/views/payment_acquirer.xml index e4c1e368b6a..fde4880a9fa 100644 --- a/addons/payment_adyen/views/payment_acquirer.xml +++ b/addons/payment_adyen/views/payment_acquirer.xml @@ -18,20 +18,5 @@ - - acquirer.transaction.form.adyen - payment.transaction - - - - - - - - - - - - diff --git a/addons/payment_authorize/models/authorize.py b/addons/payment_authorize/models/authorize.py index 2708daa37a6..ec39bac344d 100644 --- a/addons/payment_authorize/models/authorize.py +++ b/addons/payment_authorize/models/authorize.py @@ -85,8 +85,6 @@ class PaymentAcquirerAuthorize(models.Model): class TxAuthorize(models.Model): _inherit = 'payment.transaction' - authorize_txnid = fields.Char(string='Transaction ID') - _authorize_valid_tx_status = 1 _authorize_pending_tx_status = 4 _authorize_cancel_tx_status = 2 @@ -119,8 +117,8 @@ class TxAuthorize(models.Model): def _authorize_form_get_invalid_parameters(self, tx, data): invalid_parameters = [] - if tx.authorize_txnid and data.get('x_trans_id') != tx.authorize_txnid: - invalid_parameters.append(('Transaction Id', data.get('x_trans_id'), tx.authorize_txnid)) + if self.acquirer_reference and data.get('x_trans_id') != self.acquirer_reference: + invalid_parameters.append(('Transaction Id', data.get('x_trans_id'), self.acquirer_reference)) # check what is buyed if float_compare(float(data.get('x_amount', '0.0')), tx.amount, 2) != 0: invalid_parameters.append(('Amount', data.get('x_amount'), '%.2f' % tx.amount)) @@ -135,22 +133,19 @@ class TxAuthorize(models.Model): if status_code == self._authorize_valid_tx_status: tx.write({ 'state': 'done', - 'authorize_txnid': data.get('x_trans_id'), - 'acquirer_reference': data['x_invoice_num'], + 'acquirer_reference': data.get('x_trans_id'), }) return True elif status_code == self._authorize_pending_tx_status: tx.write({ 'state': 'pending', - 'authorize_txnid': data.get('x_trans_id'), - 'acquirer_reference': data['x_invoice_num'], + 'acquirer_reference': data.get('x_trans_id'), }) return True elif status_code == self._authorize_cancel_tx_status: tx.write({ 'state': 'cancel', - 'authorize_txnid': data.get('x_trans_id'), - 'acquirer_reference': data['x_invoice_num'], + 'acquirer_reference': data.get('x_trans_id'), }) return True else: @@ -159,7 +154,6 @@ class TxAuthorize(models.Model): tx.write({ 'state': 'error', 'state_message': error, - 'authorize_txnid': data.get('x_trans_id'), - 'acquirer_reference': data['x_invoice_num'], + 'acquirer_reference': data.get('x_trans_id'), }) return False diff --git a/addons/payment_authorize/tests/test_authorize.py b/addons/payment_authorize/tests/test_authorize.py index eda6c4d3a5c..f038016d579 100644 --- a/addons/payment_authorize/tests/test_authorize.py +++ b/addons/payment_authorize/tests/test_authorize.py @@ -161,10 +161,10 @@ class AuthorizeForm(AuthorizeCommon): self.payment_transaction.form_feedback(cr, uid, authorize_post_data, 'authorize', context=context) # check state self.assertEqual(tx.state, 'done', 'Authorize: validation did not put tx into done state') - self.assertEqual(tx.authorize_txnid, authorize_post_data.get('x_trans_id'), 'Authorize: validation did not update tx payid') + self.assertEqual(tx.acquirer_reference, authorize_post_data.get('x_trans_id'), 'Authorize: validation did not update tx payid') # reset tx - tx.write({'state': 'draft', 'date_validate': False, 'authorize_txnid': False}) + tx.write({'state': 'draft', 'date_validate': False, 'acquirer_reference': False}) # simulate an error authorize_post_data['x_response_code'] = u'3' diff --git a/addons/payment_authorize/views/payment_acquirer.xml b/addons/payment_authorize/views/payment_acquirer.xml index 7a8f1c950f1..7c464bc24f4 100644 --- a/addons/payment_authorize/views/payment_acquirer.xml +++ b/addons/payment_authorize/views/payment_acquirer.xml @@ -15,18 +15,4 @@ - - acquirer.transaction.form.authorize - payment.transaction - - - - - - - - - - - diff --git a/addons/payment_buckaroo/models/buckaroo.py b/addons/payment_buckaroo/models/buckaroo.py index 5b0530a60de..fbdf5e251c9 100644 --- a/addons/payment_buckaroo/models/buckaroo.py +++ b/addons/payment_buckaroo/models/buckaroo.py @@ -112,10 +112,6 @@ class TxBuckaroo(osv.Model): _buckaroo_error_tx_status = [490, 491, 492] _buckaroo_reject_tx_status = [690] - _columns = { - 'buckaroo_txnid': fields.char('Transaction ID'), - } - # -------------------------------------------------- # FORM RELATED METHODS @@ -168,19 +164,19 @@ class TxBuckaroo(osv.Model): if status_code in self._buckaroo_valid_tx_status: tx.write({ 'state': 'done', - 'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'), + 'acquirer_reference': data.get('BRQ_TRANSACTIONS'), }) return True elif status_code in self._buckaroo_pending_tx_status: tx.write({ 'state': 'pending', - 'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'), + 'acquirer_reference': data.get('BRQ_TRANSACTIONS'), }) return True elif status_code in self._buckaroo_cancel_tx_status: tx.write({ 'state': 'cancel', - 'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'), + 'acquirer_reference': data.get('BRQ_TRANSACTIONS'), }) return True else: @@ -189,6 +185,6 @@ class TxBuckaroo(osv.Model): tx.write({ 'state': 'error', 'state_message': error, - 'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'), + 'acquirer_reference': data.get('BRQ_TRANSACTIONS'), }) return False diff --git a/addons/payment_buckaroo/tests/test_buckaroo.py b/addons/payment_buckaroo/tests/test_buckaroo.py index b826f3b920e..3a9773d34f0 100644 --- a/addons/payment_buckaroo/tests/test_buckaroo.py +++ b/addons/payment_buckaroo/tests/test_buckaroo.py @@ -159,10 +159,10 @@ class BuckarooForm(BuckarooCommon): # check state tx = self.payment_transaction.browse(cr, uid, tx_id, context=context) self.assertEqual(tx.state, 'done', 'Buckaroo: validation did not put tx into done state') - self.assertEqual(tx.buckaroo_txnid, buckaroo_post_data.get('BRQ_TRANSACTIONS'), 'Buckaroo: validation did not update tx payid') + self.assertEqual(tx.acquirer_reference, buckaroo_post_data.get('BRQ_TRANSACTIONS'), 'Buckaroo: validation did not update tx payid') # reset tx - tx.write({'state': 'draft', 'date_validate': False, 'buckaroo_txnid': False}) + tx.write({'state': 'draft', 'date_validate': False, 'acquirer_reference': False}) # now buckaroo post is ok: try to modify the SHASIGN buckaroo_post_data['BRQ_SIGNATURE'] = '54d928810e343acf5fb0c3ee75fd747ff159ef7a' diff --git a/addons/payment_buckaroo/views/payment_acquirer.xml b/addons/payment_buckaroo/views/payment_acquirer.xml index f1af9047dd7..e9cecec2309 100644 --- a/addons/payment_buckaroo/views/payment_acquirer.xml +++ b/addons/payment_buckaroo/views/payment_acquirer.xml @@ -17,20 +17,5 @@ - - acquirer.transaction.form.buckaroo - payment.transaction - - - - - - - - - - - - diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py index 6aa86631653..1fca9134d11 100644 --- a/addons/payment_paypal/models/paypal.py +++ b/addons/payment_paypal/models/paypal.py @@ -175,7 +175,6 @@ class TxPaypal(osv.Model): _inherit = 'payment.transaction' _columns = { - 'paypal_txn_id': fields.char('Transaction ID'), 'paypal_txn_type': fields.char('Transaction type'), } diff --git a/addons/payment_paypal/tests/test_paypal.py b/addons/payment_paypal/tests/test_paypal.py index a66b90cf0fb..8428222442e 100644 --- a/addons/payment_paypal/tests/test_paypal.py +++ b/addons/payment_paypal/tests/test_paypal.py @@ -223,13 +223,13 @@ class PaypalForm(PaypalCommon): tx = self.payment_transaction.browse(cr, uid, tx_id, context=context) self.assertEqual(tx.state, 'pending', 'paypal: wrong state after receiving a valid pending notification') self.assertEqual(tx.state_message, 'multi_currency', 'paypal: wrong state message after receiving a valid pending notification') - self.assertEqual(tx.paypal_txn_id, '08D73520KX778924N', 'paypal: wrong txn_id after receiving a valid pending notification') + self.assertEqual(tx.acquirer_reference, '08D73520KX778924N', 'paypal: wrong txn_id after receiving a valid pending notification') self.assertFalse(tx.date_validate, 'paypal: validation date should not be updated whenr receiving pending notification') # update tx self.payment_transaction.write(cr, uid, [tx_id], { 'state': 'draft', - 'paypal_txn_id': False, + 'acquirer_reference': False, }, context=context) # update notification from paypal paypal_post_data['payment_status'] = 'Completed' @@ -238,5 +238,5 @@ class PaypalForm(PaypalCommon): # check tx = self.payment_transaction.browse(cr, uid, tx_id, context=context) self.assertEqual(tx.state, 'done', 'paypal: wrong state after receiving a valid pending notification') - self.assertEqual(tx.paypal_txn_id, '08D73520KX778924N', 'paypal: wrong txn_id after receiving a valid pending notification') + self.assertEqual(tx.acquirer_reference, '08D73520KX778924N', 'paypal: wrong txn_id after receiving a valid pending notification') self.assertEqual(tx.date_validate, '2013-11-18 03:21:19', 'paypal: wrong validation date') diff --git a/addons/payment_paypal/views/payment_acquirer.xml b/addons/payment_paypal/views/payment_acquirer.xml index bdd5c789049..a624366c1ed 100644 --- a/addons/payment_paypal/views/payment_acquirer.xml +++ b/addons/payment_paypal/views/payment_acquirer.xml @@ -29,7 +29,6 @@ -