Merge branch 'master' of git.mindplus-dev.ir:sahama/wallet
This commit is contained in:
commit
a5639b5426
2 changed files with 2 additions and 2 deletions
|
|
@ -364,7 +364,7 @@ class Transaction(BaseModel):
|
||||||
self.rollback_withdraw_to_payer_balance()
|
self.rollback_withdraw_to_payer_balance()
|
||||||
self.change_state(
|
self.change_state(
|
||||||
[StateChoices.PENDING, StateChoices.DELAYED, StateChoices.INCOMPLETE],
|
[StateChoices.PENDING, StateChoices.DELAYED, StateChoices.INCOMPLETE],
|
||||||
StateChoices.SUCCESS,
|
StateChoices.ROLLED_BACK,
|
||||||
error_message=_('TRANSACTION_STATE_NOT_SUITABLE_FOR_ROLLBACK')
|
error_message=_('TRANSACTION_STATE_NOT_SUITABLE_FOR_ROLLBACK')
|
||||||
)
|
)
|
||||||
return self
|
return self
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ from rest_framework.viewsets import ViewSet, GenericViewSet
|
||||||
|
|
||||||
from apps.wallet.models import Transaction
|
from apps.wallet.models import Transaction
|
||||||
from django.contrib.postgres.aggregates import ArrayAgg
|
from django.contrib.postgres.aggregates import ArrayAgg
|
||||||
from django.db.models import Sum, Count, F, StringAgg
|
from django.db.models import Sum, Count, F
|
||||||
|
|
||||||
from apps.gooyal_oauth2.rest_framework import IsAuthenticatedOrTokenMatchesOASRequirements
|
from apps.gooyal_oauth2.rest_framework import IsAuthenticatedOrTokenMatchesOASRequirements
|
||||||
from apps.wallet.models import Transaction, Wallet, Account
|
from apps.wallet.models import Transaction, Wallet, Account
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue