-
Notifications
You must be signed in to change notification settings - Fork 112
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support to shipping cost #36
Open
jjacquesf
wants to merge
3
commits into
omnilight:master
Choose a base branch
from
jjacquesf:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+139
−1
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
<?php | ||
|
||
namespace yz\shoppingcart; | ||
|
||
use yii\base\Behavior; | ||
|
||
|
||
/** | ||
* Class ShippingCostBehavior | ||
* @package \yz\shoppingcart | ||
*/ | ||
class ShippingCostBehavior extends Behavior | ||
{ | ||
public function events() | ||
{ | ||
return [ | ||
ShoppingCart::EVENT_SHIPPING_COST_CALCULATION => 'onShippingCostCalculation', | ||
]; | ||
} | ||
|
||
/** | ||
* @param CostCalculationEvent $event | ||
*/ | ||
public function onShippingCostCalculation($event) | ||
{ | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
<?php | ||
|
||
namespace yz\shoppingcart; | ||
|
||
use yii\base\Event; | ||
|
||
|
||
/** | ||
* Class ShippingCostCalculationEvent | ||
* @package \yz\shoppingcart | ||
*/ | ||
class ShippingCostCalculationEvent extends Event | ||
{ | ||
/** | ||
* Shipping value that could be filled by the cart's behaviors that should provide shippings methods. | ||
* This value will be added to the cart's cost | ||
* @var float | ||
*/ | ||
public $shippingValue = 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,6 +32,8 @@ class ShoppingCart extends Component | |
const EVENT_CART_CHANGE = 'cartChange'; | ||
/** Triggered on after cart cost calculation */ | ||
const EVENT_COST_CALCULATION = 'costCalculation'; | ||
/** Triggered on after cart shipping calculation */ | ||
const EVENT_SHIPPING_COST_CALCULATION = 'shippingCostcalculation'; | ||
|
||
/** | ||
* If true (default) cart will be automatically stored in and loaded from session. | ||
|
@@ -278,6 +280,34 @@ public function getCost($withDiscount = false) | |
return $cost; | ||
} | ||
|
||
/** | ||
* Return full cart shipping cost | ||
* @param $withDiscount | ||
* @return int | ||
*/ | ||
public function getShippingCost($withDiscount = false) | ||
{ | ||
$cost = $this->getCost($withDiscount); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This value is not used There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You are right. I delete that line. |
||
|
||
$shippingCostEvent = new ShippingCostCalculationEvent([]); | ||
$this->trigger(self::EVENT_SHIPPING_COST_CALCULATION, $shippingCostEvent); | ||
$cost = $shippingCostEvent->shippingValue; | ||
return $cost; | ||
} | ||
|
||
/** | ||
* Return full cart total cost | ||
* @param $withDiscount | ||
* @return int | ||
*/ | ||
public function getTotal($withDiscount = false) | ||
{ | ||
$cost = $this->getCost($withDiscount); | ||
$shipping = $this->getShippingCost($withDiscount); | ||
|
||
return $cost + $shipping; | ||
} | ||
|
||
/** | ||
* Returns hash (md5) of the current cart, that is unique to the current combination | ||
* of positions, quantities and costs. This helps us fast compare if two carts are the same, or not, also | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why shipping cost must be in it's own separate method? It is possible to add shipping cost value during general computations using EVENT_COST_CALCULATION. If shipping cost should be based on the calculated cart cost, than probably it is possible to add event EVENT_AFTER_COST_CALCULATION and evaluate value of the cost there
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually I wrote two additional methods getShippingCost() and getTotal() in order to use something like this:
`
$cart = \Yii::$app->cart;
$cart->attachBehavior('percentDiscount', ['class' => 'common\components\PercentDiscount', 'ammount' => 10]);
$cart->attachBehavior('fixedShippingCost', ['class' => 'common\components\FixedShippingCost', 'ammount' => 89, 'freeSince' => 999]);
$subtotal = \Yii::$app->cart->getCost(true);
$shipping = \Yii::$app->cart->getShippingCost();
$total = \Yii::$app->cart->getTotal(true);
`
If there is a better way to get subtotal, shipping cost and total independently?