From ca542f81f20d33279c040a6a70e044ed6bbab2e9 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 26 May 2021 12:23:45 +0530
Subject: [PATCH] Sort Order Method Added

---
 packages/Webkul/Product/src/Models/ProductFlat.php     | 10 ++++++++++
 .../views/products/view/grouped-products.blade.php     |  4 ++--
 .../shop/products/view/grouped-products.blade.php      |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Product/src/Models/ProductFlat.php b/packages/Webkul/Product/src/Models/ProductFlat.php
index c9bba615f..1d48e8bb4 100644
--- a/packages/Webkul/Product/src/Models/ProductFlat.php
+++ b/packages/Webkul/Product/src/Models/ProductFlat.php
@@ -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.
      */
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php
index 1f2b36dcc..c9f3122ec 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php
@@ -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">
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/grouped-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/grouped-products.blade.php
index 06ca41b48..f41e8f06a 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/grouped-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/grouped-products.blade.php
@@ -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">