Merge branch 'master' of https://github.com/bagisto/bagisto into development

packages/Webkul/Core/src/Providers/ModuleServiceProvider.php

@@ -15,9 +15,6 @@ class ModuleServiceProvider extends BaseModuleServiceProvider
         \Webkul\Core\Models\CurrencyExchangeRate::class,
         \Webkul\Core\Models\Locale::class,
         \Webkul\Core\Models\Slider::class,
-        \Webkul\Core\Models\SubscribersList::class,
-        \Webkul\Core\Models\TaxCategory::class,
-        \Webkul\Core\Models\TaxMap::class,
-        \Webkul\Core\Models\TaxRate::class,
+        \Webkul\Core\Models\SubscribersList::class
     ];
 }

packages/Webkul/Product/src/Models/ProductFlat.php

@@ -98,4 +98,28 @@ class ProductFlat extends Model implements ProductFlatContract
     {
         return $this->images()->get();
     }
+
+    /**
+     * The related products that belong to the product.
+     */
+    public function related_products()
+    {
+        return $this->product->related_products();
+    }
+
+    /**
+     * The up sells that belong to the product.
+     */
+    public function up_sells()
+    {
+        return $this->product->up_sells();
+    }
+
+    /**
+     * The cross sells that belong to the product.
+     */
+    public function cross_sells()
+    {
+        return $this->product->cross_sells();
+    }
 }

packages/Webkul/Shop/src/Resources/views/products/view.blade.php

@@ -91,9 +91,9 @@
             </product-view>
         </div>
 
-        {{--@include ('shop::products.view.related-products')--}}
+        @include ('shop::products.view.related-products')
 
-        {{--@include ('shop::products.view.up-sells')--}}
+        @include ('shop::products.view.up-sells')
 
     </section>
 

packages/Webkul/Shop/src/Resources/views/products/view/related-products.blade.php

@@ -14,7 +14,7 @@
 
             @foreach ($relatedProducts as $related_product)
 
-                @include ('shop::products.list.card', ['product' => $related_product])
+                @include ('shop::products.list.card', ['productFlat' => $related_product])
 
             @endforeach
 

packages/Webkul/Shop/src/Resources/views/products/view/up-sells.blade.php

@@ -16,7 +16,7 @@
 
             @foreach ($productUpSells as $up_sell_product)
 
-                @include ('shop::products.list.card', ['product' => $up_sell_product])
+                @include ('shop::products.list.card', ['productFlat' => $up_sell_product])
 
             @endforeach