diff --git a/pass/app/payment_processor/Micropayment.js b/pass/app/payment_processor/Micropayment.js
index 387033df7bbd3090b528a227e424827052623bdc..35232c22edd94c232cc61ea89908517db053a4b7 100644
--- a/pass/app/payment_processor/Micropayment.js
+++ b/pass/app/payment_processor/Micropayment.js
@@ -10,7 +10,7 @@ class Micropayment extends PaymentProcessor {
/**
* @var {string[]}
*/
- #supported_services = ["sofort"];
+ #supported_services = ["sofort", "prepay", "lastschrift"];
/**
* @var {string}
diff --git a/pass/lang/de/checkout.json b/pass/lang/de/checkout.json
index 4b8a0dadc82b443bd82f014ca9fe5ddc3b33c6a9..91e3335f6e7c8541a5a958c1ed8bfa0ca715cfb8 100644
--- a/pass/lang/de/checkout.json
+++ b/pass/lang/de/checkout.json
@@ -17,22 +17,31 @@
"order-unique": "Verwenden Sie die Zahlungs-ID nur für eine einzige Aufladung. Sie erhalten mit jedem Aufruf dieser Seite eine neue!",
"error": "Beim Erstellen Ihrer Bestellung ist etwas schief gegangen. Versuchen Sie es bitte später erneut.",
"generate": "Zahlungs-ID generieren"
+ },
+ "prepay": {
+ "name": "Banküberweisung",
+ "email": {
+ "label": "E-Mail Addresse",
+ "description": "An diese Addresse werden Ihnen einmalig Informationen zu unserer Bankverbindung und eine Benachrichtigung bei Abschluss der Zahlung zugesendet."
+ }
+ },
+ "sofort": {
+ "name": "Ãœberweisung"
}
},
"charge": {
- "heading": "Zahlungsart wählen",
"includes-vat": "inkl. 7% MwSt.",
+ "heading": "Zahlungsart wählen",
"amount": "Wählen Sie eines der folgenden Tokenpakete aus, um den Bestellvorgang zu starten.",
"month_one": "{{count}} Monat",
"month_other": "{{count}} Monate",
"not-available": "Die gewählte Zahlungsart ist in deiner Region leider nicht verfügbar.",
"anonymous-payment": "Anonyme Zahlung",
- "paypal-privacy": "Zahlungsmethoden in dieser Gruppe erfordern zwar meist keinen PayPal Account, werden aber dort verarbeitet. Mehr zum <a href=\"https://www.paypal.com/us/legalhub/privacy-full\" target=\"_blank\">Datenschutz bei PayPal</a>.",
- "more": "Weitere alternative Zahlungsmethoden sind in Arbeit"
+ "paypal-privacy": "Zahlungsmethoden in dieser Gruppe erfordern zwar meist keinen PayPal Account, werden aber dort verarbeitet. Mehr zum <a href=\"https://www.paypal.com/us/legalhub/privacy-full\" target=\"_blank\">Datenschutz bei PayPal</a>."
},
"micropayment": {
- "privacy": "Mit dem Klick auf \"Zahlung durchführen\" werden Sie zu unserem Zahlungsdienstleister <a href=\"https://micropayment.de\">MicroPayment</a> weitergeleitet, um den Kauf abzuschließen. Mehr zum <a href=\"{{link}}\">Datenschutz bei {{link_text}}</a>.",
- "submit": "Zahlung durchführen"
+ "submit": "Zahlung durchführen",
+ "privacy": "Mit dem Klick auf \"Zahlung durchführen\" werden Sie zu unserem Zahlungsdienstleister <a href=\"https://micropayment.de\" target=\"_blank\">MicroPayment</a> weitergeleitet, um den Kauf abzuschließen. Mehr zum <a href=\"{{link}}\" target=\"_blank\">Datenschutz bei {{link_text}}</a>."
},
"paypal": {
"heading": "Zahlung durchführen",
@@ -46,7 +55,8 @@
"card": {
"number": "Kartennummer",
"expiration": "Gültig bis",
- "cvv": "CVV"
+ "cvv": "CVV",
+ "label": "Kredit- / Debitkarte"
},
"submit": "Zahlung durchführen",
"loading": "Zahlungsmethode wird geladen"
diff --git a/pass/public/images/lastschrift.svg b/pass/public/images/lastschrift.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2a8eaf5e89a066e4c70bde9d192d924a4add73fe
--- /dev/null
+++ b/pass/public/images/lastschrift.svg
@@ -0,0 +1 @@
+<svg width="100" height="32" viewBox="0 0 100 32" preserveAspectRatio="xMinYMin meet" xmlns="http://www.w3.org/2000/svg"><path fill="#005DA0" d="M 39.871 18.772 C 37.78 18.772 35.843 18.278 34.272 17.425 L 34.81 13.935 C 36.409 14.769 38.051 15.263 39.826 15.263 C 41.809 15.263 42.661 14.544 42.661 13.284 C 42.661 10.45 34.34 11.641 34.34 5.59 C 34.34 2.53 36.319 0.055 40.885 0.055 C 42.639 0.055 44.549 0.416 45.946 0.999 L 45.474 4.395 C 43.989 3.926 42.481 3.633 41.108 3.633 C 38.86 3.633 38.275 4.395 38.275 5.364 C 38.275 8.175 46.598 6.895 46.598 13.013 C 46.576 16.569 44.101 18.772 39.871 18.772 Z"></path><path fill="#005DA0" d="M 62.233 14.881 L 62.233 18.413 L 49.951 18.413 L 49.951 0.345 L 62.233 0.345 L 62.233 3.946 L 54.022 3.946 L 54.022 7.549 L 60.705 7.549 L 60.705 10.787 L 54.022 10.787 L 54.022 14.905 L 62.233 14.905 Z"></path><path fill="#005DA0" d="M 72.313 12.565 L 69.905 12.565 L 69.905 18.437 L 65.834 18.437 L 65.834 0.345 L 72.313 0.345 C 77.328 0.345 79.376 2.328 79.376 6.534 C 79.376 10.361 77.355 12.565 72.313 12.565 Z M 72.313 3.766 L 69.905 3.766 L 69.905 9.302 L 72.313 9.302 C 74.314 9.302 75.194 8.808 75.194 6.534 C 75.194 4.352 74.428 3.766 72.313 3.766 Z"></path><path fill="#005DA0" d="M 91.797 14.924 L 85.246 14.924 L 84.234 18.437 L 79.939 18.437 L 86.193 0.345 L 91.031 0.345 L 97.352 18.437 L 92.808 18.437 L 91.797 14.924 Z M 88.04 5.318 L 86.238 11.506 L 90.85 11.506 L 89.118 5.318 L 88.645 3.408 L 88.578 3.408 L 88.04 5.318 Z"></path><path fill="#005DA0" d="M 39.736 30.157 L 39.692 31.867 L 34.382 31.867 L 34.382 23.475 L 36.299 23.475 L 36.299 30.157 L 39.736 30.157 Z"></path><path fill="#005DA0" d="M 44.798 31.215 L 44.778 31.215 C 44.371 31.71 43.722 31.977 42.931 31.977 C 41.648 31.977 40.818 31.257 40.818 29.727 C 40.818 28.468 41.695 27.613 43.222 27.613 C 43.722 27.613 44.168 27.68 44.527 27.796 L 44.527 27.411 C 44.527 26.736 44.168 26.421 43.244 26.421 C 42.505 26.421 42.007 26.534 41.382 26.782 L 41.245 25.387 C 41.919 25.095 42.707 24.936 43.563 24.936 C 45.563 24.936 46.263 25.792 46.263 27.658 L 46.263 31.867 L 44.933 31.867 L 44.798 31.215 Z M 44.549 28.966 C 44.393 28.896 44.056 28.828 43.583 28.828 C 42.819 28.828 42.46 29.12 42.46 29.727 C 42.46 30.38 42.842 30.63 43.427 30.63 C 44.012 30.63 44.549 30.271 44.549 29.842 L 44.549 28.966 Z"></path><path fill="#005DA0" d="M 50.02 32.002 C 49.21 32.002 48.466 31.842 47.883 31.529 L 48.062 30.088 C 48.625 30.405 49.41 30.561 49.996 30.561 C 50.693 30.561 50.986 30.29 50.986 29.887 C 50.986 28.807 47.84 29.436 47.84 27.051 C 47.84 25.838 48.667 24.959 50.403 24.959 C 51.075 24.959 51.752 25.095 52.336 25.32 L 52.201 26.736 C 51.64 26.512 50.897 26.396 50.381 26.396 C 49.816 26.396 49.503 26.625 49.503 26.961 C 49.503 27.995 52.603 27.366 52.603 29.707 C 52.603 31.101 51.862 32.002 50.02 32.002 Z"></path><path fill="#005DA0" d="M 56.026 26.375 L 56.026 29.842 C 56.026 30.36 56.295 30.582 56.836 30.582 C 57.014 30.582 57.239 30.561 57.374 30.514 L 57.464 31.776 C 57.239 31.888 56.789 31.956 56.295 31.956 C 54.946 31.956 54.27 31.169 54.27 29.887 L 54.27 26.352 L 53.506 26.352 L 53.506 25.095 L 54.337 25.095 L 54.631 23.562 L 56.002 23.451 L 56.002 25.116 L 57.51 25.116 L 57.51 26.421 L 56.026 26.421 Z"></path><path fill="#005DA0" d="M 60.885 32.002 C 60.073 32.002 59.331 31.842 58.748 31.529 L 58.929 30.088 C 59.49 30.405 60.275 30.561 60.862 30.561 C 61.561 30.561 61.851 30.29 61.851 29.887 C 61.851 28.807 58.702 29.436 58.702 27.051 C 58.702 25.838 59.534 24.959 61.269 24.959 C 61.943 24.959 62.615 25.095 63.203 25.32 L 63.069 26.736 C 62.505 26.512 61.764 26.396 61.246 26.396 C 60.681 26.396 60.367 26.625 60.367 26.961 C 60.367 27.995 63.47 27.366 63.47 29.707 C 63.47 31.101 62.729 32.002 60.885 32.002 Z"></path><path fill="#005DA0" d="M 69.365 26.736 C 69.028 26.625 68.603 26.534 68.22 26.534 C 66.958 26.534 66.53 27.051 66.53 28.49 C 66.53 29.954 67.116 30.514 68.174 30.514 C 68.623 30.514 69.05 30.425 69.41 30.271 L 69.525 31.616 C 69.119 31.867 68.511 32.002 67.792 32.002 C 65.787 32.002 64.732 30.854 64.732 28.49 C 64.732 26.242 65.653 24.981 67.835 24.981 C 68.397 24.981 69.05 25.095 69.479 25.276 L 69.365 26.736 Z"></path><path fill="#005DA0" d="M 75.078 31.867 L 75.078 27.546 C 75.078 26.849 74.743 26.491 74.001 26.491 C 73.508 26.491 73.055 26.714 72.855 27.008 L 72.855 31.867 L 71.122 31.867 L 71.122 23.16 L 72.855 23.069 L 72.855 24.622 L 72.83 25.52 L 72.855 25.545 C 73.348 25.116 73.979 24.959 74.541 24.959 C 75.98 24.959 76.812 25.926 76.812 27.546 L 76.812 31.867 L 75.078 31.867 Z"></path><path fill="#005DA0" d="M 78.658 31.867 L 78.658 25.139 L 80.052 25.072 L 80.21 26.199 L 80.231 26.199 C 80.66 25.387 81.313 24.981 82.098 24.981 C 82.39 24.981 82.663 25.028 82.84 25.072 L 82.731 26.782 C 82.528 26.714 82.257 26.667 81.985 26.667 C 81.088 26.667 80.413 27.321 80.413 28.468 L 80.413 31.867 L 78.658 31.867 Z"></path><path fill="#005DA0" d="M 85.382 24.35 C 84.708 24.35 84.395 24.172 84.395 23.609 C 84.395 23.136 84.708 22.867 85.382 22.867 C 86.058 22.867 86.375 23.113 86.375 23.609 C 86.354 24.105 86.058 24.35 85.382 24.35 Z M 84.484 31.867 L 84.484 25.139 L 86.259 25.072 L 86.259 31.888 L 84.484 31.888 Z"></path><path fill="#005DA0" d="M 88.757 31.867 L 88.757 26.375 L 87.902 26.375 L 87.902 25.095 L 88.757 25.095 L 88.757 24.798 C 88.757 23.79 89.454 22.935 91.076 22.935 C 91.459 22.935 91.885 22.979 92.178 23.069 L 92.063 24.195 C 91.863 24.147 91.636 24.126 91.411 24.126 C 90.738 24.126 90.466 24.399 90.466 24.825 L 90.466 25.072 L 91.907 25.072 L 91.907 26.352 L 90.466 26.352 L 90.466 31.842 L 88.757 31.842 Z"></path><path fill="#005DA0" d="M 95.486 26.375 L 95.486 29.842 C 95.486 30.36 95.754 30.582 96.296 30.582 C 96.473 30.582 96.698 30.561 96.834 30.514 L 96.924 31.776 C 96.698 31.888 96.249 31.956 95.754 31.956 C 94.406 31.956 93.729 31.169 93.729 29.887 L 93.729 26.352 L 92.965 26.352 L 92.965 25.095 L 93.798 25.095 L 94.09 23.562 L 95.461 23.451 L 95.461 25.116 L 96.969 25.116 L 96.969 26.421 L 95.486 26.421 Z"></path><path fill="#AEB1BC" d="M 20.357 8.826 L 15.368 5.081 L 10.379 1.334 C 10.033 1.074 9.54 1.146 9.281 1.493 L 4.883 7.322 C 4.811 7.409 4.768 7.51 4.754 7.624 C 4.68 7.93 4.782 8.248 5.043 8.45 L 8.022 10.677 L 12.042 13.698 L 15.021 15.926 C 15.281 16.13 15.629 16.13 15.888 15.97 C 15.991 15.912 16.062 15.854 16.136 15.752 L 20.531 9.91 C 20.763 9.578 20.706 9.087 20.357 8.826 Z M 10.047 1.769 L 13.012 3.995 L 13.012 3.995 L 15.021 5.5 L 17.046 7.017 L 17.046 7.017 L 20.025 9.245 C 20.142 9.332 20.156 9.491 20.082 9.607 L 19.374 10.591 L 16.005 8.058 L 12.36 5.326 L 8.976 2.809 L 9.684 1.826 C 9.772 1.709 9.931 1.682 10.047 1.769 Z M 15.673 15.463 C 15.629 15.507 15.585 15.536 15.528 15.55 C 15.469 15.564 15.398 15.55 15.339 15.507 L 12.345 13.265 L 8.34 10.257 L 5.361 8.001 C 5.302 7.958 5.275 7.9 5.259 7.842 C 5.259 7.785 5.259 7.726 5.302 7.669 L 6.113 6.585 C 6.113 6.585 7.009 5.427 7.791 4.386 L 11.16 6.917 L 14.804 9.65 L 18.173 12.181 C 17.393 13.222 16.496 14.379 16.496 14.379 L 15.673 15.463 Z"></path><g transform="matrix(0.144619, 0, 0, 0.144619, -7.250457, -3.988513)"><path fill="#005DA0" d="M197.1,150.4l52-69.6l5.3-7c0,0,0.1-0.2,0.2-0.2c0.4-0.5,0.3-1.2-0.2-1.6l-14.7-10.7 c-0.5-0.4-1.2-0.2-1.6,0.3c-0.1,0.1-0.2,0.2-0.2,0.2l-2,2.5l-64.3,86l-70.8,0l-26.5,87.4h177.1l-25-87.4L197.1,150.4z M79.1,234.3 l24.2-80.5l65.7,0l-5.7,7.6l-8.1,11.3l-0.9,1.7l-0.9,1.9l-0.9,2.2l-0.9,2.3l-0.9,2.5l-0.9,2.5l-0.8,2.5l-0.8,2.4l-0.7,2.3 l-0.7,2.1l-0.6,1.9l-0.4,1.6l-0.3,1.2l-0.3,0.7c0,0-0.1,0.2-0.2,0.4c-0.2,0.2-1.2,1.1-2,0.5c-0.8-0.6-0.7-2.6-0.6-3.6 c0.2-3,0.5-6,0.7-8.9c0.1-1-1.2-1.6-2-1.2c-3.6,2.1-5.8,4.6-7.8,7.5c0.2-0.7,0.4-1.4,0.6-2c0.8-3.1,2-6.2,2.5-9.4 c0.3-1.8-0.2-3.9-2.3-4.3c-2.4-0.4-3.9,2.1-5.1,3.7c-3.5,5-5.6,11.2-9.9,15.5c-1.6,1.6-3.5,2.8-5.8,2.1c-2.7-0.8-3.8,2.4,1,2.9 c4.7,0.4,8.3-4.6,10.4-8.1c1.6-2.5,2.9-5.2,4.5-7.8c0.7-1.2,1.5-2.4,2.3-3.6c0.4-0.5,1-1.8,1.7-2c0.8-0.2,0.6,0.3,0.6,0.9 c-0.1,1.5-0.7,3-1.1,4.5c-0.4,1.6-0.9,3.2-1.3,4.7c-0.9,3.4-1.8,6.8-2.8,10.1c-0.4,1.5,1.6,2.2,2.5,1c3.4-4.8,5.1-8.9,9.2-12.1 c-0.1,1.1-0.2,2.1-0.3,3.2c-0.1,1.7-0.5,3.6-0.4,5.3c0.2,2.9,2.4,4.8,5.1,3.6c1.4-0.7,2.4-1.7,2.4-1.7l0.2-0.1l0.6-0.4l1-0.7 l1.4-1l1.6-1.2l1.7-1.2l2.1-1.4l2.1-1.5l2.1-1.5l2.1-1.5l2-1.5l1.9-1.4l1.8-1.4l1.5-1.2l1.2-1.1l1-0.9l0-0.1l0,0l6.5-7.6 l16.6-22.1l29.4,0l22.9,80.5H79.1z"></path><path fill="#005DA0" d="M261.1,77.1l-1.9-1.5c-0.4-0.3-0.9-0.2-1.2,0.2l-24.7,32.9c-0.3,0.4-0.2,0.9,0.2,1.2l1.9,1.5 c0.4,0.3,0.9,0.2,1.2-0.2l24.7-32.9C261.5,77.9,261.5,77.4,261.1,77.1z"></path><polygon fill="#005DA0" points="161.7,217.2 210.9,217.2 209.9,213.3 161.7,213.3 113.6,213.3 112.5,217.2 "></polygon></g></svg>
\ No newline at end of file
diff --git a/pass/public/images/paypal/card.svg b/pass/public/images/paypal/card.svg
index 75aa232793fbd298aeb2256bd6b8dfcd4498d0bd..40432328d859dbef4613b0aa51831e9ed6afb6bd 100644
--- a/pass/public/images/paypal/card.svg
+++ b/pass/public/images/paypal/card.svg
@@ -7,12 +7,12 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="150"
- height="50"
- viewBox="0 0 150 50"
+ width="43.465797"
+ height="33.806732"
+ viewBox="0 0 43.465797 33.806732"
version="1.1"
id="svg1123"
- sodipodi:docname="card_de.svg"
+ sodipodi:docname="card.svg"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
<metadata
id="metadata1129">
@@ -37,20 +37,25 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="996"
+ inkscape:window-width="2560"
+ inkscape:window-height="1361"
id="namedview1125"
showgrid="false"
inkscape:zoom="4.9652778"
- inkscape:cx="91.928374"
- inkscape:cy="21.152099"
- inkscape:window-x="0"
- inkscape:window-y="840"
+ inkscape:cx="78.713678"
+ inkscape:cy="13.055464"
+ inkscape:window-x="2560"
+ inkscape:window-y="480"
inkscape:window-maximized="1"
- inkscape:current-layer="svg1123" />
+ inkscape:current-layer="g1704"
+ inkscape:document-rotation="0"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
<g
id="g1704"
- transform="translate(2.7918223,-0.3616617)">
+ transform="translate(-10.422873,-8.4582962)">
<g
stroke="none"
stroke-width="1"
@@ -68,21 +73,5 @@
id="Stroke-1" />
</g>
</g>
- <text
- xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none"
- x="64.267097"
- y="21.999041"
- id="text1133"><tspan
- sodipodi:role="line"
- id="tspan1131"
- x="64.267097"
- y="21.999041"
- style="font-size:13.3333px;fill:#333333;fill-opacity:1">Kredit- /</tspan><tspan
- sodipodi:role="line"
- x="64.267097"
- y="38.665665"
- style="font-size:13.3333px;fill:#333333;fill-opacity:1"
- id="tspan1696">Debitkarte</tspan></text>
</g>
</svg>
diff --git a/pass/public/styles/key/checkout-micropayment.less b/pass/public/styles/key/checkout-micropayment.less
index 8dc6cac2fdff136c5b4d35407b6d8b202be274fa..907a2c1221fe1549d65a0f4fc6791be4aae8e5c6 100644
--- a/pass/public/styles/key/checkout-micropayment.less
+++ b/pass/public/styles/key/checkout-micropayment.less
@@ -8,4 +8,19 @@
width: 2em;
}
}
+ div.input-group {
+ display: grid;
+ gap: 0.5rem;
+ > label {
+ font-size: 0.8em;
+ font-weight: bold;
+ }
+ > input {
+ padding: 0.5rem 1rem;
+ border-radius: 5px;
+ }
+ > div {
+ font-size: 0.8em;
+ }
+ }
}
diff --git a/pass/routes/checkout/micropayment.js b/pass/routes/checkout/micropayment.js
index 219ae12a2250f3df1fe2c9f85adbcfa7b3a70f0e..71bedbcc5aa626ecd262b10c6c34ce8fba8da314 100644
--- a/pass/routes/checkout/micropayment.js
+++ b/pass/routes/checkout/micropayment.js
@@ -13,7 +13,7 @@ router.get("/event", (req, res) => {
)
.then((payment_reference) => {
let price = (req.query.amount / 100).toFixed(2);
- if (req.query.function == "storno" && req.query.function === "refund") {
+ if (["storno", "refund", "quit"].includes(req.query.function)) {
price *= -1;
}
let redirect_url = new URL(
@@ -23,16 +23,21 @@ router.get("/event", (req, res) => {
payment_reference.public_id
);
- return payment_reference
- .createPayment({
- price: price,
- converted_currency: req.query.currency,
- converted_price: (req.query.amount / 100).toFixed(2),
- payment_processor: Micropayment.NAME,
- payment_processor_id: req.query.auth,
- payment_processor_data: req.query,
- })
- .then(() => redirect_url);
+ // Prepay payment unused events
+ if (["storno", "refund", "billing"].includes(req.query.function)) {
+ return payment_reference
+ .createPayment({
+ price: price,
+ converted_currency: req.query.currency,
+ converted_price: (req.query.amount / 100).toFixed(2),
+ payment_processor: Micropayment.NAME,
+ payment_processor_id: req.query.auth,
+ payment_processor_data: req.query,
+ })
+ .then(() => redirect_url);
+ } else {
+ return redirect_url;
+ }
})
.then((redirect_url) => {
let response = {
@@ -73,18 +78,35 @@ router.use("/", (req, res, next) => {
});
router.use("/:service", (req, res, next) => {
- let payment_window_url = new URL(
- `https://${req.params.service}.micropayment.de/${req.params.service}/event`
- );
+ let subdomain = "";
+ let servicename = "";
let privacy_url = "";
switch (req.params.service) {
+ case "prepay":
+ subdomain = "prepayment";
+ servicename = "prepay";
+ privacy_url = "https://resources.micropayment.de/billing/documents/privacy-policy/prepay/prepay-gmbh-de.pdf";
+ privacy_url_text = "Micropayment";
+ break;
+ case "lastschrift":
+ subdomain = "sepadirectdebit";
+ servicename = "lastschrift";
+ privacy_url = "https://resources.micropayment.de/billing/documents/privacy-policy/debit/debit-gmbh-de.pdf";
+ privacy_url_text = "Micropayment";
+ break;
case "sofort":
+ subdomain = "directbanking";
+ servicename = "sofort";
privacy_url = "https://cdn.klarna.com/1.0/shared/content/legal/terms/de/bt_payment_data_privacy";
privacy_url_text = "Klarna";
break;
}
+ let payment_window_url = new URL(
+ `https://${subdomain}.micropayment.de/${servicename}/event`
+ );
+
req.data.checkout.payment.micropayment = {
funding_source: req.params.service,
payment_window_url: payment_window_url,
@@ -121,6 +143,11 @@ router.post("/:service", async (req, res) => {
service: req.data.checkout.payment.micropayment.funding_source,
vatinfo: "1",
};
+
+ if (req.data.checkout.payment.micropayment.funding_source == "prepay") {
+ searchParams.mp_user_email = req.body.email;
+ }
+
let seal = "";
for (let key in searchParams) {
seal += `${key}=${searchParams[key]}&`;
diff --git a/pass/views/checkout/charge.ejs b/pass/views/checkout/charge.ejs
index 9fb3e9bc5d8218b611d360c5037cefd19109f3c9..fe1e1f0b88f338a573096bef6b9dc6cf9bf22a9c 100644
--- a/pass/views/checkout/charge.ejs
+++ b/pass/views/checkout/charge.ejs
@@ -17,11 +17,18 @@
<%_ if(checkout.payment.provider === "paypal") { _%>
<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>
+ <%= req.t("paypal.card.label", {ns: "checkout"}) _%>
+ </span>
<%_ } _%>
<%_ } else if(checkout.payment.provider === "manual") { _%>
Manuell (Dev)
<%_ } else if(checkout.payment.provider === "micropayment") { _%>
+ <%_ if(checkout.payment.micropayment.funding_source == "prepay") { _%>
+ <%= req.t("payments.prepay.name", {ns: "checkout"}) %>
+ <%_ } else { _%>
<img src="<%= baseDir _%>/images/<%= checkout.payment.micropayment.funding_source %>.svg" alt="<%= checkout.payment.micropayment.funding_source %> Logo">
+ <%_ } _%>
<%_ } else if(checkout.payment.provider === "cash") { _%>
<img src="<%= baseDir _%>/images/letter.svg" alt="Cash Payment">
<span>
@@ -74,8 +81,17 @@
<div class="payment-group-container">
<label for="payment-group-micropayment">MicroPayment</label>
<div id="anonymous-payments" class="payment-group">
+ <a href="<%= baseDir _%>/key/<%= key.key.get_key() _%>/checkout/<%= checkout.amount _%>/micropayment/prepay#cash-payment-container" id="prepay-payment" class="funding_source">
+ <span><%= req.t("payments.prepay.name", {ns: "checkout"}) _%></span>
+ </a>
+ <a href="<%= baseDir _%>/key/<%= key.key.get_key() _%>/checkout/<%= checkout.amount _%>/micropayment/lastschrift#cash-payment-container" id="cash-payment" class="funding_source">
+ <img src="<%= baseDir _%>/images/lastschrift.svg" alt="SEPA Direct Debit Payment">
+ </a>
<a href="<%= baseDir _%>/key/<%= key.key.get_key() _%>/checkout/<%= checkout.amount _%>/micropayment/sofort#cash-payment-container" id="cash-payment" class="funding_source">
<img src="<%= baseDir _%>/images/sofort.svg" alt="Cash Payment">
+ <span>
+ <%= req.t("payments.sofort.name", {ns: "checkout"}) _%>
+ </span>
</a>
</div>
</div>
@@ -89,9 +105,9 @@
</a>
<a href="<%= baseDir _%>/key/<%= key.key.get_key() %>/checkout/<%= checkout.amount %>/paypal/card#paypal-checkout" id="card" class="funding_source">
<img src="<%= baseDir _%>/images/paypal/card.svg" alt="Credit Card Logo">
- </a>
- <a href="<%= baseDir _%>/key/<%= key.key.get_key() %>/checkout/<%= checkout.amount %>/paypal/sepa#paypal-checkout" id="sepa" class="funding_source">
- <img src="<%= baseDir _%>/images/paypal/sepa.svg" alt="SEPA Logo">
+ <span>
+ <%= req.t("paypal.card.label", {ns: "checkout"}) _%>
+ </span>
</a>
<a href="<%= baseDir _%>/key/<%= key.key.get_key() %>/checkout/<%= checkout.amount %>/paypal/giropay#paypal-checkout" id="giropay" class="funding_source">
<img src="<%= baseDir _%>/images/paypal/giropay.svg" alt="Giropay Logo">
@@ -118,7 +134,6 @@
<div><%- req.t("charge.paypal-privacy", {ns: "checkout"}) _%></div>
</div>
</div>
-<p class="error"><%- req.t("charge.more", {ns: "checkout"}) _%></p>
<%_ } _%>
<%_ if(typeof checkout !== "undefined" && typeof checkout.amount !== "undefined" && typeof checkout.payment !== "undefined" && typeof checkout.payment.provider !== "undefined"){ _%>
<%_ if(checkout.payment.provider === "paypal") { _%>
diff --git a/pass/views/checkout/micropayment.ejs b/pass/views/checkout/micropayment.ejs
index eb9a61c6fd2e8dd4c87efeda9e6a7af296a1a3b0..cc90f08f79f08d5508df53e827109efa1fa2b84f 100644
--- a/pass/views/checkout/micropayment.ejs
+++ b/pass/views/checkout/micropayment.ejs
@@ -1,5 +1,12 @@
<div id="micropayment-checkout">
<form action="<%= baseDir _%>/key/<%= key.key.get_key() _%>/checkout/<%= checkout.amount _%>/micropayment/<%= checkout.payment.micropayment.funding_source _%>" method="post">
+ <%_ if(checkout.payment.micropayment.funding_source == "prepay") { _%>
+ <div class="input-group">
+ <label for="email"><%= req.t("payments.prepay.email.label", {ns: "checkout"}) _%></label>
+ <input type="email" name="email" id="email" placeholder="max@mustermann.de" required autofocus>
+ <div><%= req.t("payments.prepay.email.description", {ns: "checkout"}) _%></div>
+ </div>
+ <%_ } _%>
<%- include("../templates/revocation") -%>
<button type="submit" class="button">
<img src="<%= baseDir _%> %>/images/money.svg" alt="">