Skip to content

Commit

Permalink
Prepare camapign for C23_WMDE_Desktop_04
Browse files Browse the repository at this point in the history
- text changes in both banners
- based on desktop DE 03
- custom amount form page is removed from both banners, link leads back to mainpage

https://phabricator.wikimedia.org/T344423
  • Loading branch information
moiikana committed Aug 28, 2023
1 parent 98e13d3 commit 57f6cda
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 26 deletions.
2 changes: 1 addition & 1 deletion banners/desktop/banner_var.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const currencyFormatter = localeFactory.getCurrencyFormatter();

app.provide( 'currencyFormatter', currencyFormatter );
app.provide( 'formItems', createFormItems( translator, currencyFormatter.euroAmount.bind( currencyFormatter ) ) );
app.provide( 'formActions', createFormActions( page.getTracking(), impressionCount, { ast: '2' } ) );
app.provide( 'formActions', createFormActions( page.getTracking(), impressionCount, { ast: '0' } ) );
app.provide( 'tracker', tracker );

app.mount( page.getBannerContainer() );
4 changes: 1 addition & 3 deletions banners/desktop/components/BannerCtrl.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ import {
import {
createSubmittableUpgradeToYearly
} from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
import { createSubmittableCustomAmount } from '@src/components/DonationForm/StepControllers/SubmittableCustomAmount';
import { CloseChoices } from '@src/domain/CloseChoices';
import { CloseEvent } from '@src/tracking/events/CloseEvent';
import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
Expand Down Expand Up @@ -109,8 +108,7 @@ const contentState = ref<ContentStates>( ContentStates.Main );
const formModel = useFormModel();
const stepControllers = [
createSubmittableMainDonationForm( formModel, FormStepNames.UpgradeToYearlyFormStep ),
createSubmittableUpgradeToYearly( formModel, FormStepNames.CustomAmountFormStep, FormStepNames.MainDonationFormStep ),
createSubmittableCustomAmount( formModel, FormStepNames.UpgradeToYearlyFormStep )
createSubmittableUpgradeToYearly( formModel, FormStepNames.MainDonationFormStep, FormStepNames.MainDonationFormStep )
];
watch( contentState, async () => {
Expand Down
22 changes: 10 additions & 12 deletions banners/desktop/components/BannerVar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
<template #donation-form="{ formInteraction }: any">
<MultiStepDonation :step-controllers="stepControllers" @form-interaction="formInteraction">

<template #[FormStepNames.MainDonationFormStep]="{ pageIndex, submit, isCurrent, previous }: any">
<MainDonationForm :page-index="pageIndex" @submit="submit" :is-current="isCurrent" @previous="previous"/>
</template>
<template #[FormStepNames.MainDonationFormStep]="{ pageIndex, submit, isCurrent, previous }: any">
<MainDonationForm :page-index="pageIndex" @submit="submit" :is-current="isCurrent" @previous="previous"/>
</template>

<template #[FormStepNames.UpgradeToYearlyFormStep]="{ pageIndex, submit, isCurrent, previous }: any">
<UpgradeToYearlyForm :page-index="pageIndex" @submit="submit" :is-current="isCurrent" @previous="previous"/>
</template>
<template #[FormStepNames.UpgradeToYearlyFormStep]="{ pageIndex, submit, isCurrent, previous }: any">
<UpgradeToYearlyForm :page-index="pageIndex" @submit="submit" :is-current="isCurrent" @previous="previous"/>
</template>

<template #[FormStepNames.CustomAmountFormStep]="{ pageIndex, submit, isCurrent, previous }: any">
<CustomAmountForm :page-index="pageIndex" @submit="submit" :is-current="isCurrent" @previous="previous"/>
</template>
<template #[FormStepNames.CustomAmountFormStep]="{ pageIndex, submit, isCurrent, previous }: any">
<CustomAmountForm :page-index="pageIndex" @submit="submit" :is-current="isCurrent" @previous="previous"/>
</template>

</MultiStepDonation>
</template>
Expand Down Expand Up @@ -80,7 +80,6 @@ import {
import {
createSubmittableUpgradeToYearly
} from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
import { createSubmittableCustomAmount } from '@src/components/DonationForm/StepControllers/SubmittableCustomAmount';
import { CloseChoices } from '@src/domain/CloseChoices';
import { CloseEvent } from '@src/tracking/events/CloseEvent';
import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
Expand Down Expand Up @@ -109,8 +108,7 @@ const contentState = ref<ContentStates>( ContentStates.Main );
const formModel = useFormModel();
const stepControllers = [
createSubmittableMainDonationForm( formModel, FormStepNames.UpgradeToYearlyFormStep ),
createSubmittableUpgradeToYearly( formModel, FormStepNames.CustomAmountFormStep, FormStepNames.MainDonationFormStep ),
createSubmittableCustomAmount( formModel, FormStepNames.UpgradeToYearlyFormStep )
createSubmittableUpgradeToYearly( formModel, FormStepNames.MainDonationFormStep, FormStepNames.MainDonationFormStep )
];
watch( contentState, async () => {
Expand Down
14 changes: 7 additions & 7 deletions campaign_info.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
[desktop]
name = "Desktop"
icon = "desktop"
campaign = "C23_WMDE_Desktop_DE_03"
description = "Address type options test on the Fundraising Application"
campaign_tracking = "03-ba-230810"
campaign = "C23_WMDE_Desktop_DE_04"
description = "Small text changes, Custom Amount Form Page is removed from both banners."
campaign_tracking = "04-ba-230828"
preview_link = "/wiki/Wikipedia:Hauptseite?devbanner={{banner}}&banner=B22_WMDE_local_prototype"
preview_url = 'https://de.wikipedia.org/wiki/Wikipedia:Hauptseite?banner={{banner}}&devMode'
wrapper_template = "wikipedia_org"
Expand All @@ -17,13 +17,13 @@ use_of_funds_source = "MediaWiki:WMDE_Fundraising/UseOfFunds_2023_DE"
# Banners of the campaign, key after "banners" can be anything
[desktop.banners.ctrl]
filename = "./banners/desktop/banner_ctrl.ts"
pagename = "B23_WMDE_Desktop_DE_03_ctrl"
tracking = "org-03-230810-ctrl"
pagename = "B23_WMDE_Desktop_DE_04_ctrl"
tracking = "org-04-230828-ctrl"

[desktop.banners.var]
filename = "./banners/desktop/banner_var.ts"
pagename = "B23_WMDE_Desktop_DE_03_var"
tracking = "org-03-230810-var"
pagename = "B23_WMDE_Desktop_DE_04_var"
tracking = "org-04-230828-var"

[desktop.test_matrix]
platform = ["edge", "firefox_win10", "chrome_win10", "safari", "firefox_macos", "chrome_macos", "firefox_linux", "chrome_linux"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const translations: TranslationMessages = {
'interval-yearly': 'jährlich',

'payment-direct-debit': 'Lastschrift',
'payment-bank-transfer': 'Überweisung',
'payment-bank-transfer': 'Banküberweisung',
'payment-credit-card': 'Kreditkarte',
'payment-paypal': 'PayPal',
'payment-sofort': 'Sofortüberweisung'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footer/BannerFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="wmde-banner-footer">
<div class="wmde-banner-footer-bank">
<label class="wmde-banner-footer-bank-item account">{{ $translate('donation-account') }}:
<SelectionInput :value="'Wikimedia'"/>
<SelectionInput :value="'Wikimedia e.V.'"/>
</label>
<label class="wmde-banner-footer-bank-item bic">BIC:
<SelectionInput :value="'BFSWDE33BER'"/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footer/FooterAlreadyDonated.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TickIcon :fill="'#5B5B5B'"/> {{ $translate( 'already-donated-open-link' ) }}
</a>
<label class="wmde-banner-footer-bank-item account">{{ $translate( 'donation-account' ) }}:
<SelectionInput :value="'Wikimedia'"/>
<SelectionInput :value="'Wikimedia e. V.'"/>
</label>
<label class="wmde-banner-footer-bank-item bic">BIC:
<SelectionInput :value="'BFSWDE33BER'"/>
Expand Down

0 comments on commit 57f6cda

Please sign in to comment.