diff --git a/main.py b/main.py index 7fbc8b6..30a4074 100755 --- a/main.py +++ b/main.py @@ -185,7 +185,7 @@ def pushTopupStatus(request_id, response_code, _message, dontparsesn = False): if response_code == '00' and not dontparsesn: sn = xltunai.getSNFromMessage(message) LAST_SN = sn - message = 'SN={0};{1}. Signal Strength: {2}'.format(sn, message, modem.signalStrength) + message = 'SN={0};{1}'.format(sn, message) push_message = CHIPINFO + '$' + message diff --git a/test_xltunai.py b/test_xltunai.py index 8de3e1e..2b6695f 100644 --- a/test_xltunai.py +++ b/test_xltunai.py @@ -126,3 +126,7 @@ def test_getPulsaFromUssdResponseMessage(): assert xltunai.getMasaAktifFromUssdResponseMessage('Pulsa 41875 s/d 16Sep15. Mendadak DISKON 1 JUTA pelanggan pertama!') == '2015-09-16' assert xltunai.getMasaAktifFromUssdResponseMessage('Pulsa 53000 s.d 10Sep15. Pkt TalkMania-XTRA 250Mnt, Rp3375!') == '2015-09-10' assert xltunai.getMasaAktifFromUssdResponseMessage('Pulsa 41875 s/d. Mendadak DISKON 1 JUTA pelanggan pertama!') == None + + +def test_getLastSNFromMessage(): + assert xltunai.getLastSNFromHistoryMessage('Transaksi Terakhir : 20063778248257/5500/12-02-2016 14:37:08/M201312021528418273770285/P201511211752675316198716/RELOAD XL 5000') == '20063778248257' diff --git a/xltunai.py b/xltunai.py index e3b4edf..f19b74c 100644 --- a/xltunai.py +++ b/xltunai.py @@ -150,6 +150,6 @@ def getMasaAktifFromUssdResponseMessage(message): return time.strftime("%Y-%m-%d", masa_aktif) def getLastSNFromHistoryMessage(message): - sn = re.findall(r"Transaksi Terakhir: (\d+)", message) + sn = re.findall(r"Transaksi Terakhir :\s*(\d+)", message) if sn: return sn