From da7e0f8f1dc4d193c020396c335d86443cbaf7db Mon Sep 17 00:00:00 2001 From: jingrow Date: Tue, 23 Dec 2025 23:04:51 +0800 Subject: [PATCH] update erpnext to jerp --- .cspell.json | 2 +- dashboard/src/assets/erpnext-logo.svg | 4 +- .../components/BuyPrepaidCreditsStripe.vue | 2 +- dashboard/src/components/InvoiceTable.vue | 2 +- dashboard/src/components/NavigationItems.vue | 2 +- .../components/billing/BuyCreditsStripe.vue | 2 +- .../components/partners/LinkCertificate.vue | 2 +- .../partners/PartnerCertificateRequest.vue | 2 +- .../settings/RoleConfigureDialog.vue | 2 +- .../components/settings/RoleCreateDialog.vue | 2 +- .../settings/profile/AccountPartner.vue | 2 +- .../src/pages/PartnerAdminCertificates.vue | 2 +- dashboard/src/pages/PartnerNewPayout.vue | 2 +- dashboard/src/pages/Partners.vue | 20 ++++---- deployment/nginx.conf | 6 +-- .../Marketplace Review Process.MD | 2 +- press/agent.py | 4 +- press/api/account.py | 2 +- press/api/billing.py | 6 +-- press/api/central.py | 14 +++--- press/api/marketplace.py | 2 +- press/api/oauth.py | 2 +- press/api/partner.py | 18 +++---- press/api/regional_payments/mpesa/utils.py | 4 +- press/api/saas.py | 12 ++--- press/api/tests/test_site.py | 30 +++++------ press/bootstrap.py | 8 +-- press/fixtures/agent_job_type.json | 2 +- press/hooks.py | 2 +- .../marketplace_app_subscription.py | 2 +- .../doctype/partner_lead/partner_lead.json | 4 +- .../doctype/partner_lead/partner_lead.py | 2 +- .../v0_0_1/create_balance_transactions.py | 2 +- .../v0_0_1/enable_partner_privileges.py | 4 +- press/patches/v0_0_1/new_onboarding.py | 2 +- .../v0_0_1/set_cluster_in_press_settings.py | 2 +- .../roles/warning_banners/files/motd.j2 | 2 +- press/press/custom/address.json | 18 +++---- .../account_request/account_request.json | 4 +- .../account_request/account_request.py | 4 +- .../account_request/test_account_request.py | 4 +- press/press/doctype/agent_job/agent_job.py | 6 +-- press/press/doctype/app/test_app.py | 12 ++--- press/press/doctype/app_source/app_source.py | 4 +- .../doctype/app_source/test_app_source.py | 2 +- .../deploy_candidate/test_deploy_candidate.py | 10 ++-- press/press/doctype/drip_email/drip_email.py | 8 +-- .../erpnext_consultant/erpnext_consultant.py | 8 +-- .../press_settings/press_settings.json | 50 +++++++++---------- .../doctype/press_settings/press_settings.py | 18 +++---- .../doctype/release_group/release_group.py | 2 +- .../release_group/test_release_group.py | 16 +++--- .../test_self_hosted_server.py | 4 +- press/press/doctype/site/erpnext_site.py | 48 +++++++++--------- press/press/doctype/site/pool.py | 14 +++--- press/press/doctype/site/site.json | 8 +-- press/press/doctype/site/site.py | 10 ++-- press/press/doctype/site/sync.py | 2 +- press/press/doctype/site/test_site.py | 14 +++--- .../site_analytics/site_analytics.json | 4 +- .../doctype/site_migration/site_migration.py | 2 +- .../site_migration/test_site_migration.py | 2 +- .../doctype/team/patches/set_partner_email.py | 2 +- press/press/doctype/team/suspend_sites.py | 2 +- press/press/doctype/team/team.js | 6 +-- press/press/doctype/team/team.json | 16 +++--- press/press/doctype/team/team.py | 24 ++++----- .../tls_certificate/test_tls_certificate.py | 10 ++-- .../shared_app_server_stats.py | 2 +- press/saas/README.md | 2 +- press/saas/api/readme.md | 2 +- press/saas/doctype/saas_app/saas_app.py | 2 +- .../saas_app_subscription.py | 4 +- .../doctype/saas_settings/saas_settings.py | 2 +- press/scripts/weekend_support.py | 6 +-- press/templates/marketplace/footer.html | 2 +- press/templates/saas_signup_layout.html | 4 +- press/utils/billing.py | 12 ++--- press/www/stripe/setup-account.html | 2 +- press/www/stripe/signup.html | 8 +-- pyproject.toml | 2 +- 81 files changed, 283 insertions(+), 283 deletions(-) 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"}