Skip to content
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

[Shipping] shipping is valid when no shipping rule is configured #741

Merged
merged 2 commits into from
Dec 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions features/shipping/carrier_with_no_shipping_rules_valid.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@shipping @shipping_carrier_with_no_rules
Feature: Add a new carrier without rules should be valid

Background:
Given the site operates on a store in "Austria"
And the site has a currency "Euro" with iso "EUR"
And I am in country "Austria"
And the site has a tax rate "AT" with "20%" rate
And the site has a tax rule group "AT"
And the tax rule group has a tax rule for country "Austria" with tax rate "AT"
And the site has a product "Shoe" priced at 10000
And the product has the tax rule group "AT"
And I add the product "Shoe" to my cart
And the site has a carrier "Post"

Scenario: Carrier with not shipping rule should be valid
Given I add the product "Shoe" to my cart
And the carrier "Post" should be valid for my cart

Scenario: Carrier with one shipping rule should be valid
Given adding a shipping rule named "product"
And the shipping rule is active
And the shipping rule has a condition products with product "Shoe"
And the shipping rule belongs to carrier "Post"
And I add the product "Shoe" to my cart
And the carrier "Post" should be valid for my cart

41 changes: 35 additions & 6 deletions src/CoreShop/Behat/Context/Domain/ShippingContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
use CoreShop\Component\Resource\Factory\FactoryInterface;
use CoreShop\Component\Rule\Condition\RuleValidationProcessorInterface;
use CoreShop\Component\Shipping\Calculator\CarrierPriceCalculatorInterface;
use CoreShop\Component\Shipping\Checker\CarrierShippingRuleCheckerInterface;
use CoreShop\Component\Shipping\Model\ShippingRuleGroupInterface;
use CoreShop\Component\Shipping\Model\ShippingRuleInterface;
use Webmozart\Assert\Assert;

Expand Down Expand Up @@ -51,24 +53,32 @@ final class ShippingContext implements Context
private $carrierPriceCalculator;

/**
* @param SharedStorageInterface $sharedStorage
* @param CarrierRepositoryInterface $carrierRepository
* @param RuleValidationProcessorInterface $ruleValidationProcessor
* @param FactoryInterface $addressFactory
* @param CarrierPriceCalculatorInterface $carrierPriceCalculator
* @var CarrierShippingRuleCheckerInterface
*/
private $carrierShippingRuleChecker;

/**
* @param SharedStorageInterface $sharedStorage
* @param CarrierRepositoryInterface $carrierRepository
* @param RuleValidationProcessorInterface $ruleValidationProcessor
* @param FactoryInterface $addressFactory
* @param CarrierPriceCalculatorInterface $carrierPriceCalculator
* @param CarrierShippingRuleCheckerInterface $carrierShippingRuleChecker
*/
public function __construct(
SharedStorageInterface $sharedStorage,
CarrierRepositoryInterface $carrierRepository,
RuleValidationProcessorInterface $ruleValidationProcessor,
FactoryInterface $addressFactory,
CarrierPriceCalculatorInterface $carrierPriceCalculator
CarrierPriceCalculatorInterface $carrierPriceCalculator,
CarrierShippingRuleCheckerInterface $carrierShippingRuleChecker
) {
$this->sharedStorage = $sharedStorage;
$this->carrierRepository = $carrierRepository;
$this->ruleValidationProcessor = $ruleValidationProcessor;
$this->addressFactory = $addressFactory;
$this->carrierPriceCalculator = $carrierPriceCalculator;
$this->carrierShippingRuleChecker = $carrierShippingRuleChecker;
}

/**
Expand Down Expand Up @@ -122,4 +132,23 @@ public function shippingShouldBePriced(CartInterface $cart, CarrierInterface $ca

Assert::same(intval($price), $this->carrierPriceCalculator->getPrice($carrier, $cart, $address));
}

/**
* @Then /^the (carrier "[^"]+") should be valid for (my cart)$/
*/
public function carrierShouldBeValidForMyCart(CarrierInterface $carrier, CartInterface $cart)
{
$address = $cart->getShippingAddress() ?: $this->addressFactory->createNew();

$ruleResult = $this->carrierShippingRuleChecker->isShippingRuleValid($carrier, $cart, $address);

if ($ruleResult instanceof ShippingRuleGroupInterface) {
$ruleResult = true;
}

Assert::true(
$ruleResult,
sprintf('Asserted that the Carrier %s is valid for my cart, but it is not', $carrier->getTitle('en'))
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ services:
- '@__symfony__.coreshop.shipping_rule.processor'
- '@__symfony__.coreshop.factory.address'
- '@__symfony__.coreshop.carrier.price_calculator'
- '@__symfony__.coreshop.carrier.shipping_rule.checker'
tags:
- { name: fob.context_service }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public function isShippingRuleValid(CarrierInterface $carrier, ShippableInterfac
{
$shippingRules = $carrier->getShippingRules();

if (count($shippingRules) === 0) {
return true;
}

foreach ($shippingRules as $rule) {
$isValid = $this->ruleValidationProcessor->isValid($carrier, $rule->getShippingRule(), [
$carrier,
Expand Down