Conflicts resolve

config/carriers.php

@@ -1,27 +0,0 @@
-<?php
-
-return [
-    'flatrate' => [
-        'code' => 'flatrate',
-        'name' => 'Flat Rate',
-        'description' => '',
-        'default_type' => 'per_order',
-        'types' => [
-            'per_unit' => 'Per Unit',
-            'per_order' => 'Per Order',
-        ],
-        'price' => 10,
-        'class' => 'Webkul\Shipping\Calculators\FlatRate',
-        'status' => 1
-    ], 
-    
-    'fedex' => [
-        'code' => 'fedex',
-        'name' => 'Fedex',
-        'description' => '',
-        'class' => 'Webkul\Shipping\Calculators\FedexRate',
-        'status' => 1
-    ]
-];
-
-?>

packages/Webkul/Admin/src/Providers/EventServiceProvider.php

@@ -96,7 +96,6 @@ class EventServiceProvider extends ServiceProvider
 
             $acl->add('catalog.categories', 'Categories', 'admin.catalog.categories.index', 1);
             
-
             $acl->add('configuration', 'Configure', 'admin.account.edit', 5);
 
             $acl->add('settings', 'Settings', 'admin.users.index', 6);

packages/Webkul/Product/src/Product/ConfigurableOption.php

@@ -212,7 +212,7 @@ class ConfigurableOption extends AbstractProduct
                 'final_price' => [
                     'formated_price' => core()->currency($this->price->getMinimalPrice($variant)),
                     'price' => $this->price->getMinimalPrice($variant)
-                ],
+                ]
             ];
         }
 

packages/Webkul/Shipping/src/Carriers/FlatRate.php

@@ -1,21 +0,0 @@
-<?php
-
-use Webkul\Shipping\Contracts\Carrier;
-
-class FlatRate extends Carrier 
-{
-    public function calculateRates()
-    {
-        return [
-            'code' => 'flatrate',
-            'title' => 'Flatrate',
-            'rates' => [
-                [
-                    'title' => 'Flat Rate',
-                    'rate' => 10
-                ]
-            ]
-        ];
-    }
-}
-?>

packages/Webkul/Shipping/src/Carriers/PerProduct.php

@@ -1,21 +0,0 @@
-<?php
-
-use Webkul\Shipping\Contracts\Carrier;
-
-class PerProduct extends Carrier 
-{
-    public function calculeRates()
-    {
-        return [
-            'code' => 'perproduct',
-            'title' => 'Per Product',
-            'rates' => [
-                [
-                    'title' => 'Per Product',
-                    'rate' => 10
-                ]
-            ]
-        ];
-    }
-}
-?>

packages/Webkul/Shipping/src/Contracts/Carrier.php

@@ -1,9 +0,0 @@
-<?php
-
-abstract class Carrier {
-
-    abstract public function calculateRates();
-
-}
- 
-?>

packages/Webkul/Shipping/src/Helpers/Rates.php

@@ -1,26 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Config;
-
-class Rates {
-
-    public function collectRates()
-    {
-        $rates = [];
-
-        foreach(Config::get('carriers') as $shippingMethod) {
-            if(isset($shippingMethod['class'])) {
-                $object = new $shippingMethod['class'];
-
-                if($rate = $object->calculeRates()) {
-                    array_push($rates, $rate);
-                }
-            }
-        }
-
-        return $rates;
-    }
-    
-}
-
-?>

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

@@ -12,7 +12,6 @@
         <img class="wishlist" src="{{ bagisto_asset('images/wish.svg') }}" />
         <img class="share" src="{{ bagisto_asset('images/icon-share.svg') }}" />
     </div>
-
 </div>
 
 @push('scripts')