From 3fd2100afaea6f79479b641cb80aad1104028b43 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@hebeler.club>
Date: Fri, 24 Feb 2023 12:41:06 +0100
Subject: [PATCH] key page
---
pass/routes/checkout/paypal.js | 6 +-
pass/routes/key.js | 10 +-
pass/views/key.ejs | 396 ++++++++++++++++-----------------
pass/views/orders/invoice.ejs | 98 ++++----
pass/views/orders/order.ejs | 10 +-
5 files changed, 259 insertions(+), 261 deletions(-)
diff --git a/pass/routes/checkout/paypal.js b/pass/routes/checkout/paypal.js
index eea4ff6..762b5cd 100644
--- a/pass/routes/checkout/paypal.js
+++ b/pass/routes/checkout/paypal.js
@@ -58,7 +58,7 @@ router.get("/:funding_source", async (req, res) => {
encodeURIComponent(req.data.checkout.payment.paypal.funding_source) +
"/order";
- req.data.js.push("/js/checkout_paypal.js");
+ req.data.js.push(`${res.locals.baseDir}/js/checkout_paypal.js`);
res.render("key", req.data);
});
@@ -72,7 +72,7 @@ router.post("/:funding_source/order/create", async (req, res) => {
new Paypal()
)
.then(
- /** @param {Order} */ (order) => {
+ /** @param {Order} */(order) => {
res.status(200).json({
order_id: order.getOrderID(),
paypal_order_id: order.getPaymentProcessor().getOrderId(),
@@ -90,7 +90,7 @@ router.post("/:funding_source/order/create", async (req, res) => {
router.post("/:funding_source/order/cancel", async (req, res) => {
Order.LOAD_ORDER_FROM_ID(req.body.order_id)
.then(
- /** @param {Order} order */ (order) => {
+ /** @param {Order} order */(order) => {
if (order.isPaymentCaptured()) {
// Not so good. Something went wrong after we captured the Payment
// Refund it back
diff --git a/pass/routes/key.js b/pass/routes/key.js
index 4ff088f..5ee3ec5 100644
--- a/pass/routes/key.js
+++ b/pass/routes/key.js
@@ -115,11 +115,11 @@ router.use("/:key", param("key").isUUID(4), async (req, res, next) => {
cookies: req.cookies,
page: "fill",
links: {
- fill_url: `/key/${req.params.key}`,
- orders_url: `/key/${req.params.key}/orders`,
+ fill_url: `${res.locals.baseDir}/key/${req.params.key}`,
+ orders_url: `${res.locals.baseDir}/key/${req.params.key}/orders`,
},
js: [],
- css: ["/styles/key/key.css"],
+ css: [`${res.locals.baseDir}/styles/key/key.css`],
});
if (!req.data.admin && (!req.cookies.key || req.cookies.key !== req.data.key.key)) {
@@ -166,7 +166,7 @@ router.use(
// Add a URL to change the checkout amount
req.data.change_url = {
- amount: "/key/" + encodeURIComponent(req.data.key.key) + "#charge",
+ amount: `${res.locals.baseDir}/key/` + encodeURIComponent(req.data.key.key) + "#charge",
};
next("route");
@@ -177,7 +177,7 @@ router.get("/:key/checkout/:amount", (req, res) => {
if (req.query.error) {
req.data.checkout.error = req.query.error;
}
- req.data.js.push("/js/funding_sources.js");
+ req.data.js.push(`${res.locals.baseDir}/js/funding_sources.js`);
res.render("key", req.data);
});
diff --git a/pass/views/key.ejs b/pass/views/key.ejs
index d952ff6..6bb3efa 100644
--- a/pass/views/key.ejs
+++ b/pass/views/key.ejs
@@ -1,208 +1,206 @@
<%- include('templates/page_header', {css: css, js: js}); %>
- <img id="qr" src="<%= key.qr %> "></img>
- <div id="key">
- <%= key.key %>
- </div>
- <input id="setting-url" type="text" readonly value="<%= key.settings_url %>" />
- <div id="buttons">
- <button class="copy button" data-target="setting-url"><img src="/images/copy.svg" />
- <div>URL kopieren</div>
- </button>
- <button class="share button" data-share_title="MetaGer Schlüssel" data-share_url_target="setting-url"><img
- src="/images/share.svg" />
- <div>Teilen</div>
- </button>
- <a class="download button" href="<%= key.qr %>" target="_blank" download="metager_key.png"><img
- src="/images/download.svg" />
- <div>In Datei sichern</div>
- </a>
- </div>
+<img id="qr" src="<%= key.qr %> "></img>
+<div id="key">
+ <%= key.key %>
+</div>
+<input id="setting-url" type="text" readonly value="<%= key.settings_url %>" />
+<div id="buttons">
+ <button class="copy button" data-target="setting-url"><img src="<%= baseDir _%>/images/copy.svg" />
+ <div>URL kopieren</div>
+ </button>
+ <button class="share button" data-share_title="MetaGer Schlüssel" data-share_url_target="setting-url"><img src="<%= baseDir _%>/images/share.svg" />
+ <div>Teilen</div>
+ </button>
+ <a class="download button" href="<%= key.qr %>" target="_blank" download="metager_key.png"><img src="<%= baseDir _%>/images/download.svg" />
+ <div>In Datei sichern</div>
+ </a>
+</div>
+
+<div id="amount">
+ <h3>Gültig für</h3>
+ <div class="amount"><%= key.charge %></div>
+ <div>Suchanfragen</div>
+ <div>bis <span><%= key.expiration.format("DD.MM.YYYY") %></span></div>
+</div>
+<nav id="second-nav">
+ <a class="button <% if(page === "fill") { _%> active<%_ } _%>" href="<%= links.fill_url %>">Auffüllen</a>
+ <a class="button <% if(page === "order") { _%> active<%_ } %>" href="<%= links.orders_url %>">Bestellungen</a>
+</nav>
+<%_ if (created_new) { _%>
+<div id="store">
+ <h2>So gehts weiter:</h2>
+ <p>
+ Ihr MetaGer Schlüssel wurde erstellt und eingerichtet. Er muss lediglich noch aufgeladen werden.
+ Bitte stellen Sie vorher sicher, dass Sie sich den Schlüssel so abgespeichert haben, dass Sie ihn
+ eingeben können, falls die Einstellung in Ihrem Browser gelöscht wird. Dafür benötigen Sie entweder
+ den Schlüssel selbst, obige URL oder den QR-Code als Datei.
+ </p>
+ <a class="button" href="<%= baseDir _%>/key/<%= key.key %>">Schlüssel jetzt aufladen</a>
+</div>
+<% } else if (page === "order") { %>
+<%_ if(typeof order === "undefined") { _%>
+<%- include('./orders/orders', {}); %>
+<%_ } else { _%>
+<%- include('./orders/order', {}); %>
+<%_ } _%>
+<%_ } else { _%>
+<div id="charge">
+ <%_ if (typeof checkout !== "undefined" && typeof checkout.amount !== "undefined") { _%>
+ <div id="summary">
+ <a href="<%= change_url.amount %>" class="checkout-amount" title="Menge ändern">
+ <span class="checkout-amount"><%= checkout.amount %></span>
+ <span class="checkout-cost"><%= checkout.amount / 300 * 5%>€</span>
+ <span class="checkout-duration">inkl. 7% USt.</span>
+ </a>
- <div id="amount">
- <h3>Gültig für</h3>
- <div class="amount"><%= key.charge %></div>
- <div>Suchanfragen</div>
- <div>bis <span><%= key.expiration.format("DD.MM.YYYY") %></span></div>
+ <%_ if (typeof checkout !== "undefined" && typeof checkout.payment !== "undefined" && typeof checkout.payment.provider !== "undefined" && checkout.payment.provider === "paypal") { _%>
+ <a href="<%= change_url.funding_source %>" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/<%= checkout.payment.paypal.funding_source %>.svg" alt="<%= checkout.payment.paypal.funding_source %> Logo">
+ <%_ if(checkout.payment.paypal.funding_source === "card") { _%>
+ <span>Kreditkarte</span>
+ <%_ } _%>
+ </a>
+ <%_ } _%>
+ </div>
+ <%_ } _%>
+ <div id="checkout">
+ <%_ if (typeof checkout === "undefined" || typeof checkout.amount === "undefined") { _%>
+ <p>Wählen Sie aus, wie viele Suchanfragen Sie kaufen möchten.</p>
+ <div id="checkout-amount">
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/300#payment">
+ <span class="checkout-amount">300</span>
+ <span class="checkout-cost">10€</span>
+ <span class="checkout-duration">>1 Monat*</span>
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/600#payment">
+ <span class="checkout-amount">600</span>
+ <span class="checkout-cost">20€</span>
+ <span class="checkout-duration">>2 Monate*</span>
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/900#payment">
+ <span class="checkout-amount">900</span>
+ <span class="checkout-cost">30€</span>
+ <span class="checkout-duration">>3 Monate*</span>
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/1200#payment">
+ <span class="checkout-amount">1200</span>
+ <span class="checkout-cost">40€</span>
+ <span class="checkout-duration">>4 Monate*</span>
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/1800#payment">
+ <span class="checkout-amount">1800</span>
+ <span class="checkout-cost">60€</span>
+ <span class="checkout-duration">>6 Monate*</span>
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/3600#payment">
+ <span class="checkout-amount">3600</span>
+ <span class="checkout-cost">120€</span>
+ <span class="checkout-duration">>1 Jahr*</span>
+ </a>
</div>
- <nav id="second-nav">
- <a class="button <% if(page === "fill") { _%> active<%_ } _%>" href="<%= links.fill_url %>">Auffüllen</a>
- <a class="button <% if(page === "order") { _%> active<%_ } %>" href="<%= links.orders_url %>">Bestellungen</a>
- </nav>
- <%_ if (created_new) { _%>
- <div id="store">
- <h2>So gehts weiter:</h2>
- <p>
- Ihr MetaGer Schlüssel wurde erstellt und eingerichtet. Er muss lediglich noch aufgeladen werden.
- Bitte stellen Sie vorher sicher, dass Sie sich den Schlüssel so abgespeichert haben, dass Sie ihn
- eingeben können, falls die Einstellung in Ihrem Browser gelöscht wird. Dafür benötigen Sie entweder
- den Schlüssel selbst, obige URL oder den QR-Code als Datei.
- </p>
- <a class="button" href="/key/<%= key.key %>">Schlüssel jetzt aufladen</a>
+ <p>* Die angegebenen Zeiträume sind Schätzungen, die auf unseren Erfahrungswerten basieren und sollen einen Anhaltspunkt geben, wie viele Suchanfragen benötigt werden.</p>
+ <%_ } _%>
+ </div>
+ <%_ if (typeof checkout !== "undefined" && typeof checkout.amount !== "undefined" && (typeof checkout.payment === "undefined" || typeof checkout.payment.provider === "undefined")) { _%>
+ <div id="payment">
+ <%_ if(typeof checkout.paypal_client_id !== "undefined") { _%>
+ <input type="hidden" name="paypal-client-id" value="<%= checkout.paypal_client_id %>">
+ <%_ } %>
+ <h2>Zahlungsart wählen</h2>
+ <%_ if (checkout.error === "funding_source_not_eligible") { _%>
+ <p class="error">Die gewählte Zahlungsart ist in deiner Region leider nicht verfügbar.</p>
+ <%_ } _%>
+ <label for="payment-group-paypal">
+ <div class="info">Zahlungsdienstleister</div>
+ </label>
+ <input type="radio" name="payment-group" id="payment-group-paypal" selected>
+ <div id="paypal-payments" class="payment-group">
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/paypal#paypal-checkout" id="paypal-payment" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/paypal.svg" alt="PayPal Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/card#paypal-checkout" id="card" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/card.svg" alt="Credit Card Logo">
+ <span>Kreditkarte</span>
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/sepa#paypal-checkout" id="sepa" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/sepa.svg" alt="SEPA Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/giropay#paypal-checkout" id="giropay" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/giropay.svg" alt="Giropay Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/sofort#paypal-checkout" id="sofort" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/sofort.svg" alt="SOFORT Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/p24#paypal-checkout" id="p24" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/p24.svg" alt="P24 Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/bancontact#paypal-checkout" id="bancontact" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/bancontact.svg" alt="Bancontact Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/blik#paypal-checkout" id="blik" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/blik.svg" alt="BLIK Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/eps#paypal-checkout" id="eps" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/eps.svg" alt="EPS Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/ideal#paypal-checkout" id="ideal" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/ideal.svg" alt="iDeal Logo">
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/mybank#paypal-checkout" id="mybank" class="funding_source">
+ <img src="<%= baseDir _%>/images/paypal/mybank.svg" alt="Mybank Logo">
+ </a>
</div>
- <% } else if (page === "order") { %>
- <%_ if(typeof order === "undefined") { _%>
- <%- include('./orders/orders', {}); %>
- <%_ } else { _%>
- <%- include('./orders/order', {}); %>
- <%_ } _%>
- <%_ } else { _%>
- <div id="charge">
- <%_ if (typeof checkout !== "undefined" && typeof checkout.amount !== "undefined") { _%>
- <div id="summary">
- <a href="<%= change_url.amount %>" class="checkout-amount" title="Menge ändern">
- <span class="checkout-amount"><%= checkout.amount %></span>
- <span class="checkout-cost"><%= checkout.amount / 300 * 5%>€</span>
- <span class="checkout-duration">inkl. 7% USt.</span>
- </a>
-
- <%_ if (typeof checkout !== "undefined" && typeof checkout.payment !== "undefined" && typeof checkout.payment.provider !== "undefined" && checkout.payment.provider === "paypal") { _%>
- <a href="<%= change_url.funding_source %>" class="funding_source">
- <img src="/images/paypal/<%= checkout.payment.paypal.funding_source %>.svg" alt="<%= checkout.payment.paypal.funding_source %> Logo">
- <%_ if(checkout.payment.paypal.funding_source === "card") { _%>
- <span>Kreditkarte</span>
- <%_ } _%>
- </a>
- <%_ } _%>
- </div>
- <%_ } _%>
- <div id="checkout">
- <%_ if (typeof checkout === "undefined" || typeof checkout.amount === "undefined") { _%>
- <p>Wählen Sie aus, wie viele Suchanfragen Sie kaufen möchten.</p>
- <div id="checkout-amount">
- <a href="/key/<%= key.key %>/checkout/300#payment">
- <span class="checkout-amount">300</span>
- <span class="checkout-cost">5€</span>
- <span class="checkout-duration">>1 Monat*</span>
- </a>
- <a href="/key/<%= key.key %>/checkout/600#payment">
- <span class="checkout-amount">600</span>
- <span class="checkout-cost">10€</span>
- <span class="checkout-duration">>2 Monate*</span>
- </a>
- <a href="/key/<%= key.key %>/checkout/900#payment">
- <span class="checkout-amount">900</span>
- <span class="checkout-cost">15€</span>
- <span class="checkout-duration">>3 Monate*</span>
- </a>
- <a href="/key/<%= key.key %>/checkout/1200#payment">
- <span class="checkout-amount">1200</span>
- <span class="checkout-cost">20€</span>
- <span class="checkout-duration">>4 Monate*</span>
- </a>
- <a href="/key/<%= key.key %>/checkout/1800#payment">
- <span class="checkout-amount">1800</span>
- <span class="checkout-cost">30€</span>
- <span class="checkout-duration">>6 Monate*</span>
- </a>
- <a href="/key/<%= key.key %>/checkout/3600#payment">
- <span class="checkout-amount">3600</span>
- <span class="checkout-cost">60€</span>
- <span class="checkout-duration">>1 Jahr*</span>
- </a>
- </div>
- <p>* Die angegebenen Zeiträume sind Schätzungen, die auf unseren Erfahrungswerten basieren und sollen einen Anhaltspunkt geben, wie viele Suchanfragen benötigt werden.</p>
- <%_ } _%>
+ </div>
+ <%_ } _%>
+ <%_ if(typeof checkout !== "undefined" && typeof checkout.amount !== "undefined" && typeof checkout.payment !== "undefined" && typeof checkout.payment.provider !== "undefined" && checkout.payment.provider === "paypal") { _%>
+ <div id="paypal-checkout">
+ <h2>Zahlung durchführen</h2>
+ <input type="hidden" name="funding-source-not-eligible-url" value="<%= change_url.funding_source_not_eligible %>">
+ <input type="hidden" name="paypal-order-base-url" value="<%= change_url.order_base_url %>">
+ <input type="hidden" name="paypal-client-id" value="<%= checkout.payment.paypal.client_id %>">
+ <input type="hidden" name="paypal-funding-source" value="<%= checkout.payment.paypal.funding_source %>">
+ <%_ if(typeof checkout.payment.paypal.client_token !== "undefined") { _%>
+ <input type="hidden" name="paypal-client-token" value="<%= checkout.payment.paypal.client_token %>">
+ <%_ } _%>
+ <div id="loading_paypal_funding_source">
+ <img src="<%= baseDir _%>/images/loader.gif" alt="Loading Icon">
+ <div>Zahlungsmethode wird geladen</div>
+ </div>
+ <%_ if(typeof checkout.payment.paypal.funding_source !== undefined) { _%>
+ <%_ if(checkout.payment.paypal.funding_source === "card") { _%>
+ <div id="paypal-payment-card" class="hidden">
+ <div id="paypal-card-errors">
+ <p id="paypal-card-errors-generic" class="error hidden">Zahlung fehlgeschlagen</p>
+ <p id="paypal-card-errors-invalid-card" class="error hidden">Diese Karte wird leider nicht unterstützt</p>
+ <p id="paypal-card-errors-expired" class="error hidden">Diese Karte ist abgelaufen</p>
+ <p id="paypal-card-errors-rejected" class="error hidden">Ihre Zahlung wurde von der Bank abgelehnt.</p>
+ <p id="paypal-card-errors-3d" class="error hidden">3D Authentifizierung fehlgeschlagen</p>
+ </div>
+ <form id="paypal-card-form">
+ <div>
+ <label for="card-number">Kartennummer</label>
+ <div id="card-number" class="card_field"></div>
</div>
- <%_ if (typeof checkout !== "undefined" && typeof checkout.amount !== "undefined" && (typeof checkout.payment === "undefined" || typeof checkout.payment.provider === "undefined")) { _%>
- <div id="payment">
- <%_ if(typeof checkout.paypal_client_id !== "undefined") { _%>
- <input type="hidden" name="paypal-client-id" value="<%= checkout.paypal_client_id %>">
- <%_ } %>
- <h2>Zahlungsart wählen</h2>
- <%_ if (checkout.error === "funding_source_not_eligible") { _%>
- <p class="error">Die gewählte Zahlungsart ist in deiner Region leider nicht verfügbar.</p>
- <%_ } _%>
- <label for="payment-group-paypal">
- <div class="info">Zahlungsdienstleister</div>
- </label>
- <input type="radio" name="payment-group" id="payment-group-paypal" selected>
- <div id="paypal-payments" class="payment-group">
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/paypal#paypal-checkout" id="paypal-payment" class="funding_source">
- <img src="/images/paypal/paypal.svg" alt="PayPal Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/card#paypal-checkout" id="card" class="funding_source">
- <img src="/images/paypal/card.svg" alt="Credit Card Logo">
- <span>Kreditkarte</span>
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/sepa#paypal-checkout" id="sepa" class="funding_source">
- <img src="/images/paypal/sepa.svg" alt="SEPA Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/giropay#paypal-checkout" id="giropay" class="funding_source">
- <img src="/images/paypal/giropay.svg" alt="Giropay Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/sofort#paypal-checkout" id="sofort" class="funding_source">
- <img src="/images/paypal/sofort.svg" alt="SOFORT Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/p24#paypal-checkout" id="p24" class="funding_source">
- <img src="/images/paypal/p24.svg" alt="P24 Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/bancontact#paypal-checkout" id="bancontact" class="funding_source">
- <img src="/images/paypal/bancontact.svg" alt="Bancontact Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/blik#paypal-checkout" id="blik" class="funding_source">
- <img src="/images/paypal/blik.svg" alt="BLIK Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/eps#paypal-checkout" id="eps" class="funding_source">
- <img src="/images/paypal/eps.svg" alt="EPS Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/ideal#paypal-checkout" id="ideal" class="funding_source">
- <img src="/images/paypal/ideal.svg" alt="iDeal Logo">
- </a>
- <a href="/key/<%= key.key %>/checkout/<%= checkout.amount %>/paypal/mybank#paypal-checkout" id="mybank" class="funding_source">
- <img src="/images/paypal/mybank.svg" alt="Mybank Logo">
- </a>
- </div>
+ <div>
+ <label for="expiration-date">Gültig bis</label>
+ <div id="expiration-date" class="card_field"></div>
</div>
- <%_ } _%>
- <%_ if(typeof checkout !== "undefined" && typeof checkout.amount !== "undefined" && typeof checkout.payment !== "undefined" && typeof checkout.payment.provider !== "undefined" && checkout.payment.provider === "paypal") { _%>
- <div id="paypal-checkout">
- <h2>Zahlung durchführen</h2>
- <input type="hidden" name="funding-source-not-eligible-url" value="<%= change_url.funding_source_not_eligible %>">
- <input type="hidden" name="paypal-order-base-url" value="<%= change_url.order_base_url %>">
- <input type="hidden" name="paypal-client-id" value="<%= checkout.payment.paypal.client_id %>">
- <input type="hidden" name="paypal-funding-source" value="<%= checkout.payment.paypal.funding_source %>">
- <%_ if(typeof checkout.payment.paypal.client_token !== "undefined") { _%>
- <input type="hidden" name="paypal-client-token" value="<%= checkout.payment.paypal.client_token %>">
- <%_ } _%>
- <div id="loading_paypal_funding_source">
- <img src="/images/loader.gif" alt="Loading Icon">
- <div>Zahlungsmethode wird geladen</div>
- </div>
- <%_ if(typeof checkout.payment.paypal.funding_source !== undefined) { _%>
- <%_ if(checkout.payment.paypal.funding_source === "card") { _%>
- <div id="paypal-payment-card" class="hidden">
- <div id="paypal-card-errors">
- <p id="paypal-card-errors-generic" class="error hidden">Zahlung fehlgeschlagen</p>
- <p id="paypal-card-errors-invalid-card" class="error hidden">Diese Karte wird leider nicht unterstützt</p>
- <p id="paypal-card-errors-expired" class="error hidden">Diese Karte ist abgelaufen</p>
- <p id="paypal-card-errors-rejected" class="error hidden">Ihre Zahlung wurde von der Bank abgelehnt.</p>
- <p id="paypal-card-errors-3d" class="error hidden">3D Authentifizierung fehlgeschlagen</p>
- </div>
- <form id="paypal-card-form">
- <div>
- <label for="card-number">Kartennummer</label>
- <div id="card-number" class="card_field"></div>
- </div>
- <div>
- <label for="expiration-date">Gültig bis</label>
- <div id="expiration-date" class="card_field"></div>
- </div>
- <%_ if(process.env.NODE_ENV === "development") { _%>
- <div class="card-holder-name">
- <label for="card-holder-name">Name (Entfällt im Produktivbetrieb)</label>
- <input type="text" id="card-holder-name" class="card_field" autocomplete="off" placeholder="Name"/>
- </div>
- <%_ } _%>
- <button type="submit" id="submit-credit-card" class="button"><img src="/images/loader.gif" alt="Loading symbol"> <span>Jetzt bezahlen</span></button>
- </form>
- </div>
- <%_ }else { _%>
- <div id="paypal-payment-fields" class="hidden"></div>
- <div id="paypal-payment-button" class="hidden"></div>
- <%_ } _%>
- <%_ } _%>
+ <%_ if(process.env.NODE_ENV === "development") { _%>
+ <div class="card-holder-name">
+ <label for="card-holder-name">Name (Entfällt im Produktivbetrieb)</label>
+ <input type="text" id="card-holder-name" class="card_field" autocomplete="off" placeholder="Name" />
</div>
<%_ } _%>
- <%_ } _%>
+ <button type="submit" id="submit-credit-card" class="button"><img src="<%= baseDir _%>/images/loader.gif" alt="Loading symbol"> <span>Jetzt bezahlen</span></button>
+ </form>
</div>
- <%- include('templates/page_footer'); -%>
\ No newline at end of file
+ <%_ }else { _%>
+ <div id="paypal-payment-fields" class="hidden"></div>
+ <div id="paypal-payment-button" class="hidden"></div>
+ <%_ } _%>
+ <%_ } _%>
+ </div>
+ <%_ } _%>
+ <%_ } _%>
+</div>
+<%- include('templates/page_footer'); -%>
\ No newline at end of file
diff --git a/pass/views/orders/invoice.ejs b/pass/views/orders/invoice.ejs
index 2c584e0..321f1ab 100644
--- a/pass/views/orders/invoice.ejs
+++ b/pass/views/orders/invoice.ejs
@@ -1,52 +1,52 @@
<div id="invoice">
- <h2>Rechnung</h2>
- <ul class="breadcrumbs">
- <li><a href="<%= links.orders_url %>">Bestellungen</a></li>
- <li><a href="<%= links.order_url %>"><%= order.order.getOrderID() %></a></li>
- <li>Rechnung</li>
- </ul>
- <%- include("order_details") %>
+ <h2>Rechnung</h2>
+ <ul class="breadcrumbs">
+ <li><a href="<%= links.orders_url %>">Bestellungen</a></li>
+ <li><a href="<%= links.order_url %>"><%= order.order.getOrderID() %></a></li>
+ <li>Rechnung</li>
+ </ul>
+ <%- include("order_details") %>
- <form <% if(admin) { %>action="<%= order.invoice.create_invoice_url %>"<%_ } _%> method="POST" id="invoice-form">
- <%_ if(!order.invoice.success) { _%>
- <p>
- Wenn Sie eine Rechnung benötigen, tragen Sie bitte Ihre Rechnungsdaten in das nachfolgende Formular ein. Wir benötigen von Ihnen dafür Ihren vollständigen Namen, Ihre postalische Anschrift und Ihre E-Mail Adresse um Ihnen die Rechnung zuzustellen.
- </p>
- <div id="invoice-form-fields">
- <div class="invoice-form-field">
- <label for="name" <%_ if(order.invoice.errors.name) { _%>class="error"<%_ } _%>>Vollständiger Name*</label>
- <input type="text" name="name" id="name" placeholder="Max Mustermann" value="<%= order.invoice.params.name %>" required>
- </div>
- <div class="invoice-form-field">
- <label for="email" <%_ if(order.invoice.errors.email) { _%>class="error"<%_ } _%>>E-Mail*</label>
- <input type="email" name="email" id="email" placeholder="test@example.com" value="<%= order.invoice.params.email %>" required>
- </div>
- <div class="invoice-form-field">
- <label for="address" <%_ if(order.invoice.errors["address"]) { _%>class="error"<%_ } _%>>Anschrift*</label>
- <textarea name="address" id="address" cols="30" rows="4" placeholder="Mustergasse 3 30159 Musterstadt Deutschland" required><%= order.invoice.params["address"] %></textarea>
- </div>
- <% if (admin) { %>
- <input type="hidden" name="admin" value="true">
- <div class="invoice-form-field">
- <button type="submit" class="button">
- <img src="/images/invoice.svg" alt="" />
- <span>Rechnung erstellen</span>
- </button>
- </div>
- <%_ } else { _%>
- <div class="invoice-form-field">
- <button type="submit" class="button">
- <img src="/images/invoice.svg" alt="" />
- <span>Rechnung anfragen</span>
- </button>
- </div>
- <% } %>
- </div>
- <p class="storage-time">
- Wir sind rechtlich dazu verpflichtet einmal ausgestellte Rechnungen <span class="bold">10 Jahre</span> lang aufzubewahren. Da eine Rechnung auf Sie persönlich ausgestellt sein muss, enthält sie zwangsläufig personenbeziehbare Daten (Name, Anschrift, E-Mail).
- </p>
- <%_ } else { _%>
- <p>Ihre Nachricht wurde uns zugestellt. Wir bearbeiten die Anfrage so schnell wie möglich und antworten an die hinterlegte E-Mail Adresse.</p>
- <%_ } _%>
- </form>
+ <form <% if(admin) { %>action="<%= order.invoice.create_invoice_url %>" <%_ } _%> method="POST" id="invoice-form">
+ <%_ if(!order.invoice.success) { _%>
+ <p>
+ Wenn Sie eine Rechnung benötigen, tragen Sie bitte Ihre Rechnungsdaten in das nachfolgende Formular ein. Wir benötigen von Ihnen dafür Ihren vollständigen Namen, Ihre postalische Anschrift und Ihre E-Mail Adresse um Ihnen die Rechnung zuzustellen.
+ </p>
+ <div id="invoice-form-fields">
+ <div class="invoice-form-field">
+ <label for="name" <%_ if(order.invoice.errors.name) { _%>class="error" <%_ } _%>>Vollständiger Name*</label>
+ <input type="text" name="name" id="name" placeholder="Max Mustermann" value="<%= order.invoice.params.name %>" required>
+ </div>
+ <div class="invoice-form-field">
+ <label for="email" <%_ if(order.invoice.errors.email) { _%>class="error" <%_ } _%>>E-Mail*</label>
+ <input type="email" name="email" id="email" placeholder="test@example.com" value="<%= order.invoice.params.email %>" required>
+ </div>
+ <div class="invoice-form-field">
+ <label for="address" <%_ if(order.invoice.errors["address"]) { _%>class="error" <%_ } _%>>Anschrift*</label>
+ <textarea name="address" id="address" cols="30" rows="4" placeholder="Mustergasse 3 30159 Musterstadt Deutschland" required><%= order.invoice.params["address"] %></textarea>
+ </div>
+ <% if (admin) { %>
+ <input type="hidden" name="admin" value="true">
+ <div class="invoice-form-field">
+ <button type="submit" class="button">
+ <img src="<%= baseDir _%>/images/invoice.svg" alt="" />
+ <span>Rechnung erstellen</span>
+ </button>
+ </div>
+ <%_ } else { _%>
+ <div class="invoice-form-field">
+ <button type="submit" class="button">
+ <img src="<%= baseDir _%>/images/invoice.svg" alt="" />
+ <span>Rechnung anfragen</span>
+ </button>
+ </div>
+ <% } %>
+ </div>
+ <p class="storage-time">
+ Wir sind rechtlich dazu verpflichtet einmal ausgestellte Rechnungen <span class="bold">10 Jahre</span> lang aufzubewahren. Da eine Rechnung auf Sie persönlich ausgestellt sein muss, enthält sie zwangsläufig personenbeziehbare Daten (Name, Anschrift, E-Mail).
+ </p>
+ <%_ } else { _%>
+ <p>Ihre Nachricht wurde uns zugestellt. Wir bearbeiten die Anfrage so schnell wie möglich und antworten an die hinterlegte E-Mail Adresse.</p>
+ <%_ } _%>
+ </form>
</div>
\ No newline at end of file
diff --git a/pass/views/orders/order.ejs b/pass/views/orders/order.ejs
index 38391a4..744aea7 100644
--- a/pass/views/orders/order.ejs
+++ b/pass/views/orders/order.ejs
@@ -9,22 +9,22 @@
<h3>Vielen Dank für Ihren Einkauf!</h3>
<div id="order-buttons">
<a href="<%= links.receipt_url %>" target="_blank" class="button">
- <img src="/images/download.svg" alt="" class="order-receipt" />
+ <img src="<%= baseDir _%>/images/download.svg" alt="" class="order-receipt" />
<span>Auftragsbestätigung herunterladen</span>
</a>
<%_ if(!order.order.isReceiptCreated()) { _%>
<a href="<%= links.invoice_url %>" class="button">
- <img src="/images/invoice.svg" alt="" />
+ <img src="<%= baseDir _%>/images/invoice.svg" alt="" />
<span>Rechnung anfragen</span>
</a>
<%_ } else { _%>
<a href="<%= links.download_invoice_url %>" target="_blank" class="button">
- <img src="/images/invoice.svg" alt="" />
+ <img src="<%= baseDir _%>/images/invoice.svg" alt="" />
<span>Rechnung herunterladen</span>
</a>
<%_ } _%> <% if (order.order.getAmountRefundRequested() === 0) { %>
<a href="<%= links.refund_url %>" class="button">
- <img src="/images/money.svg" alt="" />
+ <img src="<%= baseDir _%>/images/money.svg" alt="" />
<span>Erstattung anfragen</span>
</a>
<% } %>
@@ -32,4 +32,4 @@
<%_ } else if(order.invoice) { _%> <%- include('./invoice', {}); %> <%_ } else
if(typeof order.refund !== "undefined") { _%> <%- include('./refund') %> <%_ }
_%>
-</div>
+</div>
\ No newline at end of file
--
GitLab