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

Add Google Wallet integration #6028

Merged
merged 89 commits into from Feb 26, 2024

Conversation

openprojects
Copy link
Contributor

@openprojects openprojects commented Nov 9, 2023

Add Google Wallet integration.

Google Wallet Event ticket preview:

Screenshot 2024-01-17 at 13 24 28 Screenshot 2024-01-17 at 13 50 12

@openprojects openprojects force-pushed the Add-Google-Wallet-integration branch 3 times, most recently from 2653814 to 7f7a84a Compare November 9, 2023 17:01
indico/modules/events/__init__.py Outdated Show resolved Hide resolved
indico/modules/events/registration/blueprint.py Outdated Show resolved Hide resolved
indico/modules/events/registration/badges.py Outdated Show resolved Hide resolved
indico/modules/events/registration/badges.py Outdated Show resolved Hide resolved
indico/modules/events/registration/badges.py Outdated Show resolved Hide resolved
@openprojects openprojects marked this pull request as ready for review November 9, 2023 20:35
@ThiefMaster
Copy link
Member

You accidentally pushed an empty branch. To recover this without having to open a new PR (assuming origin is your remote):

  • git push --force origin 010d0293235:Add-Google-Wallet-integration
  • Now the "reopen" button should be available here

(010d0293235 is the "Move GoogleWalletManager class to separate file" commit you pushed earlier today)

Then to properly sync it with master:

  • git fetch upstream
  • git rebase upstream/master
  • git push --force

@openprojects
Copy link
Contributor Author

openprojects commented Nov 13, 2023 via email

@openprojects openprojects reopened this Nov 13, 2023
@tomasr8
Copy link
Member

tomasr8 commented Nov 22, 2023

@openprojects Could you please rebase the PR (and update the migration)? thanks!

indico/modules/events/models/events.py Outdated Show resolved Hide resolved
indico/modules/categories/controllers/management.py Outdated Show resolved Hide resolved
indico/modules/events/registration/google_wallet.py Outdated Show resolved Hide resolved
@tomasr8
Copy link
Member

tomasr8 commented Jan 31, 2024

@openprojects Could you rebase the PR? :)

@openprojects
Copy link
Contributor Author

@openprojects Could you rebase the PR? :)

Done.

@tomasr8
Copy link
Member

tomasr8 commented Jan 31, 2024

@openprojects Could you rebase the PR? :)

Done.

Could you rebase instead of merging master? We try to avoid merge commits to keep the history clean

@ThiefMaster
Copy link
Member

And while we usually squash-and-merge PRs anyway, it's way easier if we can do a quick git rebase master locally for testing (at least I always do that to test on the latest version regardless of how fresh the PR 's branch is)

@openprojects
Copy link
Contributor Author

@openprojects Could you rebase the PR? :)

Done.

Could you rebase instead of merging master? We try to avoid merge commits to keep the history clean

Working on it...

@tomasr8
Copy link
Member

tomasr8 commented Feb 1, 2024

@openprojects Could you rebase the PR? :)

Done.

Could you rebase instead of merging master? We try to avoid merge commits to keep the history clean

Working on it...

Try this:

git checkout Add-Google-Wallet-integration
git reset --hard HEAD~3  # To remove the last 3 commits which shouldn't be there
git fetch upstream
git rebase upstream/master
git push -f origin Add-Google-Wallet-integration

@openprojects openprojects force-pushed the Add-Google-Wallet-integration branch 2 times, most recently from 6a4213a to 4349e6b Compare February 1, 2024 09:43
- better naming
- util to prepend issuer id part
It should never change, but by saving it in the event settings we know
for which events a ticket class can been created. That may come in handy
in the future...
Co-authored-by: Alejandro Avilés <omegak@gmail.com>
@ThiefMaster ThiefMaster self-assigned this Feb 26, 2024
@ThiefMaster
Copy link
Member

ThiefMaster commented Feb 26, 2024

Final TODOs for later or tomorrow before this this is finally getting merged:

  • Expose event logo via secret (signed) URL so even private events can have their logo in Google Wallet
  • Mention that wallet tickets are not available for accompanying persons?
  • Warn when exactly one of address/venue are set and wallet tickets are enabled
  • Separate setting for wallet logo URL? Also super useful for developers whose instance is not accessible by Google's servers

@ThiefMaster ThiefMaster added this to the v3.3 milestone Feb 26, 2024
@ThiefMaster ThiefMaster enabled auto-merge (squash) February 26, 2024 18:30
It gets squeezed into a square so the default logo with the full
"Indico" text looks really weird
@ThiefMaster ThiefMaster merged commit b509a5e into indico:master Feb 26, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants