addwin/promotions
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feature/wallet-changes

Browse source 
# Conflicts:
#	README.md
#	apps/promotions/models.py
#	main/settings.py
This commit is contained in:
Ali Asadi 2026-08-25 17:49:45 +03:30
commit d3800584b5
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/settings.py
View file

@ -391,8 +391,8 @@ WALLET_USER_BILLBOARD_VISIT_INCOME = config('WALLET_USER_BILLBOARD_VISIT_INCOME'
# wallet above. TODO(you): replace with the real wallet-type UUID from the wallet service. # wallet above. TODO(you): replace with the real wallet-type UUID from the wallet service.
WALLET_PROMOTIONS_TRANSIT = config('WALLET_PROMOTIONS_TRANSIT', cast=str) WALLET_PROMOTIONS_TRANSIT = config('WALLET_PROMOTIONS_TRANSIT', cast=str)
# Same wallet-service UUID as the advertising repo's own WALLET_ADVERTISING_TRANSIT setting. # Same wallet-service UUID as the advertising repo's own WALLET_ADVERTISING_TRANSIT setting.
# Destination for promotion types that fund billboard/ad credit rather than a cash-like user # Destination for a Recipient whose wallet_destination is advertising_transit — billboard/ad
# reward (CAPTURE, FIRST_AD_CREATE) — see Recipient.get_wallet_category_uuid(). # credit rather than a cash-like user reward — see Recipient.get_wallet_category_uuid().
WALLET_ADVERTISING_TRANSIT = config('WALLET_ADVERTISING_TRANSIT', cast=str) WALLET_ADVERTISING_TRANSIT = config('WALLET_ADVERTISING_TRANSIT', cast=str)
NOTIFICATIONS_BASE_PUBLIC_URL = config('NOTIFICATIONS_BASE_PUBLIC_URL', default=None, cast=str) NOTIFICATIONS_BASE_PUBLIC_URL = config('NOTIFICATIONS_BASE_PUBLIC_URL', default=None, cast=str)

5
utils/clients/notifications_client.py
View file

@ -75,7 +75,9 @@ def get_notifications_client():
return client return client
def notifications_push_user(user_uuid, title, message, priority=5, extras=None): def notifications_push_user(user_uuid, title, message, priority=5, extras=None, click_url=None):
# click_url is optional — most notifications aren't clickable. When set,
# the notifications service embeds it as the tap destination.
class Tmp(): class Tmp():
def to_dict(self): def to_dict(self):
return { return {
@ -83,6 +85,7 @@ def notifications_push_user(user_uuid, title, message, priority=5, extras=None):
'message': message, 'message': message,
'priority': priority, 'priority': priority,
'extras': extras, 'extras': extras,
'click_url': click_url,
} }
push_data = Tmp() push_data = Tmp()