0001-pass-order-id-to-all-backends-9941.patch

Serghei Mihai (congés, retour 15/05), 15 février 2016 18:07

Voir les différences: en ligne côte à côte

Subject: [PATCH] pass order id to all backends (#9941)

 README.txt               |  9 +++++++++
 eopayment/common.py      |  3 +++
 eopayment/dummy.py       | 10 ++++------
 eopayment/ogone.py       | 14 ++++++++++++--
 eopayment/paybox.py      | 15 +++++++++++----
 eopayment/sips.py        |  7 ++++---
 eopayment/sips2.py       |  6 +++---
 eopayment/spplus.py      |  7 ++++---
 eopayment/systempayv2.py | 13 ++++++++++++-
 eopayment/tipi.py        |  5 +++--
 10 files changed, 65 insertions(+), 24 deletions(-)

     The spplus and paybox module also depend upon the python Crypto library for DES
     decoding of the merchant key and RSA signature validation on the responses.
     Some backends allow to specify the order and transaction ids in different
     fields, in order to allow to match them in payment system backoffice. They are:
     - Payzen
     - SIPS
     - SystemPay
     For other backends, the order and transaction ids, separated by '!' are sent in
     order id field, so they can be matched in backoffice.
     Changelog
     =========

     CANCELED = 5  # typo for backward compatibility
     ERROR = 99
     # separator between order and transaction ids
     ORDERID_TRANSACTION_SEPARATOR = '!'
     class PaymentResponse(object):
         '''Holds a generic view on the result of payment transaction response.

+        }
         def request(self, amount, name=None, address=None, email=None, phone=None,
                 info1=None, info2=None, info3=None, next_url=None, **kwargs):
                 orderid=None, info1=None, info2=None, info3=None, next_url=None, **kwargs):
             self.logger.debug('%s amount %s name %s address %s email %s phone %s'
                     ' next_url %s info1 %s info2 %s info3 %s kwargs: %s',
                     __name__, amount, name, address, email, phone, info1, info2, info3, next_url, kwargs)
-...
                     'origin': self.origin
+            }
             query.update(dict(name=name, address=address, email=email, phone=phone,
                 info1=info1, info2=info2, info3=info3))
                 orderid=orderid, info1=info1, info2=info2, info3=info3))
             for key in query.keys():
                 if query[key] is None:
                     del query[key]
-...
         p = Payment(options)
         retour = 'http://example.com/retour?amount=10.0&direct_notification_url=http%3A%2F%2Fexample.com%2Fdirect_notification_url&email=toto%40example.com&transaction_id=6Tfw2e1bPyYnz7CedZqvdHt7T9XX6T&return_url=http%3A%2F%2Fexample.com%2Fretour&nok=1'
         r = p.response(retour.split('?',1)[1])
         assert not r[0]
         assert not r[0]
         assert r[1] == '6Tfw2e1bPyYnz7CedZqvdHt7T9XX6T'
         assert r[3] is None
         retour = 'http://example.com/retour?amount=10.0&direct_notification_url=http%3A%2F%2Fexample.com%2Fdirect_notification_url&email=toto%40example.com&transaction_id=6Tfw2e1bPyYnz7CedZqvdHt7T9XX6T&return_url=http%3A%2F%2Fexample.com%2Fretour&ok=1&signed=1'
         r = p.response(retour.split('?',1)[1])
         assert r[0]
         assert r[0]
         assert r[1] == '6Tfw2e1bPyYnz7CedZqvdHt7T9XX6T'
         assert r[3] == 'signature ok'

     from decimal import Decimal, ROUND_HALF_UP
     from common import (PaymentCommon, PaymentResponse, FORM, CANCELLED, PAID,
             ERROR, Form, DENIED, ACCEPTED)
             ERROR, Form, DENIED, ACCEPTED, ORDERID_TRANSACTION_SEPARATOR)
     def N_(message): return message
     ENVIRONMENT_TEST = 'TEST'
-...
         def request(self, amount, orderid=None, name=None, email=None,
                 language=None, description=None, **kwargs):
             reference = orderid or self.transaction_id(20, string.digits + string.ascii_letters)
             reference = self.transaction_id(20, string.digits + string.ascii_letters)
             # prepend order id in payment reference
             if orderid:
                 if len(orderid) > 24:
                     raise ValueError('orderid length exceed 25 characters')
                 reference = orderid + ORDERID_TRANSACTION_SEPARATOR + self.transaction_id(29-len(orderid), string.digits + string.ascii_letters)
             language = language or self.language
             # convertir en centimes
             amount = Decimal(amount) * 100
-...
                 self.logger.error('response STATUS=%s NCERROR=%s NCERRORPLUS=%s',
                         status, error, params.get('NCERRORPLUS', ''))
                 result = ERROR
             # extract reference from received order id
             if ORDERID_TRANSACTION_SEPARATOR in reference:
                 reference, transaction_id = reference.split(ORDERID_TRANSACTION_SEPARATOR, 1)
             return PaymentResponse(
                     result=result,
                     signed=signed,

     from gettext import gettext as _
     import string
     from common import PaymentCommon, PaymentResponse, FORM, PAID, ERROR, Form
     from common import (PaymentCommon, PaymentResponse, FORM, PAID, ERROR, Form,
             ORDERID_TRANSACTION_SEPARATOR)
     __all__ = ['sign', 'Payment']
-...
+            ]
+        }
         def request(self, amount, email, name=None, **kwargs):
         def request(self, amount, email, name=None, orderid=None, **kwargs):
             d = OrderedDict()
             d['PBX_SITE'] = unicode(self.site)
             d['PBX_RANG'] = unicode(self.rang).strip()[-2:]
-...
                 self.transaction_id(12, string.digits, 'paybox', self.site,
                                     self.rang, self.identifiant)
             d['PBX_CMD'] = unicode(transaction_id)
             # prepend order id command reference
             if orderid:
                 d['PBX_CMD'] = orderid + ORDERID_TRANSACTION_SEPARATOR + d['PBX_CMD']
             d['PBX_PORTEUR'] = unicode(email)
             d['PBX_RETOUR'] = 'montant:M;reference:R;code_autorisation:A;erreur:E;signature:K'
             d['PBX_HASH'] = 'SHA512'
-...
                 bank_status = PAYBOX_ERROR_CODES.get(prefix + suffix)
                 if bank_status is not None:
                     break
             orderid = d['reference'][0]
             # decode order id from returned reference
             if ORDERID_TRANSACTION_SEPARATOR in orderid:
                 orderid, transaction_id = orderid.split(ORDERID_TRANSACTION_SEPARATOR, 1)
             return PaymentResponse(
                 order_id=d['reference'][0],
                 order_id=orderid,
                 signed=signed,
                 bank_data=d,
                 result=result,

             params.update(self.options)
             return params
         def request(self, amount, name=None, address=None, email=None, phone=None, info1=None,
                 info2=None, info3=None, next_url=None, **kwargs):
         def request(self, amount, name=None, address=None, email=None, phone=None, orderid=None,
                 info1=None, info2=None, info3=None, next_url=None, **kwargs):
             params = self.get_request_params()
             transaction_id = self.transaction_id(6, string.digits, 'sips',
                     params[MERCHANT_ID])
             params[TRANSACTION_ID] = transaction_id
             params[ORDER_ID] = str(uuid.uuid4()).replace('-', '')
             params[ORDER_ID] = orderid or str(uuid.uuid4())
             params[ORDER_ID] = params[ORDER_ID].replace('-', '')
             params['amount'] = str(int(Decimal(amount) * 100))
             if email:
                 params['customer_email'] = email

         def get_url(self):
             return self.URL[self.platform]
         def request(self, amount, name=None, address=None, email=None, phone=None, info1=None,
                     info2=None, info3=None, next_url=None, **kwargs):
         def request(self, amount, name=None, address=None, email=None, phone=None,
                     orderid=None, info1=None, info2=None, info3=None, next_url=None, **kwargs):
             data = self.get_data()
             transaction_id = self.transaction_id(6, string.digits, 'sips2', data['merchantId'])
             data['transactionReference'] = unicode(transaction_id)
             data['orderId'] = unicode(uuid.uuid4()).replace('-', '')
             data['orderId'] = orderid or unicode(uuid.uuid4()).replace('-', '')
             data['amount'] = unicode(int(Decimal(amount) * 100))
             if email:
                 data['billingContact.email'] = email

+        }
         devise = '978'
         def request(self, amount, name=None, address=None, email=None, phone=None, info1=None,
                 info2=None, info3=None, next_url=None, logger=LOGGER, **kwargs):
         def request(self, amount, name=None, address=None, email=None, phone=None,
                 orderid=None, info1=None, info2=None, info3=None, next_url=None,
                 logger=LOGGER, **kwargs):
             logger.debug('requesting spplus payment with montant %s email=%s and \
     next_url=%s' % (amount, email, next_url))
             reference = self.transaction_id(20, ALPHANUM, 'spplus', self.siret)
-...
                     'langue': self.langue,
                     'taxe': self.taxe,
                     'montant': str(Decimal(amount)),
                     REFERENCE: reference,
                     REFERENCE: orderid or reference,
                     'validite': validite,
                     'version': '1',
                     'modalite': self.modalite,

             self.logger = logger or logging.getLogger(__name__)
         def request(self, amount, name=None, address=None, email=None, phone=None,
                     info1=None, info2=None, info3=None, next_url=None, **kwargs):
                     orderid=None, info1=None, info2=None, info3=None,
                     next_url=None, **kwargs):
             '''
                Create the URL string to send a request to SystemPay
             '''
-...
                 kwargs['vads_order_info2'] = unicode(info2)
             if info3 is not None:
                 kwargs['vads_order_info3'] = unicode(info3)
             if orderid is not None:
                 # check orderid format first
                 name = 'vads_order_id'
                 orderid = unicode(orderid)
                 ptype = 'an-'
                 p = Parameter(name, ptype, 13, max_length=32)
                 if not p.check_value(orderid):
                     raise ValueError('%s value %s is not of the type %s' % (name,
                                     orderid, ptype))
                 kwargs[name] = orderid
             transaction_id = self.transaction_id(6, string.digits, 'systempay',
                                                  self.options[VADS_SITE_ID])

             self.numcli = options.pop('numcli', '')
             self.logger = logger
         def request(self, amount, next_url=None, exer=None, refdet=None,
                 objet=None, email=None, saisie=None, **kwargs):
         def request(self, amount, next_url=None, exer=None, orderid=None,
                 refdet=None, objet=None, email=None, saisie=None, **kwargs):
             try:
                 montant = Decimal(amount)
                 if Decimal('0') > montant > Decimal('9999.99'):
-...
             except ValueError:
                 raise ValueError('EXER format invalide')
             try:
                 refdet = orderid or refdet
                 refdet = str(refdet)
                 if 6 > len(refdet) > 30:
                     raise ValueError('len(REFDET) < 6 or > 30')
+    -

Projet

Général

Profil

Produits Entr'ouvert » EOPayment

0001-pass-order-id-to-all-backends-9941.patch