From bcabb11bc1556414b33ef5472df6059bba5c08cc Mon Sep 17 00:00:00 2001
From: arings <aringbauer@codingunicorns.com>
Date: Sat, 27 Jan 2018 20:46:21 +0100
Subject: [PATCH 1/3] Fix productsPerRow select reset to 1

When settings page are loaded, select doesn't reflect value of
config.productsPerRow and resets to 1. Following settings update
saves that value.
---
 views/settings.hbs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/settings.hbs b/views/settings.hbs
index e83e0e0..1072a5c 100644
--- a/views/settings.hbs
+++ b/views/settings.hbs
@@ -66,6 +66,7 @@
             <div class="form-group">
 			    <label>Products per row</label>
                 <select class="form-control" name="productsPerRow">
+                    <option value="{{config.productsPerRow}}" hidden="hidden" selected="selected">{{config.productsPerRow}}</option>
                     <option {{selectState '1' config.productsPerRow}}>1</option>
                     <option {{selectState '2' config.productsPerRow}}>2</option>
                     <option {{selectState '3' config.productsPerRow}}>3</option>
@@ -141,4 +142,4 @@
 		  	</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>

From c2184649faf2adaadaf11494c3d8ae06873d12fb Mon Sep 17 00:00:00 2001
From: arings <aringbauer@codingunicorns.com>
Date: Wed, 31 Jan 2018 17:57:56 +0100
Subject: [PATCH 2/3] Fix bugs in Stripe and crashes in Paypal modules

- Paypal: deprecated req.param in express
- Paypal: newId was saving in DB as empty string
- Stripe: newId was undefined, resulting in wrongly reported unsuccesful
transaction
- Stripe: client email was not sending because was undefined
---
 routes/payments/paypal.js | 7 ++-----
 routes/payments/stripe.js | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/routes/payments/paypal.js b/routes/payments/paypal.js
index 0446afd..aeba43f 100644
--- a/routes/payments/paypal.js
+++ b/routes/payments/paypal.js
@@ -12,7 +12,7 @@ router.get('/checkout_return', (req, res, next) => {
     let db = req.app.db;
     let config = common.getConfig();
     let paymentId = req.session.paymentId;
-    let payerId = req.param('PayerID');
+    let payerId = req.query['PayerID'];
 
     let details = {'payer_id': payerId};
     paypal.payment.execute(paymentId, details, (error, payment) => {
@@ -190,10 +190,7 @@ router.post('/checkout_action', (req, res, next) => {
                     }
 
                     // get the new ID
-                    let newId = '';
-                    if(newDoc.insertedIds.length > 0){
-                        newId = newDoc.insertedIds[0].toString();
-                    }
+                    let newId = newDoc.insertedIds['0'];
 
                     // set the order ID in the session
                     req.session.orderId = newId;
diff --git a/routes/payments/stripe.js b/routes/payments/stripe.js
index efd8bc3..55b6cfb 100644
--- a/routes/payments/stripe.js
+++ b/routes/payments/stripe.js
@@ -60,7 +60,7 @@ router.post('/checkout_action', (req, res, next) => {
             }
 
             // get the new ID
-            let newId = newDoc.insertedIds;
+            let newId = newDoc.insertedIds['0'];
 
             // add to lunr index
             common.indexOrders(req.app)
@@ -70,7 +70,7 @@ router.post('/checkout_action', (req, res, next) => {
                     // set the results
                     req.session.messageType = 'success';
                     req.session.message = 'Your payment was successfully completed';
-                    req.session.paymentEmailAddr = newDoc.orderEmail;
+                    req.session.paymentEmailAddr = newDoc.ops[0].orderEmail;
                     req.session.paymentApproved = true;
                     req.session.paymentDetails = '<p><strong>Order ID: </strong>' + newId + '</p><p><strong>Transaction ID: </strong>' + charge.id + '</p>';
 

From 6f379b393dedb64d065f4d769a1f5c8ad90acfdb Mon Sep 17 00:00:00 2001
From: arings <aringbauer@codingunicorns.com>
Date: Fri, 2 Feb 2018 21:20:33 +0100
Subject: [PATCH 3/3] Fix crash after adding new product, similar to #3

---
 routes/admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/admin.js b/routes/admin.js
index 54a94c7..b556cb1 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -410,7 +410,7 @@ router.post('/product/insert', common.restrict, (req, res) => {
                     res.redirect('/admin/product/new');
                 }else{
                     // get the new ID
-                    let newId = newDoc.insertedIds;
+                    let newId = newDoc.insertedIds[0];
 
                     // add to lunr index
                     common.indexProducts(req.app)