Merge remote-tracking branch 'upstream/master' into laravel-8-support

This commit is contained in:
devansh bawari 2021-03-01 10:21:37 +05:30
commit 2ba2fedc19
2 changed files with 12 additions and 5 deletions

View File

@ -157,7 +157,12 @@ Thank you to all our backers! 🙏
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
<a href="https://opencollective.com/bagisto/contribute/sponsor-7372/checkout" target="_blank"> <div>
<img src="https://images.opencollective.com/e-ventures1/7d61db2/logo.png" style="border-radius: 50%; width: auto; height:42px;"> <a href="https://opencollective.com/bagisto/contribute/sponsor-7372/checkout" target="_blank">
<img src="https://images.opencollective.com/static/images/become_sponsor.svg"> <img src="https://images.opencollective.com/static/images/become_sponsor.svg">
</a> </a>
</div>
<kbd>
<img src="https://images.opencollective.com/e-ventures1/7d61db2/logo.png" height="75">
</kbd>

View File

@ -84,7 +84,9 @@ class ShopController extends Controller
return $this->velocityHelper->formatProduct($product); return $this->velocityHelper->formatProduct($product);
} }
} }
}), })->reject(function ($product) {
return is_null($product);
})->values(),
]; ];
break; break;