diff --git a/.cspell.json b/.cspell.json index a106d4ba..96a50ecf 100644 --- a/.cspell.json +++ b/.cspell.json @@ -170,7 +170,7 @@ "equivs", "erikgeiser", "erpdb", - "erpnext", + "jerp", "erpnextcom", "erpnextsmb", "errgo", diff --git a/dashboard/src/assets/erpnext-logo.svg b/dashboard/src/assets/erpnext-logo.svg index e87479c2..1cbcfe54 100644 --- a/dashboard/src/assets/erpnext-logo.svg +++ b/dashboard/src/assets/erpnext-logo.svg @@ -1,10 +1,10 @@ - erpnext-logo + jerp-logo Created with Sketch. -
Jingrow - ERPNext Jingrow diff --git a/press/templates/saas_signup_layout.html b/press/templates/saas_signup_layout.html index 37f39bdb..324bd55c 100644 --- a/press/templates/saas_signup_layout.html +++ b/press/templates/saas_signup_layout.html @@ -3,8 +3,8 @@ {%- block navbar -%} diff --git a/press/utils/billing.py b/press/utils/billing.py index 8c865423..645154f5 100644 --- a/press/utils/billing.py +++ b/press/utils/billing.py @@ -55,19 +55,19 @@ def format_stripe_money(amount, currency): return fmt_money(amount / 100, 2, currency) -def get_erpnext_com_connection(): +def get_jerp.jingrow.com_connection(): from jingrow.frappeclient import FrappeClient jcloude_settings = jingrow.get_single("Jcloude Settings") - erpnext_api_secret = jcloude_settings.get_password("erpnext_api_secret", raise_exception=False) + jerp_api_secret = jcloude_settings.get_password("jerp_api_secret", raise_exception=False) - if not (jcloude_settings.erpnext_api_key and jcloude_settings.erpnext_url and erpnext_api_secret): + if not (jcloude_settings.jerp_api_key and jcloude_settings.jerp_url and jerp_api_secret): jingrow.throw("ERPNext.com URL not set up in Jcloude Settings", exc=CentralServerNotSet) return FrappeClient( - jcloude_settings.erpnext_url, - api_key=jcloude_settings.erpnext_api_key, - api_secret=erpnext_api_secret, + jcloude_settings.jerp_url, + api_key=jcloude_settings.jerp_api_key, + api_secret=jerp_api_secret, ) diff --git a/press/www/stripe/setup-account.html b/press/www/stripe/setup-account.html index 6f57fe20..149469a2 100644 --- a/press/www/stripe/setup-account.html +++ b/press/www/stripe/setup-account.html @@ -164,7 +164,7 @@ Object.assign(form_values, values); return call('jcloude.api.saas.setup_account', { key, business_data: form_values }, $form) .then(() => { - window.location.href = '/prepare-site?key=' + key + '&app=erpnext_smb'; + window.location.href = '/prepare-site?key=' + key + '&app=jerp_smb'; }); } diff --git a/press/www/stripe/signup.html b/press/www/stripe/signup.html index 896e8226..50075082 100644 --- a/press/www/stripe/signup.html +++ b/press/www/stripe/signup.html @@ -39,7 +39,7 @@ onchange="validate_subdomain(this)" />
- .erpnext.com + .jerp.jingrow.com
@@ -200,7 +200,7 @@ function set_subdomain_from_url() { let query_params = jingrow.utils.get_query_params(); if (query_params.domain) { - let subdomain = query_params.domain.replace('.erpnext.com', ''); + let subdomain = query_params.domain.replace('.jerp.jingrow.com', ''); $('input[name="subdomain"]').val(subdomain).trigger('change'); } } @@ -233,8 +233,8 @@ controller.show_input_feedback( 'subdomain', !available - ? `${subdomain}.erpnext.com is already taken` - : `${subdomain}.erpnext.com is available`, + ? `${subdomain}.jerp.jingrow.com is already taken` + : `${subdomain}.jerp.jingrow.com is available`, !available ); }); diff --git a/pyproject.toml b/pyproject.toml index 7d33d7e3..982d4233 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "jcloude" dynamic = ["version"] description = "Managed Jingrow Hosting" authors = [ - {name = "Jingrow", email = "aditya@erpnext.com"} + {name = "Jingrow", email = "aditya@jerp.jingrow.com"} ] readme = "README.md" license = {text = "AGPL-3.0"}