diff --git a/apps/transactions/serializers.py b/apps/transactions/serializers.py index 28fdfcf..1b6fb35 100755 --- a/apps/transactions/serializers.py +++ b/apps/transactions/serializers.py @@ -30,19 +30,17 @@ class TransactionSerializer(serializers.ModelSerializer): read_only_fields = ['uuid', 'last_update', 'state', 'create'] # , 'detail_id'] #, 'application_client_id'] 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') - request = self.context.get('request') - user = request.user if request else payer - - if user == payer: - with atomic(): - transaction = Transaction.objects.create_transaction(**validated_data) - transaction.pay() - - else: - transaction = Transaction.objects.create_transaction(**validated_data) - + # if user == payer: + # with atomic(): + # transaction = Transaction.objects.create_transaction(**validated_data) + # transaction.pay() + # + # else: + transaction = Transaction.objects.create_transaction(**validated_data) return transaction diff --git a/gooyal_accounts/urls.py b/gooyal_accounts/urls.py index d8954cc..6d9b8a9 100644 --- a/gooyal_accounts/urls.py +++ b/gooyal_accounts/urls.py @@ -52,14 +52,10 @@ urlpatterns = [ url(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'), path('admin/', admin.site.urls), # path('accounts/', include(auth_urls)), - # path('login/', OTPLoginView.as_view(), name='login'), - # path('logout/', LogoutView.as_view(), name='logout'), - # path('', home, name='home'), - - # path('oauth2/introspect', introspect_token), - # path('oauth2/introspect/', introspect_token, name='introspect'), + path('login/', OTPLoginView.as_view(), name='login'), + path('logout/', LogoutView.as_view(), name='logout'), + path('', home, name='home'), 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('users/', UserListView.as_view()), @@ -69,15 +65,15 @@ urlpatterns = [ path('province', ProvinceApiView.as_view(), name='province'), path('inquiry/', UserInquiryView.as_view(), name='inquiry'), - # path('transactions/', TransactionList.as_view(), name='transactions'), + path('transactions/', TransactionList.as_view(), name='transactions'), # path('transactions/', TransactionDetail.as_view(), name='transaction_detail'), # path('transactions//pay', TransactionPay.as_view(), name='transaction_pay'), # - # path('deposit/', DepositSubmit.as_view(), name='deposit_submit'), - # path('deposit//verify', DepositVerify.as_view(), name='deposit_verify'), + path('deposit/', DepositSubmit.as_view(), name='deposit_submit'), + path('deposit//verify', DepositVerify.as_view(), name='deposit_verify'), # - # path('withdraw/', WithdrawSubmit.as_view(), name='withdraw_submit'), - # path('withdraw//verify', WithdrawVerify.as_view(), name='withdraw_verify'), + path('withdraw/', WithdrawSubmit.as_view(), name='withdraw_submit'), + path('withdraw//verify', WithdrawVerify.as_view(), name='withdraw_verify'), ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/templates/base.html b/templates/base.html index 3ee1113..201ede4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,4 @@ -{% with site_title="Gooyal Accounts" %} +{% with site_title="Account Managment" %} {% load static %} {# {% load jalali_tags %}#}