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

Merge pull request #21556 from ankush/fixup_geoip

Browse source 
fix(UX): guess country on setup wizrd
This commit is contained in:
Ankush Menat 2023-07-02 12:33:21 +05:30 • committed by GitHub
commit dde979389c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/auth.py
View file

@ -349,8 +349,6 @@ class CookieManager:
expires = datetime.datetime.now() + datetime.timedelta(days=3)
if frappe.session.sid:
self.set_cookie("sid", frappe.session.sid, expires=expires, httponly=True)
if frappe.session.session_country:
self.set_cookie("country", frappe.session.session_country)
def set_cookie(self, key, value, expires=None, secure=False, httponly=False, samesite="Lax"):
if not secure and hasattr(frappe.local, "request"):

31
frappe/desk/page/setup_wizard/setup_wizard.js
View file

@ -545,15 +545,19 @@ frappe.setup.utils = {
slide.get_input("timezone").empty().add_options(data.all_timezones);
// set values if present
if (frappe.wizard.values.country) {
country_field.set_input(frappe.wizard.values.country);
} else if (data.default_country) {
country_field.set_input(data.default_country);
}
slide.get_field("currency").set_input(frappe.wizard.values.currency);
slide.get_field("timezone").set_input(frappe.wizard.values.timezone);
// set values if present
let country =
frappe.wizard.values.country ||
data.default_country ||
guess_country(frappe.setup.data.regional_data.country_info);
if (country) {
country_field.set_input(country);
$(country_field.input).change();
}
},
bind_language_events: function (slide) {
@ -630,3 +634,16 @@ frappe.setup.utils = {
});
},
};
function guess_country(country_info) {
try {
const system_timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
for ([country, info] of Object.entries(country_info)) {
let possible_timezones = (info.timezones || []).filter((t) => t == system_timezone);
if (possible_timezones.length) return country;
}
} catch (e) {
console.log("Could not guess country", e);
}
}

3
frappe/sessions.py
View file

@ -236,9 +236,6 @@ class Session:
"session_expiry": get_expiry_period(),
"full_name": self.full_name,
"user_type": self.user_type,
"session_country": get_geo_ip_country(frappe.local.request_ip)
if frappe.local.request_ip
else None,
}
)