Merge pull request #10 from pruebasepayco/14.0

14.0

Author: RicardoSaldarriagaPayco

payment_epayco/__init__.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright 2019 ePayco.co
-# - Manuel Marquez <buzondemam@gmail.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import controllers
 from . import models
+from . import controllers
+from odoo.addons.payment.models.payment_acquirer import create_missing_journal_for_acquirers
+from odoo.addons.payment import reset_payment_provider
+
+def uninstall_hook(cr, registry):
+    reset_payment_provider(cr, registry, 'epayco')

payment_epayco/__manifest__.py

@@ -1,29 +1,20 @@
 # -*- coding: utf-8 -*-
-# Copyright 2019 ePayco.co
-# - Manuel Marquez <buzondemam@gmail.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
 {
     'name': 'Epayco Payment Acquirer',
-    'summary': 'Epayco Payment Acquirer for the eCommerce.',
-    'category': 'Accounting',
-    'author': 'ePayco',
-    "maintainers": ["mamcode"],
-    'development_status': 'Production/Stable',
-    'website': 'https://epayco.co/',
-    'license': 'AGPL-3',
-    'version': '12.0.1.0.0',
+    'category': 'Accounting/Payment',
+    'sequence': 365,
+    'summary': 'Payment Acquirer: Epayco Implementation',
+    'version': '1.0',
     'description': """Epayco Payment Acquirer""",
-    'depends': ['payment', 'l10n_co', 'website_sale'],
+    'depends': ['payment'],
     'data': [
-        'security/ir.model.access.csv',
-        'data/payment_icon.xml',
+        'views/payment_views.xml',
         'views/payment_epayco_templates.xml',
-        'data/payment_acquirer.xml',
-        'data/epayco_franchise.xml',
-        'data/epayco_tx_state.xml',
-        'data/epayco_document_type.xml',
-        'views/payment_acquirer_views.xml',
-        'views/payment_transaction_views.xml',
+        'data/payment_acquirer_data.xml',
     ],
     'installable': True,
+    'application': True,
+    'post_init_hook': 'create_missing_journal_for_acquirers',
+    'uninstall_hook': 'uninstall_hook',
 }

payment_epayco/controllers/__init__.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-# Copyright 2019 ePayco.co
-# - Manuel Marquez <buzondemam@gmail.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import main

payment_epayco/controllers/main.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2019 ePayco.co
-# - Manuel Marquez <buzondemam@gmail.com>
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import logging
 import pprint
@@ -10,48 +8,48 @@
 
 from odoo import http
 from odoo.http import request, Response
+from werkzeug import urls
 
 _logger = logging.getLogger(__name__)
 
 
 class EpaycoController(http.Controller):
-    _response_url = '/payment/epayco/response/'
-    _confirmation_url = '/payment/epayco/confirmation/'
-
-    @http.route(
-        ['/payment/epayco/checkout/'], type='http', csrf=False, website=True)
-    def epayco_checkout(self, **post):
-        """Render template to redirect to ePayco checkout."""
+    @http.route(['/payment/epayco/checkout'], type='http', website=True, csrf=False)
+    def epayco_return(self, **post):
+        """ Epayco."""
         order = request.website.sale_get_order()
+        print(order)
+        print(type(order))
+        print('_____________________  _______________')
         post_data = {
             'amount_tax': order.amount_tax,
             'amount_untaxed': order.amount_untaxed,
         }
         post.update(post_data)
+        print(post)
         return request.render('payment_epayco.checkout', post)
 
-    def _post_process_tx(self, data):
-        """Post process transaction to confirm the sale order and
-        to generate the invoices if needed."""
-        tx_reference = data.get('x_id_invoice')
-        payment_transaction = request.env['payment.transaction'].sudo()
 
-        tx = payment_transaction.search([('reference', '=', tx_reference)])
-
-        if not tx:
-            _logger.exception('Transaction post processing failed. '
-                              'Not found any transaction with reference %s',
-                              tx_reference)
-
-        if tx.state == 'done':
-            return tx.sudo()._post_process_after_done()
-        elif tx.state != 'pending':
-            return tx.sudo()._log_payment_transaction_received()
+    @http.route(['/payment/epayco/response/'], type='http', website=True, csrf=False)
+    def epayco_return_url(self, **post):
+        """Process response from ePayco after process payment."""
+        return self._epayco_process_response(post)
 
+    @http.route(
+        ['/payment/epayco/confirmation/'],
+        type='http',
+        csrf=False,
+        website=True,
+        auth='public')
+    def epayco_payment_confirmation_url(self, **post):
+        """Process payment confirmation from ePayco."""
+        return self._epayco_process_response(post, confirmation=True)
+        
     def _epayco_process_response(self, data, confirmation=False):
         if not confirmation:
             ref_payco = data.get('ref_payco')
-
+            print('ref_payco')
+            print(ref_payco)
             if ref_payco is None:
                 _logger.debug('User error in ePayco checkout: %s', data)
                 return werkzeug.utils.redirect('/shop/payment')
@@ -74,22 +72,22 @@ def _epayco_process_response(self, data, confirmation=False):
                 data, 'epayco')
             self._post_process_tx(data)
             return Response(status=200)
+    
 
-    @http.route(
-        ['/payment/epayco/response/'],
-        type='http',
-        csrf=False,
-        website=True)
-    def epayco_return_url(self, **post):
-        """Process response from ePayco after process payment."""
-        return self._epayco_process_response(post)
+    def _post_process_tx(self, data):
+        """Post process transaction to confirm the sale order and
+        to generate the invoices if needed."""
+        tx_reference = data.get('x_id_invoice')
+        payment_transaction = request.env['payment.transaction'].sudo()
 
-    @http.route(
-        ['/payment/epayco/confirmation/'],
-        type='http',
-        csrf=False,
-        website=True,
-        auth='public')
-    def epayco_payment_confirmation_url(self, **post):
-        """Process payment confirmation from ePayco."""
-        return self._epayco_process_response(post, confirmation=True)
+        tx = payment_transaction.search([('reference', '=', tx_reference)])
+
+        if not tx:
+            _logger.exception('Transaction post processing failed. '
+                              'Not found any transaction with reference %s',
+                              tx_reference)
+
+        if tx.state == 'done':
+            return tx.sudo()._post_process_after_done()
+        elif tx.state != 'pending':
+            return tx.sudo()._log_payment_transaction_received()