From b651393a01adfdfbbb9ffde3cf7970e68ff3913d Mon Sep 17 00:00:00 2001 From: ndeet Date: Tue, 9 Jul 2024 11:57:19 +0200 Subject: [PATCH 1/5] Adding odoo to docs. --- .gitignore | 1 + docs/.vuepress/config.js | 1 + docs/.vuepress/preprocessMarkdown.js | 3 ++- setup-deps.sh | 20 ++++++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index aefe9936a8..1e5ab7237f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ /docs/TicketTailor /docs/Trocador /docs/Wabisabi +/docs/Odoo /docs/.vuepress/public/API/Greenfield/**/*.json # Files copied from external repos diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 7479e69b4d..c33f099284 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -121,6 +121,7 @@ const sidebarUserGuide = [ ['/Nopcommerce/', 'Nopcommerce'], ['/Xenforo/', 'Xenforo'], ['/InvoiceNinja', 'Invoice Ninja'], + ['/Odoo/', 'Odoo'], ['/CustomIntegration', 'Custom Integration'] ] }, diff --git a/docs/.vuepress/preprocessMarkdown.js b/docs/.vuepress/preprocessMarkdown.js index b410996512..0ad693c5c0 100644 --- a/docs/.vuepress/preprocessMarkdown.js +++ b/docs/.vuepress/preprocessMarkdown.js @@ -16,7 +16,8 @@ const EXTERNAL_DOCS = { Smartstore: 'https://github.com/btcpayserver/Smartstore.BTCPayServer.git', Grandnode: 'https://github.com/btcpayserver/grandnode.git', Nopcommerce: 'https://github.com/btcpayserver/nopcommerce.git', - Xenforo: 'https://github.com/btcpayserver/xenforo.git' + Xenforo: 'https://github.com/btcpayserver/xenforo.git', + Odoo: 'https://github.com/btcpayserver/odoo.git' } const replaceExternalRepoLinks = (source, externalRepoUrl, resourcePath) => { diff --git a/setup-deps.sh b/setup-deps.sh index 14b8a3d400..83e063ffb9 100755 --- a/setup-deps.sh +++ b/setup-deps.sh @@ -21,6 +21,7 @@ BOLTCARDPLUGIN_DIR="$BASE_DIR/deps/boltcardplugin" ROCKSTAR_DIR="$BASE_DIR/deps/rockstar" NOPCOMMERCE_DIR="$BASE_DIR/deps/nopcommerce" XENFORO_DIR="$BASE_DIR/deps/xenforo" +ODOO_DIR="$BASE_DIR/deps/odoo" update_external() { file="$1" @@ -303,6 +304,25 @@ for file in "$DOCS_DIR"/Xenforo/*.md; do update_external "$file" https://github.com/btcpayserver/xenforo.git "$DOCS_DIR"/Xenforo/ done +# Odoo + +echo "Setup dependency: Odoo" + +rm -rf "$DOCS_DIR/Odoo" +mkdir -p "$DOCS_DIR/Odoo" + +if [ ! -d "$ODOO_DIR" ]; then + git clone https://github.com/btcpayserver/odoo.git "$ODOO_DIR" +else + cd "$ODOO_DIR" && git checkout 17.0 && git pull +fi + +cd "$ODOO_DIR" +cp -r README.md "$DOCS_DIR/Odoo" +for file in "$DOCS_DIR"/Odoo/*.md; do + update_external "$file" https://github.com/btcpayserver/odoo.git "$DOCS_DIR"/Odoo/ +done + # Kukks' plugins From 1fb1694a44f78fa711c18d7dc3b0e4f7dbb46d8e Mon Sep 17 00:00:00 2001 From: ndeet Date: Tue, 16 Jul 2024 14:51:05 +0200 Subject: [PATCH 2/5] Set Odoo 17 as default documentation. --- setup-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-deps.sh b/setup-deps.sh index 83e063ffb9..4beee7a1d4 100755 --- a/setup-deps.sh +++ b/setup-deps.sh @@ -318,7 +318,7 @@ else fi cd "$ODOO_DIR" -cp -r README.md "$DOCS_DIR/Odoo" +cp -r payment_btcpay/README.md "$DOCS_DIR/Odoo" for file in "$DOCS_DIR"/Odoo/*.md; do update_external "$file" https://github.com/btcpayserver/odoo.git "$DOCS_DIR"/Odoo/ done From 3e03b0b9b697364a0355af30770bd70dc9dcb498 Mon Sep 17 00:00:00 2001 From: ndeet Date: Tue, 16 Jul 2024 15:18:57 +0200 Subject: [PATCH 3/5] Trigger build. --- setup-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-deps.sh b/setup-deps.sh index 4beee7a1d4..05463a4b1e 100755 --- a/setup-deps.sh +++ b/setup-deps.sh @@ -306,7 +306,7 @@ done # Odoo -echo "Setup dependency: Odoo" +echo "Setup dependency: Odoo 17" rm -rf "$DOCS_DIR/Odoo" mkdir -p "$DOCS_DIR/Odoo" From 6f5ea42966ba6a53c0251038553f9b5be5e456fe Mon Sep 17 00:00:00 2001 From: ndeet Date: Wed, 17 Jul 2024 16:55:58 +0200 Subject: [PATCH 4/5] Trigger build. --- setup-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-deps.sh b/setup-deps.sh index 05463a4b1e..162cdb798e 100755 --- a/setup-deps.sh +++ b/setup-deps.sh @@ -306,7 +306,7 @@ done # Odoo -echo "Setup dependency: Odoo 17" +echo "Setup dependency: Odoo 16 and 17" rm -rf "$DOCS_DIR/Odoo" mkdir -p "$DOCS_DIR/Odoo" From c777d01592a7650c3c606d9de142d61c7c9d7464 Mon Sep 17 00:00:00 2001 From: ndeet Date: Tue, 1 Oct 2024 11:54:55 +0200 Subject: [PATCH 5/5] Fix renamed btcpayserver directory name. --- setup-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-deps.sh b/setup-deps.sh index 162cdb798e..23e4b8e3b4 100755 --- a/setup-deps.sh +++ b/setup-deps.sh @@ -318,7 +318,7 @@ else fi cd "$ODOO_DIR" -cp -r payment_btcpay/README.md "$DOCS_DIR/Odoo" +cp -r payment_btcpayserver/README.md "$DOCS_DIR/Odoo" for file in "$DOCS_DIR"/Odoo/*.md; do update_external "$file" https://github.com/btcpayserver/odoo.git "$DOCS_DIR"/Odoo/ done