Commit graph

47912 commits

Author SHA1 Message Date
Shariq Ansari
eece201ea9 fix: changed Billing page name to Overview 2024-11-16 13:11:58 +05:30
Shariq Ansari
78870ba10b fix: added user dropdown and made sidebar static 2024-11-16 13:07:48 +05:30
Shariq Ansari
b77810322d fix: added billing.py to handle csrf token issue 2024-11-15 20:47:13 +05:30
Shariq Ansari
eb55ff194a fix: removed TrialBanner component and used css variables instead of hard coded values 2024-11-15 18:24:52 +05:30
Shariq Ansari
5bfc2e7f58 refactor: trial banner class naming 2024-11-15 16:46:44 +05:30
Shariq Ansari
681b2b0186 fix: do not show billing page if setup not completed or not system manager 2024-11-15 16:27:08 +05:30
Shariq Ansari
1001f1fe0e fix: added trial banner in desk 2024-11-15 16:09:17 +05:30
Shariq Ansari
167929ffd7 fix: added manage billing button in navbar settings dropdown 2024-11-15 14:32:05 +05:30
Shariq Ansari
a78bcc4566 fix: allow adding condition (js) in navbar settings dropdown 2024-11-15 14:31:34 +05:30
Shariq Ansari
fb0a19bd03 chore: linter fix 2024-11-14 21:50:00 +05:30
Shariq Ansari
a305984216 fix: show confirmation message before changing plan 2024-11-14 21:42:39 +05:30
Shariq Ansari
c109306169 fix: allow adding component in dialog 2024-11-14 21:38:51 +05:30
Shariq Ansari
2cafc7fb09 fix: cache cards 2024-11-14 20:47:01 +05:30
Shariq Ansari
b4b890ec35 fix: moved set as default option in menu 2024-11-14 20:44:45 +05:30
Shariq Ansari
a0d14a4547 fix: renamed BillingHistory to Invoices 2024-11-14 20:37:36 +05:30
Shariq Ansari
e1c64ed3f0 fix: added cards list 2024-11-14 19:53:49 +05:30
Shariq Ansari
d96b313fba refactor: moved team provide to App.vue 2024-11-14 19:53:14 +05:30
Shariq Ansari
37a5e0eddb fix: show PageNotFound page if not fc site 2024-11-14 17:49:01 +05:30
Shariq Ansari
d9e4e9ff9d
Merge branch 'frappe:develop' into billing 2024-11-14 16:33:11 +05:30
Shariq Ansari
6c26226278 chore: Updated README.md 2024-11-14 16:29:20 +05:30
Shariq Ansari
61caa8324d fix: post install also install billing dependencies
moved build command from esbuild.js to build.py
2024-11-14 16:08:26 +05:30
Akhil Narang
3dff39946d
Merge pull request #28448 from blaggacao/fix/test-environment-user-idempotency
fix(testing)!: ensure idempotency on the test environment user
2024-11-14 15:36:58 +05:30
Shariq Ansari
3cee6234d3 chore: linter fix 2024-11-14 14:19:56 +05:30
Shariq Ansari
2b74539d4e chore: fixed union pay & jcb logo 2024-11-14 13:01:31 +05:30
Shariq Ansari
a4de6b1d5b chore: changed billing icon 2024-11-14 12:19:58 +05:30
David Arnold
057139ea2e
chore(communication): cleanup unused code (#28199)
* chore: feedback doctype no longer exists

missed from https://github.com/frappe/frappe/pull/17479

* chore: remove unused communication type

This was removed and migrated already in v12:

```
frappe/patches/v12_0/setup_comments_from_communications.py:	frappe.db.delete("Communication", {"communication_type": "Comment"})
```
... comming from 41d90fa6d1
which effectively reverted 465318878e
2024-11-14 00:12:14 +01:00
David Arnold
786106d45e
fix: full compat mode for FrappeTestCase on run-tests cmd (#28457) 2024-11-13 17:54:14 +01:00
David Arnold
aa41cbad76
fix(testing): tolerate missing app.tests module (#28456) 2024-11-13 16:19:39 +00:00
Akhil Narang
fa3fe0e75e
Merge pull request #28449 from barredterra/get-pdf
fix: get PDF from printview
2024-11-13 17:58:14 +05:30
Raffael Meyer
3f63583215
fix: print_format can be None
Co-authored-by: Akhil Narang <me@akhilnarang.dev>
2024-11-13 12:14:25 +01:00
Akhil Narang
9700c10ba7
Merge pull request #28447 from akhilnarang/changelog-skip-develop
fix(change_log): skip checking if `develop` is part of the detected version
2024-11-13 16:41:58 +05:30
David Arnold
9095c6f6d1
fix: finer grained test categorization of legacy frappe test case (#28387) 2024-11-13 11:30:09 +01:00
barredterra
834c31aa52 fix: get PDF from printview
Clicking "Get PDF" in printview should result in the same view being converted to PDF. So far, we didn't pass the print format and letterhead, sometimes resulting in an entirely different PDF.
2024-11-13 11:22:59 +01:00
David
087b26dd59
deprecate: setting Administrator by test runner 2024-11-13 11:20:11 +01:00
David
b20fc4856b
chore: add depr to commit types for deprecation decisions 2024-11-13 11:20:10 +01:00
David
e2f5536f08
fix(testing): ensure idempotency on the test environment user 2024-11-13 10:42:19 +01:00
Akhil Narang
504ef2e9e4
Merge pull request #28401 from barredterra/wrong-enc-key
fix(Login): don't prevent login if encryption key is invalid
2024-11-13 13:55:47 +05:30
Akhil Narang
d7b74e9d30
fix(change_log): skip checking if develop is part of the detected version
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-11-13 13:26:46 +05:30
Shariq Ansari
7b7eafc188 fix: implemented Billing, Plans, Invoices in sidebar - body layout 2024-11-13 12:08:30 +05:30
Akhil Narang
a01e779a74
Merge pull request #28391 from blaggacao/fix/dont-deprecate-json-test-records
fix: revert deprecation of json test records
2024-11-13 11:25:06 +05:30
David Arnold
8051652c19
ci: smooth transition when adding mypy support for old PRs (#28442) 2024-11-12 14:35:03 +00:00
David Arnold
3fe8a0d35e
docs: docstring on simple singledipatch util (#28437) 2024-11-12 11:52:19 +01:00
Akhil Narang
7d95f4577c
Merge pull request #28436 from frappe/mergify/bp/develop/pr-28249
fix: Resolve App Logo considering Website & Navbar Settings  (backport #28249)
2024-11-12 15:48:44 +05:30
Akhil Narang
6aeccbb669 chore: format
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit ddc0d6007c2dd93a177717eec4178fb4db4d3620)
2024-11-12 10:01:43 +00:00
gavin
bdaa979159 chore: "or" over "if not" pattern
Co-authored-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit e7e7ee0ec15d73c1e59cc34b93253ad21d619e0a)
2024-11-12 10:01:43 +00:00
Maverjk Carter
ae1c887b58 fix: check app logo from website settings before checking navbar settings
(cherry picked from commit 3db7f7a674930c864fa0aa6ed89cc43d2e32c46f)
2024-11-12 10:01:43 +00:00
Akhil Narang
4353a7991d
Merge pull request #28428 from frappe/l10n_develop
fix: sync translations from crowdin
2024-11-12 15:18:59 +05:30
Akhil Narang
f0cb96dc3d
Merge pull request #28411 from 628426/develop
fix: is_frappe_app check not wai for --soft-link apps
2024-11-12 15:18:18 +05:30
Akhil Narang
baa6674266
Merge pull request #28430 from akhilnarang/newsletter-attachments-public
chore(newsletter): make attachments public
2024-11-12 13:07:03 +05:30
Akhil Narang
e5be90beb8
chore(newsletter): make attachments public
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-11-12 12:43:38 +05:30