From ed7e8399717b680a80783e7b8e75f5b27aff26c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 17 Sep 2024 10:35:26 +0200 Subject: [PATCH 01/58] Config: Init git submodule web-assets branch v2 upgrade --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 86de804..753968b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "assets_shared"] path = assets_shared url = https://projects.blender.org/infrastructure/web-assets.git + branch = v2 [submodule "playbooks/shared"] path = playbooks/shared url = https://projects.blender.org/infrastructure/web-playbooks -- 2.30.2 From d03caf379e00afc4f6f49048277f5c3a0c022035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 17 Sep 2024 10:36:10 +0200 Subject: [PATCH 02/58] Chore: Update git submodule assets_shared branch to v2 and version to 2.0.0-alpha.34 --- assets_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets_shared b/assets_shared index 016c666..1a86cfe 160000 --- a/assets_shared +++ b/assets_shared @@ -1 +1 @@ -Subproject commit 016c666bad84c78f5c910419dd0917b443f1695d +Subproject commit 1a86cfee1229737683232e12cd4c2fdf6a3f5a4b -- 2.30.2 From 92ec8788efc8086d9af40fb730e640d42e87255d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 17 Sep 2024 10:42:12 +0200 Subject: [PATCH 03/58] Config: Change post web-assets v2 upgrade style imports base --- .../static/conference_main/styles/main.sass | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/conference_main/static/conference_main/styles/main.sass b/conference_main/static/conference_main/styles/main.sass index 86e2d71..674375d 100644 --- a/conference_main/static/conference_main/styles/main.sass +++ b/conference_main/static/conference_main/styles/main.sass @@ -1,35 +1,7 @@ $font-path: '/static/assets/fonts' -// Import variables. -@import "../../../../assets_shared/src/styles/_media_queries.sass" -@import "../../../../assets_shared/src/styles/_variables.sass" -@import "../../../../assets_shared/src/styles/_mixins.sass" - -// Import complete Bootstrap. -@import "../../../../assets_shared/src/styles/bootstrap/bootstrap.scss" - -@import "../../../../assets_shared/src/styles/_utilities.sass" -@import "../../../../assets_shared/src/styles/_fonts.sass" - -@import "../../../../assets_shared/src/styles/_bootstrap_overrides.sass" - -@import "../../../../assets_shared/src/styles/_alert.sass" -@import "../../../../assets_shared/src/styles/_badge.sass" -@import "../../../../assets_shared/src/styles/_base.sass" -@import "../../../../assets_shared/src/styles/_box.sass" -@import "../../../../assets_shared/src/styles/_button.sass" -@import "../../../../assets_shared/src/styles/_cards.sass" -@import "../../../../assets_shared/src/styles/_code.sass" -@import "../../../../assets_shared/src/styles/_details.sass" -@import "../../../../assets_shared/src/styles/_footer.sass" -@import "../../../../assets_shared/src/styles/_forms.sass" -@import "../../../../assets_shared/src/styles/_hero.sass" -@import "../../../../assets_shared/src/styles/_list.sass" -@import "../../../../assets_shared/src/styles/_navigation.sass" -@import "../../../../assets_shared/src/styles/_navigation_global.scss" -@import "../../../../assets_shared/src/styles/_sidebar.sass" -@import "../../../../assets_shared/src/styles/_table.sass" -@import "../../../../assets_shared/src/styles/_type.sass" +// Import Web Assets. +@import "../../../../assets_shared/src/styles/main.sass" @import "_albums.sass" @import "_attendee.sass" -- 2.30.2 From 1d50952f90a76e2f3d61fdee536f17e44b9f4618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Lente?= Date: Tue, 17 Sep 2024 11:10:47 +0200 Subject: [PATCH 04/58] Chore: Run post web-assets v2 upgrade script bash helper Run post web-assets v2 upgrade script bash helper and make project-specific replacements adjustments base. --- .../conference_main/styles/_albums.sass | 6 +- .../conference_main/styles/_attendee.sass | 14 ++-- .../static/conference_main/styles/_event.sass | 10 +-- .../conference_main/styles/_footer.sass | 4 +- .../conference_main/styles/_homepage.sass | 4 +- .../conference_main/styles/_navigation.sass | 14 ++-- .../static/conference_main/styles/_panel.sass | 8 +-- .../conference_main/styles/_schedule.sass | 66 +++++++++---------- .../conference_main/styles/_slideshow.sass | 6 +- .../conference_main/styles/_sponsors.sass | 8 +-- .../static/conference_main/styles/_utils.sass | 4 +- .../static/conference_main/styles/main.sass | 10 +-- .../conference_main/widgets/image.html | 2 +- tickets/templates/tickets/checkout.html | 4 +- .../templates/tickets/components/badge.html | 2 +- .../components/pill_payment_status.html | 2 +- .../forms/widgets/gateway_radio_option.html | 4 +- tickets/templates/tickets/invoice.css | 2 +- tickets/templates/tickets/invoice.html | 12 ++-- tickets/templates/tickets/products_table.html | 4 +- .../tickets/ticket_detail_claims.html | 2 +- 21 files changed, 94 insertions(+), 94 deletions(-) diff --git a/conference_main/static/conference_main/styles/_albums.sass b/conference_main/static/conference_main/styles/_albums.sass index 6d6753a..d8a4b9c 100644 --- a/conference_main/static/conference_main/styles/_albums.sass +++ b/conference_main/static/conference_main/styles/_albums.sass @@ -45,7 +45,7 @@ top: 0 .album-upload-container - background-color: var(--background-color) + background-color: var(--color-bg) position: relative header @@ -63,7 +63,7 @@ .dropzone align-items: center - background-color: var(--background-color-alt) + background-color: var(--color-bg-alt) color: white display: flex justify-content: center @@ -72,7 +72,7 @@ background: transparent .album-container-fullscreen - background-color: var(--background-color-alt) + background-color: var(--color-bg-alt) height: 100% header diff --git a/conference_main/static/conference_main/styles/_attendee.sass b/conference_main/static/conference_main/styles/_attendee.sass index 89e096b..6e37a0c 100644 --- a/conference_main/static/conference_main/styles/_attendee.sass +++ b/conference_main/static/conference_main/styles/_attendee.sass @@ -49,8 +49,8 @@ transition: color var(--transition-speed) var(--transition-timing-fast) .attendee-name - font-size: var(--font-size-large) - +font-weight-bold + font-size: var(--fs-lg) + +fw-bold .attendee-title display: block @@ -58,7 +58,7 @@ .attendee-company color: var(--text-color-secondary) - font-size: var(--font-size-small) + font-size: var(--fs-sm) line-height: 1 .attendee-portrait @@ -77,14 +77,14 @@ img filter: unset - &.size-medium + &.size-md --attendee-portrait-size: 80px +media-sm --attendee-portrait-size: 110px - --font-size-large: clamp(1.2rem, 1.5vw + 1rem, 18px) + --fs-lg: clamp(1.2rem, 1.5vw + 1rem, 18px) - &.size-large + &.size-lg --attendee-portrait-size: 150px +media-sm @@ -92,7 +92,7 @@ img - background-color: var(--background-color-secondary) + background-color: var(--color-bg-secondary) border-radius: 50% display: block filter: grayscale(50%) diff --git a/conference_main/static/conference_main/styles/_event.sass b/conference_main/static/conference_main/styles/_event.sass index d426a1f..0f14b3b 100644 --- a/conference_main/static/conference_main/styles/_event.sass +++ b/conference_main/static/conference_main/styles/_event.sass @@ -25,7 +25,7 @@ +padding(3) &.review - background-color: var(--background-color-primary) + background-color: var(--color-bg-primary) +box-shadow-card +margin(4, bottom) +padding(3, x) @@ -33,7 +33,7 @@ .event-location, .event-category - +font-weight-bold + +fw-bold .event-detail .event-date @@ -60,11 +60,11 @@ summary padding-right: 0 - +font-weight-normal + +fw-normal color: var(--text-color-secondary) .date - font-size: var(--font-size-small) + font-size: var(--fs-sm) +margin(1, top) opacity: .5 @@ -83,7 +83,7 @@ content: 'UNDER REVIEW' display: flex font-size: 10px - +font-weight-bold + +fw-bold position: absolute padding: 2px 10px 0 10px top: -7px diff --git a/conference_main/static/conference_main/styles/_footer.sass b/conference_main/static/conference_main/styles/_footer.sass index 277806d..3d3e44e 100644 --- a/conference_main/static/conference_main/styles/_footer.sass +++ b/conference_main/static/conference_main/styles/_footer.sass @@ -1,5 +1,5 @@ footer - background-color: var(--background-color) + background-color: var(--color-bg) border-top: var(--border-width) var(--border-color) solid +margin(3, y) +padding(3, y) @@ -44,7 +44,7 @@ footer .btn color: var(--text-color-secondary) - +font-weight-normal + +fw-normal .footer-logo margin-top: -2px diff --git a/conference_main/static/conference_main/styles/_homepage.sass b/conference_main/static/conference_main/styles/_homepage.sass index 9c086b1..c8e0e23 100644 --- a/conference_main/static/conference_main/styles/_homepage.sass +++ b/conference_main/static/conference_main/styles/_homepage.sass @@ -8,7 +8,7 @@ $bcon-accent: #1291bd .bcon-date, .bcon-place padding: $spacer / 3 - +font-weight-bold + +fw-bold .bcon-date, background-color: $white @@ -19,7 +19,7 @@ $bcon-accent: #1291bd color: $white .location-map - background-color: var(--background-color) + background-color: var(--color-bg) border-radius: var(--border-radius) height: 420px diff --git a/conference_main/static/conference_main/styles/_navigation.sass b/conference_main/static/conference_main/styles/_navigation.sass index 4d1a8be..b853ff2 100644 --- a/conference_main/static/conference_main/styles/_navigation.sass +++ b/conference_main/static/conference_main/styles/_navigation.sass @@ -24,7 +24,7 @@ body.is-scrolled display: flex .navbar-mobile - background-color: var(--background-color) + background-color: var(--color-bg) .nav-icon i transform: scale(1.33) @@ -38,7 +38,7 @@ body.is-scrolled color: var(--navbar-color) display: flex flex-direction: column - font-size: var(--font-size-extra-small) + font-size: var(--fs-xs) line-height: 1.5 +padding(3, x) text-overflow: ellipsis @@ -47,7 +47,7 @@ body.is-scrolled span margin: -2px 0 - +font-weight-bold + +fw-bold .navbar-brand +padding(2, y) @@ -88,14 +88,14 @@ body.is-scrolled outline: none &:hover - background-color: var(--color-primary-bg) - color: var(--color-primary) + background-color: var(--color-accent-bg) + color: var(--color-accent) text-decoration: none i +margin(2, right) &.is-active a - background-color: var(--color-primary-bg) - color: var(--color-primary) + background-color: var(--color-accent-bg) + color: var(--color-accent) text-decoration: none diff --git a/conference_main/static/conference_main/styles/_panel.sass b/conference_main/static/conference_main/styles/_panel.sass index acfe089..95c711b 100644 --- a/conference_main/static/conference_main/styles/_panel.sass +++ b/conference_main/static/conference_main/styles/_panel.sass @@ -35,7 +35,7 @@ .board-e-time color: white - +font-weight-bold + +fw-bold .event-meta display: flex @@ -84,8 +84,8 @@ header color: white - font-size: var(--font-size-large) - +font-weight-bold + font-size: var(--fs-lg) + +fw-bold +padding(3, x) +padding(2, y) @@ -230,7 +230,7 @@ .tw-header display: flex - font-size: var(--font-size-small) + font-size: var(--fs-sm) .tw-author, .tw-screen_name diff --git a/conference_main/static/conference_main/styles/_schedule.sass b/conference_main/static/conference_main/styles/_schedule.sass index 9e63368..dc7e37a 100644 --- a/conference_main/static/conference_main/styles/_schedule.sass +++ b/conference_main/static/conference_main/styles/_schedule.sass @@ -11,7 +11,7 @@ $col-time-width: 8% .schedule-filters-container, .schedule-day-toggles @extend .container-fluid - background-color: var(--background-color-primary) + background-color: var(--color-bg-primary) +media-xs +padding(0, y) @@ -33,7 +33,7 @@ $col-time-width: 8% .schedule-filter-title color: var(--text-color-secondary) - font-size: var(--font-size-small) + font-size: var(--fs-sm) .schedule-filters display: flex @@ -131,12 +131,12 @@ $col-time-width: 8% &:checked ~ label - background-color: var(--color-primary-bg) - border-color: var(--color-primary-bg) - color: var(--color-primary-text) + background-color: var(--color-accent-bg) + border-color: var(--color-accent-bg) + color: var(--color-accent-text) &:hover - background-color: var(--color-primary-bg-hover) + background-color: var(--color-accent-bg-hover) .schedule-day-toggles gap: .5rem @@ -169,7 +169,7 @@ body.is-scrolled &.is-fixed @extend .d-none @extend .fixed-top - background-color: var(--background-color-primary) + background-color: var(--color-bg-primary) +box-shadow-card @include media-breakpoint-up(lg) @@ -182,19 +182,19 @@ body.is-scrolled opacity: .5 .day-header - font-size: var(--font-size-large) + font-size: var(--fs-lg) margin-bottom: 0 +padding(2, y) .time-cell-placeholder - font-size: var(--font-size-large) - +font-weight-bold + font-size: var(--fs-lg) + +fw-bold +padding(3, x) +padding(2, top) text-align: right .schedule - background-color: var(--background-color-primary) + background-color: var(--color-bg-primary) display: flex flex-direction: column flex-wrap: nowrap @@ -254,8 +254,8 @@ body.is-scrolled @extend .col-day @extend .row-rulers border-color: transparent - font-size: var(--font-size-large) - +font-weight-bold + font-size: var(--fs-lg) + +fw-bold margin-bottom: 0 order: var(--day-number) +padding(2, y) @@ -278,7 +278,7 @@ body.is-scrolled position: relative &:before - background-color: var(--background-color-primary) + background-color: var(--color-bg-primary) content: 'Today' +padding(2, right) position: absolute @@ -289,7 +289,7 @@ body.is-scrolled @extend .row-rulers @include media-breakpoint-up(sm) - font-size: var(--font-size-large) + font-size: var(--fs-lg) @include media-breakpoint-up(lg) display: none @@ -305,8 +305,8 @@ body.is-scrolled @extend .row-rulers-lg display: none - font-size: var(--font-size-large) - +font-weight-bold + font-size: var(--fs-lg) + +fw-bold +padding(3, x) text-align: right @@ -328,7 +328,7 @@ body.is-scrolled .event-cell background-color: rgba(black, .025) - background-color: var(--background-color) + background-color: var(--color-bg) display: flex flex-direction: column @extend .col-day @@ -359,13 +359,13 @@ body.is-scrolled /* Current-time slot. */ &.happening-now - background-color: var(--color-primary-bg) - box-shadow: 0 0 0 3px inset var(--color-primary-bg-hover) + background-color: var(--color-accent-bg) + box-shadow: 0 0 0 3px inset var(--color-accent-bg-hover) position: relative /* Draw an horizontal line across the entire schedule. */ &:before - background-color: var(--color-primary) + background-color: var(--color-accent) content: '' height: 3px left: -50% @@ -375,7 +375,7 @@ body.is-scrolled width: 300vw .time-header - +font-weight-bold + +fw-bold /* In the vertical schedule, only hide events on mobile, * It's nice to see all days at once on desktop. */ @@ -391,8 +391,8 @@ body.is-scrolled .bcon-logo-text align-items: center display: flex - font-size: var(--font-size-large) - +font-weight-bold + font-size: var(--fs-lg) + +fw-bold height: 100% justify-content: center opacity: 0 @@ -456,7 +456,7 @@ body.is-scrolled /* Ongoing events.. */ &.happening-now background-color: white !important - box-shadow: 0 5px 15px var(--color-primary-bg-hover), 0 0 20px rgba(white, .5) + box-shadow: 0 5px 15px var(--color-accent-bg-hover), 0 0 20px rgba(white, .5) .event-name color: black @@ -491,7 +491,7 @@ body.is-scrolled .event-thumbnail --thumbnail-width: 100% align-items: center - background-color: var(--background-color) + background-color: var(--color-bg) border-top-left-radius: var(--border-radius-lg) border-top-right-radius: var(--border-radius-lg) display: flex @@ -536,7 +536,7 @@ body.is-scrolled opacity: .25 .event-border - background-color: var(--background-color) + background-color: var(--color-bg) border-radius: 99rem +margin(2, top) height: 4px @@ -547,7 +547,7 @@ body.is-scrolled color: var(--text-color-secondary) display: flex flex-wrap: wrap - font-size: var(--font-size-small) + font-size: var(--fs-sm) +margin(1, bottom) .event-description @@ -678,7 +678,7 @@ body.is-scrolled top: -2px .location-label - font-size: var(--font-size-small) + font-size: var(--fs-sm) color: white height: 0 left: 0 @@ -723,7 +723,7 @@ body.is-scrolled span align-items: center - background-color: var(--background-color) + background-color: var(--color-bg) display: flex flex: 1 height: var(--time-slots-height) @@ -746,11 +746,11 @@ body.is-scrolled right: 0 &.happening-now - background-color: var(--color-primary) + background-color: var(--color-accent) &:before - box-shadow: 0 0 0 3px inset var(--color-primary-bg-hover) - background-color: var(--color-primary-bg-hover) + box-shadow: 0 0 0 3px inset var(--color-accent-bg-hover) + background-color: var(--color-accent-bg-hover) strong color: white diff --git a/conference_main/static/conference_main/styles/_slideshow.sass b/conference_main/static/conference_main/styles/_slideshow.sass index bd98369..83a30bb 100644 --- a/conference_main/static/conference_main/styles/_slideshow.sass +++ b/conference_main/static/conference_main/styles/_slideshow.sass @@ -1,8 +1,8 @@ .photo-list-page-nav - background-color: var(--background-color-alt) + background-color: var(--color-bg-alt) color: white - +font-weight-bold - font-size: var(--font-size-large) + +fw-bold + font-size: var(--fs-lg) display: flex align-items: center justify-content: center diff --git a/conference_main/static/conference_main/styles/_sponsors.sass b/conference_main/static/conference_main/styles/_sponsors.sass index 64ea3cb..8c793c1 100644 --- a/conference_main/static/conference_main/styles/_sponsors.sass +++ b/conference_main/static/conference_main/styles/_sponsors.sass @@ -3,8 +3,8 @@ --sponsor-level-2-max-size: 265px --sponsor-level-3-max-size: 215px - background-color: var(--background-color) - border-top: var(--border-width) solid var(--background-color-tertiary) + background-color: var(--color-bg) + border-top: var(--border-width) solid var(--color-bg-tertiary) +padding(5, top) +margin(5, top) text-align: center @@ -20,11 +20,11 @@ .sponsor-level color: rgb(108,160,255) - font-size: var(--font-size-large) + font-size: var(--fs-lg) position: relative span - background-color: var(--background-color) + background-color: var(--color-bg) +padding(3, x) position: relative z-index: 1 diff --git a/conference_main/static/conference_main/styles/_utils.sass b/conference_main/static/conference_main/styles/_utils.sass index 24d4fd3..b8eb0bb 100644 --- a/conference_main/static/conference_main/styles/_utils.sass +++ b/conference_main/static/conference_main/styles/_utils.sass @@ -76,7 +76,7 @@ =text-gradient($direction, $colorfrom, $colorto) background: linear-gradient($direction, $colorfrom, $colorto) background-clip: text - -webkit-background-clip: text + -webkit-bg-clip: text -webkit-text-fill-color: transparent =transition($prop: all, $time: 0.1s, $ease: ease-in) @@ -132,7 +132,7 @@ =pointer-events-none pointer-events: none !important -@mixin text-background($text-color, $background-color, $roundness, $padding) +@mixin text-bg($text-color, $background-color, $roundness, $padding) border-radius: $roundness padding: $padding background-color: $background-color diff --git a/conference_main/static/conference_main/styles/main.sass b/conference_main/static/conference_main/styles/main.sass index 674375d..25fd6e2 100644 --- a/conference_main/static/conference_main/styles/main.sass +++ b/conference_main/static/conference_main/styles/main.sass @@ -19,12 +19,12 @@ $font-path: '/static/assets/fonts' \:root --body-bg: #e9ecef - --background-color: var(--body-bg) + --color-bg: var(--body-bg) --navbar-bg: #1e1e1e --navbar-primary-height: 45px - --table-border-color: var(--background-color-tertiary) - --table-row-bg-color: var(--background-color-secondary) + --table-border-color: var(--color-bg-tertiary) + --table-row-bg-color: var(--color-bg-secondary) --color-cat-talk: hsl(178deg, 69%, 45%) --color-cat-talk-bg: hsl(178deg, 69%, 89%) @@ -110,7 +110,7 @@ button.favorite-star button.going-star &:hover, &[data-is-checked] - +font-weight-bold + +fw-bold color: var(--color-success) i @@ -181,7 +181,7 @@ button.going-star border-radius: var(--border-radius) .badge - +font-weight-bold + +fw-bold &.status-submitted --badge-bg: hsla(42deg, 100%, 50%, .15) diff --git a/conference_main/templates/conference_main/widgets/image.html b/conference_main/templates/conference_main/widgets/image.html index ee99a9b..f746fc3 100644 --- a/conference_main/templates/conference_main/widgets/image.html +++ b/conference_main/templates/conference_main/widgets/image.html @@ -2,7 +2,7 @@
{% if not widget.required %}
- +
{% endif %} diff --git a/tickets/templates/tickets/checkout.html b/tickets/templates/tickets/checkout.html index 7eed5b7..421a132 100644 --- a/tickets/templates/tickets/checkout.html +++ b/tickets/templates/tickets/checkout.html @@ -131,9 +131,9 @@
- + -

+

diff --git a/tickets/templates/tickets/components/badge.html b/tickets/templates/tickets/components/badge.html index 298a167..b13d462 100644 --- a/tickets/templates/tickets/components/badge.html +++ b/tickets/templates/tickets/components/badge.html @@ -4,7 +4,7 @@

Your Badge - + Edit

diff --git a/tickets/templates/tickets/components/pill_payment_status.html b/tickets/templates/tickets/components/pill_payment_status.html index 56cab30..6bba0cd 100644 --- a/tickets/templates/tickets/components/pill_payment_status.html +++ b/tickets/templates/tickets/components/pill_payment_status.html @@ -2,7 +2,7 @@ {% if ticket.order_number %}Order number: {{ ticket.order_number }}{% endif %} {% with refund_status=ticket.refund_status %} -
+
{% if ticket.is_free %} Free {% elif refund_status == "full" %} diff --git a/tickets/templates/tickets/forms/widgets/gateway_radio_option.html b/tickets/templates/tickets/forms/widgets/gateway_radio_option.html index e39cf23..7f0ec2f 100644 --- a/tickets/templates/tickets/forms/widgets/gateway_radio_option.html +++ b/tickets/templates/tickets/forms/widgets/gateway_radio_option.html @@ -9,7 +9,7 @@ {# Make bank transfer look similar to BT options #}
+ --color-bg: var(--body-bg); margin-top: 0"> {% if widget.value == "bank" %} -

When choosing to pay by bank, you will need to manually perform a payment. It might take several days until our team receives the bank transfer and finalises your order. diff --git a/tickets/templates/tickets/invoice.css b/tickets/templates/tickets/invoice.css index 66f349b..bb908b0 100644 --- a/tickets/templates/tickets/invoice.css +++ b/tickets/templates/tickets/invoice.css @@ -51,7 +51,7 @@ footer { color: rgba(40, 35, 74, 0.6); } -.secondary-small { +.secondary-sm { font-size: 0.7rem; color: rgba(40, 35, 74, 0.6); } diff --git a/tickets/templates/tickets/invoice.html b/tickets/templates/tickets/invoice.html index deccf00..13696cf 100644 --- a/tickets/templates/tickets/invoice.html +++ b/tickets/templates/tickets/invoice.html @@ -82,16 +82,16 @@ - Products + Products - Price + Price - Quantity + Quantity - Total Price + Total Price {% for item in order.line_items %} @@ -101,7 +101,7 @@ {# **N.B.**: For now we just assume there's always one line item and product is known, if tax must be shown #} {% for tax in object.product.taxes %}
- Incl. VAT {{ tax.rate }}% ({{ tax.description }}) + Incl. VAT {{ tax.rate }}% ({{ tax.description }}) {% endfor %} @@ -109,7 +109,7 @@ {% format_cents item.price.unit_amount item.currency %} {# **N.B.**: For now we just assume there's always one line item and product is known, if tax must be shown #} {% for tax in object.product.taxes %} - {% format_cents tax.amount item.currency %} + {% format_cents tax.amount item.currency %} {% endfor %} diff --git a/tickets/templates/tickets/products_table.html b/tickets/templates/tickets/products_table.html index a9b27d8..b13b4d7 100644 --- a/tickets/templates/tickets/products_table.html +++ b/tickets/templates/tickets/products_table.html @@ -36,7 +36,7 @@

- Price: {{ product.price_label }} + Price: {{ product.price_label }}
{% if request.user.is_authenticated %} @@ -59,7 +59,7 @@
-

+

Developers who have contributed code to Blender in the past 12 months can contact Thomas Dinges diff --git a/tickets/templates/tickets/ticket_detail_claims.html b/tickets/templates/tickets/ticket_detail_claims.html index 990adb2..3f4d565 100644 --- a/tickets/templates/tickets/ticket_detail_claims.html +++ b/tickets/templates/tickets/ticket_detail_claims.html @@ -26,7 +26,7 @@ -
+