Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7f7cacc448 | |||
|
fa2a81ecd1
|
|||
|
8e0554572b
|
|||
|
3213a5a400
|
|||
| 5c36ce7dbb | |||
| 9600bc8fd3 | |||
| defd078e4b |
@@ -1,4 +1,4 @@
|
||||
name: Build and publish
|
||||
name: build
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -7,49 +7,18 @@ on:
|
||||
pull_request:
|
||||
branches: [main]
|
||||
|
||||
# Required secrets:
|
||||
# REGISTRY git.librete.ch
|
||||
# REGISTRY_USER libretech-bot
|
||||
# REGISTRY_PASS bot PAT (write:package; bot is in libreshop Owners team)
|
||||
# Required variable:
|
||||
# PUBLISH_ENABLED "true" to actually push (off = build-only on PRs)
|
||||
#
|
||||
# Image: git.librete.ch/libreshop/cms
|
||||
# main pushes → :main + :sha-<short>
|
||||
# tag pushes → :<tag> + :latest
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: git.librete.ch/libretech/runner-image:v1
|
||||
image: git.librete.ch/public/runner-image:v0.2.0@sha256:f60c587d3c0b0aac04a572db5349e27672bf76baec2ce547a3dcc28cebcf1b7e
|
||||
timeout-minutes: 20
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login (only when publishing)
|
||||
if: ${{ vars.PUBLISH_ENABLED == 'true' }}
|
||||
uses: docker/login-action@v3
|
||||
- uses: https://git.librete.ch/public/actions/.gitea/actions/docker-build@main
|
||||
with:
|
||||
registry: ${{ secrets.REGISTRY }}
|
||||
username: ${{ secrets.REGISTRY_USER }}
|
||||
password: ${{ secrets.REGISTRY_PASS }}
|
||||
|
||||
- id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ secrets.REGISTRY }}/libreshop/cms
|
||||
tags: |
|
||||
type=ref,event=branch
|
||||
type=ref,event=tag
|
||||
type=sha,format=short
|
||||
type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
|
||||
|
||||
- uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
push: ${{ vars.PUBLISH_ENABLED == 'true' && github.event_name == 'push' }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
registry_user: ${{ secrets.REGISTRY_USER }}
|
||||
registry_pass: ${{ secrets.REGISTRY_PASS }}
|
||||
publish: ${{ github.event_name == 'push' && vars.PUBLISH_ENABLED == 'true' }}
|
||||
|
||||
21
CHANGELOG.md
21
CHANGELOG.md
@@ -2,7 +2,26 @@
|
||||
|
||||
All notable changes to libreshop/cms are documented here.
|
||||
|
||||
## Unreleased
|
||||
## [0.1.1] - 2026-04-29
|
||||
|
||||
### Changed
|
||||
|
||||
- White-label email templates: replace all hardcoded muellerprints company
|
||||
identity (name, contact, address, phone, email, logo URLs) with
|
||||
`<%= shopName %>` / `<%= shopContactName %>` / `<%= shopAddress %>` /
|
||||
`<%= shopPhone %>` / `<%= shopEmail %>` / `<%= shopLogoUrl %>` /
|
||||
`<%= shopSecondaryLogoUrl %>` template variables, sourced from env vars
|
||||
`SHOP_NAME`, `SHOP_CONTACT_NAME`, `SHOP_ADDRESS`, `SHOP_PHONE`,
|
||||
`SHOP_EMAIL`, `SHOP_LOGO_URL`, `SHOP_SECONDARY_LOGO_URL`.
|
||||
- `config/constants.ts`: export shop brand constants from env.
|
||||
- `src/api/order/services/order.ts`: inject shop context into template calls.
|
||||
- `config/plugins.ts`: API doc title/description driven by `API_TITLE` /
|
||||
`API_DESCRIPTION` env vars (defaults: `"Paperwork API"`).
|
||||
- `src/extensions/documentation/config/settings.json`: neutral placeholder.
|
||||
|
||||
Closes #1
|
||||
|
||||
## [0.1.0] - 2026-04-29
|
||||
|
||||
- Extracted from `mp/cms/` (2026-04-29). The component history before
|
||||
the extraction lives in the `muellerprints` repository.
|
||||
|
||||
@@ -10,6 +10,14 @@ export const paypalEnvironment = process.env.PAYPAL_ENVIRONMENT! === "production
|
||||
|
||||
export const adminEmail = process.env.ADMIN_EMAIL_ADDRESS!;
|
||||
|
||||
export const shopName = process.env.SHOP_NAME ?? "Shop";
|
||||
export const shopContactName = process.env.SHOP_CONTACT_NAME ?? "";
|
||||
export const shopAddress = process.env.SHOP_ADDRESS ?? "";
|
||||
export const shopPhone = process.env.SHOP_PHONE ?? "";
|
||||
export const shopEmail = process.env.SHOP_EMAIL ?? process.env.ADMIN_EMAIL_ADDRESS ?? "";
|
||||
export const shopLogoUrl = process.env.SHOP_LOGO_URL ?? "";
|
||||
export const shopSecondaryLogoUrl = process.env.SHOP_SECONDARY_LOGO_URL ?? "";
|
||||
|
||||
// TODO: Should be retrieved from DepotApi
|
||||
export const vatIncludedDecimal = 1.19;
|
||||
// TODO: Should be retrieved from DepotApi
|
||||
|
||||
@@ -10,15 +10,11 @@ export default ({ env }) => ({
|
||||
openapi: "3.0.1",
|
||||
info: {
|
||||
version: "1.0.0",
|
||||
title: "MUELLERPTINTS. Paperwork",
|
||||
description: "API Documentation for MUELLERPRINTS. Paperwork",
|
||||
title: env("API_TITLE", "Paperwork API"),
|
||||
description: env("API_DESCRIPTION", "Paperwork API"),
|
||||
termsOfService: false,
|
||||
contact: {
|
||||
name: "Michael W. Czechowski",
|
||||
email: "mail@dailysh.it",
|
||||
url: "https://dailysh.it"
|
||||
},
|
||||
license: "Copyright (C) 2024 Michael W. Czechowski",
|
||||
contact: false,
|
||||
license: false,
|
||||
externalDocs: false
|
||||
},
|
||||
"x-strapi-config": {
|
||||
|
||||
@@ -3,7 +3,7 @@ import fs from "fs";
|
||||
import { factories } from "@strapi/strapi";
|
||||
import { sanitize } from "@strapi/utils";
|
||||
import { ID } from "@strapi/database/dist/types";
|
||||
import { vatDecimal, vatIncludedDecimal, baseUrl, adminEmail } from "../../../../config/constants";
|
||||
import { vatDecimal, vatIncludedDecimal, baseUrl, adminEmail, shopName, shopContactName, shopAddress, shopPhone, shopEmail, shopLogoUrl, shopSecondaryLogoUrl } from "../../../../config/constants";
|
||||
import { calculateTotalProductPrice, productDefaultParams } from "../../product/services/product";
|
||||
import { CartProduct, Order, PdfBody } from "../../../../types";
|
||||
import { pdfApi } from "../../../services/PdfApi";
|
||||
@@ -81,12 +81,13 @@ export default factories.createCoreService("api::order.order", ({ strapi }) => (
|
||||
strapi.log.info(`app:i:order-service: - Sending invoice for order ${uuid}`);
|
||||
const oderUnsafe = (await strapi.service("api::order.order").findOneByUuid(uuid)) as Partial<Order>;
|
||||
|
||||
const shopContext = { shopName, shopContactName, shopAddress, shopPhone, shopEmail, shopLogoUrl, shopSecondaryLogoUrl };
|
||||
try {
|
||||
const emailConfig: MessageBody = {
|
||||
to_email: oderUnsafe.email,
|
||||
subject: template(invoiceEmailTemplate.subject)(oderUnsafe),
|
||||
message: template(invoiceEmailTemplate.text)({ baseUrl, ...oderUnsafe }),
|
||||
html: template(invoiceEmailTemplate.html)({ baseUrl, ...oderUnsafe })
|
||||
subject: template(invoiceEmailTemplate.subject)({ ...shopContext, ...oderUnsafe }),
|
||||
message: template(invoiceEmailTemplate.text)({ baseUrl, ...shopContext, ...oderUnsafe }),
|
||||
html: template(invoiceEmailTemplate.html)({ baseUrl, ...shopContext, ...oderUnsafe })
|
||||
};
|
||||
|
||||
strapi.log.debug(`app:d:order-service: - Email config ${emailConfig.html}`);
|
||||
@@ -118,12 +119,13 @@ export default factories.createCoreService("api::order.order", ({ strapi }) => (
|
||||
sendDeliveryNote: async (uuid: string, blob?: ArrayBuffer) => {
|
||||
strapi.log.info(`app:i:order-service: - Sending delivery note for order ${uuid}`);
|
||||
const oderUnsafe = (await strapi.service("api::order.order").findOneByUuid(uuid)) as Partial<Order>;
|
||||
const shopContext = { shopName, shopContactName, shopAddress, shopPhone, shopEmail, shopLogoUrl, shopSecondaryLogoUrl };
|
||||
try {
|
||||
const emailConfig: MessageBody = {
|
||||
to_email: oderUnsafe.email,
|
||||
subject: template(deliveryNoteEmailTemplate.subject)(oderUnsafe),
|
||||
message: template(deliveryNoteEmailTemplate.text)(oderUnsafe),
|
||||
html: template(deliveryNoteEmailTemplate.html)({ ...oderUnsafe, baseUrl })
|
||||
subject: template(deliveryNoteEmailTemplate.subject)({ ...shopContext, ...oderUnsafe }),
|
||||
message: template(deliveryNoteEmailTemplate.text)({ ...shopContext, ...oderUnsafe }),
|
||||
html: template(deliveryNoteEmailTemplate.html)({ baseUrl, ...shopContext, ...oderUnsafe })
|
||||
};
|
||||
await mailApi.sendTextMessage(emailConfig);
|
||||
strapi.log.info(`app:i:order-service: ✔ Sending delivery note for order ${uuid}`);
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
"openapi": "3.0.1",
|
||||
"info": {
|
||||
"version": "1.0.0",
|
||||
"title": "MUELLERPTINTS. Paperwork",
|
||||
"description": "API Documentation for MUELLERPRINTS. Paperwork",
|
||||
"title": "Paperwork API",
|
||||
"description": "Paperwork API",
|
||||
"termsOfService": false,
|
||||
"contact": false,
|
||||
"license": false
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
export const invoiceEmailTemplate = {
|
||||
subject: "MUELLERPRINTS Rechnungsnummer <%= invoiceNumber %>",
|
||||
subject: "<%= shopName %> Rechnungsnummer <%= invoiceNumber %>",
|
||||
text: `Rechnungsnummer: <%= invoiceNumber %>
|
||||
Ausstellungsdatum: <%= new Date(acceptedTermsAndConditionsAt).toLocaleDateString("de-DE") %>
|
||||
|
||||
@@ -7,7 +7,7 @@ Ausstellungsdatum: <%= new Date(acceptedTermsAndConditionsAt).toLocaleDateString
|
||||
|
||||
Hallo <%= invoiceAddressStructured.givenName %>,
|
||||
|
||||
vielen Dank für deinen Einkauf bei MUELLERPRINTS.
|
||||
vielen Dank für deinen Einkauf bei <%= shopName %>.
|
||||
|
||||
Deine Bestellnummer: <%= id %>
|
||||
Zur Bestellübersicht: <%= baseUrl %>/checkout/result/<%= uuid %>
|
||||
@@ -49,14 +49,14 @@ inkl. MwSt. (19%): <%= VAT.toFixed(2) %> EUR
|
||||
Deine Rechnung kannst du jederzeit über diesen Link herunterladen: <%= baseUrl %><%= invoice.url %>
|
||||
<% } %>
|
||||
|
||||
Vielen Dank, dass du dich für MUELLERPRINTS entschieden hast.
|
||||
Vielen Dank, dass du dich für <%= shopName %> entschieden hast.
|
||||
|
||||
------------------
|
||||
MUELLERPRINTS
|
||||
Max Müller
|
||||
Rotenbergstraße 39, 70190 Stuttgart
|
||||
T +49 (0)711/262 49 64
|
||||
paperwork@muellerprints.de`,
|
||||
<%= shopName %>
|
||||
<%= shopContactName %>
|
||||
<%= shopAddress %>
|
||||
<%= shopPhone ? "T " + shopPhone : "" %>
|
||||
<%= shopEmail %>`,
|
||||
html: `<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
@@ -74,7 +74,7 @@ paperwork@muellerprints.de`,
|
||||
<!-- Header -->
|
||||
<tr>
|
||||
<td style="background-color: #E31E26; padding: 30px 40px;">
|
||||
<img src="https://muellerprints-paperwork.com/paperwork-logo.png" alt="MUELLERPRINTS PAPERWORK" style="max-width: 200px; height: auto;">
|
||||
<% if (shopLogoUrl) { %><img src="<%= shopLogoUrl %>" alt="<%= shopName %>" style="max-width: 200px; height: auto;"><% } %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -83,7 +83,7 @@ paperwork@muellerprints.de`,
|
||||
<td style="padding: 40px;">
|
||||
<!-- Greeting -->
|
||||
<h1 style="margin: 0 0 20px; color: #333; font-size: 24px; font-weight: normal;">
|
||||
Vielen Dank für deinen Einkauf bei MUELLERPRINTS.
|
||||
Vielen Dank für deinen Einkauf bei <%= shopName %>.
|
||||
</h1>
|
||||
|
||||
<!-- Order Info -->
|
||||
@@ -197,7 +197,7 @@ paperwork@muellerprints.de`,
|
||||
<% } %>
|
||||
|
||||
<p style="color: #666; font-size: 14px; margin: 20px 0;">
|
||||
Vielen Dank, dass du dich für MUELLERPRINTS entschieden hast.
|
||||
Vielen Dank, dass du dich für <%= shopName %> entschieden hast.
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -209,15 +209,15 @@ paperwork@muellerprints.de`,
|
||||
<tr>
|
||||
<td style="color: #666; font-size: 12px; line-height: 1.5;">
|
||||
<p style="margin: 0 0 10px;">
|
||||
MUELLERPRINTS<br>
|
||||
Max Müller<br>
|
||||
Rotenbergstraße 39, 70190 Stuttgart<br>
|
||||
T +49 (0)711/262 49 64<br>
|
||||
paperwork@muellerprints.de
|
||||
<%= shopName %><br>
|
||||
<% if (shopContactName) { %><%= shopContactName %><br><% } %>
|
||||
<% if (shopAddress) { %><%= shopAddress %><br><% } %>
|
||||
<% if (shopPhone) { %>T <%= shopPhone %><br><% } %>
|
||||
<% if (shopEmail) { %><%= shopEmail %><% } %>
|
||||
</p>
|
||||
</td>
|
||||
<td style="text-align: right; vertical-align: bottom;">
|
||||
<img src="https://www.muellerprints.de/images/digi_logo.png" alt="MUELLERPRINTS" style="max-width: 100px; height: auto;">
|
||||
<% if (shopSecondaryLogoUrl) { %><img src="<%= shopSecondaryLogoUrl %>" alt="<%= shopName %>" style="max-width: 100px; height: auto;"><% } %>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -243,7 +243,7 @@ paperwork@muellerprints.de`,
|
||||
};
|
||||
|
||||
export const deliveryNoteEmailTemplate = {
|
||||
subject: "Your Delivery Note <%= deliveryNoteNumber %> from MUELLERPRINTS",
|
||||
subject: "Your Delivery Note <%= deliveryNoteNumber %> from <%= shopName %>",
|
||||
text: `Dear Customer,
|
||||
|
||||
Thank you for your Your delivery note <%= deliveryNoteNumber %> is attached to this email.
|
||||
@@ -272,14 +272,14 @@ Delivery Address:
|
||||
If you have any questions about your delivery, please don't hesitate to contact us.
|
||||
|
||||
Best regards,
|
||||
MUELLERPRINTS PAPERWORK
|
||||
<%= shopName %>
|
||||
|
||||
------------------
|
||||
MUELLERPRINTS PAPERWORK
|
||||
Max Müller
|
||||
Rotenbergstraße 39, 70190 Stuttgart
|
||||
T +49 (0)711/262 49 64
|
||||
paperwork@muellerprints.de`,
|
||||
<%= shopName %>
|
||||
<%= shopContactName %>
|
||||
<%= shopAddress %>
|
||||
<%= shopPhone ? "T " + shopPhone : "" %>
|
||||
<%= shopEmail %>`,
|
||||
html: `<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
@@ -295,7 +295,7 @@ paperwork@muellerprints.de`,
|
||||
<!-- Header -->
|
||||
<tr>
|
||||
<td style="background-color: #E31E26; padding: 30px 40px;">
|
||||
<img src="https://muellerprints-paperwork.com/paperwork-logo.png" alt="MUELLERPRINTS PAPERWORK" style="max-width: 200px; height: auto;">
|
||||
<% if (shopLogoUrl) { %><img src="<%= shopLogoUrl %>" alt="<%= shopName %>" style="max-width: 200px; height: auto;"><% } %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -407,15 +407,15 @@ paperwork@muellerprints.de`,
|
||||
<tr>
|
||||
<td style="color: #666; font-size: 12px; line-height: 1.5;">
|
||||
<p style="margin: 0 0 10px;">
|
||||
MUELLERPRINTS PAPERWORK<br>
|
||||
Max Müller<br>
|
||||
Rotenbergstraße 39, 70190 Stuttgart<br>
|
||||
T +49 (0)711/262 49 64<br>
|
||||
paperwork@muellerprints.de
|
||||
<%= shopName %><br>
|
||||
<% if (shopContactName) { %><%= shopContactName %><br><% } %>
|
||||
<% if (shopAddress) { %><%= shopAddress %><br><% } %>
|
||||
<% if (shopPhone) { %>T <%= shopPhone %><br><% } %>
|
||||
<% if (shopEmail) { %><%= shopEmail %><% } %>
|
||||
</p>
|
||||
</td>
|
||||
<td style="text-align: right; vertical-align: bottom;">
|
||||
<img src="https://www.muellerprints.de/images/digi_logo.png" alt="MUELLERPRINTS" style="max-width: 100px; height: auto;">
|
||||
<% if (shopSecondaryLogoUrl) { %><img src="<%= shopSecondaryLogoUrl %>" alt="<%= shopName %>" style="max-width: 100px; height: auto;"><% } %>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user