Improve error handling

verbb · Apr 27, 2016 · 7fd8b16 · 7fd8b16
1 parent 5a9d080
commit 7fd8b16
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -73,6 +73,12 @@ This plugin has been tested with Craft 2.5 and Craft Commerce 1.0.1187.
 
 ## Changelog
 
+0.1.0 
+* [Improved] Improved error handling.
+
+0.0.9
+* [Added] releases.json
+
 0.0.8 
 * [Fixed] Handle submissions with all zero quantities more gracefully
 

diff --git a/multiadd/MultiAddPlugin.php b/multiadd/MultiAddPlugin.php
@@ -22,7 +22,7 @@ public function getName()
 
     public function getVersion()
     {
-        return '0.0.9';
+        return '0.1.0';
     }
 
     public function getSchemaVersion()

diff --git a/multiadd/controllers/MultiAddController.php b/multiadd/controllers/MultiAddController.php
@@ -46,53 +46,51 @@ public function actionMultiAdd()
             echo '</pre>';
         }
 
+
         if (!isset($items)) {
-            $errors[] = "No items?";
-            craft()->urlManager->setRouteVariables(['error' => 'No items?']);
+            $errors[] = "No items to add.";
         } 
-
-        //prevent submission of all 0 qtys
-        $itemsToProcess = false;
-        foreach ($items as $key => $item) {
-            $qty = isset($item['qty']) ? (int)$item['qty'] : 0;
-            if ($qty >0){
-                $itemsToProcess = true;
-                break;
+        else{
+            $itemsToProcess = false;
+            //prevent submission of all 0 qtys            
+            foreach ($items as $key => $item) {
+                $qty = isset($item['qty']) ? (int)$item['qty'] : 0;
+                if ($qty >0){
+                    $itemsToProcess = true;
+                    break;
+                }
+            }
+            if(!$itemsToProcess){
+                $errors[] = "All items have 0 quantity.";
             }
         }
 
-        if(!$itemsToProcess){
-            $errors[] = "All items have 0 quantity?";
-            craft()->urlManager->setRouteVariables(['error' => 'No items?']);
-        } 
-        else {
-
 
-            // Do some cart-adding using our new, faster, rollback-able service
-            if (!$errors) {
-                $error = "";
-                if (!craft()->multiAdd_cart->multiAddToCart($cart, $items, $error)) {
-                    $errors[] = $error;  
-                }              
-            }
+        // Do some cart-adding using our new, faster, rollback-able service
+        if (!$errors) {
+            $error = "";
+            if (!craft()->multiAdd_cart->multiAddToCart($cart, $items, $error)) {
+                $errors[] = $error;  
+            }              
+        }
 
-            //trouble?
-            if ($errors) {
-                foreach ($errors as $error) {
-                    $this->logError($error);
-                }
-                craft()->urlManager->setRouteVariables(['error' => $errors]);
+        //trouble?
+        if ($errors) {
+            foreach ($errors as $error) {
+                $this->logError($error);
             }
-            //everything went fine!
-            else {
-                craft()->userSession->setFlash('notice', 'Products have been multiadd-ed');
-                //only redirect if we're not debugging and we haven't submitted by ajax
-                if (!$debug and !$ajax){
-                    $this->redirectToPostedUrl();
-                }
+            craft()->urlManager->setRouteVariables(['error' => $errors]);
+        }
+        //everything went fine!
+        else {
+            craft()->userSession->setFlash('notice', 'Products have been multiadd-ed');
+            //only redirect if we're not debugging and we haven't submitted by ajax
+            if (!$debug and !$ajax){
+                $this->redirectToPostedUrl();
             }
         }
 
+
         // Appropriate Ajax responses...
         if($ajax){
             if($errors){

diff --git a/releases.json b/releases.json
@@ -1,4 +1,12 @@
 [
+    {
+        "version": "0.1.0",
+        "downloadUrl": "https://github.com/engram-design/MultiAdd/archive/0.1.0.zip",
+        "date": "2016-04-27T11:17:28+10:00",
+        "notes": [
+            "[Improved] Error Handling",
+        ]
+    },
     {
         "version": "0.0.9",
         "downloadUrl": "https://github.com/engram-design/MultiAdd/archive/0.0.9.zip",