Revert "Revert "Merge branch 'main' into ana""

This reverts commit 0f76072e57.

app/main/disable.py

@@ -18,7 +18,7 @@ def disable_card(storedPaymentMethodId):
 
     disable_request['shopperReference'] = "UniqueReference"
     disable_request['recurringDetailReference'] =  f"{storedPaymentMethodId}"
-    disable_request['merchantAccount'] = "CheckoutCreateDemo"
+    disable_request['merchantAccount'] = get_adyen_merchant_account()
     print("/disable request:\n" + str(disable_request))
 
     disable_response = adyen.recurring.disable(disable_request)

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'] = "CheckoutCreateDemo"
+    payment_methods_request['merchantAccount'] = get_adyen_merchant_account()
     payment_methods_request['blockedPaymentMethods'] = locale_data['blockedPaymentMethods']
 
 

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'] = "CheckoutCreateDemo"
+    payments_request['merchantAccount'] = get_adyen_merchant_account()
     payments_request['recurringExpiry'] = "2022-08-01T23:59:59+02:00"
 
 

venv/bin/activate

@@ -0,0 +1,66 @@
+# 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