diff --git a/.env b/.env index b1ab1b4..1e51c9a 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ # environment file for docker-compose REPO=robotshop -TAG=0.3.2 +TAG=0.3.3 diff --git a/docker-compose.yaml b/docker-compose.yaml index 6cac5b8..7427d01 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -107,6 +107,9 @@ services: - rabbitmq networks: - robot-shop + # Uncomment to change payment gateway + #environment: + #PAYMENT_GATEWAY: "https://www.worldpay.com" deploy: replicas: 1 restart_policy: diff --git a/payment/payment.py b/payment/payment.py index 47af054..924a411 100644 --- a/payment/payment.py +++ b/payment/payment.py @@ -16,6 +16,7 @@ app = Flask(__name__) CART = os.getenv('CART_HOST', 'cart') USER = os.getenv('USER_HOST', 'user') +PAYMENT_GATEWAY = os.getenv('PAYMENT_GATEWAY', 'https://paypal.com/') @app.route('/health', methods=['GET']) def health(): @@ -28,8 +29,8 @@ def pay(id): app.logger.info(cart) # dummy call to Paypal, hope they dont object - req = requests.get('https://paypal.com/') - app.logger.info('paypal returned {}'.format(req.status_code)) + req = requests.get(PAYMENT_GATEWAY) + app.logger.info('{} returned {}'.format(PAYMENT_GATEWAY, req.status_code)) # Generate order id orderid = str(uuid.uuid4()) @@ -82,5 +83,6 @@ if __name__ == "__main__": sh.setLevel(logging.INFO) app.logger.addHandler(sh) app.logger.setLevel(logging.INFO) + app.logger.info('Payment gateway {}'.format(PAYMENT_GATEWAY)) port = int(os.getenv("SHOP_PAYMENT_PORT", "8080")) app.run(host='0.0.0.0', port=port) diff --git a/web/static/payment.html b/web/static/payment.html index f23935c..19906ad 100644 --- a/web/static/payment.html +++ b/web/static/payment.html @@ -28,7 +28,7 @@ - +