[FIX] FIX Installment in /my/payment_method

plugberry · Nov 7, 2022 · ef90fb9 · ef90fb9
1 parent 2a444a3
commit ef90fb9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 23 deletions.
diff --git a/payment_mercadopago/controllers/main.py b/payment_mercadopago/controllers/main.py
@@ -96,13 +96,13 @@ def mercadopago_notification(self, aquirer_id=False):
         :return: Status 200 to acknowledge the notification
         :rtype: Response
         """
-        params = dict(http.request.params)
-        _logger.debug("MercadoPago notification: \n%s", pprint.pformat(params))
+        data = json.loads(request.httprequest.data)
+        _logger.debug("MercadoPago notification: \n%s", pprint.pformat(data))
 
-        if params['topic'] == 'payment':
+        if data['type'] == 'payment':
             try:
                 # Payment ID
-                payment_id = params['id']
+                payment_id = data['data']['id']
 
                 # Get payment data from MercadoPago
                 leaf = [('provider', '=', 'mercadopago')]

diff --git a/payment_mercadopago/models/mercadopago_request.py b/payment_mercadopago/models/mercadopago_request.py
@@ -174,11 +174,11 @@ def payment(self, tx, token=None, form_data={}, cvv=True):
         elif 'mercadopago_token' in form_data:
             payment_token = form_data['mercadopago_token']
 
-        capture, validation_capture_method = self.validation_capture_method(tx, form_data, token) 
+        capture, validation_capture_method = self.validation_capture_method(tx, form_data, token)
 
         values = {
             "token": payment_token,
-            "installments": 1 if token else form_data['installments'],
+            "installments": form_data['installments'] if 'installments' in form_data and form_data['installments'] else 1,
             "transaction_amount": tx.amount,
             "description": "Odoo ~ MercadoPago payment",
             "payment_method_id": token.acquirer_ref if token else form_data['mercadopago_payment_method'],

diff --git a/payment_mercadopago/static/src/js/payment_form.js b/payment_mercadopago/static/src/js/payment_form.js
@@ -177,6 +177,8 @@ odoo.define('payment_mercadopago.payment_form', require => {
             };
 
             function getIssuers(paymentMethodId, bin) {
+                console.log(bin);
+
                 self.mp.getIssuers({ paymentMethodId: paymentMethodId, bin: bin }).then((response)=>{
                     setIssuers(response, paymentOptionId, bin);
                 });
@@ -186,6 +188,7 @@ odoo.define('payment_mercadopago.payment_form', require => {
 
             function setIssuers(response, paymentOptionId,  bin) {
                 if (response) {
+                    console.log(response);
                     let issuerLabel = document.getElementById('o_mercadopago_issuer_label_' + paymentOptionId);
                     let issuerSelect = document.getElementById('o_mercadopago_issuer_' + paymentOptionId);
                     issuerSelect.options.length = 0;
@@ -208,15 +211,17 @@ odoo.define('payment_mercadopago.payment_form', require => {
             };
 
             function getInstallments(transactionAmount, paymentOptionId, bin){
-                self.mp.getInstallments({
-                    bin: bin,
-                    amount: transactionAmount.toString(),
-                }).then((response) => {
-                    setInstallments(response, paymentOptionId);
-                }).catch((error) => {
-                    console.error( error );
+                if (transactionAmount){
+                    self.mp.getInstallments({
+                        bin: bin,
+                        amount: transactionAmount.toString(),
+                    }).then((response) => {
+                        setInstallments(response, paymentOptionId);
+                    }).catch((error) => {
+                        console.error( error );
 
-                });
+                    });
+                }
             };
 
             function setInstallments(response, paymentOptionId){
@@ -243,15 +248,16 @@ odoo.define('payment_mercadopago.payment_form', require => {
             self = this;
             getTokenInstallments(transactionAmount, paymentOptionId, bin);
             function getTokenInstallments(transactionAmount, paymentOptionId, bin){
-                self.mp.getInstallments({
-                    bin: bin,
-                    amount: transactionAmount.toString(),
-                }).then((response) => {
-                    setTokenInstallments(response, paymentOptionId);
-                }).catch(error => {
-                    console.error( error );
-
-                });
+                if (transactionAmount){
+                    self.mp.getInstallments({
+                        bin: bin,
+                        amount: transactionAmount.toString(),
+                    }).then((response) => {
+                        setTokenInstallments(response, paymentOptionId);
+                    }).catch(error => {
+                        console.error( error );
+                    });
+                }
             };
             function setTokenInstallments(response, paymentOptionId){
                 if (response) {