diff --git a/store/__pycache__/__init__.cpython-39.pyc b/store/__pycache__/__init__.cpython-39.pyc index 29b8495e81db0c45817b62c607566f9ad877d490..19a04983c6ebb68f177ddf619f6652430cc7c962 100644 Binary files a/store/__pycache__/__init__.cpython-39.pyc and b/store/__pycache__/__init__.cpython-39.pyc differ diff --git a/store/__pycache__/productViews.cpython-39.pyc b/store/__pycache__/productViews.cpython-39.pyc index 8b329b4845f6bc332cce0da92e7b943564c685ea..c61276187665bf1c366c498a0b31f979e38057ed 100644 Binary files a/store/__pycache__/productViews.cpython-39.pyc and b/store/__pycache__/productViews.cpython-39.pyc differ diff --git a/store/__pycache__/views.cpython-39.pyc b/store/__pycache__/views.cpython-39.pyc index 060fc72ec47649e66ad5c4f39282ebff97a91b2b..d9214d215aa36aefebb44e9eef570aa7d663c42c 100644 Binary files a/store/__pycache__/views.cpython-39.pyc and b/store/__pycache__/views.cpython-39.pyc differ diff --git a/store/productViews.py b/store/productViews.py index d5686778fe4960320224414bbb0387b49b29fb20..c0ca2f9d49e62c81bb7f46e243bdd5736bfb06c2 100644 --- a/store/productViews.py +++ b/store/productViews.py @@ -35,11 +35,17 @@ def creamer(): if basket_item: basket_item.quantity = basket_item.quantity + 1 - else: - basket_item = Basket(user_id=current_user.id, item=[product], quantity=1) - db.session.add(basket_item) db.session.commit() - flash('Item added to cart!', category='success') + flash('Item added to basket!', category='success') + else: + basket_item = Basket(user_id=current_user.id, item=[getCreamer()], quantity=1) + if len(basket_item.item) < 1: + flash('An error occured!', category='error') + else: + db.session.add(basket_item) + db.session.commit() + flash('Item added to basket!', category='success') + elif request.form.get('delete'): creamer = getCreamer() @@ -76,11 +82,16 @@ def coffee(): if basket_item: basket_item.quantity = basket_item.quantity + 1 - else: - basket_item = Basket(user_id=current_user.id, item=[product], quantity=1) - db.session.add(basket_item) db.session.commit() - flash('Item added to cart!', category='success') + flash('Item added to basket!', category='success') + else: + basket_item = Basket(user_id=current_user.id, item=[getCoffee()], quantity=1) + if len(basket_item.item) < 1: + flash('An error occured!', category='error') + else: + db.session.add(basket_item) + db.session.commit() + flash('Item added to basket!', category='success') elif request.form.get('delete'): coffee = getCoffee() @@ -117,11 +128,16 @@ def dread(): if basket_item: basket_item.quantity = basket_item.quantity + 1 - else: - basket_item = Basket(user_id=current_user.id, item=[product], quantity=1) - db.session.add(basket_item) db.session.commit() - flash('Item added to cart!', category='success') + flash('Item added to basket!', category='success') + else: + basket_item = Basket(user_id=current_user.id, item=[getDread()], quantity=1) + if len(basket_item.item) < 1: + flash('An error occured!', category='error') + else: + db.session.add(basket_item) + db.session.commit() + flash('Item added to basket!', category='success') elif request.form.get('delete'): dread = getDread() @@ -155,14 +171,20 @@ def existence(): if request.form.get('submit') == 'submit': product = getExistence() basket_item = checkItem(current_user, product) + db.session.commit() if basket_item: basket_item.quantity = basket_item.quantity + 1 - else: - basket_item = Basket(user_id=current_user.id, item=[product], quantity=1) - db.session.add(basket_item) db.session.commit() - flash('Item added to cart!', category='success') + flash('Item added to basket!', category='success') + else: + basket_item = Basket(user_id=current_user.id, item=[getExistence()], quantity=1) + if len(basket_item.item) < 1: + flash('An error occured!', category='error') + else: + db.session.add(basket_item) + db.session.commit() + flash('Item added to basket!', category='success') elif request.form.get('delete'): existence = getExistence() @@ -199,11 +221,16 @@ def fly(): if basket_item: basket_item.quantity = basket_item.quantity + 1 - else: - basket_item = Basket(user_id=current_user.id, item=[product], quantity=1) - db.session.add(basket_item) db.session.commit() - flash('Item added to cart!', category='success') + flash('Item added to basket!', category='success') + else: + basket_item = Basket(user_id=current_user.id, item=[getFly()], quantity=1) + if len(basket_item.item) < 1: + flash('An error occured!', category='error') + else: + db.session.add(basket_item) + db.session.commit() + flash('Item added to basket!', category='success') elif request.form.get('delete'): fly = getFly() diff --git a/store/static/js/checkout.js b/store/static/js/checkout.js index efdbdc89646c9a8f884a5fc4669649df01dc80a0..2326075812b6cac4e17ac8a569901ab03cda0774 100644 --- a/store/static/js/checkout.js +++ b/store/static/js/checkout.js @@ -57,7 +57,7 @@ checkoutForm.addEventListener("submit", (e) => { if(exp.value.match(regEx)) { var regEx = /[0-9]{3}$/; if(cvc.value.match(regEx)) { - if (user === 'user') { + if (user.value === 'user') { checkoutUser(); } else { checkoutAnon(); diff --git a/store/views.py b/store/views.py index dcf03c3f595e5babf3b6b9b0f5be0065caf722e3..db3f46ce38cf97ddcf8f3e930e0e54790c78f8c9 100644 --- a/store/views.py +++ b/store/views.py @@ -42,8 +42,11 @@ def home(): else: basket_item = Basket(user_id=current_user.id, item=[product], quantity=1) db.session.add(basket_item) - db.session.commit() - flash('Item added to basket!', category='success') + if len(basket_item.item) < 1: + flash('An error occured!', category='error') + else: + db.session.commit() + flash('Item added to basket!', category='success') if sort: if sort == "name": @@ -110,6 +113,6 @@ def checkoutPay(): for basket in current_user.basket: db.session.delete(basket) db.session.commit() - flash('Payment successful!', category='success') redirect(url_for('views.home')) + flash('Payment successful!', category='success') return jsonify({}) \ No newline at end of file