Merge branch 'hotfix'

DigiThinkIT · Jun 26, 2018 · 8958f8c · 8958f8c
2 parents 6fda3bd + 4482e1c
commit 8958f8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/gateway_selector/__init__.py b/gateway_selector/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '1.0.3'
+__version__ = '1.0.4'
 
diff --git a/gateway_selector/public/js/base.js b/gateway_selector/public/js/base.js
@@ -126,6 +126,8 @@ frappe.gateway_selector._generic_embed = Class.extend({
   },
 
   process: function(data, callback) {
+    var base = this;
+
     // trigger payment gateway to use
     frappe.call({
       method: "gateway_selector.gateway_selector.doctype.gateway_selector_settings.gateway_selector_settings.get_url_from_gateway",
@@ -142,7 +144,9 @@ frappe.gateway_selector._generic_embed = Class.extend({
 			window.location.href = data.message
 
 			if ( base.gateway.name.toLowerCase() != "paypal" ) {
-				callback(null, result.message);
+        if (!base.gateway.muteProcessingCallback) {
+          callback(null, result.message);
+        }
 			}
 		})
 		.fail(function(xhr, textStatus) {