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

Conflicts resolve

This commit is contained in:
jitendra 2018-09-11 16:10:57 +05:30
parent 5202729391 f7d5908705
commit 9731b499d4
8 changed files with 2 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
config/carriers.php
View File

@ -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
]
];
?>

1
packages/Webkul/Admin/src/Providers/EventServiceProvider.php
View File

@ -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);

2
packages/Webkul/Product/src/Product/ConfigurableOption.php
View File

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

21
packages/Webkul/Shipping/src/Carriers/FlatRate.php
View File

@ -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
]
]
];
}
}
?>

21
packages/Webkul/Shipping/src/Carriers/PerProduct.php
View File

@ -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
]
]
];
}
}
?>

9
packages/Webkul/Shipping/src/Contracts/Carrier.php
View File

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

26
packages/Webkul/Shipping/src/Helpers/Rates.php
View File

@ -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;
}
}
?>

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

@ -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')