Merge pull request #76 from val92130/develop

2.9.1 - Fix cart page redirecting to checkout even if autocheckout is disabled
val92130 · Nov 2, 2017 · c5c1dda · c5c1dda
2 parents 6fffcbd + e487b94
commit c5c1dda
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/bot/manifest.json b/bot/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Supreme Auto-Checkout bot",
   "description": "Supreme Open-Source add to cart bot",
-  "version": "2.9",
+  "version": "2.9.1",
   "background": {
     "scripts": ["background.js"]
   },

diff --git a/bot/src/app/version.js b/bot/src/app/version.js
@@ -1 +1 @@
-export default '2.9';
+export default '2.9.1';
diff --git a/bot/src/extension/content/supreme/processors/atcProcessor.js b/bot/src/extension/content/supreme/processors/atcProcessor.js
@@ -27,7 +27,7 @@ export default class AtcProcessor extends BaseProcessor {
     }));
   }
 
-  static async handleRetry(atcId, maxRetry, currentRetryCount) {
+  async handleRetry(atcId, maxRetry, currentRetryCount) {
     if (maxRetry === 'inf') {
       Helpers.timeout(() => window.location.reload(), 500, 'Product is not available, refreshing...', true);
       return;
@@ -45,7 +45,7 @@ export default class AtcProcessor extends BaseProcessor {
     if (nextProduct) {
       window.location.href = AtcService.getAtcUrl(nextProduct, true);
     } else {
-      window.location.href = '/checkout';
+      window.location.href = this.preferences.autoCheckout ? '/checkout' : '/shop/cart';
     }
   }
 
@@ -78,15 +78,15 @@ export default class AtcProcessor extends BaseProcessor {
     const atcRunAll = Helpers.getQueryStringValue('atc-run-all');
     if (!match) {
       if (!isNaN(atcId) && atcRunAll) {
-        return await AtcProcessor.handleRetry(atcId, maxRetryCount, atcRetryCount);
+        return await this.handleRetry(atcId, maxRetryCount, atcRetryCount);
       }
       setTimeout(() => {
         window.location.reload();
       }, 600);
     } else if (match.soldOut) {
       if (!isNaN(atcId) && atcRunAll) {
         const soldOutAction = atcProduct.product.soldOutAction;
-        return await AtcProcessor.handleRetry(atcId, soldOutAction, atcRetryCount);
+        return await this.handleRetry(atcId, soldOutAction, atcRetryCount);
       }
       setTimeout(() => {
         window.location.reload();

diff --git a/bot/src/extension/content/supreme/processors/cartProcessor.js b/bot/src/extension/content/supreme/processors/cartProcessor.js
@@ -20,6 +20,9 @@ export default class CartProcessor extends BaseProcessor {
    * to the checkout page after the delay configured in the options
    */
   processCart() {
+    if (!this.preferences.autoCheckout) {
+      return;
+    }
     const outOfStockItems = document.querySelectorAll('.out_of_stock');
     const outOfStockAction = this.preferences.onCartSoldOut;
     if (!outOfStockItems.length) {

diff --git a/bot/src/extension/content/supreme/processors/productProcessor.js b/bot/src/extension/content/supreme/processors/productProcessor.js
@@ -184,7 +184,7 @@ export default class ProductProcessor extends BaseProcessor {
 
     if (!atcProduct) return notify('Invalid Autocop Product Id');
 
-    let nextUrl = '/checkout';
+    let nextUrl = this.preferences.autoCheckout ? '/checkout' : '/shop/cart';
     if (atcRunAll) {
       const nextProduct = await AtcService.getNextAtcMonitorProduct(atcId);
       if (nextProduct) {
@@ -255,7 +255,10 @@ export default class ProductProcessor extends BaseProcessor {
     if (!isNaN(atcId) && atcMonitor) {
       return await this.processProductMonitor();
     }
-    let nextUrl = atcRunAll ? '/checkout' : null;
+    let nextUrl = null;
+    if (atcRunAll) {
+      nextUrl = this.preferences.autoCheckout ? '/checkout' : '/shop/cart';
+    }
     if (!isNaN(atcId) && atcRunAll) {
       const nextProduct = await AtcService.getNextEnabledAtcProduct(atcId);
       if (nextProduct) {
@@ -287,7 +290,7 @@ export default class ProductProcessor extends BaseProcessor {
       return false;
     }
 
-    this.addToCart(nextUrl || '/checkout');
+    this.addToCart(nextUrl || (this.preferences.autoCheckout ? '/checkout' : '/shop/cart'));
     return true;
   }
 }