nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fetch token if not valid

Browse Source
This commit is contained in:
Saqib Ansari
2020-10-07 12:26:45 +05:30
committed by Deepesh Garg
parent fb33f7d3c3
commit 96bd2f72d0
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/regional/india/e_invoice_utils.py
View File

@@ -15,8 +15,8 @@ from Crypto.Util.Padding import pad, unpad
from frappe.model.document import Document from frappe.model.document import Document
from frappe import _, get_module_path, scrub from frappe import _, get_module_path, scrub
from erpnext.regional.india.utils import get_gst_accounts from erpnext.regional.india.utils import get_gst_accounts
from frappe.utils.data import get_datetime, cstr, cint, format_date, flt
from frappe.integrations.utils import make_post_request, make_get_request from frappe.integrations.utils import make_post_request, make_get_request
from frappe.utils.data import get_datetime, cstr, cint, format_date, flt, time_diff_in_seconds, now_datetime
def validate_einvoice_fields(doc): def validate_einvoice_fields(doc):
e_invoice_enabled = frappe.db.get_value("E Invoice Settings", "E Invoice Settings", "enable") e_invoice_enabled = frappe.db.get_value("E Invoice Settings", "E Invoice Settings", "enable")
@@ -29,8 +29,13 @@ def validate_einvoice_fields(doc):
elif doc.docstatus == 2 and doc._action == 'cancel' and not doc.irn_cancelled: elif doc.docstatus == 2 and doc._action == 'cancel' and not doc.irn_cancelled:
frappe.throw(_("You must cancel IRN before cancelling the document."), title=_("Cancel Not Allowed")) frappe.throw(_("You must cancel IRN before cancelling the document."), title=_("Cancel Not Allowed"))
def get_einv_credentials(): def get_einv_credentials(for_token=False):
return frappe.get_doc("E Invoice Settings") creds = frappe.get_doc("E Invoice Settings")
if not for_token and (not creds.token_expiry or time_diff_in_seconds(now_datetime(), creds.token_expiry) > 5.0):
fetch_token()
creds.load_from_db()
return creds
def rsa_encrypt(msg, key): def rsa_encrypt(msg, key):
if not (isinstance(msg, bytes) or isinstance(msg, bytearray)): if not (isinstance(msg, bytes) or isinstance(msg, bytearray)):
@@ -78,7 +83,7 @@ def get_header(creds):
@frappe.whitelist() @frappe.whitelist()
def fetch_token(): def fetch_token():
einv_creds = get_einv_credentials() einv_creds = get_einv_credentials(for_token=True)
endpoint = 'https://einv-apisandbox.nic.in/eivital/v1.03/auth' endpoint = 'https://einv-apisandbox.nic.in/eivital/v1.03/auth'
headers = { 'content-type': 'application/json' } headers = { 'content-type': 'application/json' }
@@ -270,11 +275,13 @@ def get_doc_details(invoice):
def get_party_gstin_details(party_address): def get_party_gstin_details(party_address):
address = frappe.get_all("Address", filters={"name": party_address}, fields=["*"])[0] address = frappe.get_all("Address", filters={"name": party_address}, fields=["*"])[0]
# gstin_details = get_gstin_details(gstin)
gstin = address.get('gstin') gstin = address.get('gstin')
legal_name = address.get('address_title') gstin_details = get_gstin_details(gstin)
# trade_name = gstin_details.get('TradeName') # legal_name = address.get('address_title')
location = address.get('city') legal_name = gstin_details.get('LegalName')
trade_name = gstin_details.get('TradeName')
# location = address.get('city')
location = gstin_details.get('Loc')
state_code = address.get('gst_state_number') state_code = address.get('gst_state_number')
pincode = cint(address.get('pincode')) pincode = cint(address.get('pincode'))
address_line1 = address.get('address_line1') address_line1 = address.get('address_line1')

3
erpnext/regional/india/einvoice.js
View File

@@ -157,7 +157,8 @@ erpnext.setup_einvoice_actions = (doctype) => {
primary_action_label: __('Download JSON') primary_action_label: __('Download JSON')
}); });
d.show(); d.show();
}, "E-Invoicing"); }, "E-Invoicing");
frm.add_custom_button( frm.add_custom_button(
"Upload Cancel JSON", "Upload Cancel JSON",
() => { () => {