diff --git a/bornhack/settings/base.py b/bornhack/settings/base.py index 9902de6c..4b7c2934 100644 --- a/bornhack/settings/base.py +++ b/bornhack/settings/base.py @@ -99,10 +99,8 @@ BOOTSTRAP3 = { 'javascript_url': '/static/js/bootstrap.min.js' } -#EPAY_MERCHANT_NUMBER = env('EPAY_MERCHANT_NUMBER') -#EPAY_MD5_SECRET = env('EPAY_MD5_SECRET') - -#TICKET_CATEGORY_ID = env('TICKET_CATEGORY_ID') +EPAY_MERCHANT_NUMBER = env('EPAY_MERCHANT_NUMBER') +EPAY_MD5_SECRET = env('EPAY_MD5_SECRET') COINIFY_API_KEY = env('COINIFY_API_KEY') COINIFY_API_SECRET = env('COINIFY_API_SECRET') diff --git a/shop/urls.py b/shop/urls.py index ca92c421..3e6892c0 100644 --- a/shop/urls.py +++ b/shop/urls.py @@ -11,9 +11,9 @@ urlpatterns = [ url(r'orders/(?P[0-9]+)/invoice/$', DownloadInvoiceView.as_view(), name='download_invoice'), url(r'orders/(?P[0-9]+)/mark_as_paid/$', OrderMarkAsPaidView.as_view(), name='mark_order_as_paid'), - #url(r'orders/(?P[0-9]+)/pay/creditcard/$', EpayFormView.as_view(), name='epay_form'), - #url(r'orders/(?P[0-9]+)/pay/creditcard/callback/$',EpayCallbackView.as_view(), name='epay_callback'), - #url(r'orders/(?P[0-9]+)/pay/creditcard/thanks/$', EpayThanksView.as_view(), name='epay_thanks'), + url(r'orders/(?P[0-9]+)/pay/creditcard/$', EpayFormView.as_view(), name='epay_form'), + url(r'orders/(?P[0-9]+)/pay/creditcard/callback/$',EpayCallbackView.as_view(), name='epay_callback'), + url(r'orders/(?P[0-9]+)/pay/creditcard/thanks/$', EpayThanksView.as_view(), name='epay_thanks'), url(r'orders/(?P[0-9]+)/pay/blockchain/$', CoinifyRedirectView.as_view(), name='coinify_pay'), url(r'orders/(?P[0-9]+)/pay/blockchain/callback/$', CoinifyCallbackView.as_view(), name='coinify_callback'),