From 0f76072e576dfca3fecb2799e8266059a3333a4d Mon Sep 17 00:00:00 2001
From: anamotaadyen <ana.mota@adyen.com>
Date: Fri, 4 Nov 2022 13:21:11 +0000
Subject: [PATCH] Revert "Merge branch 'main' into ana"

This reverts commit 67207eae8ddfadc50719670e5d3b29cd07775b79, reversing
changes made to 9b9a86fc4af915b447eea3ed4c61dc51df7d7e11.
---
 .../workflows/{e2e.yml.disabled => e2e.yml}   |  0
 app/main/disable.py                           |  2 +-
 app/main/paymentMethods.py                    |  2 +-
 app/main/payments.py                          |  2 +-
 venv/bin/activate                             | 66 -------------------
 5 files changed, 3 insertions(+), 69 deletions(-)
 rename .github/workflows/{e2e.yml.disabled => e2e.yml} (100%)
 delete mode 100644 venv/bin/activate

diff --git a/.github/workflows/e2e.yml.disabled b/.github/workflows/e2e.yml
similarity index 100%
rename from .github/workflows/e2e.yml.disabled
rename to .github/workflows/e2e.yml
diff --git a/app/main/disable.py b/app/main/disable.py
index 5097c88..ce6348d 100644
--- a/app/main/disable.py
+++ b/app/main/disable.py
@@ -18,7 +18,7 @@ def disable_card(storedPaymentMethodId):
 
     disable_request['shopperReference'] = "UniqueReference"
     disable_request['recurringDetailReference'] =  f"{storedPaymentMethodId}"
-    disable_request['merchantAccount'] = get_adyen_merchant_account()
+    disable_request['merchantAccount'] = "CheckoutCreateDemo"
     print("/disable request:\n" + str(disable_request))
 
     disable_response = adyen.recurring.disable(disable_request)
diff --git a/app/main/paymentMethods.py b/app/main/paymentMethods.py
index 7896426..e624343 100644
--- a/app/main/paymentMethods.py
+++ b/app/main/paymentMethods.py
@@ -22,7 +22,7 @@ def adyen_payment_methods(locale_data):
     payment_methods_request['countryCode'] = locale_data['countryCode'] 
     payment_methods_request['shopperReference'] = "UniqueReference"
     payment_methods_request['channel'] = "Web"
-    payment_methods_request['merchantAccount'] = get_adyen_merchant_account()
+    payment_methods_request['merchantAccount'] = "CheckoutCreateDemo"
     payment_methods_request['blockedPaymentMethods'] = locale_data['blockedPaymentMethods']
 
 
diff --git a/app/main/payments.py b/app/main/payments.py
index 8556a1f..946d2ea 100644
--- a/app/main/payments.py
+++ b/app/main/payments.py
@@ -27,7 +27,7 @@ def adyen_payments(frontend_request, locale_data):
     payments_request['shopperReference'] = "UniqueReference"
     payments_request['returnUrl'] = "http://localhost:8080/api/handleShopperRedirect"
     payments_request['countryCode'] = locale_data['countryCode']  
-    payments_request['merchantAccount'] = get_adyen_merchant_account()
+    payments_request['merchantAccount'] = "CheckoutCreateDemo"
     payments_request['recurringExpiry'] = "2022-08-01T23:59:59+02:00"
 
 
diff --git a/venv/bin/activate b/venv/bin/activate
deleted file mode 100644
index cc79d2b..0000000
--- a/venv/bin/activate
+++ /dev/null
@@ -1,66 +0,0 @@
-# This file must be used with "source bin/activate" *from bash*
-# you cannot run it directly
-
-deactivate () {
-    # reset old environment variables
-    if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then
-        PATH="${_OLD_VIRTUAL_PATH:-}"
-        export PATH
-        unset _OLD_VIRTUAL_PATH
-    fi
-    if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then
-        PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}"
-        export PYTHONHOME
-        unset _OLD_VIRTUAL_PYTHONHOME
-    fi
-
-    # This should detect bash and zsh, which have a hash command that must
-    # be called to get it to forget past commands.  Without forgetting
-    # past commands the $PATH changes we made may not be respected
-    if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
-        hash -r 2> /dev/null
-    fi
-
-    if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
-        PS1="${_OLD_VIRTUAL_PS1:-}"
-        export PS1
-        unset _OLD_VIRTUAL_PS1
-    fi
-
-    unset VIRTUAL_ENV
-    if [ ! "${1:-}" = "nondestructive" ] ; then
-    # Self destruct!
-        unset -f deactivate
-    fi
-}
-
-# unset irrelevant variables
-deactivate nondestructive
-
-VIRTUAL_ENV="/Users/julienlengrand-lambert/Developer/adyen/checkoutCreate/venv"
-export VIRTUAL_ENV
-
-_OLD_VIRTUAL_PATH="$PATH"
-PATH="$VIRTUAL_ENV/bin:$PATH"
-export PATH
-
-# unset PYTHONHOME if set
-# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
-# could use `if (set -u; : $PYTHONHOME) ;` in bash
-if [ -n "${PYTHONHOME:-}" ] ; then
-    _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}"
-    unset PYTHONHOME
-fi
-
-if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
-    _OLD_VIRTUAL_PS1="${PS1:-}"
-    PS1="(venv) ${PS1:-}"
-    export PS1
-fi
-
-# This should detect bash and zsh, which have a hash command that must
-# be called to get it to forget past commands.  Without forgetting
-# past commands the $PATH changes we made may not be respected
-if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
-    hash -r 2> /dev/null
-fi