vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into develop

Browse source
This commit is contained in:
Saurabh 2017-11-03 17:01:07 +05:30
commit 9a6424bfdb
6 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '9.2.5'
__version__ = '9.2.6'
__title__ = "Frappe Framework"
local = Local()

14
frappe/core/doctype/block_module/block_module.json
View file

@ -1,5 +1,6 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"beta": 0,
@ -11,16 +12,20 @@
"editable_grid": 1,
"fields": [
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "module",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Module",
"length": 0,
"no_copy": 0,
@ -30,6 +35,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@ -37,17 +43,17 @@
"unique": 0
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
"modified": "2016-07-11 03:27:58.240564",
"modified": "2017-10-31 19:36:18.586834",
"modified_by": "Administrator",
"module": "Core",
"name": "Block Module",
@ -57,7 +63,9 @@
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 0,
"track_seen": 0
}

2
frappe/core/doctype/sms_settings/sms_settings.json
View file

@ -202,7 +202,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2017-10-23 12:57:20.943845",
"modified": "2017-11-01 12:57:20.943845",
"modified_by": "Administrator",
"module": "Core",
"name": "SMS Settings",

27
frappe/core/doctype/sms_settings/sms_settings.py
View file

@ -64,18 +64,17 @@ def send_sms(receiver_list, msg, sender_name = '', success_msg = True):
def send_via_gateway(arg):
ss = frappe.get_doc('SMS Settings', 'SMS Settings')
headers = get_headers(ss)
args = {ss.message_parameter: arg.get('message')}
headers={'Accept': "text/plain, text/html, */*"}
for d in ss.get("parameters"):
if d.header == 1:
headers.update({d.parameter: d.value})
continue
args[d.parameter] = d.value
if not d.header:
args[d.parameter] = d.value
success_list = []
for d in arg.get('receiver_list'):
args[ss.receiver_parameter] = d
status = send_request(ss.sms_gateway_url, headers, args, ss.use_post)
status = send_request(ss.sms_gateway_url, args, headers, ss.use_post)
if 200 <= status < 300:
success_list.append(d)
@ -86,9 +85,23 @@ def send_via_gateway(arg):
if arg.get('success_msg'):
frappe.msgprint(_("SMS sent to following numbers: {0}").format("\n" + "\n".join(success_list)))
def get_headers(sms_settings=None):
if not sms_settings:
sms_settings = frappe.get_doc('SMS Settings', 'SMS Settings')
def send_request(gateway_url, headers, params, use_post=False):
headers={'Accept': "text/plain, text/html, */*"}
for d in sms_settings.get("parameters"):
if d.header == 1:
headers.update({d.parameter: d.value})
return headers
def send_request(gateway_url, params, headers=None, use_post=False):
import requests
if not headers:
headers = get_headers()
if use_post:
response = requests.post(gateway_url, headers=headers, data=params)
else:

2
frappe/core/doctype/user/user.py
View file

@ -938,7 +938,7 @@ def send_token_via_sms(tmp_id,phone_no=None,user=None):
return False
args[ss.receiver_parameter] = usr_phone
status = send_request(ss.sms_gateway_url, args)
status = send_request(ss.sms_gateway_url, args, use_post=ss.use_post)
if 200 <= status < 300:
frappe.cache().delete(tmp_id + '_token')

4
frappe/twofactor.py
View file

@ -255,7 +255,6 @@ def get_link_for_qrcode(user, totp_uri):
def send_token_via_sms(otpsecret, token=None, phone_no=None):
'''Send token as sms to user.'''
otp_issuer = frappe.db.get_value('System Settings', 'System Settings', 'otp_issuer_name')
try:
from frappe.core.doctype.sms_settings.sms_settings import send_request
except:
@ -280,7 +279,8 @@ def send_token_via_sms(otpsecret, token=None, phone_no=None):
sms_args = {
'params': args,
'gateway_url': ss.sms_gateway_url
'gateway_url': ss.sms_gateway_url,
'use_post': ss.use_post
}
enqueue(method=send_request, queue='short', timeout=300, event=None,
async=True, job_name=None, now=False, **sms_args)