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

Merge pull request #411 from jitendra-webkul/jitendra 

Per unit and per order feature added in Flatrate shipping
This commit is contained in:
JItendra Singh 2018-12-26 19:34:00 +05:30 committed by GitHub
parent feb6c8cc76 de90ab1d6a
commit 69875dac77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ namespace Webkul\Shipping\Carriers;
use Config; use Config;
use Webkul\Checkout\Models\CartShippingRate; use Webkul\Checkout\Models\CartShippingRate;
use Webkul\Shipping\Facades\Shipping; use Webkul\Shipping\Facades\Shipping;
use Webkul\Checkout\Facades\Cart;
/** /**
* Class Rate. * Class Rate.
@ -29,6 +30,8 @@ class FlatRate extends AbstractShipping
if(!$this->isAvailable()) if(!$this->isAvailable())
return false; return false;
$cart = Cart::getCart();
$object = new CartShippingRate; $object = new CartShippingRate;
$object->carrier = 'flatrate'; $object->carrier = 'flatrate';
@ -36,8 +39,15 @@ class FlatRate extends AbstractShipping
$object->method = 'flatrate_flatrate'; $object->method = 'flatrate_flatrate';
$object->method_title = $this->getConfigData('title'); $object->method_title = $this->getConfigData('title');
$object->method_description = $this->getConfigData('description'); $object->method_description = $this->getConfigData('description');
$object->price = core()->convertPrice($this->getConfigData('default_rate'));
$object->base_price = $this->getConfigData('default_rate'); if ($this->getConfigData('type') == 'per_unit') {
$object->price = core()->convertPrice($this->getConfigData('default_rate')) * $cart->items_qty;
$object->base_price = $this->getConfigData('default_rate') * $cart->items_qty;
} else {
$object->price = core()->convertPrice($this->getConfigData('default_rate'));
$object->base_price = $this->getConfigData('default_rate');
}
return $object; return $object;
} }

4
packages/Webkul/Shipping/src/Config/system.php
View File

@ -74,9 +74,9 @@ return [
'options' => [ 'options' => [
[ [
'title' => 'Per Unit', 'title' => 'Per Unit',
'value' => 'Per Order' 'value' => 'per_unit'
], [ ], [
'title' => 'Inactive', 'title' => 'Per Order',
'value' => 'per_order' 'value' => 'per_order'
] ]
], ],