From 9e2eda031ed624001c680461d4906cd2522edf01 Mon Sep 17 00:00:00 2001 From: Daniel Yohan Date: Sun, 29 Nov 2020 15:32:03 -0300 Subject: [PATCH] Override __str__ and bump version 0.1.4 --- examples/sample.py | 2 +- pypix/pix.py | 30 +++++++++++++++--------------- pyproject.toml | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/sample.py b/examples/sample.py index 1b58ebf..9cd90c9 100644 --- a/examples/sample.py +++ b/examples/sample.py @@ -7,4 +7,4 @@ pix.set_merchant_name('Daniel Yohan') pix.set_merchant_city('MACEIO') pix.set_txid('Aquele Lanche') -print(pix.get_payload()) +print(pix) diff --git a/pypix/pix.py b/pypix/pix.py index 057a357..410e6ff 100644 --- a/pypix/pix.py +++ b/pypix/pix.py @@ -27,6 +27,21 @@ def __init__(self): self.txid = None self.amount = None + def __str__(self): + payload = "{}{}{}{}{}{}{}{}{}".format( + self.get_value(self._ID_PAYLOAD_FORMAT_INDICATOR, "01"), + self.get_merchant_account_information(), + self.get_value(self._ID_MERCHANT_CATEGORY_CODE, "0000"), + self.get_value(self._ID_TRANSACTION_CURRENCY, "986"), + self.get_value(self._ID_TRANSACTION_AMOUNT, self.amount), + self.get_value(self._ID_COUNTRY_CODE, self.country_code), + self.get_value(self._ID_MERCHANT_NAME, self.merchant_name), + self.get_value(self._ID_MERCHANT_CITY, self.merchant_city), + self.get_additional_data_field_template(), + ) + + return "{}{}".format(payload, self.get_crc16(payload)) + def set_pixkey(self, pixkey: str): self.pixkey = pixkey @@ -95,18 +110,3 @@ def get_crc16(self, payload: str): else: crc = crc << 1 return "{}{}{}".format(self._ID_CRC16, "04", self.toHex(crc & 0xFFFF).upper()) - - def get_payload(self): - payload = "{}{}{}{}{}{}{}{}{}".format( - self.get_value(self._ID_PAYLOAD_FORMAT_INDICATOR, "01"), - self.get_merchant_account_information(), - self.get_value(self._ID_MERCHANT_CATEGORY_CODE, "0000"), - self.get_value(self._ID_TRANSACTION_CURRENCY, "986"), - self.get_value(self._ID_TRANSACTION_AMOUNT, self.amount), - self.get_value(self._ID_COUNTRY_CODE, self.country_code), - self.get_value(self._ID_MERCHANT_NAME, self.merchant_name), - self.get_value(self._ID_MERCHANT_CITY, self.merchant_city), - self.get_additional_data_field_template(), - ) - - return "{}{}".format(payload, self.get_crc16(payload)) diff --git a/pyproject.toml b/pyproject.toml index 7b9a008..3befa79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pypix" -version = "0.1.3" +version = "0.1.4" description = "Python library for generating pix codes with CRC16 validation" authors = ["Daniel Yohan "] readme = "README.md"