Skip to content

Commit e456fc6

Browse files
author
Pavlo Cherniavskyi
committed
MAGETWO-30801: Asynchronous products addition to cart
- merge fix
1 parent cf13190 commit e456fc6

File tree

4 files changed

+5
-267
lines changed

4 files changed

+5
-267
lines changed

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
774774
}
775775

776776
if (!isset($_result[0])) {
777-
return __('Cannot add the item to shopping cart');
777+
return __('Cannot add the item to shopping cart')->render();
778778
}
779779

780780
/**
@@ -809,7 +809,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
809809
}
810810
}
811811

812-
return (string)$this->getSpecifyOptionMessage();
812+
return $this->getSpecifyOptionMessage()->render();
813813
}
814814

815815
/**

app/code/Magento/Downloadable/Model/Product/Type.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
485485
return $result;
486486
}
487487
if ($this->getLinkSelectionRequired($product) && $this->_isStrictProcessMode($processMode)) {
488-
return __('Please specify product link(s).');
488+
return __('Please specify product link(s).')->render();
489489
}
490490
return $result;
491491
}

app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
364364
}
365365

366366
if (!isset($_result[0])) {
367-
return __('We cannot process the item.');
367+
return __('We cannot process the item.')->render();
368368
}
369369

370370
if ($isStrictProcessMode) {
@@ -402,7 +402,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
402402
}
403403
}
404404

405-
return __('Please specify the quantity of product(s).')->__toString();
405+
return __('Please specify the quantity of product(s).')->render();
406406
}
407407

408408
/**

dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php

Lines changed: 0 additions & 262 deletions
This file was deleted.

0 commit comments

Comments
 (0)