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

site name

Browse source
This commit is contained in:
Sayyid Hamid Mahdavi 2020-12-16 14:44:28 +03:30
parent c82d8c520b
commit c7a83258a1
3 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/transactions/serializers.py
View file

@ -30,19 +30,17 @@ class TransactionSerializer(serializers.ModelSerializer):
read_only_fields = ['uuid', 'last_update', 'state', 'create'] # , 'detail_id'] #, 'application_client_id'] read_only_fields = ['uuid', 'last_update', 'state', 'create'] # , 'detail_id'] #, 'application_client_id']
def create(self, validated_data): def create(self, validated_data):
# payer = validated_data.get('payer')
# request = self.context.get('request')
# user = request.user if request else payer
payer = validated_data.get('payer') # if user == payer:
request = self.context.get('request') # with atomic():
user = request.user if request else payer # transaction = Transaction.objects.create_transaction(**validated_data)
# transaction.pay()
if user == payer: #
with atomic(): # else:
transaction = Transaction.objects.create_transaction(**validated_data) transaction = Transaction.objects.create_transaction(**validated_data)
transaction.pay()
else:
transaction = Transaction.objects.create_transaction(**validated_data)
return transaction return transaction

20
gooyal_accounts/urls.py
View file

@ -52,14 +52,10 @@ urlpatterns = [
url(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'), url(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
# path('accounts/', include(auth_urls)), # path('accounts/', include(auth_urls)),
# path('login/', OTPLoginView.as_view(), name='login'), path('login/', OTPLoginView.as_view(), name='login'),
# path('logout/', LogoutView.as_view(), name='logout'), path('logout/', LogoutView.as_view(), name='logout'),
# path('', home, name='home'), path('', home, name='home'),
# path('oauth2/introspect', introspect_token),
# path('oauth2/introspect/', introspect_token, name='introspect'),
path('oauth2/', include('oauth2_provider.urls', namespace='oauth2_provider')), path('oauth2/', include('oauth2_provider.urls', namespace='oauth2_provider')),
# url(r'^oauth2/register_scope/$', register_scope, name = 'register-scope'),
path('account/', AccountView.as_view(), name='account'), path('account/', AccountView.as_view(), name='account'),
path('users/', UserListView.as_view()), path('users/', UserListView.as_view()),
@ -69,15 +65,15 @@ urlpatterns = [
path('province', ProvinceApiView.as_view(), name='province'), path('province', ProvinceApiView.as_view(), name='province'),
path('inquiry/', UserInquiryView.as_view(), name='inquiry'), path('inquiry/', UserInquiryView.as_view(), name='inquiry'),
# path('transactions/', TransactionList.as_view(), name='transactions'), path('transactions/', TransactionList.as_view(), name='transactions'),
# path('transactions/<uuid>', TransactionDetail.as_view(), name='transaction_detail'), # path('transactions/<uuid>', TransactionDetail.as_view(), name='transaction_detail'),
# path('transactions/<uuid>/pay', TransactionPay.as_view(), name='transaction_pay'), # path('transactions/<uuid>/pay', TransactionPay.as_view(), name='transaction_pay'),
# #
# path('deposit/', DepositSubmit.as_view(), name='deposit_submit'), path('deposit/', DepositSubmit.as_view(), name='deposit_submit'),
# path('deposit/<uuid>/verify', DepositVerify.as_view(), name='deposit_verify'), path('deposit/<uuid>/verify', DepositVerify.as_view(), name='deposit_verify'),
# #
# path('withdraw/', WithdrawSubmit.as_view(), name='withdraw_submit'), path('withdraw/', WithdrawSubmit.as_view(), name='withdraw_submit'),
# path('withdraw/<uuid>/verify', WithdrawVerify.as_view(), name='withdraw_verify'), path('withdraw/<uuid>/verify', WithdrawVerify.as_view(), name='withdraw_verify'),
] ]
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

2
templates/base.html
View file

@ -1,4 +1,4 @@
{% with site_title="Gooyal Accounts" %} {% with site_title="Account Managment" %}
<!DOCTYPE html> <!DOCTYPE html>
{% load static %} {% load static %}
{# {% load jalali_tags %}#} {# {% load jalali_tags %}#}