Commit 2d64cb6a0b2693b175d229748b9569a5005a87be
1 parent
9fbb7d2a7e
Exists in
master
getSNFromResponseObject
Showing 1 changed file with 16 additions and 2 deletions Side-by-side Diff
partner-cjk.js
... | ... | @@ -69,7 +69,7 @@ function getSNFromMessage(message) { |
69 | 69 | try { |
70 | 70 | var sn_match = message.match(/SN: (\w+)/); |
71 | 71 | logger.verbose('Got SN: ' + sn_match[1]); |
72 | - return sn_match[1]; | |
72 | + return sn_match[1].trim(); | |
73 | 73 | } |
74 | 74 | catch(err) { |
75 | 75 | logger.verbose('Exception on getting sn from message', {err: err}); |
... | ... | @@ -102,6 +102,15 @@ function supplierRcToST24Rc(rc) { |
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | +function getSNFromResponseObject(respObj) { | |
106 | + try { | |
107 | + return respObj.ciwaru.sn[0].trim(); | |
108 | + } | |
109 | + catch(err) { | |
110 | + return; | |
111 | + } | |
112 | +} | |
113 | + | |
105 | 114 | function topupResponseHandler(body, task) { |
106 | 115 | //logger.info('Got reply from partner', {body: body}); |
107 | 116 | xml2js(body, function(err, result) { |
... | ... | @@ -125,9 +134,14 @@ function topupResponseHandler(body, task) { |
125 | 134 | rc = '68'; |
126 | 135 | } |
127 | 136 | else if (hasSuccessKeywords(message)) { |
128 | - var sn = getSNFromMessage(message); | |
137 | + var sn = getSNFromResponseObject(result); | |
138 | + if (!sn) { | |
139 | + sn = getSNFromMessage(message); | |
140 | + } | |
141 | + | |
129 | 142 | message = 'SN=' + sn + '; ' + message; |
130 | 143 | rc = '00'; |
144 | + | |
131 | 145 | } else { |
132 | 146 | rc = supplierRcToST24Rc(result.ciwaru.rc[0]); |
133 | 147 | if (!rc) { |