AddToCartAction updated to be able to handle both errored and ok posi…

…tions
hiqdev · Mar 21, 2016 · d9b14cf · d9b14cf
1 parent fe44f81
commit d9b14cf
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/src/actions/AddToCartAction.php b/src/actions/AddToCartAction.php
@@ -54,19 +54,25 @@ public function run()
             $collection->load();
         }
 
-        if ($collection->validate()) {
-            foreach ($collection->models as $position) {
-                /** @var CartPositionInterface $position */
-                if (!$cart->hasPosition($position->getId())) {
-                    $cart->put($position);
-                    Yii::$app->session->addFlash('success', Yii::t('cart', 'Item has been added to cart'));
-                } else {
-                    Yii::$app->session->addFlash('warning', Yii::t('cart', 'Item is already in the cart'));
+        foreach ($collection->models as $position) {
+            /** @var CartPositionInterface $position */
+            if (!$position->validate()) {
+                $error = $collection->getFirstError();
+                if (empty($error)) {
+                    $error = Yii::t('cart', 'Failed to add item to the cart');
                 }
+                Yii::$app->session->addFlash('warning', $error);
+                Yii::warning('Failed to add item to cart', 'cart');
+
+                continue;
+            }
+
+            if (!$cart->hasPosition($position->getId())) {
+                $cart->put($position);
+                Yii::$app->session->addFlash('success', Yii::t('cart', 'Item has been added to cart'));
+            } else {
+                Yii::$app->session->addFlash('warning', Yii::t('cart', 'Item is already in the cart'));
             }
-        } else {
-            Yii::$app->session->addFlash('warning', Yii::t('cart', 'Failed to add item to the cart'));
-            Yii::warning('Failed to add item to the cart', 'cart');
         }
 
         if ($request->isAjax) {