A bunch of fixes to various issues

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()

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();

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