perbaikan serial/token dengan spasi

Adhidarma Hadiwinoto
1 parent c36f8503f6
Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff
partner-simplepay.js
@@ -118,9 +118,13 @@ function _composeMessageFromResponseData(responseDataObj) {
 }
  
 function _composeCompleteSn(responseDataObj) {
-    const serial = _getPropertyFromObjectSafe(responseDataObj, 'serial');
+    let serial = _getPropertyFromObjectSafe(responseDataObj, 'serial');
     const info = _getPropertyFromObjectSafe(responseDataObj, 'info');
  
+    if (serial) {
+        serial = serial.replace(/ /g, '-');
+    }
+
     if (!info) {
         //logger.warn('Undefined data.info on _composeCompleteSn');
         return serial;
@@ -133,10 +137,6 @@ function _composeCompleteSn(responseDataObj) {
         total_kwh: _getPropertyFromObjectSafe(info, 'size')
     }
  
-    if (cleanedData.token) {
-        cleanedData.token = cleanedData.token.replace(/ /g, '-');
-    }
-
     if (cleanedData.cust_name) {
         cleanedData.cust_name = cleanedData.cust_name.replace(/\W+/g, ' ').trim().replace(/\W+/g, '-').toUpperCase();
     }
...	...	@@ -118,9 +118,13 @@ function _composeMessageFromResponseData(responseDataObj) {
118	118	}
119	119
120	120	function _composeCompleteSn(responseDataObj) {
121		- const serial = _getPropertyFromObjectSafe(responseDataObj, 'serial');
	121	+ let serial = _getPropertyFromObjectSafe(responseDataObj, 'serial');
122	122	const info = _getPropertyFromObjectSafe(responseDataObj, 'info');
123	123
	124	+ if (serial) {
	125	+ serial = serial.replace(/ /g, '-');
	126	+ }
	127	+
124	128	if (!info) {
125	129	//logger.warn('Undefined data.info on _composeCompleteSn');
126	130	return serial;
...	...	@@ -133,10 +137,6 @@ function _composeCompleteSn(responseDataObj) {
133	137	total_kwh: _getPropertyFromObjectSafe(info, 'size')
134	138	}
135	139
136		- if (cleanedData.token) {
137		- cleanedData.token = cleanedData.token.replace(/ /g, '-');
138		- }
139		-
140	140	if (cleanedData.cust_name) {
141	141	cleanedData.cust_name = cleanedData.cust_name.replace(/\W+/g, ' ').trim().replace(/\W+/g, '-').toUpperCase();
142	142	}