Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Payment Window Design #131

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Changes from 4 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
e340a5e
Started making layout changes
mlouring Jun 9, 2023
34c7761
Made a baseline for new design
mlouring Jun 19, 2023
6e57444
Removed unused template files
mlouring Jun 19, 2023
8255c31
Began work on removing Bootstrap
mlouring Jun 22, 2023
9265475
Removed Bootstrap and some unneeded CSS in templates
mlouring Jun 28, 2023
3efe119
Minor design changes and some code clean up
mlouring Jun 29, 2023
b41b2b0
Remade footer and made some changes to text appearance
mlouring Jul 4, 2023
99d1bea
Made design for header that works with or without added logo
mlouring Jul 5, 2023
fd13b65
Minor adjustments and code cleanup
mlouring Jul 27, 2023
88415b9
Added support for reservation notice
mlouring Jul 28, 2023
fb0b6b9
Removed references to deleted templates
mlouring Jul 31, 2023
fdae9fb
Reworked selector template and adjusted alternative payment methods CSS
mlouring Aug 1, 2023
dbccc0d
Simplified content templates
mlouring Aug 1, 2023
ff83a8a
Added missing CSS class
mlouring Aug 1, 2023
9f8a836
Removed unused form_dankort_acs template
mlouring Aug 1, 2023
d51bed7
Removed unnecessary div
mlouring Aug 1, 2023
011db00
Added support for choosing card brand
mlouring Aug 3, 2023
d5cb9c0
Cleanup of CSS and templates - focused on payment methods
mlouring Aug 9, 2023
caea7d6
Cleaned up template code for footer
mlouring Aug 9, 2023
55429d5
Moved footer to a separate template
mlouring Aug 9, 2023
33ae840
Cleaned up Card template
mlouring Aug 11, 2023
ded5788
Removed autogenerated vscode folder
mlouring Aug 11, 2023
f068cfc
Small fixes
mlouring Aug 15, 2023
c60d87a
Set max length on cardholder field
mlouring Aug 16, 2023
729a400
Small adjustments and fixes
mlouring Aug 22, 2023
0c460fd
Added styling to Google Pay button when disabled
mlouring Aug 22, 2023
cd1dfb7
Fixed an issue with element IDs
mlouring Aug 22, 2023
86a5922
Reverted fix of issue that turned out not to be an issue
mlouring Aug 22, 2023
b938590
Some CSS clean-up and organizing
mlouring Aug 24, 2023
fed76da
Incorporated changes from #122 PR
mlouring Sep 6, 2023
0d37f3d
Removed a couple redundant CSS classes in HTML
mlouring Sep 6, 2023
7a7a18d
Removed and changed a couple of comments
mlouring Sep 7, 2023
e39efc3
Merge branch 'master' into PaymentWindowDesign
mlouring Sep 21, 2023
88e8317
merge master
cramt Oct 10, 2023
60cf489
Merge branch 'master' into PaymentWindowDesign
cramt Jan 15, 2024
36a4556
Implemented changes from #136
mlouring Feb 7, 2024
fb11625
Implemented changes from #134
mlouring Feb 7, 2024
ec540b8
Merged with remote branch
mlouring Feb 7, 2024
61b9a48
update po files
cramt Feb 26, 2024
3414cfb
copilot translate de/da/sv/no
cramt Feb 26, 2024
de7d570
merge vmp
cramt Mar 13, 2024
0d2d2d4
merge
cramt Apr 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 68 additions & 72 deletions locales/branding.pot
Original file line number Diff line number Diff line change
@@ -90,60 +90,9 @@ msgstr ""
msgid "When you click the button below, the Anyday split payment window will open."
msgstr ""

#: templates/cancelled.liquid:7
msgid "You have cancelled the payment"
msgstr ""

#: templates/layout.liquid:22
msgid "You are about to abort the payment. Are you sure?"
msgstr ""

#: templates/layout.liquid:22
msgid "Cancel Payment"
msgstr ""

#: templates/waiting.liquid:8
msgid "Open Swish App"
msgstr ""

#: templates/waiting.liquid:12
msgid "To complete the payment, open your Swish App on your mobile device and authorize the payment"
msgstr ""

#: templates/waiting.liquid:13
msgid "You have 3 minutes to complete the payment"
msgstr ""

#: templates/waiting.liquid:14
msgid "Waiting for authorization"
msgstr ""

#: templates/waiting.liquid:20
msgid "Please wait..."
msgstr ""

#: templates/waiting.liquid:24
msgid "The process may take some time."
msgstr ""

#: templates/waiting.liquid:24
msgid "Click here if processing takes a long time"
msgstr ""

#: templates/form/sofort_ideal.liquid:15
#: templates/form/trustly_ideal.liquid:9
msgid "When you click the button below, the iDeal payment window will open."
msgstr ""

#: templates/form/sofort_ideal.liquid:16
#: templates/form/mobilepay_online.liquid:8
#: templates/form/vippspsp.liquid:8
#: templates/form/paysafecard.liquid:12
#: templates/form/anydaysplit.liquid:13
#: templates/form/bancontact.liquid:14
#: templates/form/viabill.liquid:12
#: templates/form/klarnapayments.liquid:10
#: templates/form/przelewy24.liquid:14
#: templates/form/trustly_ideal.liquid:10
#: templates/form/bitcoin.liquid:28
#: templates/form/blik.liquid:14
#: templates/form/klarnapayments.liquid:10
#: templates/form/mobilepay.liquid:14
@@ -179,9 +128,7 @@ msgstr ""
#: templates/form/przelewy24.liquid:15
#: templates/form/resurs.liquid:28
#: templates/form/sofort.liquid:10
#: templates/form/paypal.liquid:13
#: templates/form/vipps.liquid:15
#: templates/form/anydaysplit.liquid:14
#: templates/form/sofort_ideal.liquid:17
#: templates/form/sofortppro.liquid:15
#: templates/form/swipp.liquid:9
#: templates/form/trustly.liquid:11
@@ -197,14 +144,8 @@ msgstr ""
msgid "When you click the button below, the Bancontact payment window will open."
msgstr ""

#: templates/form/sofort_ideal.liquid:43
#: templates/form/trustly_ideal.liquid:40
#: templates/form/unzer_pay_later_invoice.liquid:50
#: templates/form/swish.liquid:29
#: templates/form/trustly.liquid:40
#: templates/form/unzer_pay_later_direct_debit.liquid:82
#: templates/form_dankort_acs.liquid:28
msgid "Proceed"
#: templates/form/bitcoin.liquid:21
msgid "The Bitcoin address was copied to your clipboard."
msgstr ""

#: templates/form/bitcoin.liquid:21
@@ -287,20 +228,75 @@ msgstr ""
msgid "You tried to make a test payment on a live transaction."
msgstr ""

#: templates/form/vippspsp.liquid:7
msgid "When you click the button below, the Vipps PSP window will open"
#: templates/form/klarna.liquid:24
msgid "Gender"
msgstr ""

#: templates/form/paysafecard.liquid:11
msgid "When you click the button below, the paysafecard payment window will open."
#: templates/form/klarna.liquid:26
msgid "Male"
msgstr ""

#: templates/form/bancontact.liquid:13
msgid "When you click the button below, the Bancontact payment window will open."
#: templates/form/klarna.liquid:27
msgid "Female"
msgstr ""

#: templates/form/viabill.liquid:11
msgid "When you click the button below, the ViaBill payment window will open."
#: templates/form/klarna.liquid:31
#: templates/form/klarna.liquid:67
msgid "Country"
msgstr ""

#: templates/form/klarna.liquid:37
#: templates/form/klarna.liquid:73
msgid "Denmark"
msgstr ""

#: templates/form/klarna.liquid:39
#: templates/form/klarna.liquid:75
msgid "Sweden"
msgstr ""

#: templates/form/klarna.liquid:41
#: templates/form/klarna.liquid:77
msgid "Norway"
msgstr ""

#: templates/form/klarna.liquid:43
#: templates/form/klarna.liquid:79
msgid "Finland"
msgstr ""

#: templates/form/klarna.liquid:45
#: templates/form/klarna.liquid:81
msgid "Netherlands"
msgstr ""

#: templates/form/klarna.liquid:47
#: templates/form/klarna.liquid:83
msgid "Germany"
msgstr ""

#: templates/form/klarna.liquid:49
#: templates/form/klarna.liquid:85
msgid "Austria"
msgstr ""

#: templates/form/klarna.liquid:58
msgid "Social security number"
msgstr ""

#: templates/form/klarna.liquid:94
msgid "Company Registration Number"
msgstr ""

#: templates/form/klarna.liquid:102
#: templates/form/sofort_ideal.liquid:43
#: templates/form/swish.liquid:29
#: templates/form/trustly.liquid:40
#: templates/form/trustly_ideal.liquid:40
#: templates/form/unzer_pay_later_direct_debit.liquid:82
#: templates/form/unzer_pay_later_invoice.liquid:50
#: templates/form_dankort_acs.liquid:28
msgid "Proceed"
msgstr ""

#: templates/form/klarnapayments.liquid:9
1 change: 0 additions & 1 deletion stylesheets/paymentwindow.css
Original file line number Diff line number Diff line change
@@ -743,7 +743,6 @@ img.icon-rotate {
@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }


/* ----- Utility classes ----- */

.clickable {
6 changes: 3 additions & 3 deletions templates/form/wechatpay.liquid
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
<input type="hidden" name="{{ field[0] }}" value='{{ field[1] }}' />
{% endfor %}
<div class="text-center">
<img src="/assets/v2/images/brands/wechat.svg" alt="WeChat logo">
<img src="/assets/v2/images/brands/wechatpay.svg" alt="WeChatPay logo">
</div>
<div>
<p>{% t When you click the button below, the WeChat payment window will open. %}</p>
<p>{% t When you click the button below, the WeChatPay payment window will open. %}</p>
<p>{% t When finished, you will be redirected back to your receipt. %}</p>
<button type="submit" class="btn btn-primary">{% t Proceed to payment %}</button>
</div>
</form>
</div>
</div>
Loading