merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tax-enhancement

This commit is contained in:
devansh bawari 2021-05-26 20:04:15 +05:30
parent 1b9acd277a e968b331a6
commit fa2c9dca96
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Webkul/Product/src/Models/ProductFlat.php
View File

@ -206,6 +206,16 @@ class ProductFlat extends Model implements ProductFlatContract
return $this->product->grouped_products();
}
/**
* Get the grouped products by `sort_order` key that owns the product.
*
* @return Illuminate\Database\Eloquent\Relations\HasMany
*/
public function groupedProductsBySortOrder()
{
return $this->product->grouped_products()->orderBy('sort_order');
}
/**
* Get the bundle options that owns the product.
*/

4
packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php
View File

@ -2,14 +2,14 @@
{!! view_render_event('bagisto.shop.products.view.grouped_products.before', ['product' => $product]) !!}
<div class="grouped-product-container">
@if ($product->grouped_products->count())
@if ($product->groupedProductsBySortOrder->count())
<div class="grouped-product-list">
<ul>
<li>
<span>{{ __('shop::app.products.name') }}</span>
<span>{{ __('shop::app.products.qty') }}</span>
</li>
@foreach ($product->grouped_products as $groupedProduct)
@foreach ($product->groupedProductsBySortOrder as $groupedProduct)
@if($groupedProduct->associated_product->getTypeInstance()->isSaleable())
<li>
<span class="name">

4
packages/Webkul/Velocity/src/Resources/views/shop/products/view/grouped-products.blade.php
View File

@ -2,14 +2,14 @@
{!! view_render_event('bagisto.shop.products.view.grouped_products.before', ['product' => $product]) !!}
<div class="grouped-product-container">
@if ($product->grouped_products->count())
@if ($product->groupedProductsBySortOrder->count())
<div class="grouped-product-list">
<ul type="none">
<li>
<span>{{ __('shop::app.products.name') }}</span>
<span>{{ __('shop::app.products.qty') }}</span>
</li>
@foreach ($product->grouped_products as $groupedProduct)
@foreach ($product->groupedProductsBySortOrder as $groupedProduct)
@if($groupedProduct->associated_product->getTypeInstance()->isSaleable())
<li>
<span class="name">