- {% block messages %}
-
-
- {% endblock messages %}
-
- {% if saved %}
-
- {% else %}
+{% if saved %}
+ {% set widgetResponse = {
+ widget: {
+ trigger: [{
+ eventBroker: 'widget',
+ name: 'formSave',
+ args: [form.vars.value.id],
+ }],
+ }
+ } %}
+
+ {{ widgetResponse|json_encode|raw }}
+{% else %}
+
+{% endif %}
diff --git a/src/Marello/Bundle/OrderBundle/Tests/Functional/Api/OrderJsonApiTest.php b/src/Marello/Bundle/OrderBundle/Tests/Functional/Api/OrderJsonApiTest.php
index 8c983ebd6..3f4e84c5d 100644
--- a/src/Marello/Bundle/OrderBundle/Tests/Functional/Api/OrderJsonApiTest.php
+++ b/src/Marello/Bundle/OrderBundle/Tests/Functional/Api/OrderJsonApiTest.php
@@ -5,7 +5,7 @@
use Symfony\Component\HttpFoundation\Response;
use Marello\Bundle\OrderBundle\Entity\Order;
-use Marello\Bundle\OrderBundle\Entity\Customer;
+use Marello\Bundle\CustomerBundle\Entity\Customer;
use Marello\Bundle\CoreBundle\Tests\Functional\RestJsonApiTestCase;
use Marello\Bundle\OrderBundle\Tests\Functional\DataFixtures\LoadOrderData;
use Marello\Bundle\OrderBundle\Tests\Functional\DataFixtures\LoadOrderWorkflowData;
diff --git a/src/Marello/Bundle/OrderBundle/Tests/Functional/Api/requests/order_create_with_existing_customer.yml b/src/Marello/Bundle/OrderBundle/Tests/Functional/Api/requests/order_create_with_existing_customer.yml
index 47b8b3dcf..66e901df3 100644
--- a/src/Marello/Bundle/OrderBundle/Tests/Functional/Api/requests/order_create_with_existing_customer.yml
+++ b/src/Marello/Bundle/OrderBundle/Tests/Functional/Api/requests/order_create_with_existing_customer.yml
@@ -7,7 +7,7 @@ data:
totalTax: 0
grandTotal: 101
currency: 'USD'
- paymentMethod: null
+ paymentMethod: 'payment_term_1'
paymentReference: null
paymentDetails: null
shippingAmountInclTax: null
@@ -103,7 +103,6 @@ included:
attributes:
quantity: 10
productName: '+{% endfor %} \ No newline at end of file diff --git a/src/Marello/Bundle/PackingBundle/Tests/Unit/Entity/PackingSlipTest.php b/src/Marello/Bundle/PackingBundle/Tests/Unit/Entity/PackingSlipTest.php index 0c59d719f..2cd260179 100644 --- a/src/Marello/Bundle/PackingBundle/Tests/Unit/Entity/PackingSlipTest.php +++ b/src/Marello/Bundle/PackingBundle/Tests/Unit/Entity/PackingSlipTest.php @@ -8,7 +8,7 @@ use Oro\Bundle\OrganizationBundle\Entity\Organization; use Marello\Bundle\OrderBundle\Entity\Order; -use Marello\Bundle\OrderBundle\Entity\Customer; +use Marello\Bundle\CustomerBundle\Entity\Customer; use Marello\Bundle\SalesBundle\Entity\SalesChannel; use Marello\Bundle\InventoryBundle\Entity\Warehouse; use Marello\Bundle\PackingBundle\Entity\PackingSlip; diff --git a/src/Marello/Bundle/PackingBundle/Tests/Unit/Mapper/OrderToPackingSlipMapperTest.php b/src/Marello/Bundle/PackingBundle/Tests/Unit/Mapper/OrderToPackingSlipMapperTest.php index 7095940ac..8e03942fb 100644 --- a/src/Marello/Bundle/PackingBundle/Tests/Unit/Mapper/OrderToPackingSlipMapperTest.php +++ b/src/Marello/Bundle/PackingBundle/Tests/Unit/Mapper/OrderToPackingSlipMapperTest.php @@ -4,6 +4,9 @@ use Doctrine\Common\Collections\ArrayCollection; +use Marello\Bundle\InventoryBundle\Entity\InventoryBatch; +use Marello\Bundle\InventoryBundle\Entity\InventoryItem; +use Marello\Bundle\InventoryBundle\Entity\InventoryLevel; use Symfony\Component\PropertyAccess\PropertyAccess; use PHPUnit\Framework\TestCase; @@ -13,7 +16,7 @@ use Oro\Bundle\EntityBundle\Provider\EntityFieldProvider; use Marello\Bundle\OrderBundle\Entity\Order; -use Marello\Bundle\OrderBundle\Entity\Customer; +use Marello\Bundle\CustomerBundle\Entity\Customer; use Marello\Bundle\ProductBundle\Entity\Product; use Marello\Bundle\OrderBundle\Entity\OrderItem; use Marello\Bundle\SalesBundle\Entity\SalesChannel; @@ -89,11 +92,17 @@ public function testMap() $salesChannel = new SalesChannel(); $customer = new Customer(); $organization = new Organization(); - + $product1 = $this->getEntity(Product::class, ['id' => 1, 'weight' => 2]); $product2 = $this->getEntity(Product::class, ['id' => 2, 'weight' => 3]); $product3 = $this->getEntity(Product::class, ['id' => 3, 'weight' => 5]); + $inventoryLevel1 = $this->getEntity(InventoryLevel::class, ['id' => 1, 'warehouse' => $warehouse]); + $inventoryBatch1 = $this->getEntity(InventoryBatch::class, ['id' => 1, 'batchNumber' => '000001', 'quantity' => 5]); + $inventoryItem1 = new InventoryItem($product1); + $inventoryLevel1->addInventoryBatch($inventoryBatch1); + $inventoryItem1->addInventoryLevel($inventoryLevel1); + $orderItem1 = $this->getEntity(OrderItem::class, ['id' => 1, 'product' => $product1, 'quantity' => 5]); $orderItem2 = $this->getEntity(OrderItem::class, ['id' => 2, 'product' => $product2, 'quantity' => 3]); $orderItem3 = $this->getEntity(OrderItem::class, ['id' => 3, 'product' => $product3, 'quantity' => 1]); @@ -111,6 +120,7 @@ public function testMap() $this->getEntity(PackingSlipItem::class, [ 'orderItem' => $orderItem1, 'product' => $product1, + 'inventoryBatches' => ['000001' => 5], 'quantity' => $orderItem1->getQuantity(), 'weight' => $product1->getWeight() ]), diff --git a/src/Marello/Bundle/PaymentBundle/Action/Handler/PaymentMethodsConfigsRuleToggleStatusActionHandler.php b/src/Marello/Bundle/PaymentBundle/Action/Handler/PaymentMethodsConfigsRuleToggleStatusActionHandler.php new file mode 100644 index 000000000..80b89624e --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Action/Handler/PaymentMethodsConfigsRuleToggleStatusActionHandler.php @@ -0,0 +1,45 @@ +entityManager = $entityManager; + $this->value = (boolean)$value; + } + + /** + * @param PaymentMethodsConfigsRule $configsRule + * @return boolean + */ + public function handleAction(PaymentMethodsConfigsRule $configsRule) + { + if ($configsRule->getRule()->isSystem()) { + return false; + } + $configsRule->getRule()->setEnabled($this->value); + $this->entityManager->persist($configsRule); + $this->entityManager->flush(); + + return true; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Checker/PaymentMethodEnabledByIdentifierChecker.php b/src/Marello/Bundle/PaymentBundle/Checker/PaymentMethodEnabledByIdentifierChecker.php new file mode 100755 index 000000000..c0b4a86d2 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Checker/PaymentMethodEnabledByIdentifierChecker.php @@ -0,0 +1,31 @@ +paymentMethodProvider = $paymentMethodProvider; + } + + /** + * {@inheritDoc} + */ + public function isEnabled($identifier) + { + return $this->paymentMethodProvider->getPaymentMethod($identifier) !== null ? + $this->paymentMethodProvider->getPaymentMethod($identifier)->isEnabled() : + false; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Checker/PaymentMethodEnabledByIdentifierCheckerInterface.php b/src/Marello/Bundle/PaymentBundle/Checker/PaymentMethodEnabledByIdentifierCheckerInterface.php new file mode 100755 index 000000000..203f577ba --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Checker/PaymentMethodEnabledByIdentifierCheckerInterface.php @@ -0,0 +1,13 @@ +methodEnabledChecker = $methodEnabledChecker; + } + + /** + * {@inheritdoc} + */ + public function canBeEnabled(PaymentMethodsConfigsRule $rule) + { + foreach ($rule->getMethodConfigs() as $config) { + if ($this->methodEnabledChecker->isEnabled($config->getMethod())) { + return true; + } + } + + return false; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Checker/PaymentRuleEnabledCheckerInterface.php b/src/Marello/Bundle/PaymentBundle/Checker/PaymentRuleEnabledCheckerInterface.php new file mode 100755 index 000000000..dda0f43da --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Checker/PaymentRuleEnabledCheckerInterface.php @@ -0,0 +1,15 @@ +propertyPath = $option; + + if (!$this->propertyPath) { + throw new \InvalidArgumentException('Missing "method_identifier" option'); + } + + return $this; + } + + /** + * {@inheritDoc} + */ + protected function isConditionAllowed($context) + { + $paymentMethodIdentifier = $this->resolveValue($context, $this->propertyPath, false); + $methodConfigRules = $this->getRulesByMethod($paymentMethodIdentifier); + + return count($methodConfigRules) !== 0; + } + + /** + * @param $paymentMethodIdentifier + * + * @return PaymentMethodsConfigsRule[] + */ + abstract protected function getRulesByMethod($paymentMethodIdentifier); + + /** + * {@inheritDoc} + */ + public function toArray() + { + return $this->convertToArray([$this->propertyPath]); + } + + /** + * {@inheritDoc} + */ + public function compile($factoryAccessor) + { + return $this->convertToPhpCode([$this->propertyPath], $factoryAccessor); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Condition/HasApplicablePaymentMethods.php b/src/Marello/Bundle/PaymentBundle/Condition/HasApplicablePaymentMethods.php new file mode 100644 index 000000000..52f60ac0e --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Condition/HasApplicablePaymentMethods.php @@ -0,0 +1,103 @@ +paymentMethodProvider = $paymentMethodProvider; + $this->paymentMethodsViewsProvider = $paymentMethodsViewsProvider; + } + + /** + * {@inheritdoc} + */ + public function initialize(array $options) + { + if (array_key_exists('paymentContext', $options)) { + $this->paymentContext = $options['paymentContext']; + } elseif (array_key_exists(0, $options)) { + $this->paymentContext = $options[0]; + } + + if (!$this->paymentContext) { + throw new InvalidArgumentException('Missing "paymentContext" option'); + } + + return $this; + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return self::NAME; + } + + /** + * {@inheritdoc} + */ + protected function isConditionAllowed($context) + { + /** @var PaymentContextInterface $paymentContext */ + $paymentContext = $this->resolveValue($context, $this->paymentContext, false); + + $methodsData = []; + if (null !== $paymentContext) { + $methodsData = $this->paymentMethodsViewsProvider->getApplicableMethodsViews($paymentContext); + } + + return count($methodsData) !== 0; + } + + /** + * {@inheritdoc} + */ + public function toArray() + { + return $this->convertToArray([$this->paymentContext]); + } + + /** + * {@inheritdoc} + */ + public function compile($factoryAccessor) + { + return $this->convertToPhpCode([$this->paymentContext], $factoryAccessor); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Condition/PaymentMethodHasEnabledPaymentRules.php b/src/Marello/Bundle/PaymentBundle/Condition/PaymentMethodHasEnabledPaymentRules.php new file mode 100644 index 000000000..ae5a062a1 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Condition/PaymentMethodHasEnabledPaymentRules.php @@ -0,0 +1,35 @@ +repository = $repository; + } + + /** + * {@inheritDoc} + */ + protected function getRulesByMethod($paymentMethodIdentifier) + { + return $this->repository->getEnabledRulesByMethod($paymentMethodIdentifier); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Condition/PaymentMethodHasPaymentRules.php b/src/Marello/Bundle/PaymentBundle/Condition/PaymentMethodHasPaymentRules.php new file mode 100644 index 000000000..0e2cfedee --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Condition/PaymentMethodHasPaymentRules.php @@ -0,0 +1,35 @@ +repository = $repository; + } + + /** + * {@inheritDoc} + */ + protected function getRulesByMethod($paymentMethodIdentifier) + { + return $this->repository->getRulesByMethod($paymentMethodIdentifier); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Context/Builder/Basic/BasicPaymentContextBuilder.php b/src/Marello/Bundle/PaymentBundle/Context/Builder/Basic/BasicPaymentContextBuilder.php new file mode 100644 index 000000000..ebe533217 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Context/Builder/Basic/BasicPaymentContextBuilder.php @@ -0,0 +1,258 @@ +sourceEntity = $sourceEntity; + $this->sourceEntityIdentifier = $sourceEntityIdentifier; + $this->paymentLineItemCollectionFactory = $paymentLineItemCollectionFactory; + } + + /** + * {@inheritDoc} + */ + public function getResult() + { + $params = $this->getMandatoryParams(); + $params += $this->getOptionalParams(); + + return new PaymentContext($params); + } + + /** + * {@inheritDoc} + */ + public function setLineItems(PaymentLineItemCollectionInterface $lineItemCollection) + { + $this->lineItems = $lineItemCollection->toArray(); + + return $this; + } + + /** + * {@inheritDoc} + */ + public function addLineItem(PaymentLineItemInterface $paymentLineItem) + { + $this->lineItems[] = $paymentLineItem; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setBillingAddress(AddressInterface $billingAddress) + { + $this->billingAddress = $billingAddress; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setShippingAddress(AddressInterface $shippingAddress) + { + $this->shippingAddress = $shippingAddress; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setShippingOrigin(AddressInterface $shippingOrigin) + { + $this->shippingOrigin = $shippingOrigin; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setPaymentMethod($paymentMethod) + { + $this->paymentMethod = $paymentMethod; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setCustomer(Customer $customer) + { + $this->customer = $customer; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setCompany(Company $company) + { + $this->company = $company; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setSubTotal(Price $subTotal) + { + $this->subTotal = $subTotal; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setCurrency($currency) + { + $this->currency = $currency; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setTotal($total) + { + $this->total = $total; + + return $this; + } + + /** + * @return array + */ + private function getMandatoryParams() + { + $lineItems = $this->paymentLineItemCollectionFactory->createPaymentLineItemCollection($this->lineItems); + $params = [ + PaymentContext::FIELD_SOURCE_ENTITY => $this->sourceEntity, + PaymentContext::FIELD_SOURCE_ENTITY_ID => $this->sourceEntityIdentifier, + PaymentContext::FIELD_LINE_ITEMS => $lineItems, + ]; + + return $params; + } + + /** + * @return array + */ + private function getOptionalParams() + { + $optionalParams = [ + PaymentContext::FIELD_CURRENCY => $this->currency, + PaymentContext::FIELD_SUBTOTAL => $this->subTotal, + PaymentContext::FIELD_BILLING_ADDRESS => $this->billingAddress, + PaymentContext::FIELD_SHIPPING_ADDRESS => $this->shippingAddress, + PaymentContext::FIELD_PAYMENT_METHOD => $this->paymentMethod, + PaymentContext::FIELD_CUSTOMER => $this->customer, + PaymentContext::FIELD_COMPANY => $this->company, + PaymentContext::FIELD_SHIPPING_ORIGIN => $this->shippingOrigin, + PaymentContext::FIELD_TOTAL => $this->total, + ]; + + // Exclude NULL elements. + $optionalParams = array_diff_key($optionalParams, array_filter($optionalParams, 'is_null')); + + return $optionalParams; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Context/Builder/Basic/Factory/BasicPaymentContextBuilderFactory.php b/src/Marello/Bundle/PaymentBundle/Context/Builder/Basic/Factory/BasicPaymentContextBuilderFactory.php new file mode 100644 index 000000000..c0325de2e --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Context/Builder/Basic/Factory/BasicPaymentContextBuilderFactory.php @@ -0,0 +1,35 @@ +collectionFactory = $collectionFactory; + } + + /** + * {@inheritDoc} + */ + public function createPaymentContextBuilder($sourceEntity, $sourceEntityId) + { + return new BasicPaymentContextBuilder( + $sourceEntity, + $sourceEntityId, + $this->collectionFactory + ); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Context/Builder/Factory/PaymentContextBuilderFactoryInterface.php b/src/Marello/Bundle/PaymentBundle/Context/Builder/Factory/PaymentContextBuilderFactoryInterface.php new file mode 100644 index 000000000..c822930e0 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Context/Builder/Factory/PaymentContextBuilderFactoryInterface.php @@ -0,0 +1,16 @@ +decoratedProductLineItemFactory = $decoratedProductLineItemFactory; + } + + /** + * @inheritDoc + */ + public function convert(PaymentContextInterface $paymentContext) + { + $lineItems = $paymentContext->getLineItems()->toArray(); + + return [ + 'lineItems' => array_map(function (PaymentLineItemInterface $lineItem) use ($lineItems) { + return $this->decoratedProductLineItemFactory + ->createLineItemWithDecoratedProductByLineItem($lineItems, $lineItem); + }, $lineItems), + 'billingAddress' => $paymentContext->getBillingAddress(), + 'shippingAddress' => $paymentContext->getShippingAddress(), + 'shippingOrigin' => $paymentContext->getShippingOrigin(), + 'paymentMethod' => $paymentContext->getPaymentMethod(), + 'currency' => $paymentContext->getCurrency(), + 'subtotal' => $paymentContext->getSubtotal(), + 'customer' => $paymentContext->getCustomer(), + 'company' => $paymentContext->getCompany(), + 'total' => $paymentContext->getTotal(), + ]; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Context/Converter/PaymentContextToRulesValueConverterInterface.php b/src/Marello/Bundle/PaymentBundle/Context/Converter/PaymentContextToRulesValueConverterInterface.php new file mode 100644 index 000000000..4cbfd8fd9 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Context/Converter/PaymentContextToRulesValueConverterInterface.php @@ -0,0 +1,15 @@ +factories = $factories; + } + + /** + * {@inheritDoc} + */ + public function create($entityClass, $entityId) + { + return $this->getFactory($entityClass, $entityId)->create($entityClass, $entityId); + } + + /** + * {@inheritDoc} + */ + public function supports($entityClass, $entityId) + { + foreach ($this->factories as $factory) { + if ($factory->supports($entityClass, $entityId)) { + return true; + } + } + + return false; + } + + /** + * @param $entityClass + * @param $entityId + * + * @return SupportsEntityPaymentContextFactoryInterface + * + * @throws UnsupportedEntityException + */ + protected function getFactory($entityClass, $entityId) + { + foreach ($this->factories as $factory) { + if ($factory->supports($entityClass, $entityId)) { + return $factory; + } + } + + $msg = sprintf( + 'Could not find payment context factory for given entity class (%s) and id (%d)', + $entityClass, + $entityId + ); + throw new UnsupportedEntityException($msg); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Context/Factory/Exception/UnsupportedEntityException.php b/src/Marello/Bundle/PaymentBundle/Context/Factory/Exception/UnsupportedEntityException.php new file mode 100644 index 000000000..5b5a26b55 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Context/Factory/Exception/UnsupportedEntityException.php @@ -0,0 +1,7 @@ +quantity = $quantity; + $this->productHolder = $productHolder; + } + + /** + * {@inheritDoc} + */ + public function getResult() + { + $params = [ + PaymentLineItem::FIELD_QUANTITY => $this->quantity, + PaymentLineItem::FIELD_PRODUCT_HOLDER => $this->productHolder, + PaymentLineItem::FIELD_ENTITY_IDENTIFIER => $this->productHolder->getId(), + ]; + + if (null !== $this->product) { + $params[PaymentLineItem::FIELD_PRODUCT] = $this->product; + } + + if (null !== $this->productSku) { + $params[PaymentLineItem::FIELD_PRODUCT_SKU] = $this->productSku; + } + + if (null !== $this->weight) { + $params[PaymentLineItem::FIELD_WEIGHT] = $this->weight; + } + + if (null !== $this->price) { + $params[PaymentLineItem::FIELD_PRICE] = $this->price; + } + + return new PaymentLineItem($params); + } + + /** + * {@inheritDoc} + */ + public function setProduct(Product $product) + { + $this->product = $product; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setProductSku($sku) + { + $this->productSku = $sku; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setWeight($weight) + { + $this->weight = $weight; + + return $this; + } + + /** + * {@inheritDoc} + */ + public function setPrice(Price $price) + { + $this->price = $price; + + return $this; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Context/LineItem/Builder/Basic/Factory/BasicPaymentLineItemBuilderFactory.php b/src/Marello/Bundle/PaymentBundle/Context/LineItem/Builder/Basic/Factory/BasicPaymentLineItemBuilderFactory.php new file mode 100644 index 000000000..564a19d0a --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Context/LineItem/Builder/Basic/Factory/BasicPaymentLineItemBuilderFactory.php @@ -0,0 +1,20 @@ +get(self::FIELD_COMPANY); + } + + /** + * {@inheritDoc} + */ + public function getCustomer() + { + return $this->get(self::FIELD_CUSTOMER); + } + + /** + * {@inheritDoc} + */ + public function getLineItems() + { + return $this->get(self::FIELD_LINE_ITEMS); + } + + /** + * {@inheritDoc} + */ + public function getBillingAddress() + { + return $this->get(self::FIELD_BILLING_ADDRESS); + } + + /** + * {@inheritDoc} + */ + public function getShippingAddress() + { + return $this->get(self::FIELD_SHIPPING_ADDRESS); + } + + /** + * {@inheritDoc} + */ + public function getShippingOrigin() + { + return $this->get(self::FIELD_SHIPPING_ORIGIN); + } + + /** + * {@inheritDoc} + */ + public function getPaymentMethod() + { + return $this->get(self::FIELD_PAYMENT_METHOD); + } + + /** + * {@inheritDoc} + */ + public function getCurrency() + { + return $this->get(self::FIELD_CURRENCY); + } + + /** + * {@inheritDoc} + */ + public function getSubtotal() + { + return $this->get(self::FIELD_SUBTOTAL); + } + + /** + * {@inheritDoc} + */ + public function getSourceEntity() + { + return $this->get(self::FIELD_SOURCE_ENTITY); + } + + /** + * {@inheritDoc} + */ + public function getSourceEntityIdentifier() + { + return $this->get(self::FIELD_SOURCE_ENTITY_ID); + } + + /** + * {@inheritDoc} + */ + public function getTotal() + { + return $this->get(self::FIELD_TOTAL); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Context/PaymentContextFactoryInterface.php b/src/Marello/Bundle/PaymentBundle/Context/PaymentContextFactoryInterface.php new file mode 100644 index 000000000..66b75f004 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Context/PaymentContextFactoryInterface.php @@ -0,0 +1,13 @@ +get(self::FIELD_PRICE); + } + + /** + * {@inheritDoc} + */ + public function getProduct() + { + return $this->get(self::FIELD_PRODUCT); + } + + /** + * {@inheritDoc} + */ + public function getProductHolder() + { + return $this->get(self::FIELD_PRODUCT_HOLDER); + } + + /** + * {@inheritDoc} + */ + public function getProductSku() + { + return $this->get(self::FIELD_PRODUCT_SKU); + } + + /** + * {@inheritDoc} + */ + public function getEntityIdentifier() + { + return $this->get(self::FIELD_ENTITY_IDENTIFIER); + } + + /** + * {@inheritDoc} + */ + public function getQuantity() + { + return $this->get(self::FIELD_QUANTITY); + } + + /** + * {@inheritDoc} + */ + public function getWeight() + { + return $this->get(self::FIELD_WEIGHT); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Context/PaymentLineItemInterface.php b/src/Marello/Bundle/PaymentBundle/Context/PaymentLineItemInterface.php new file mode 100644 index 000000000..377044bad --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Context/PaymentLineItemInterface.php @@ -0,0 +1,46 @@ + PaymentMethodsConfigsRule::class + ]; + } + + /** + * @Route("/create", name="marello_payment_methods_configs_rule_create") + * @Template("MarelloPaymentBundle:PaymentMethodsConfigsRule:update.html.twig") + * @Acl( + * id="marello_payment_methods_configs_rule_create", + * type="entity", + * permission="CREATE", + * class="MarelloPaymentBundle:PaymentMethodsConfigsRule" + * ) + * + * @param Request $request + * @return array + */ + public function createAction(Request $request) + { + return $this->update(new PaymentMethodsConfigsRule(), $request); + } + + /** + * @Route("/view/{id}", name="marello_payment_methods_configs_rule_view", requirements={"id"="\d+"}) + * @Template("MarelloPaymentBundle:PaymentMethodsConfigsRule:view.html.twig") + * @Acl( + * id="marello_payment_methods_configs_rule_view", + * type="entity", + * class="MarelloPaymentBundle:PaymentMethodsConfigsRule", + * permission="VIEW" + * ) + * + * @param PaymentMethodsConfigsRule $paymentMethodsConfigsRule + * + * @return array + */ + public function viewAction(PaymentMethodsConfigsRule $paymentMethodsConfigsRule) + { + return [ + 'entity' => $paymentMethodsConfigsRule, + ]; + } + + /** + * @Route("/update/{id}", name="marello_payment_methods_configs_rule_update", requirements={"id"="\d+"}) + * @Template("MarelloPaymentBundle:PaymentMethodsConfigsRule:update.html.twig") + * @Acl( + * id="marello_payment_methods_configs_rule_update", + * type="entity", + * permission="EDIT", + * class="MarelloPaymentBundle:PaymentMethodsConfigsRule" + * ) + * @param Request $request + * @param PaymentMethodsConfigsRule $entity + * + * @return array + */ + public function updateAction(Request $request, PaymentMethodsConfigsRule $entity) + { + return $this->update($entity, $request); + } + + /** + * @param PaymentMethodsConfigsRule $entity + * @param Request $request + * @return array|\Symfony\Component\HttpFoundation\RedirectResponse + */ + protected function update(PaymentMethodsConfigsRule $entity, Request $request) + { + $form = $this->createForm(PaymentMethodsConfigsRuleType::class); + if ($this->get('marello_payment.form.handler.payment_methods_configs_rule')->process($form, $entity)) { + $this->get('session')->getFlashBag()->add( + 'success', + $this->get('translator')->trans('marello.payment.controller.rule.saved.message') + ); + + return $this->get('oro_ui.router')->redirect($entity); + } + + if ($request->get(PaymentMethodsConfigsRuleHandler::UPDATE_FLAG, false)) { + // take different form due to JS validation should be shown even in case + // when it was not validated on backend + $form = $this->createForm(PaymentMethodsConfigsRuleType::class, $form->getData()); + } + + return [ + 'entity' => $entity, + 'form' => $form->createView() + ]; + } + + /** + * @Route("/{gridName}/massAction/{actionName}", name="marello_payment_methods_configs_massaction") + * @Acl( + * id="marello_payment_methods_configs_update", + * type="entity", + * permission="EDIT", + * class="MarelloPaymentBundle:PaymentMethodsConfigsRule" + * ) + * @CsrfProtection() + * + * @param string $gridName + * @param string $actionName + * @param Request $request + * + * @return JsonResponse + */ + public function markMassAction($gridName, $actionName, Request $request) + { + /** @var MassActionDispatcher $massActionDispatcher */ + $massActionDispatcher = $this->get('oro_datagrid.mass_action.dispatcher'); + + $response = $massActionDispatcher->dispatchByRequest($gridName, $actionName, $request); + + $data = [ + 'successful' => $response->isSuccessful(), + 'message' => $response->getMessage() + ]; + + return new JsonResponse(array_merge($data, $response->getOptions())); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/DependencyInjection/Compiler/CompositePaymentMethodProviderCompilerPass.php b/src/Marello/Bundle/PaymentBundle/DependencyInjection/Compiler/CompositePaymentMethodProviderCompilerPass.php new file mode 100644 index 000000000..a7d69982c --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/DependencyInjection/Compiler/CompositePaymentMethodProviderCompilerPass.php @@ -0,0 +1,34 @@ +hasDefinition(self::COMPOSITE_SERVICE)) { + return; + } + + $taggedServices = $container->findTaggedServiceIds(self::TAG); + if (empty($taggedServices)) { + return; + } + + $compiledServiceDefinition = $container->getDefinition(self::COMPOSITE_SERVICE); + + foreach ($taggedServices as $method => $value) { + $compiledServiceDefinition->addMethodCall('addProvider', [new Reference($method)]); + } + } +} diff --git a/src/Marello/Bundle/PaymentBundle/DependencyInjection/Compiler/TwigSandboxConfigurationPass.php b/src/Marello/Bundle/PaymentBundle/DependencyInjection/Compiler/TwigSandboxConfigurationPass.php new file mode 100644 index 000000000..b5ae7f0c5 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/DependencyInjection/Compiler/TwigSandboxConfigurationPass.php @@ -0,0 +1,43 @@ +root(MarelloPaymentExtension::ALIAS); + + SettingsBuilder::append( + $rootNode, + [ + // General + self::MERCHANT_COUNTRY_KEY => [ + 'type' => 'text', + 'value' => LocaleConfiguration::DEFAULT_COUNTRY, + ], + ] + ); + + return $treeBuilder; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/DependencyInjection/MarelloPaymentExtension.php b/src/Marello/Bundle/PaymentBundle/DependencyInjection/MarelloPaymentExtension.php new file mode 100644 index 000000000..b7ce323ad --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/DependencyInjection/MarelloPaymentExtension.php @@ -0,0 +1,36 @@ +processConfiguration($configuration, $configs); + $container->prependExtensionConfig($this->getAlias(), $config); + + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.yml'); + $loader->load('mass_action.yml'); + $loader->load('form_types.yml'); + } + + /** + * {@inheritDoc} + */ + public function getAlias() + { + return self::ALIAS; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodAwareInterface.php b/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodAwareInterface.php new file mode 100644 index 000000000..25a5bc018 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodAwareInterface.php @@ -0,0 +1,17 @@ +id; + } + + /** + * @return PaymentMethodsConfigsRule + */ + public function getMethodsConfigsRule() + { + return $this->methodsConfigsRule; + } + + /** + * @param PaymentMethodsConfigsRule $methodsConfigsRule + * @return $this + */ + public function setMethodsConfigsRule($methodsConfigsRule) + { + $this->methodsConfigsRule = $methodsConfigsRule; + + return $this; + } + + /** + * @return string + */ + public function getMethod() + { + return $this->method; + } + + /** + * @param string $method + * @return $this + */ + public function setMethod($method) + { + $this->method = $method; + + return $this; + } + + /** + * @return array + */ + public function getOptions() + { + return $this->options; + } + + /** + * @param array $options + * @return $this + */ + public function setOptions($options) + { + $this->options = $options; + + return $this; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRule.php b/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRule.php new file mode 100644 index 000000000..9ea57aa59 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRule.php @@ -0,0 +1,289 @@ +methodConfigs = new ArrayCollection(); + $this->destinations = new ArrayCollection(); + } + + /** + * {@inheritdoc} + */ + public function getRule() + { + return $this->rule; + } + + /** + * @param RuleInterface $rule + * + * @return $this + */ + public function setRule(RuleInterface $rule) + { + $this->rule = $rule; + + return $this; + } + + /** + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * @return Collection|PaymentMethodConfig[] + */ + public function getMethodConfigs() + { + return $this->methodConfigs; + } + + /** + * @param PaymentMethodConfig $methodConfig + * + * @return bool + */ + public function hasMethodConfig(PaymentMethodConfig $methodConfig) + { + return $this->methodConfigs->contains($methodConfig); + } + + /** + * @param PaymentMethodConfig $methodConfig + * + * @return $this + */ + public function addMethodConfig(PaymentMethodConfig $methodConfig) + { + if (!$this->hasMethodConfig($methodConfig)) { + $this->methodConfigs[] = $methodConfig; + $methodConfig->setMethodsConfigsRule($this); + } + + return $this; + } + + /** + * @param PaymentMethodConfig $methodConfig + * + * @return $this + */ + public function removeMethodConfig(PaymentMethodConfig $methodConfig) + { + if ($this->hasMethodConfig($methodConfig)) { + $this->methodConfigs->removeElement($methodConfig); + } + + return $this; + } + + /** + * @return Collection|PaymentMethodsConfigsRuleDestination[] + */ + public function getDestinations() + { + return $this->destinations; + } + + /** + * @param PaymentMethodsConfigsRuleDestination $destination + * + * @return $this + */ + public function addDestination(PaymentMethodsConfigsRuleDestination $destination) + { + if (!$this->destinations->contains($destination)) { + $this->destinations->add($destination); + $destination->setMethodsConfigsRule($this); + } + + return $this; + } + + /** + * @param PaymentMethodsConfigsRuleDestination $destination + * + * @return $this + */ + public function removeDestination(PaymentMethodsConfigsRuleDestination $destination) + { + if ($this->destinations->contains($destination)) { + $this->destinations->removeElement($destination); + } + + return $this; + } + + /** + * @return string + */ + public function getCurrency() + { + return $this->currency; + } + + /** + * @param string $currency + * + * @return $this + */ + public function setCurrency($currency) + { + $this->currency = $currency; + + return $this; + } + + /** + * @return OrganizationInterface + */ + public function getOrganization() + { + return $this->organization; + } + + /** + * @param OrganizationInterface $organization + * + * @return $this + */ + public function setOrganization(OrganizationInterface $organization) + { + $this->organization = $organization; + + return $this; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRuleDestination.php b/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRuleDestination.php new file mode 100644 index 000000000..7c2bad3f8 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRuleDestination.php @@ -0,0 +1,314 @@ +postalCodes = new ArrayCollection(); + } + + /** + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * @return PaymentMethodsConfigsRule + */ + public function getMethodsConfigsRule() + { + return $this->methodsConfigsRule; + } + + /** + * @param PaymentMethodsConfigsRule $methodsConfigsRule + * @return $this + */ + public function setMethodsConfigsRule($methodsConfigsRule) + { + $this->methodsConfigsRule = $methodsConfigsRule; + + return $this; + } + + /** + * @return Collection|PaymentMethodsConfigsRuleDestinationPostalCode[] + */ + public function getPostalCodes() + { + return $this->postalCodes; + } + + /** + * @param PaymentMethodsConfigsRuleDestinationPostalCode $postalCode + * @return $this + */ + public function addPostalCode(PaymentMethodsConfigsRuleDestinationPostalCode $postalCode) + { + if (!$this->postalCodes->contains($postalCode)) { + $postalCode->setDestination($this); + $this->postalCodes->add($postalCode); + } + + return $this; + } + + /** + * @param PaymentMethodsConfigsRuleDestinationPostalCode $postalCode + * @return $this + */ + public function removePostalCode(PaymentMethodsConfigsRuleDestinationPostalCode $postalCode) + { + if ($this->postalCodes->contains($postalCode)) { + $this->postalCodes->removeElement($postalCode); + } + + return $this; + } + + /** + * @return Region + */ + public function getRegion() + { + return $this->region; + } + + /** + * @param Region $region + * @return $this + */ + public function setRegion($region) + { + $this->region = $region; + + return $this; + } + + /** + * Get name of region + * + * @return string + */ + public function getRegionName() + { + return $this->getRegion() ? $this->getRegion()->getName() : ''; + } + + /** + * Get code of region + * + * @return string + */ + public function getRegionCode() + { + return $this->getRegion() ? $this->getRegion()->getCode() : ''; + } + + /** + * @return string + */ + public function getRegionText() + { + return $this->regionText; + } + + /** + * @param string $regionText + * @return $this + */ + public function setRegionText($regionText) + { + $this->regionText = $regionText; + + return $this; + } + + /** + * @return Country + */ + public function getCountry() + { + return $this->country; + } + + /** + * Get name of country + * + * @return string + */ + public function getCountryName() + { + return $this->getCountry() ? $this->getCountry()->getName() : ''; + } + + /** + * @param Country $country + * @return $this + */ + public function setCountry($country) + { + $this->country = $country; + + return $this; + } + + /** + * Get country ISO2 code + * + * @return string + */ + public function getCountryIso2() + { + return $this->getCountry() ? $this->getCountry()->getIso2Code() : ''; + } + + /** + * Get country ISO3 code + * + * @return string + */ + public function getCountryIso3() + { + return $this->getCountry() ? $this->getCountry()->getIso3Code() : ''; + } + + /** + * Convert address to string + * + * @return string + */ + public function __toString() + { + $countryPostalStr = implode( + ' ', + array_filter([ + $this->getCountry(), + implode(', ', array_map(function (PaymentMethodsConfigsRuleDestinationPostalCode $postalCode) { + return (string)$postalCode; + }, $this->postalCodes->getValues())), + ]) + ); + + return implode(', ', array_filter([$this->getRegionName(), $countryPostalStr])); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRuleDestinationPostalCode.php b/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRuleDestinationPostalCode.php new file mode 100644 index 000000000..c5576c56a --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Entity/PaymentMethodsConfigsRuleDestinationPostalCode.php @@ -0,0 +1,125 @@ +id; + } + + /** + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * @param string $name + * @return $this + */ + public function setName($name) + { + $this->name = $name; + + return $this; + } + + /** + * @return PaymentMethodsConfigsRuleDestination + */ + public function getDestination() + { + return $this->destination; + } + + /** + * @param PaymentMethodsConfigsRuleDestination $destination + * @return $this + */ + public function setDestination(PaymentMethodsConfigsRuleDestination $destination) + { + $this->destination = $destination; + + return $this; + } + + /** + * @return mixed + */ + public function __toString() + { + return (string)$this->getName(); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Entity/Repository/PaymentMethodConfigRepository.php b/src/Marello/Bundle/PaymentBundle/Entity/Repository/PaymentMethodConfigRepository.php new file mode 100644 index 000000000..3ef96626d --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Entity/Repository/PaymentMethodConfigRepository.php @@ -0,0 +1,49 @@ +createQueryBuilder('methodConfig'); + + $qb->delete() + ->where( + $qb->expr()->eq('methodConfig.method', ':method') + ) + ->setParameter('method', $method); + + $qb->getQuery()->execute(); + } + + /** + * @param array $ids + */ + public function deleteByIds(array $ids) + { + $qb = $this->createQueryBuilder('methodConfig'); + $qb->delete() + ->where($qb->expr()->in('methodConfig.id', ':ids')) + ->setParameter('ids', $ids) + ->getQuery()->execute(); + } + + /** + * @param string|string[] $method + * + * @return PaymentMethodConfig[] + */ + public function findByMethod($method) + { + return $this->findBy([ + 'method' => $method + ]); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Entity/Repository/PaymentMethodsConfigsRuleRepository.php b/src/Marello/Bundle/PaymentBundle/Entity/Repository/PaymentMethodsConfigsRuleRepository.php new file mode 100644 index 000000000..8a65b1626 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Entity/Repository/PaymentMethodsConfigsRuleRepository.php @@ -0,0 +1,188 @@ +aclHelper = $aclHelper; + } + + /** + * @param AddressInterface $billingAddress + * @param string $currency + * + * @return PaymentMethodsConfigsRule[] + */ + public function getByDestinationAndCurrency( + AddressInterface $billingAddress, + string $currency + ): array { + $queryBuilder = $this->getByCurrencyQueryBuilder($currency) + ->leftJoin('methodsConfigsRule.destinations', 'destination') + ->leftJoin('methodsConfigsRule.rule', 'rule') + ->addSelect('rule', 'destination', 'postalCode') + ->leftJoin('destination.region', 'region') + ->leftJoin('destination.postalCodes', 'postalCode') + ->andWhere('destination.country = :country or destination.country is null') + ->andWhere('region.code = :regionCode or region.code is null') + ->andWhere('postalCode.name in (:postalCodes) or postalCode.name is null') + ->setParameter('country', $billingAddress->getCountryIso2()) + ->setParameter('regionCode', $billingAddress->getRegionCode()) + ->setParameter('postalCodes', explode(',', $billingAddress->getPostalCode())); + + return $this->aclHelper->apply($queryBuilder)->getResult(); + } + + /** + * @param string $currency + * + * @return PaymentMethodsConfigsRule[] + */ + public function getByCurrency(string $currency): array + { + $query = $this->getByCurrencyQueryBuilder($currency); + + return $this->aclHelper->apply($query)->getResult(); + } + + /** + * @param string $currency + * + * @return PaymentMethodsConfigsRule[] + */ + public function getByCurrencyWithoutDestination(string $currency): array + { + $query = $this->getByCurrencyQueryBuilder($currency) + ->leftJoin('methodsConfigsRule.destinations', 'destination') + ->andWhere('destination.id is null'); + + return $this->aclHelper->apply($query)->getResult(); + } + + /** + * @param string $methodId + * + * @return PaymentMethodsConfigsRule[] + */ + public function getConfigsWithEnabledRuleAndMethod($methodId) + { + $query = $this->createQueryBuilder('methodsConfigsRule') + ->innerJoin('methodsConfigsRule.methodConfigs', 'methodConfigs') + ->innerJoin('methodsConfigsRule.rule', 'rule') + ->andWhere('rule.enabled = true') + ->andWhere('methodConfigs.method = :methodId') + ->setParameter('methodId', $methodId); + + return $this->aclHelper->apply($query)->getResult(); + } + + /** + * @param bool $onlyEnabled + * + * @return mixed + */ + public function getRulesWithoutPaymentMethods($onlyEnabled = false) + { + $qb = $this->createQueryBuilder('methodsConfigsRule') + ->select('rule.id') + ->leftJoin('methodsConfigsRule.methodConfigs', 'methodConfigs') + ->leftJoin('methodsConfigsRule.rule', 'rule'); + if ($onlyEnabled) { + $qb->andWhere('rule.enabled = true'); + } + + return $qb + ->having('COUNT(methodConfigs.id) = 0') + ->groupBy('rule.id') + ->getQuery()->execute(); + } + + public function disableRulesWithoutPaymentMethods() + { + $rules = $this->getRulesWithoutPaymentMethods(true); + if (0 < count($rules)) { + $enabledRulesIds = array_column($rules, 'id'); + $qb = $this->createQueryBuilder('methodsConfigsRule'); + $qb->update('MarelloRuleBundle:Rule', 'rule') + ->set('rule.enabled', ':newValue') + ->setParameter('newValue', false) + ->where($qb->expr()->in('rule.id', ':rules')) + ->setParameter('rules', $enabledRulesIds) + ->getQuery()->execute(); + } + } + + /** + * @param string $currency + * + * @return QueryBuilder + */ + private function getByCurrencyQueryBuilder($currency): QueryBuilder + { + $queryBuilder = $this->createQueryBuilder('methodsConfigsRule'); + + return $queryBuilder + ->leftJoin('methodsConfigsRule.methodConfigs', 'methodConfigs') + ->where('methodsConfigsRule.currency = :currency') + ->orderBy($queryBuilder->expr()->asc('methodsConfigsRule.id')) + ->setParameter('currency', $currency); + } + + /** + * @param string $method + * + * @return PaymentMethodsConfigsRule[] + */ + public function getRulesByMethod($method) + { + $qb = $this->getRulesByMethodQueryBuilder($method); + + return $this->aclHelper->apply($qb)->getResult(); + } + + /** + * @param string $method + * + * @return PaymentMethodsConfigsRule[] + */ + public function getEnabledRulesByMethod($method) + { + $qb = $this->getRulesByMethodQueryBuilder($method) + ->innerJoin('methodsConfigsRule.rule', 'rule', Expr\Join::WITH, 'rule.enabled = true'); + + return $this->aclHelper->apply($qb)->getResult(); + } + + /** + * @param string $method + * + * @return QueryBuilder + */ + private function getRulesByMethodQueryBuilder($method) + { + return $this->createQueryBuilder('methodsConfigsRule') + ->innerJoin('methodsConfigsRule.methodConfigs', 'methodConfigs') + ->where('methodConfigs.method = :method') + ->setParameter('method', $method); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Event/ApplicablePaymentMethodViewEvent.php b/src/Marello/Bundle/PaymentBundle/Event/ApplicablePaymentMethodViewEvent.php new file mode 100644 index 000000000..ffeea75ba --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Event/ApplicablePaymentMethodViewEvent.php @@ -0,0 +1,121 @@ +paymentContext = $paymentContext; + $this->methodId = $methodId; + $this->methodLabel = $methodLabel; + $this->options = $options; + } + + /** + * @return string + */ + public function getMethodId() + { + return $this->methodId; + } + + /** + * @param string $methodId + * @return ApplicablePaymentMethodViewEvent + */ + public function setMethodId($methodId) + { + $this->methodId = $methodId; + + return $this; + } + + /** + * @return string + */ + public function getMethodLabel() + { + return $this->methodLabel; + } + + /** + * @param string $methodLabel + * @return ApplicablePaymentMethodViewEvent + */ + public function setMethodLabel($methodLabel) + { + $this->methodLabel = $methodLabel; + + return $this; + } + + /** + * @return array + */ + public function getOptions() + { + return $this->options; + } + + /** + * @param array $options + * @return ApplicablePaymentMethodViewEvent + */ + public function setOptions($options) + { + $this->options = $options; + + return $this; + } + + /** + * @return PaymentContextInterface + */ + public function getPaymentContext() + { + return $this->paymentContext; + } + + /** + * @param PaymentContextInterface $paymentContext + * @return ApplicablePaymentMethodViewEvent + */ + public function setPaymentContext($paymentContext) + { + $this->paymentContext = $paymentContext; + + return $this; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Event/PaymentMethodConfigDataEvent.php b/src/Marello/Bundle/PaymentBundle/Event/PaymentMethodConfigDataEvent.php new file mode 100755 index 000000000..299e9673d --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Event/PaymentMethodConfigDataEvent.php @@ -0,0 +1,56 @@ +methodIdentifier = $identifier; + } + + /** + * @return int|string + */ + public function getMethodIdentifier() + { + return $this->methodIdentifier; + } + + /** + * Returns payment method config template + * + * @return string + */ + public function getTemplate() + { + return $this->template; + } + + /** + * @param string $template + * @return $this + */ + public function setTemplate($template) + { + $this->template = $template; + return $this; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/EventListener/PaymentRuleViewMethodTemplateListener.php b/src/Marello/Bundle/PaymentBundle/EventListener/PaymentRuleViewMethodTemplateListener.php new file mode 100644 index 000000000..0c3554149 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/EventListener/PaymentRuleViewMethodTemplateListener.php @@ -0,0 +1,39 @@ +template = $template; + $this->provider = $provider; + } + + /** + * @param PaymentMethodConfigDataEvent $event + */ + public function onGetConfigData(PaymentMethodConfigDataEvent $event) + { + if ($this->provider->hasPaymentMethod($event->getMethodIdentifier())) { + $event->setTemplate($this->template); + } + } +} diff --git a/src/Marello/Bundle/PaymentBundle/ExpressionLanguage/DecoratedProductLineItemFactory.php b/src/Marello/Bundle/PaymentBundle/ExpressionLanguage/DecoratedProductLineItemFactory.php new file mode 100644 index 000000000..21e1c9b99 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/ExpressionLanguage/DecoratedProductLineItemFactory.php @@ -0,0 +1,48 @@ +virtualFieldsProductDecoratorFactory = $virtualFieldsProductDecoratorFactory; + } + + /** + * @param PaymentLineItemInterface[] $lineItems + * @param PaymentLineItemInterface $lineItem + * + * @return PaymentLineItem + */ + public function createLineItemWithDecoratedProductByLineItem(array $lineItems, PaymentLineItemInterface $lineItem) + { + $product = $lineItem->getProduct(); + + $decoratedProduct = $product + ? $this->virtualFieldsProductDecoratorFactory->createDecoratedProductByProductHolders($lineItems, $product) + : null; + + return new PaymentLineItem( + [ + PaymentLineItem::FIELD_PRICE => $lineItem->getPrice(), + PaymentLineItem::FIELD_QUANTITY => $lineItem->getQuantity(), + PaymentLineItem::FIELD_PRODUCT_HOLDER => $lineItem->getProductHolder(), + PaymentLineItem::FIELD_PRODUCT_SKU => $lineItem->getProductSku(), + PaymentLineItem::FIELD_PRODUCT => $decoratedProduct, + ] + ); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/DataTransformer/DestinationPostalCodeTransformer.php b/src/Marello/Bundle/PaymentBundle/Form/DataTransformer/DestinationPostalCodeTransformer.php new file mode 100644 index 000000000..deb9449d6 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/DataTransformer/DestinationPostalCodeTransformer.php @@ -0,0 +1,52 @@ +getName() . ', '; + } + $postalCodesString = rtrim($postalCodesString, ', '); + + return $postalCodesString; + } + + /** + * @param string|null $postalCodesString + * @return ArrayCollection|PaymentMethodsConfigsRuleDestinationPostalCode[] + */ + public function reverseTransform($postalCodesString) + { + $postalCodes = new ArrayCollection(); + + if (!$postalCodesString || $postalCodesString === '') { + return $postalCodes; + } + + $postalCodeNames = explode(',', $postalCodesString); + foreach ($postalCodeNames as $postalCodeName) { + $postalCode = new PaymentMethodsConfigsRuleDestinationPostalCode(); + + $postalCode->setName(trim($postalCodeName)); + $postalCodes->add($postalCode); + } + + return $postalCodes; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/DestinationCollectionTypeSubscriber.php b/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/DestinationCollectionTypeSubscriber.php new file mode 100644 index 000000000..b6688fe17 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/DestinationCollectionTypeSubscriber.php @@ -0,0 +1,43 @@ + 'preSubmit' + ]; + } + + /** + * @param FormEvent $event + */ + public function preSubmit(FormEvent $event) + { + $data = $event->getData(); + + if (!$data || + !(is_array($data) && array_key_exists('destinations', $data)) || + !is_array($data['destinations']) + ) { + return; + } + + foreach ($data['destinations'] as $index => $destination) { + if (!array_filter($destination)) { + unset($data['destinations']); + } + } + + $event->setData($data); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/MethodConfigCollectionSubscriber.php b/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/MethodConfigCollectionSubscriber.php new file mode 100755 index 000000000..583d53d5c --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/MethodConfigCollectionSubscriber.php @@ -0,0 +1,87 @@ +paymentMethodProvider = $paymentMethodProvider; + } + + /** + * @return array + */ + public static function getSubscribedEvents() + { + return [ + FormEvents::PRE_SET_DATA => 'preSet', + FormEvents::PRE_SUBMIT => 'preSubmit', + ]; + } + + /** + * @param FormEvent $event + */ + public function preSet(FormEvent $event) + { + /** @var Collection|PaymentMethodConfig[] $data */ + $data = $event->getData(); + $form = $event->getForm(); + + if (!$data) { + return; + } + + foreach ($data as $index => $methodConfig) { + $paymentMethod = $this->paymentMethodProvider->getPaymentMethod($methodConfig->getMethod()); + if (!$paymentMethod) { + $data->remove($index); + $form->remove($index); + } + } + $event->setData($data); + } + + /** + * @param FormEvent $event + */ + public function preSubmit(FormEvent $event) + { + /** @var array $data */ + $submittedData = $event->getData(); + $form = $event->getForm(); + + if (!$submittedData) { + return; + } + + $filteredSubmittedData = []; + foreach ($submittedData as $index => $itemData) { + if (array_key_exists('method', $itemData) + && $this->paymentMethodProvider->getPaymentMethod($itemData['method']) !== null + ) { + $filteredSubmittedData[$index] = $itemData; + } else { + $form->remove($index); + } + } + + $event->setData($filteredSubmittedData); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/MethodConfigSubscriber.php b/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/MethodConfigSubscriber.php new file mode 100755 index 000000000..6b491e79c --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/EventSubscriber/MethodConfigSubscriber.php @@ -0,0 +1,89 @@ +factory = $factory; + $this->paymentMethodProvider = $paymentMethodProvider; + } + + /** + * @return array + */ + public static function getSubscribedEvents() + { + return [ + FormEvents::PRE_SET_DATA => 'preSet', + FormEvents::PRE_SUBMIT => 'preSubmit', + ]; + } + + /** + * @param FormEvent $event + */ + public function preSet(FormEvent $event) + { + /** @var PaymentMethodConfig $data */ + $data = $event->getData(); + if (!$data) { + return; + } + $this->recreateDynamicChildren($event->getForm(), $data->getMethod()); + } + + /** + * @param FormEvent $event + */ + public function preSubmit(FormEvent $event) + { + $submittedData = $event->getData(); + $form = $event->getForm(); + /** @var PaymentMethodConfig $data */ + $data = $form->getData(); + + if (!$data) { + $this->recreateDynamicChildren($form, $submittedData['method']); + $event->setData($submittedData); + } + } + + /** + * @param FormInterface $form + * @param string $method + */ + protected function recreateDynamicChildren(FormInterface $form, $method) + { + $paymentMethod = $this->paymentMethodProvider->getPaymentMethod($method); + + $oldOptions = $form->get('options')->getConfig()->getOptions(); + $child = $this->factory->createNamed('options', $paymentMethod->getOptionsConfigurationFormType()); + $form->add('options', $paymentMethod->getOptionsConfigurationFormType(), array_merge($oldOptions, [ + 'compound' => $child->getConfig()->getOptions()['compound'] + ])); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/Handler/PaymentMethodsConfigsRuleHandler.php b/src/Marello/Bundle/PaymentBundle/Form/Handler/PaymentMethodsConfigsRuleHandler.php new file mode 100644 index 000000000..013782148 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/Handler/PaymentMethodsConfigsRuleHandler.php @@ -0,0 +1,62 @@ +requestStack = $requestStack; + $this->em = $em; + } + + /** + * @param FormInterface $form + * @param PaymentMethodsConfigsRule $entity + * @return bool + */ + public function process(FormInterface $form, PaymentMethodsConfigsRule $entity) + { + $form->setData($entity); + + $request = $this->requestStack->getCurrentRequest(); + if (in_array($request->getMethod(), ['POST', 'PUT'], true)) { + $this->submitPostPutRequest($form, $request); + if (!$request->get(self::UPDATE_FLAG, false) && $form->isValid()) { + $this->em->persist($entity); + $this->em->flush(); + + return true; + } + } + + return false; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodConfigCollectionType.php b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodConfigCollectionType.php new file mode 100644 index 000000000..bb378dbde --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodConfigCollectionType.php @@ -0,0 +1,73 @@ +subscriber = $subscriber; + } + + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder->addEventSubscriber($this->subscriber); + } + + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'show_form_when_empty' => false, + 'allow_add' => true, + 'entry_type' => PaymentMethodConfigType::class, + ]); + } + + /** + * {@inheritdoc} + */ + public function finishView(FormView $view, FormInterface $form, array $options) + { + $view->vars['allow_add'] = false; + } + + /** + * {@inheritdoc} + */ + public function getParent() + { + return CollectionType::class; + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix() + { + return self::BLOCK_PREFIX; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodConfigType.php b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodConfigType.php new file mode 100644 index 000000000..25c73d2b8 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodConfigType.php @@ -0,0 +1,87 @@ +subscriber = $subscriber; + $this->methodProvider = $methodProvider; + } + + /** + * {@inheritDoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder->add('method', HiddenType::class, ['required' => true]); + $builder->add('options', HiddenType::class); + + $builder->addEventSubscriber($this->subscriber); + } + + /** + * {@inheritDoc} + */ + public function buildView(FormView $view, FormInterface $form, array $options) + { + $methodsLabels = []; + $methodsIcons = []; + /* @var PaymentMethodInterface|PaymentMethodIconAwareInterface $method */ + foreach ($this->methodProvider->getPaymentMethods() as $method) { + $methodsLabels[$method->getIdentifier()] = $method->getLabel(); + $methodsIcons[$method->getIdentifier()] = $method->getIcon(); + } + $view->vars['methods_labels'] = $methodsLabels; + $view->vars['methods_icons'] = $methodsIcons; + } + + /** + * @param OptionsResolver $resolver + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => PaymentMethodConfig::class, + ]); + } + + /** + * {@inheritDoc} + */ + public function getBlockPrefix() + { + return self::BLOCK_PREFIX; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodSelectType.php b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodSelectType.php new file mode 100644 index 000000000..2261e9248 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodSelectType.php @@ -0,0 +1,62 @@ +paymentMethodChoicesProvider = $paymentMethodChoicesProvider; + } + + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefaults([ + 'expanded' => true, + 'choices' => array_flip($this->getChoices()), + ]); + } + + /** + * @return array + */ + protected function getChoices() + { + return $this->paymentMethodChoicesProvider->getMethods(); + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix() + { + return self::BLOCK_PREFIX; + } + + /** + * {@inheritdoc} + */ + public function getParent() + { + return ChoiceType::class; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodsConfigsRuleDestinationType.php b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodsConfigsRuleDestinationType.php new file mode 100644 index 000000000..25dfa374c --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodsConfigsRuleDestinationType.php @@ -0,0 +1,89 @@ +subscriber = $subscriber; + } + + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder->addEventSubscriber($this->subscriber); + $builder->add('country', CountryType::class, [ + 'required' => true, + 'label' => 'oro.address.country.label', + //Used to show validation error for empty countries while creating rules + 'constraints' => new NotBlank(), + ]) + ->add('region', RegionType::class, ['required' => false, 'label' => 'oro.address.region.label']) + ->add( + 'region_text', + HiddenType::class, + ['required' => false, 'random_id' => true, 'label' => 'oro.address.region_text.label'] + ) + ->add('postalCodes', TextType::class, ['required' => false, 'label' => 'oro.address.postal_code.label']); + + $builder->get('postalCodes')->addModelTransformer(new DestinationPostalCodeTransformer()); + } + + /** + * @param OptionsResolver $resolver + * @throws AccessException + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => PaymentMethodsConfigsRuleDestination::class, + 'region_route' => 'oro_api_country_get_regions', + ]); + } + + /** + * {@inheritdoc} + */ + public function buildView(FormView $view, FormInterface $form, array $options) + { + if (!empty($options['region_route'])) { + $view->vars['region_route'] = $options['region_route']; + } + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix() + { + return self::BLOCK_PREFIX; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodsConfigsRuleType.php b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodsConfigsRuleType.php new file mode 100644 index 000000000..92087712d --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Form/Type/PaymentMethodsConfigsRuleType.php @@ -0,0 +1,95 @@ +provider = $provider; + $this->translator = $translator; + } + + /** + * {@inheritDoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('rule', RuleType::class, ['label' => 'marello.payment.paymentmethodsconfigsrule.rule.label']) + ->add('currency', CurrencySelectionType::class, [ + 'label' => 'marello.payment.paymentmethodsconfigsrule.currency.label', + 'placeholder' => 'oro.currency.currency.form.choose', + ]) + ->add('destinations', CollectionType::class, [ + 'required' => false, + 'entry_type' => PaymentMethodsConfigsRuleDestinationType::class, + 'label' => 'marello.payment.paymentmethodsconfigsrule.destinations.label', + 'show_form_when_empty' => false, + ]) + ->add('methodConfigs', PaymentMethodConfigCollectionType::class, [ + 'required' => false, + ]) + ->add('method', OroChoiceType::class, [ + 'mapped' => false, + 'choices' => array_flip($this->provider->getMethods()) + ]); + } + + /** + * {@inheritDoc} + */ + public function buildView(FormView $view, FormInterface $form, array $options) + { + $view->vars['methods'] = $this->provider->getMethods(true); + } + + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => PaymentMethodsConfigsRule::class + ]); + } + + /** + * {@inheritDoc} + */ + public function getBlockPrefix() + { + return self::BLOCK_PREFIX; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Formatter/PaymentMethodLabelFormatter.php b/src/Marello/Bundle/PaymentBundle/Formatter/PaymentMethodLabelFormatter.php new file mode 100755 index 000000000..4f2bbbbad --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Formatter/PaymentMethodLabelFormatter.php @@ -0,0 +1,33 @@ +paymentMethodProvider = $paymentMethodProvider; + } + + + /** + * @param string $paymentMethodName + * @return string + */ + public function formatPaymentMethodLabel($paymentMethodName) + { + $paymentMethod = $this->paymentMethodProvider->getPaymentMethod($paymentMethodName); + + return $paymentMethod->getLabel(); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/MarelloPaymentBundle.php b/src/Marello/Bundle/PaymentBundle/MarelloPaymentBundle.php new file mode 100644 index 000000000..f16f2f926 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/MarelloPaymentBundle.php @@ -0,0 +1,27 @@ +addCompilerPass(new TwigSandboxConfigurationPass()); + $container->addCompilerPass(new CompositePaymentMethodProviderCompilerPass()); + + parent::build($container); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Config/ParameterBag/AbstractParameterBagPaymentConfig.php b/src/Marello/Bundle/PaymentBundle/Method/Config/ParameterBag/AbstractParameterBagPaymentConfig.php new file mode 100644 index 000000000..62497252a --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Config/ParameterBag/AbstractParameterBagPaymentConfig.php @@ -0,0 +1,28 @@ +get(self::FIELD_LABEL); + } + + /** + * {@inheritdoc} + */ + public function getPaymentMethodIdentifier() + { + return $this->get(self::FIELD_PAYMENT_METHOD_IDENTIFIER); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Config/PaymentConfigInterface.php b/src/Marello/Bundle/PaymentBundle/Method/Config/PaymentConfigInterface.php new file mode 100644 index 000000000..7b3ce9163 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Config/PaymentConfigInterface.php @@ -0,0 +1,16 @@ +eventDispatcher = $eventDispatcher; + } + + /** + * {@inheritdoc} + */ + public function dispatch($id) + { + $this->eventDispatcher->dispatch(MethodRemovalEvent::NAME, new MethodRemovalEvent($id)); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Event/BasicMethodRenamingEventDispatcher.php b/src/Marello/Bundle/PaymentBundle/Method/Event/BasicMethodRenamingEventDispatcher.php new file mode 100644 index 000000000..ddac0181a --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Event/BasicMethodRenamingEventDispatcher.php @@ -0,0 +1,29 @@ +eventDispatcher = $eventDispatcher; + } + + /** + * {@inheritDoc} + */ + public function dispatch($oldId, $newId) + { + $this->eventDispatcher->dispatch(MethodRenamingEvent::NAME, new MethodRenamingEvent($oldId, $newId)); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRemovalEvent.php b/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRemovalEvent.php new file mode 100644 index 000000000..b0e03deb9 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRemovalEvent.php @@ -0,0 +1,31 @@ +methodId = $id; + } + + /** + * @return int|string + */ + public function getMethodIdentifier() + { + return $this->methodId; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRemovalEventDispatcherInterface.php b/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRemovalEventDispatcherInterface.php new file mode 100644 index 000000000..a3023dab6 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRemovalEventDispatcherInterface.php @@ -0,0 +1,12 @@ +oldMethodId = $oldId; + $this->newMethodId = $newId; + } + + /** + * @return string + */ + public function getOldMethodIdentifier() + { + return $this->oldMethodId; + } + + /** + * @return string + */ + public function getNewMethodIdentifier() + { + return $this->newMethodId; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRenamingEventDispatcherInterface.php b/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRenamingEventDispatcherInterface.php new file mode 100644 index 000000000..3c5802158 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Event/MethodRenamingEventDispatcherInterface.php @@ -0,0 +1,14 @@ +channelType = $channelType; + $this->identifierGenerator = $identifierGenerator; + $this->dispatcher = $dispatcher; + } + + /** + * @param ChannelDeleteEvent $event + */ + public function onRemove(ChannelDeleteEvent $event) + { + $channel = $event->getChannel(); + if ($this->channelType === $channel->getType()) { + $this->dispatcher->dispatch($this->identifierGenerator->generateIdentifier($channel)); + } + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/EventListener/MethodRemovalListener.php b/src/Marello/Bundle/PaymentBundle/Method/EventListener/MethodRemovalListener.php new file mode 100644 index 000000000..c6c870a5e --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/EventListener/MethodRemovalListener.php @@ -0,0 +1,77 @@ +doctrineHelper = $doctrineHelper; + $this->logger = $logger; + } + + /** + * @param MethodRemovalEvent $event + * @throws \Exception + */ + public function onMethodRemove(MethodRemovalEvent $event) + { + $methodId = $event->getMethodIdentifier(); + $connection = $this->getEntityManager()->getConnection(); + try { + $connection->beginTransaction(); + $this->getPaymentMethodConfigRepository()->deleteByMethod($methodId); + $this->getPaymentMethodsConfigsRuleRepository()->disableRulesWithoutPaymentMethods(); + $connection->commit(); + } catch (\Exception $e) { + $connection->rollBack(); + $this->logger->critical($e->getMessage(), [ + 'payment_method_identifier' => $methodId + ]); + } + } + + /** + * @return \Doctrine\ORM\EntityManager|null + */ + private function getEntityManager() + { + return $this->doctrineHelper->getEntityManagerForClass('MarelloPaymentBundle:PaymentMethodsConfigsRule'); + } + + /** + * @return PaymentMethodConfigRepository|\Doctrine\ORM\EntityRepository + */ + private function getPaymentMethodConfigRepository() + { + return $this->doctrineHelper->getEntityRepository('MarelloPaymentBundle:PaymentMethodConfig'); + } + + /** + * @return PaymentMethodsConfigsRuleRepository|\Doctrine\ORM\EntityRepository + */ + private function getPaymentMethodsConfigsRuleRepository() + { + return $this->doctrineHelper->getEntityRepository('MarelloPaymentBundle:PaymentMethodsConfigsRule'); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/EventListener/MethodRenamingListener.php b/src/Marello/Bundle/PaymentBundle/Method/EventListener/MethodRenamingListener.php new file mode 100644 index 000000000..58c2db56a --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/EventListener/MethodRenamingListener.php @@ -0,0 +1,43 @@ +paymentMethodConfigRepository = $paymentMethodConfigRepository; + } + + /** + * @param MethodRenamingEvent $event + */ + public function onMethodRename(MethodRenamingEvent $event) + { + $this->updateRuleConfigs($event->getOldMethodIdentifier(), $event->getNewMethodIdentifier()); + } + + /** + * @param string $oldId + * @param string $newId + */ + private function updateRuleConfigs($oldId, $newId) + { + $configs = $this->paymentMethodConfigRepository->findByMethod($oldId); + foreach ($configs as $config) { + $config->setMethod($newId); + } + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/EventListener/PaymentMethodDisableIntegrationListener.php b/src/Marello/Bundle/PaymentBundle/Method/EventListener/PaymentMethodDisableIntegrationListener.php new file mode 100644 index 000000000..8d223e2f2 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/EventListener/PaymentMethodDisableIntegrationListener.php @@ -0,0 +1,48 @@ +channelType = $channelType; + $this->methodIdentifierGenerator = $methodIdentifierGenerator; + $this->paymentMethodDisableHandler = $paymentMethodDisableHandler; + } + + /** + * @param ChannelDisableEvent $event + */ + public function onIntegrationDisable(ChannelDisableEvent $event) + { + $channel = $event->getChannel(); + $channelType = $channel->getType(); + if ($channelType === $this->channelType) { + $methodId = $this->methodIdentifierGenerator->generateIdentifier($channel); + $this->paymentMethodDisableHandler->handleMethodDisable($methodId); + } + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Factory/IntegrationPaymentMethodFactoryInterface.php b/src/Marello/Bundle/PaymentBundle/Method/Factory/IntegrationPaymentMethodFactoryInterface.php new file mode 100644 index 000000000..0aa06f53c --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Factory/IntegrationPaymentMethodFactoryInterface.php @@ -0,0 +1,15 @@ +handler = $handler; + $this->repository = $repository; + $this->paymentMethodProvider = $paymentMethodProvider; + } + + /** + * {@inheritDoc} + */ + public function handleMethodDisable($methodId) + { + $this->handler->handleMethodDisable($methodId); + $paymentMethodsConfigsRule = $this->repository->getEnabledRulesByMethod($methodId); + foreach ($paymentMethodsConfigsRule as $configRule) { + if (!$this->configHasEnabledMethod($configRule, $methodId)) { + $rule = $configRule->getRule(); + $rule->setEnabled(false); + } + } + } + + /** + * @param PaymentMethodsConfigsRule $configRule + * @param string $disabledMethodId + * + * @return bool + */ + private function configHasEnabledMethod(PaymentMethodsConfigsRule $configRule, $disabledMethodId) + { + $methodConfigs = $configRule->getMethodConfigs(); + foreach ($methodConfigs as $methodConfig) { + $methodId = $methodConfig->getMethod(); + if ($methodId !== $disabledMethodId) { + $method = $this->paymentMethodProvider->getPaymentMethod($methodId); + if ($method->isEnabled()) { + return true; + } + } + } + + return false; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/PaymentMethodIconAwareInterface.php b/src/Marello/Bundle/PaymentBundle/Method/PaymentMethodIconAwareInterface.php new file mode 100644 index 000000000..1b4bc3745 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/PaymentMethodIconAwareInterface.php @@ -0,0 +1,13 @@ +hasMethodView($methodId)) { + return $this; + } + + $this->methodViews[$methodId] = $methodView; + + return $this; + } + + /** + * @param string $methodId + * + * @return bool + */ + public function hasMethodView($methodId) + { + return array_key_exists($methodId, $this->methodViews); + } + + /** + * @param string $methodId + * + * @return $this + */ + public function removeMethodView($methodId) + { + if (false === $this->hasMethodView($methodId)) { + return $this; + } + + unset($this->methodViews[$methodId]); + + return $this; + } + + /** + * @param string $methodId + * + * @return array|null + */ + public function getMethodView($methodId) + { + if (false === $this->hasMethodView($methodId)) { + return null; + } + + return $this->methodViews[$methodId]; + } + + /** + * @return array + */ + public function getAllMethodsViews() + { + return $this->methodViews; + } + + /** + * @return array + */ + public function toArray() + { + $resultingFullMethodViews = []; + + foreach ($this->methodViews as $methodId => $methodView) { + if (false === array_key_exists($methodId, $resultingFullMethodViews)) { + $resultingFullMethodViews[$methodId] = $methodView; + } + } + + uasort( + $resultingFullMethodViews, + function ($methodData1, $methodData2) { + if (false === array_key_exists('sortOrder', $methodData1) + || false === array_key_exists('sortOrder', $methodData2) + ) { + throw new \Exception('Method View should contain sortOrder'); + } + + return $methodData1['sortOrder'] - $methodData2['sortOrder']; + } + ); + + return $resultingFullMethodViews; + } + + /** + * @return self + */ + public function clear() + { + $this->methodViews = []; + + return $this; + } + + /** + * @return bool + */ + public function isEmpty() + { + return count($this->methodViews) <= 0; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/PaymentMethodViewFactory.php b/src/Marello/Bundle/PaymentBundle/Method/PaymentMethodViewFactory.php new file mode 100644 index 000000000..1108662c2 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/PaymentMethodViewFactory.php @@ -0,0 +1,24 @@ + $paymentMethodId, + 'label' => $label, + 'sortOrder' => $sortOrder, + 'options' => $options + ]; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Provider/AbstractPaymentMethodProvider.php b/src/Marello/Bundle/PaymentBundle/Method/Provider/AbstractPaymentMethodProvider.php new file mode 100644 index 000000000..3f20b2b58 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Provider/AbstractPaymentMethodProvider.php @@ -0,0 +1,73 @@ +methods = new ArrayCollection(); + } + + /** + * {@inheritdoc} + */ + public function hasPaymentMethod($identifier) + { + return $this->getMethods()->containsKey($identifier); + } + + /** + * {@inheritdoc} + */ + public function getPaymentMethod($identifier) + { + if (!$this->hasPaymentMethod($identifier)) { + return null; + } + + return $this->getMethods()->get($identifier); + } + + /** + * {@inheritdoc} + */ + public function getPaymentMethods() + { + return $this->getMethods()->toArray(); + } + + /** + * @return ArrayCollection|PaymentMethodInterface[] + */ + protected function getMethods() + { + if ($this->methods->isEmpty()) { + $this->collectMethods(); + } + + return $this->methods; + } + + /** + * @param string $identifier + * @param PaymentMethodInterface $method + */ + protected function addMethod($identifier, PaymentMethodInterface $method) + { + $this->methods->set($identifier, $method); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Provider/CompositePaymentMethodProvider.php b/src/Marello/Bundle/PaymentBundle/Method/Provider/CompositePaymentMethodProvider.php new file mode 100644 index 000000000..e4dab80d6 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Provider/CompositePaymentMethodProvider.php @@ -0,0 +1,60 @@ +providers[] = $provider; + } + + /** + * {@inheritDoc} + */ + public function getPaymentMethods() + { + $result = []; + foreach ($this->providers as $provider) { + $result = array_merge($result, $provider->getPaymentMethods()); + } + + return $result; + } + + /** + * {@inheritDoc} + */ + public function getPaymentMethod($identifier) + { + foreach ($this->providers as $provider) { + if ($provider->hasPaymentMethod($identifier)) { + return $provider->getPaymentMethod($identifier); + } + } + + throw new \InvalidArgumentException('There is no payment method for "' . $identifier . '" identifier'); + } + + /** + * {@inheritDoc} + */ + public function hasPaymentMethod($identifier) + { + foreach ($this->providers as $provider) { + if ($provider->hasPaymentMethod($identifier)) { + return true; + } + } + + return false; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Provider/Integration/ChannelPaymentMethodProvider.php b/src/Marello/Bundle/PaymentBundle/Method/Provider/Integration/ChannelPaymentMethodProvider.php new file mode 100644 index 000000000..12a6eda56 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Provider/Integration/ChannelPaymentMethodProvider.php @@ -0,0 +1,122 @@ +channelType = $channelType; + $this->doctrineHelper = $doctrineHelper; + $this->methodFactory = $methodFactory; + } + + /** + * We need only non dirty channels for creating methods. + * For example if entity was changed on form submit, we will have dirty channel in Unit of work. + * + * @param Channel $channel + * @param LifecycleEventArgs $event + */ + public function postLoad(Channel $channel, LifecycleEventArgs $event) + { + if ($channel->getType() === $this->channelType) { + $this->loadedChannels[] = $channel; + $this->createMethodFromChannel($channel); + } + } + + /** + * {@inheritDoc} + */ + public function getPaymentMethods() + { + $this->loadChannels(); + + return $this->methods; + } + + /** + * {@inheritDoc} + */ + public function getPaymentMethod($name) + { + if ($this->hasPaymentMethod($name)) { + return $this->getPaymentMethods()[$name]; + } + + return null; + } + + /** + * {@inheritDoc} + */ + public function hasPaymentMethod($name) + { + return array_key_exists($name, $this->getPaymentMethods()); + } + + /** + * @param Channel $channel + */ + private function createMethodFromChannel(Channel $channel) + { + $method = $this->methodFactory->create($channel); + $this->methods[$method->getIdentifier()] = $method; + } + + /** + * @return ChannelRepository|\Doctrine\ORM\EntityRepository + */ + private function getRepository() + { + return $this->doctrineHelper->getEntityRepository('OroIntegrationBundle:Channel'); + } + + private function loadChannels() + { + /* After fetching, all entities will be saved into $loadedChannels on postLoad call */ + $this->getRepository()->findByTypeAndExclude($this->channelType, $this->loadedChannels); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Provider/PaymentMethodProvider.php b/src/Marello/Bundle/PaymentBundle/Method/Provider/PaymentMethodProvider.php new file mode 100644 index 000000000..deab3f5a8 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Provider/PaymentMethodProvider.php @@ -0,0 +1,95 @@ +paymentMethodProvider = $paymentMethodProvider; + $this->paymentMethodsConfigsRulesProvider = $paymentMethodsConfigsRulesProvider; + } + + /** + * @param PaymentContextInterface $context + * + * @return PaymentMethodInterface[] + */ + public function getApplicablePaymentMethods(PaymentContextInterface $context) + { + $paymentMethodsConfigsRules = $this->paymentMethodsConfigsRulesProvider + ->getPaymentMethodsConfigsRules($context); + + $paymentMethods = []; + + foreach ($paymentMethodsConfigsRules as $paymentMethodsConfigsRule) { + $paymentMethods = array_merge( + $paymentMethods, + $this->getPaymentMethodsForConfigsRule($paymentMethodsConfigsRule, $context) + ); + } + + return $paymentMethods; + } + + /** + * @param PaymentMethodsConfigsRule $paymentMethodsConfigsRule + * @param PaymentContextInterface $context + * @return array + */ + protected function getPaymentMethodsForConfigsRule( + PaymentMethodsConfigsRule $paymentMethodsConfigsRule, + PaymentContextInterface $context + ) { + $paymentMethods = []; + foreach ($paymentMethodsConfigsRule->getMethodConfigs() as $methodConfig) { + $paymentMethod = $this->getPaymentMethodForConfig($methodConfig, $context); + if ($paymentMethod) { + $paymentMethods[$methodConfig->getMethod()] = $paymentMethod; + } + } + + return $paymentMethods; + } + + /** + * @param PaymentMethodConfig $methodConfig + * @param PaymentContextInterface $context + * @return PaymentMethodInterface|null + */ + protected function getPaymentMethodForConfig(PaymentMethodConfig $methodConfig, PaymentContextInterface $context) + { + $identifier = $methodConfig->getMethod(); + if ($this->paymentMethodProvider->hasPaymentMethod($identifier)) { + $paymentMethod = $this->paymentMethodProvider->getPaymentMethod($identifier); + + if ($paymentMethod->isApplicable($context)) { + return $paymentMethod; + } + } + + return null; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Method/Provider/PaymentMethodProviderInterface.php b/src/Marello/Bundle/PaymentBundle/Method/Provider/PaymentMethodProviderInterface.php new file mode 100644 index 000000000..8b3f16c7c --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Method/Provider/PaymentMethodProviderInterface.php @@ -0,0 +1,25 @@ +setName(self::DEFAULT_RULE_NAME) + ->setEnabled(true) + ->setSortOrder(1); + + $paymentRule = new PaymentMethodsConfigsRule(); + + $paymentRule->setRule($rule) + ->setOrganization($this->getOrganization($manager)) + ->setCurrency('USD'); + + $manager->persist($paymentRule); + $this->addReference(self::DEFAULT_RULE_REFERENCE, $paymentRule); + $manager->flush(); + } + + /** + * @param ObjectManager $manager + * + * @return Organization|object + */ + private function getOrganization(ObjectManager $manager) + { + if ($this->hasReference(LoadOrganizationAndBusinessUnitData::REFERENCE_DEFAULT_ORGANIZATION)) { + return $this->getReference(LoadOrganizationAndBusinessUnitData::REFERENCE_DEFAULT_ORGANIZATION); + } else { + return $manager + ->getRepository('OroOrganizationBundle:Organization') + ->getFirst(); + } + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Migrations/Schema/MarelloPaymentBundleInstaller.php b/src/Marello/Bundle/PaymentBundle/Migrations/Schema/MarelloPaymentBundleInstaller.php new file mode 100644 index 000000000..b82aee0bd --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Migrations/Schema/MarelloPaymentBundleInstaller.php @@ -0,0 +1,203 @@ +createMarelloPaymentMethodConfigTable($schema); + $this->createMarelloPaymentMethodsConfigsRuleTable($schema); + $this->createMarelloPaymentMethodsConfigsRuleDestinationTable($schema); + $this->createMarelloPaymentMethodsConfigsRuleDestinationPostalCodeTable($schema); + + $this->addOroPaymentMethodConfigForeignKeys($schema); + $this->addOroPaymentMethodsConfigsRuleForeignKeys($schema); + $this->addOroPaymentMethodsConfigsRuleDestinationForeignKeys($schema); + $this->addOroPaymentMethodsConfigsRuleDestinationPostalCodeForeignKeys($schema); + } + + /** + * Create marello_payment_method_config table + * + * @param Schema $schema + */ + protected function createMarelloPaymentMethodConfigTable(Schema $schema) + { + $table = $schema->createTable('marello_payment_method_config'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('configs_rule_id', 'integer', []); + $table->addColumn('method', 'string', ['length' => 255]); + $table->addColumn('options', 'array', ['notnull' => false, 'comment' => '(DC2Type:array)']); + $table->setPrimaryKey(['id']); + } + + /** + * Create marello_payment_mtds_cfgs_rl table + * + * @param Schema $schema + */ + protected function createMarelloPaymentMethodsConfigsRuleTable(Schema $schema) + { + $table = $schema->createTable('marello_payment_mtds_cfgs_rl'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('rule_id', 'integer', []); + $table->addColumn('currency', 'string', ['notnull' => true, 'length' => 3]); + $table->addColumn('organization_id', 'integer', ['notnull' => false]); + $table->setPrimaryKey(['id']); + + $this->activityExtension->addActivityAssociation( + $schema, + 'oro_note', + 'marello_payment_mtds_cfgs_rl' + ); + } + + /** + * Create marello_payment_mtds_cfgs_rl_d table + * + * @param Schema $schema + */ + protected function createMarelloPaymentMethodsConfigsRuleDestinationTable(Schema $schema) + { + $table = $schema->createTable('marello_payment_mtds_cfgs_rl_d'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('region_code', 'string', ['notnull' => false, 'length' => 16]); + $table->addColumn('configs_rule_id', 'integer', []); + $table->addColumn('country_code', 'string', ['length' => 2]); + $table->addColumn('region_text', 'string', ['notnull' => false, 'length' => 255]); + $table->setPrimaryKey(['id']); + } + + /** + * Create marello_pmnt_mtdscfgsrl_dst_pc table + * + * @param Schema $schema + */ + protected function createMarelloPaymentMethodsConfigsRuleDestinationPostalCodeTable(Schema $schema) + { + $table = $schema->createTable('marello_pmnt_mtdscfgsrl_dst_pc'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('destination_id', 'integer', []); + $table->addColumn('name', 'text', []); + $table->setPrimaryKey(['id']); + } + + /** + * Add marello_payment_method_config foreign keys. + * + * @param Schema $schema + */ + protected function addOroPaymentMethodConfigForeignKeys(Schema $schema) + { + $table = $schema->getTable('marello_payment_method_config'); + $table->addForeignKeyConstraint( + $schema->getTable('marello_payment_mtds_cfgs_rl'), + ['configs_rule_id'], + ['id'], + ['onDelete' => 'CASCADE', 'onUpdate' => null] + ); + } + + /** + * Add marello_payment_mtds_cfgs_rl foreign keys. + * + * @param Schema $schema + */ + protected function addOroPaymentMethodsConfigsRuleForeignKeys(Schema $schema) + { + $table = $schema->getTable('marello_payment_mtds_cfgs_rl'); + $table->addForeignKeyConstraint( + $schema->getTable('marello_rule'), + ['rule_id'], + ['id'], + ['onDelete' => 'CASCADE', 'onUpdate' => null] + ); + + $table->addForeignKeyConstraint( + $schema->getTable('oro_organization'), + ['organization_id'], + ['id'], + ['onDelete' => 'SET NULL', 'onUpdate' => null] + ); + } + + /** + * Add marello_payment_mtds_cfgs_rl_d foreign keys. + * + * @param Schema $schema + */ + protected function addOroPaymentMethodsConfigsRuleDestinationForeignKeys(Schema $schema) + { + $table = $schema->getTable('marello_payment_mtds_cfgs_rl_d'); + $table->addForeignKeyConstraint( + $schema->getTable('oro_dictionary_region'), + ['region_code'], + ['combined_code'], + ['onDelete' => null, 'onUpdate' => null] + ); + $table->addForeignKeyConstraint( + $schema->getTable('marello_payment_mtds_cfgs_rl'), + ['configs_rule_id'], + ['id'], + ['onDelete' => 'CASCADE', 'onUpdate' => null] + ); + $table->addForeignKeyConstraint( + $schema->getTable('oro_dictionary_country'), + ['country_code'], + ['iso2_code'], + ['onDelete' => null, 'onUpdate' => null] + ); + } + + /** + * Add marello_pmnt_mtdscfgsrl_dst_pc foreign keys. + * + * @param Schema $schema + */ + protected function addOroPaymentMethodsConfigsRuleDestinationPostalCodeForeignKeys(Schema $schema) + { + $table = $schema->getTable('marello_pmnt_mtdscfgsrl_dst_pc'); + $table->addForeignKeyConstraint( + $schema->getTable('marello_payment_mtds_cfgs_rl_d'), + ['destination_id'], + ['id'], + ['onDelete' => 'CASCADE', 'onUpdate' => null] + ); + } + + /** + * Sets the ActivityExtension + * + * @param ActivityExtension $activityExtension + */ + public function setActivityExtension(ActivityExtension $activityExtension) + { + $this->activityExtension = $activityExtension; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Migrations/Schema/v1_0/MarelloPaymentBundle.php b/src/Marello/Bundle/PaymentBundle/Migrations/Schema/v1_0/MarelloPaymentBundle.php new file mode 100644 index 000000000..4442fe6ad --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Migrations/Schema/v1_0/MarelloPaymentBundle.php @@ -0,0 +1,195 @@ +createMarelloPaymentMethodConfigTable($schema); + $this->createMarelloPaymentMethodsConfigsRuleTable($schema); + $this->createMarelloPaymentMethodsConfigsRuleDestinationTable($schema); + $this->createMarelloPaymentMethodsConfigsRuleDestinationPostalCodeTable($schema); + + $this->addOroPaymentMethodConfigForeignKeys($schema); + $this->addOroPaymentMethodsConfigsRuleForeignKeys($schema); + $this->addOroPaymentMethodsConfigsRuleDestinationForeignKeys($schema); + $this->addOroPaymentMethodsConfigsRuleDestinationPostalCodeForeignKeys($schema); + } + + /** + * Create marello_payment_method_config table + * + * @param Schema $schema + */ + protected function createMarelloPaymentMethodConfigTable(Schema $schema) + { + $table = $schema->createTable('marello_payment_method_config'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('configs_rule_id', 'integer', []); + $table->addColumn('method', 'string', ['length' => 255]); + $table->addColumn('options', 'array', ['notnull' => false, 'comment' => '(DC2Type:array)']); + $table->setPrimaryKey(['id']); + } + + /** + * Create marello_payment_mtds_cfgs_rl table + * + * @param Schema $schema + */ + protected function createMarelloPaymentMethodsConfigsRuleTable(Schema $schema) + { + $table = $schema->createTable('marello_payment_mtds_cfgs_rl'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('rule_id', 'integer', []); + $table->addColumn('currency', 'string', ['notnull' => true, 'length' => 3]); + $table->addColumn('organization_id', 'integer', ['notnull' => false]); + $table->setPrimaryKey(['id']); + + $this->activityExtension->addActivityAssociation( + $schema, + 'oro_note', + 'marello_payment_mtds_cfgs_rl' + ); + } + + /** + * Create marello_payment_mtds_cfgs_rl_d table + * + * @param Schema $schema + */ + protected function createMarelloPaymentMethodsConfigsRuleDestinationTable(Schema $schema) + { + $table = $schema->createTable('marello_payment_mtds_cfgs_rl_d'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('region_code', 'string', ['notnull' => false, 'length' => 16]); + $table->addColumn('configs_rule_id', 'integer', []); + $table->addColumn('country_code', 'string', ['length' => 2]); + $table->addColumn('region_text', 'string', ['notnull' => false, 'length' => 255]); + $table->setPrimaryKey(['id']); + } + + /** + * Create marello_pmnt_mtdscfgsrl_dst_pc table + * + * @param Schema $schema + */ + protected function createMarelloPaymentMethodsConfigsRuleDestinationPostalCodeTable(Schema $schema) + { + $table = $schema->createTable('marello_pmnt_mtdscfgsrl_dst_pc'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('destination_id', 'integer', []); + $table->addColumn('name', 'text', []); + $table->setPrimaryKey(['id']); + } + + /** + * Add marello_payment_method_config foreign keys. + * + * @param Schema $schema + */ + protected function addOroPaymentMethodConfigForeignKeys(Schema $schema) + { + $table = $schema->getTable('marello_payment_method_config'); + $table->addForeignKeyConstraint( + $schema->getTable('marello_payment_mtds_cfgs_rl'), + ['configs_rule_id'], + ['id'], + ['onDelete' => 'CASCADE', 'onUpdate' => null] + ); + } + + /** + * Add marello_payment_mtds_cfgs_rl foreign keys. + * + * @param Schema $schema + */ + protected function addOroPaymentMethodsConfigsRuleForeignKeys(Schema $schema) + { + $table = $schema->getTable('marello_payment_mtds_cfgs_rl'); + $table->addForeignKeyConstraint( + $schema->getTable('marello_rule'), + ['rule_id'], + ['id'], + ['onDelete' => 'CASCADE', 'onUpdate' => null] + ); + + $table->addForeignKeyConstraint( + $schema->getTable('oro_organization'), + ['organization_id'], + ['id'], + ['onDelete' => 'SET NULL', 'onUpdate' => null] + ); + } + + /** + * Add marello_payment_mtds_cfgs_rl_d foreign keys. + * + * @param Schema $schema + */ + protected function addOroPaymentMethodsConfigsRuleDestinationForeignKeys(Schema $schema) + { + $table = $schema->getTable('marello_payment_mtds_cfgs_rl_d'); + $table->addForeignKeyConstraint( + $schema->getTable('oro_dictionary_region'), + ['region_code'], + ['combined_code'], + ['onDelete' => null, 'onUpdate' => null] + ); + $table->addForeignKeyConstraint( + $schema->getTable('marello_payment_mtds_cfgs_rl'), + ['configs_rule_id'], + ['id'], + ['onDelete' => 'CASCADE', 'onUpdate' => null] + ); + $table->addForeignKeyConstraint( + $schema->getTable('oro_dictionary_country'), + ['country_code'], + ['iso2_code'], + ['onDelete' => null, 'onUpdate' => null] + ); + } + + /** + * Add marello_pmnt_mtdscfgsrl_dst_pc foreign keys. + * + * @param Schema $schema + */ + protected function addOroPaymentMethodsConfigsRuleDestinationPostalCodeForeignKeys(Schema $schema) + { + $table = $schema->getTable('marello_pmnt_mtdscfgsrl_dst_pc'); + $table->addForeignKeyConstraint( + $schema->getTable('marello_payment_mtds_cfgs_rl_d'), + ['destination_id'], + ['id'], + ['onDelete' => 'CASCADE', 'onUpdate' => null] + ); + } + + /** + * Sets the ActivityExtension + * + * @param ActivityExtension $activityExtension + */ + public function setActivityExtension(ActivityExtension $activityExtension) + { + $this->activityExtension = $activityExtension; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Model/ExtendPaymentMethodConfig.php b/src/Marello/Bundle/PaymentBundle/Model/ExtendPaymentMethodConfig.php new file mode 100644 index 000000000..2cd4fb95c --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Model/ExtendPaymentMethodConfig.php @@ -0,0 +1,10 @@ +name; + } + + /** + * @param string $name + * @return $this + */ + public function setName($name) + { + $this->name = $name; + + return $this; + } + + /** + * @return string + */ + public function getDescription() + { + return $this->description; + } + + /** + * @param string $description + * @return $this + */ + public function setDescription($description) + { + $this->description = $description; + + return $this; + } + + /** + * @return float + */ + public function getCost() + { + return $this->cost; + } + + /** + * @param float $cost + * @return $this + */ + public function setCost($cost) + { + $this->cost = (float)$cost; + + return $this; + } + + /** + * @return float + */ + public function getQty() + { + return $this->qty; + } + + /** + * @param float $qty + * @return $this + */ + public function setQty($qty) + { + $this->qty = $qty; + + return $this; + } + + /** + * @return string + */ + public function getCurrency() + { + return $this->currency; + } + + /** + * @param string $currency + * @return $this + */ + public function setCurrency($currency) + { + $this->currency = $currency; + + return $this; + } + + /** + * @return string + */ + public function getUnit() + { + return $this->unit; + } + + /** + * @param string $unit + * @return $this + */ + public function setUnit($unit) + { + $this->unit = $unit; + + return $this; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Model/Surcharge.php b/src/Marello/Bundle/PaymentBundle/Model/Surcharge.php new file mode 100644 index 000000000..6e719d70b --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Model/Surcharge.php @@ -0,0 +1,94 @@ +paymentAmount = (float)$amount; + + return $this; + } + + /** + * @return float + */ + public function getPaymentAmount() + { + return $this->paymentAmount; + } + + /** + * @param float $amount + * @return $this + */ + public function setHandlingAmount($amount) + { + $this->handlingAmount = (float)$amount; + + return $this; + } + + /** + * @return float + */ + public function getHandlingAmount() + { + return $this->handlingAmount; + } + + /** + * @param float $amount + * @return $this + */ + public function setDiscountAmount($amount) + { + $this->discountAmount = (float)$amount; + + return $this; + } + + /** + * @return float + */ + public function getDiscountAmount() + { + return $this->discountAmount; + } + + /** + * @param float $amount + * @return $this + */ + public function setInsuranceAmount($amount) + { + $this->insuranceAmount = (float)$amount; + + return $this; + } + + /** + * @return float + */ + public function getInsuranceAmount() + { + return $this->insuranceAmount; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Provider/BasicPaymentMethodChoicesProvider.php b/src/Marello/Bundle/PaymentBundle/Provider/BasicPaymentMethodChoicesProvider.php new file mode 100755 index 000000000..444c7b542 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Provider/BasicPaymentMethodChoicesProvider.php @@ -0,0 +1,52 @@ +paymentMethodProvider = $paymentMethodProvider; + $this->translator = $translator; + } + + /** + * {@inheritdoc} + */ + public function getMethods($translate = false) + { + return array_reduce( + $this->paymentMethodProvider->getPaymentMethods(), + function (array $result, PaymentMethodInterface $method) use ($translate) { + $label = $method->getLabel(); + if ($translate) { + $label = $this->translator->trans($label); + } + $result[$method->getIdentifier()] = $label; + + return $result; + }, + [] + ); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Provider/BasicPaymentMethodsViewsProvider.php b/src/Marello/Bundle/PaymentBundle/Provider/BasicPaymentMethodsViewsProvider.php new file mode 100644 index 000000000..781c1d7b4 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Provider/BasicPaymentMethodsViewsProvider.php @@ -0,0 +1,81 @@ +paymentRulesProvider = $paymentRulesProvider; + $this->paymentMethodProvider = $paymentMethodProvider; + $this->eventDispatcher = $eventDispatcher; + } + + /** + * @inheritDoc + */ + public function getApplicableMethodsViews(PaymentContextInterface $context) + { + $methodCollection = new PaymentMethodViewCollection(); + + $rules = $this->paymentRulesProvider->getPaymentMethodsConfigsRules($context); + foreach ($rules as $rule) { + foreach ($rule->getMethodConfigs() as $methodConfig) { + $methodId = $methodConfig->getMethod(); + $method = $this->paymentMethodProvider->getPaymentMethod($methodId); + + if (!$method) { + continue; + } + $event = new ApplicablePaymentMethodViewEvent( + $context, + $methodId, + $method->getLabel(), + $methodConfig->getOptions() + ); + $this->eventDispatcher->dispatch(ApplicablePaymentMethodViewEvent::NAME, $event); + $methodView = PaymentMethodViewFactory::createMethodView( + $event->getMethodId(), + $event->getMethodLabel(), + $method->getSortOrder(), + $event->getOptions() + ); + + $methodCollection->addMethodView($methodId, $methodView); + } + } + + return $methodCollection; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Provider/EnabledPaymentMethodChoicesProviderDecorator.php b/src/Marello/Bundle/PaymentBundle/Provider/EnabledPaymentMethodChoicesProviderDecorator.php new file mode 100755 index 000000000..00dbe6b08 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Provider/EnabledPaymentMethodChoicesProviderDecorator.php @@ -0,0 +1,51 @@ +paymentMethodProvider = $paymentMethodProvider; + $this->provider = $provider; + } + + /** + * {@inheritdoc} + */ + public function getMethods($translate = false) + { + $methods = $this->provider->getMethods($translate); + $enabledMethods = []; + foreach ($methods as $methodId => $label) { + $method = $this->paymentMethodProvider->getPaymentMethod($methodId); + if (!$method) { + continue; + } + + if ($method->isEnabled()) { + $enabledMethods[$methodId] = $label; + } + } + + return $enabledMethods; + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Provider/MethodsConfigsRule/Context/Basic/BasicMethodsConfigsRulesByContextProvider.php b/src/Marello/Bundle/PaymentBundle/Provider/MethodsConfigsRule/Context/Basic/BasicMethodsConfigsRulesByContextProvider.php new file mode 100644 index 000000000..709102bef --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Provider/MethodsConfigsRule/Context/Basic/BasicMethodsConfigsRulesByContextProvider.php @@ -0,0 +1,55 @@ +filtrationService = $filtrationService; + $this->repository = $repository; + } + + /** + * {@inheritDoc} + */ + public function getPaymentMethodsConfigsRules(PaymentContextInterface $context) + { + if ($context->getBillingAddress()) { + $methodsConfigsRules = $this->repository->getByDestinationAndCurrency( + $context->getBillingAddress(), + $context->getCurrency() + ); + } else { + $methodsConfigsRules = $this->repository->getByCurrencyWithoutDestination( + $context->getCurrency() + ); + } + + return $this->filtrationService->getFilteredPaymentMethodsConfigsRules( + $methodsConfigsRules, + $context + ); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Provider/MethodsConfigsRule/Context/MethodsConfigsRulesByContextProviderInterface.php b/src/Marello/Bundle/PaymentBundle/Provider/MethodsConfigsRule/Context/MethodsConfigsRulesByContextProviderInterface.php new file mode 100644 index 000000000..aaf245e78 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Provider/MethodsConfigsRule/Context/MethodsConfigsRulesByContextProviderInterface.php @@ -0,0 +1,15 @@ +filtrationService = $filtrationService; + $this->repository = $repository; + } + + /** + * {@inheritDoc} + */ + public function getPaymentMethodsConfigsRules(PaymentContextInterface $context) + { + if ($context->getBillingAddress()) { + $methodsConfigsRules = $this->repository->getByDestinationAndCurrency( + $context->getBillingAddress(), + $context->getCurrency() + ); + } else { + $methodsConfigsRules = $this->repository->getByCurrency( + $context->getCurrency() + ); + } + + return $this->filtrationService->getFilteredPaymentMethodsConfigsRules( + $methodsConfigsRules, + $context + ); + } +} diff --git a/src/Marello/Bundle/PaymentBundle/Provider/PaymentMethodChoicesProviderInterface.php b/src/Marello/Bundle/PaymentBundle/Provider/PaymentMethodChoicesProviderInterface.php new file mode 100755 index 000000000..6329556a0 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Provider/PaymentMethodChoicesProviderInterface.php @@ -0,0 +1,13 @@ +div { + position: relative; + padding: 15px 15px 0 0; + margin: 0 60% 20px 0; + border: 1px solid #e6e6e6; + background: #f8f8f8; + border-radius: 4px; + min-width: 500px; + } + div[data-validation-optional-group=""] { + .oro-multiselect-holder { + padding-right: 50px !important; + } + } + .add-list-item { + margin-left: 183px; + } + .removeRow { + position: absolute; + width: 28px; + top: 4px; + right: 4px; + text-decoration: none; + &:after { + color: #bbb; + } + } + input[type="text"] { + width: 290px; + } + [data-name*="field__region-text"] { + margin-top:0 !important; + } + input.method-options-surcharge { + width: 110px; + } + .small-row { + .control-group-choice { + float: left; + } + } + .selector.input-widget-select { + margin-left: 0; + } +} + +.marello-payment-rule-add-method-select { + display: inline-block; +} diff --git a/src/Marello/Bundle/PaymentBundle/Resources/public/js/app/views/payment-rule-method-view.js b/src/Marello/Bundle/PaymentBundle/Resources/public/js/app/views/payment-rule-method-view.js new file mode 100644 index 000000000..9bf6f53ca --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Resources/public/js/app/views/payment-rule-method-view.js @@ -0,0 +1,263 @@ +define(function(require) { + 'use strict'; + + const _ = require('underscore'); + const $ = require('jquery'); + const BaseView = require('oroui/js/app/views/base/view'); + const Popover = require('bootstrap-popover'); + const mediator = require('oroui/js/mediator'); + const layout = require('oroui/js/layout'); + + const PaymentRuleMethodsView = BaseView.extend({ + options: { + addSelector: '.add-method', + addAllSelector: '.add-all-methods', + gridSelector: '.payment-methods-grid', + methodSelectSelector: '[name="marello_payment_methods_configs_rule[method]"]', + methodSelector: 'input[data-name="field__method"]', + methodViewSelector: '[data-role="method-view"]', + methodPreviewSelector: '[data-role="method-preview"]', + focusFieldsSelector: 'input:text[name]', + previewFieldsSelector: 'input:text[name],select[name],textarea[name]', + enabledFieldSelector: '[data-name="field__enabled"]', + additionalOptionSelector: '.control-group-marello_payment_method_type_config', + focus: false, + updateFlag: null + }, + + events: { + 'click .add-all-methods': '_onAddAllClick', + 'click .add-method': '_onAddClick', + 'change [name="marello_payment_methods_configs_rule[method]"]': '_onMethodChange', + 'content:remove': '_onMethodRemove', + 'change textarea': '_onInputsChange' + }, + + listen: { + 'page:afterChange mediator': '_onPageAfterChange' + }, + + methods: null, + + $form: null, + + $methodSelect: null, + + $methodSelectClone: null, + + $add: null, + + $addAll: null, + + initialize: function(options) { + this.options = _.defaults(options || {}, this.options); + + this.$form = $(this.el).closest('form'); + this.$methodSelect = this.$(this.options.methodSelectSelector); + this.$methodSelectClone = this.$methodSelect.find('option[value!=""]').clone(); + this.$add = this.$(this.options.addSelector); + this.$addAll = this.$(this.options.addAllSelector); + + this.updateMethodsList(); + this.updateMethodSelect(); + this.updateMethodPreview(); + }, + + _onMethodChange: function() { + this.toggleAddButton(); + }, + + _onAddAllClick: function() { + this.createAddRequest(true); + }, + + _onAddClick: function() { + this.createAddRequest(false); + }, + + _onInputsChange: function(e) { + var $method = $(e.target).closest(this.options.methodViewSelector); + if ($method.length) { + this.updateMethodPreview($method); + } + }, + + _onMethodRemove: function(e) { + var removedMethod = $(e.target).find(this.options.methodSelector).val(); + this.updateMethodsList(removedMethod); + this.updateMethodSelect(); + + if (this.methods.length === 0) { + this.$(this.options.gridSelector).remove(); + } + }, + + _onPageAfterChange: function() { + this.focus(); + }, + + focus: function() { + if (!this.options.focus) { + return; + } + + var focusFieldsSelector = this.options.focusFieldsSelector; + this.$(this.options.methodViewSelector).each(function() { + var $fields = $(this).find(focusFieldsSelector); + var notEmptyFieldsCount = $fields.filter(function() { + return this.value.length > 0; + }).length; + if (notEmptyFieldsCount === 0) { + $fields.eq(0).attr('autofocus', true).focus(); + return false; + } + }); + }, + + toggleAddButton: function() { + this.$add.toggleClass('disabled', _.isEmpty(this.$methodSelect.val())); + }, + + createAddRequest: function(addAll) { + var methodCount = this.methods.length - 1; + var addMethod = function(option) { + methodCount++; + return { + name: 'marello_payment_methods_configs_rule[methodConfigs][' + methodCount + '][method]', + value: option.value + }; + }; + + var data = this.$form.serializeArray(); + if (addAll) { + data.push.apply(data, this.$methodSelect.find('option[value][value!=""]').get().map(addMethod)); + } else { + data.push(addMethod(this.$methodSelect.get(0))); + } + data.push({ + name: this.options.updateFlag, + value: true + }); + + mediator.execute('submitPage', { + url: this.$form.attr('action'), + type: this.$form.attr('method'), + data: $.param(data) + }); + }, + + updateMethodsList: function(removedMethod) { + this.methods = []; + _.each(this.$(this.options.methodSelector), function(option) { + if (!removedMethod || option.value !== removedMethod) { + this.methods.push(option.value); + } + }, this); + }, + + updateMethodSelect: function() { + this.$methodSelect.empty(); + _.each(this.$methodSelectClone, function(option) { + if (_.indexOf(this.methods, option.value) === -1) { + this.$methodSelect.append($(option).clone()); + } + }, this); + + var length = this.$methodSelect.find('option').length; + this.$methodSelect.prop('disabled', length === 0); + this.$methodSelect.inputWidget('refresh'); + this.$methodSelect.inputWidget('val', ''); + + this.$addAll.toggle(length > 1); + this.toggleAddButton(); + }, + + updateMethodPreview: function($method) { + if (_.isUndefined($method)) { + _.each(this.$(this.options.methodViewSelector), function(method) { + this.updateMethodPreview($(method)); + }, this); + return; + } + + var disabled = []; + $method.find(this.options.enabledFieldSelector).each(function() { + if ($(this).is(':checkbox') && !this.checked) { + disabled.push(this.name.replace(/\[enabled\]$/, '')); + } + }); + + var $preview = $method.find(this.options.methodPreviewSelector); + var preview = []; + _.each($method.find(this.options.previewFieldsSelector), function(field) { + var $field = $(field); + var value = _.trim(field.value); + if (value.length === 0) { + return; + } + + var isDisabled = _.filter(disabled, function(name) { + return field.name.indexOf(name) !== -1; + }).length > 0; + if (isDisabled) { + return; + } + + if ($field.is('select')) { + value = $field.find('option:selected').text(); + } + + var $label = this.$('label[for="' + field.id + '"]'); + var label = $label.contents().eq(0).text() + ': '; + + preview.push(label + value); + }, this); + + //replace whitespaces by , for tooltip overflow calculate + $preview.html(preview.join(', ').replace(/ /g, ' ')); + + this.updatePreviewTooltip($preview, preview); + }, + + updatePreviewTooltip: function($preview, preview) { + if ($preview.data(Popover.DATA_KEY) === void 0) { + layout.initPopoverForElements($preview, { + placement: 'bottom', + trigger: 'hover', + close: false + }, true); + } + + var height = $preview.height(); + $preview.css({ + 'word-wrap': 'break-word', + 'overflow': 'auto', + 'white-space': 'normal' + }); + var isOverflow = $preview.height() > height; + + $preview.attr('style', '').data(Popover.DATA_KEY).updateContent(isOverflow ? preview.join('
') : ''); + }, + + dispose: function() { + if (this.disposed) { + return; + } + + this.$form.off(this.eventNamespace()); + + delete this.methods; + delete this.options; + + delete this.$form; + delete this.$methodSelect; + delete this.$methodSelectClone; + delete this.$add; + delete this.$addAll; + + PaymentRuleMethodsView.__super__.dispose.apply(this, arguments); + } + }); + + return PaymentRuleMethodsView; +}); diff --git a/src/Marello/Bundle/PaymentBundle/Resources/translations/jsmessages.en.yml b/src/Marello/Bundle/PaymentBundle/Resources/translations/jsmessages.en.yml new file mode 100644 index 000000000..29dcb0d51 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Resources/translations/jsmessages.en.yml @@ -0,0 +1,16 @@ +marello: + payment: + validation: + expiration_date: "Invalid Expiration date." + month: "Please, choose correct month." + credit_card: "Invalid card number." + credit_card_type: "Credit card type not accepted." + integration: + deactivate: + message: Some payment methods in the following payment rules depend on the integration that is being disabled. The affected payment methods will be disabled. Payment rule will also be disabled if none of its payment methods remain enabled. + title: Deactivate integration + button.okText: Deactivate + delete: + message: Some payment methods in the following payment rules depend on the integration that is being deleted. The affected payment methods will be disabled. Payment rule will also be disabled if none of its payment methods remain enabled. + title: Delete integration + button.okText: Delete \ No newline at end of file diff --git a/src/Marello/Bundle/PaymentBundle/Resources/translations/messages.en.yml b/src/Marello/Bundle/PaymentBundle/Resources/translations/messages.en.yml new file mode 100644 index 000000000..f43599e9f --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Resources/translations/messages.en.yml @@ -0,0 +1,154 @@ +marello: + payment: + menu: + payments.label: Payments + paymentmethodsconfigsrule.description: Payment Rules + paymentmethodsconfigsrule.label: Payment Rules + shortcut_paymentmethodsconfigsrule.description: List of payment rules + datagrid: + action.enable: Enable + action.disable: Disable + status: + success_message: "{0} No entities status were changed|{1} One entity status was changed|]1,Inf[ %count% entities status were changed" + + payment_methods_table: + method.label: Method + options.label: Options + additional_options.label: Additional Options + option.label: Option + status.label: Status + active.label: Active + + methods: + label: "Payment Method" + select_method: 'Select a Payment Method' + no_method: 'No payment methods are available, please contact us to complete the order submission.' + required_field: 'Required Field' + + notification: + channel: + enabled: Payment rule has been enabled successfully + disabled: Payment rule has been disabled successfully + + system_configuration: + groups: + payment.title: 'Payment' + general.title: 'General' + display_options.title: 'Display Options' + merchant_location.title: 'Merchant Location' + fields: + merchant_country.label: 'Merchant Country' + merchant_country.placeholder: 'Please select country...' + enabled.label: 'Enabled' + label.label: 'Checkout Label' + label.tooltip: 'This label is used on the checkout screens' + short_label.label: 'Short Label' + short_label.tooltip: 'This label is used in order history' + sort_order.label: 'Sort Order' + allowed_countries: + label: 'Allowed Countries' + all: 'All' + selected: 'Selected' + selected_countries.label: 'Select Allowed Countries' + + result: + error: Payment failed + error_single_method: 'We were unable to process your payment. Please verify your payment information and try again.' + error_multiple_methods: 'We were unable to process your payment. Please verify your payment information and try again, or try another payment method.' + + security.transaction: Work with payments + capture: Capture + + status: + label: Payment Status + full: Paid in full + authorized: Payment authorized + pending: Pending payment + declined: Payment declined + partially: Paid partially + invoiced: Invoiced + + message: + error: 'General error. We were unable to process action.' + + paymentmethodconfig: + entity_label: Payment Method Config + entity_plural_label: Payment Method Configs + id.label: Id + methods_configs_rule.label: Payment Methods Configs Rule + method.label: Method + options.label: Options + + paymentmethodsconfigsrule: + entity_short_label: Payment Rule + entity_short_plural_label: Payment Rules + entity_label: Payment Rule + entity_plural_label: Payment Rules + id.label: Id + method_configs.label: Payment Methods Configs + rule.label: Rule + destinations.label: Destinations + currency.label: Currency + organization.label: Organization + websites.label: Websites + + notification: + enabled: Payment rule has been enabled successfully + disabled: Payment rule has been disabled successfully + + paymentmethodsconfigsruledestination: + entity_label: Payment Methods Configs Rule Destination + entity_plural_label: Payment Methods Configs Rule Destinations + id.label: Id + methods_configs_rule.label: Payment Methods Configs Rule + postal_codes.label: Postal Codes + region.label: Region + region_text.label: Region Text + country.label: Country + + paymentmethodsconfigsruledestinationpostalcode: + entity_label: Payment Methods Configs Rule Destination Postal Code + entity_plural_label: Payment Methods Configs Rule Destination Postal Codes + id.label: Id + name.label: Name + destination.label: Destination + + paymenttransaction: + entity_plural_label: Payment Transactions + entity_label: Payment Transaction + id.label: Id + paymentMethod.label: Payment Method + action.label: Type + amount.label: Amount + active.label: Active + currency.label: Currency + payment_method.label: Payment Method + reference.label: Reference + frontend_owner.label: Frontend Owner + source_payment_transaction.label: Source Payment Transaction + successful.label: Successful + access_identifier.label: Access Identifier + entity_class.label: Entity Class + entity_identifier.label: Entity Identifier + organization.label: Organization + owner.label: Owner + related_payment_transactions.label: Related Payment Transactions + types: + authorize.label: Authorize + charge.label: Charge + validate.label: Validate + capture.label: Capture + purchase.label: Purchase + invoice.label: Invoice + pending.label: Pending + + sections: + general: 'General Information' + destination: 'Destinations' + paymentrule_configurations: + no_methods.message: 'Please enable at least one payment integration.' + label: 'Payment Method Configurations' + placeholder.label: 'Choose a Method...' + + controller: + rule.saved.message: 'Payment rule has been saved' diff --git a/src/Marello/Bundle/PaymentBundle/Resources/translations/validators.en.yml b/src/Marello/Bundle/PaymentBundle/Resources/translations/validators.en.yml new file mode 100644 index 000000000..4a433c817 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Resources/translations/validators.en.yml @@ -0,0 +1,6 @@ +marello: + payment: + number.error: This value should be a number. + paymentrule: + type.config.count.message: 'You must select at least {{ limit }} payment method type|You must select at least {{ limit }} payment method types' + method.config.count.message: 'You must select at least {{ limit }} payment method|You must select at least {{ limit }} payment methods' diff --git a/src/Marello/Bundle/PaymentBundle/Resources/views/Form/fields.html.twig b/src/Marello/Bundle/PaymentBundle/Resources/views/Form/fields.html.twig new file mode 100644 index 000000000..8d88d60e7 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Resources/views/Form/fields.html.twig @@ -0,0 +1,65 @@ +{% block marello_payment_method_config_widget %} + {% import 'MarelloPaymentBundle:PaymentMethodsConfigsRule:macros.html.twig' as PayRuleMacro %} + + {% set collapseView = { + group: 'payment-method', + open: true + } %} + +
+ {% if form.method.vars.value %}
+
+{% endblock %}
+
+{% block marello_payment_methods_configs_rule_destination_widget %}
+ {{ form_row(form.country) }}
+ {{ form_row(form.region) }}
+ {{ form_row(form.postalCodes) }}
+ {{ form_rest(form) }}
+{% endblock %}
+
+{% block marello_payment_method_config_collection_widget %}
+ {% if form|length != 0 %}
+
+
+ {% endif %}
+
+
+ {% set icon = methods_icons[form.method.vars.value]|default('') %}
+ {% set label = methods_labels[form.method.vars.value]|trans %}
+ {% if icon %} }} "{{ label }}")
{% endif %}
+ {{ label }}
+ {{ PayRuleMacro.renderPaymentMethodDisabledFlag(form.method.vars.value) }}
+
+
+
+
+
+
+
+ {% endif %}
+{% endblock %}
diff --git a/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/Datagrid/configurations.html.twig b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/Datagrid/configurations.html.twig
new file mode 100644
index 000000000..75f5a4d81
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/Datagrid/configurations.html.twig
@@ -0,0 +1,2 @@
+{% import 'MarelloPaymentBundle:PaymentMethodsConfigsRule:macros.html.twig' as PayRuleMacro %}
+{{ PayRuleMacro.renderPaymentMethodsConfigs(record.getValue('methodConfigs').toArray(), record.getValue('currency'))}}
diff --git a/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/Datagrid/destinations.html.twig b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/Datagrid/destinations.html.twig
new file mode 100644
index 000000000..e3fec9a0e
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/Datagrid/destinations.html.twig
@@ -0,0 +1,10 @@
+{% spaceless %}
+ {% set destinations = record.getValue('destinations').toArray() %}
+
+ {% set escapedDestinations={} %}
+ {% for key, destination in destinations %}
+ {% set escapedDestinations = escapedDestinations|merge({(key): destination|e}) %}
+ {% endfor %}
+
+ {{ escapedDestinations|join('')|raw }}
+{% endspaceless %}
diff --git a/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/index.html.twig b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/index.html.twig
new file mode 100644
index 000000000..a7c956e62
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/index.html.twig
@@ -0,0 +1,17 @@
+{% extends 'OroUIBundle:actions:index.html.twig' %}
+{% import 'OroUIBundle::macros.html.twig' as UI %}
+{% set gridName = 'marello-payment-methods-configs-rule-grid' %}
+{% set pageTitle = 'marello.payment.paymentmethodsconfigsrule.entity_short_plural_label'|trans %}
+
+{% block navButtons %}
+ {% import 'OroUIBundle::macros.html.twig' as UI %}
+
+ {% if is_granted('marello_payment_methods_configs_rule_create') %}
+
+ {% set collapseView = {
+ widgetModule: 'oroui/js/widget/collapse-group-widget',
+ group: 'payment-method'
+ } %}
+
+
+
+ {{ 'marello.payment.payment_methods_table.method.label'|trans }}
+
+ {{ 'marello.payment.payment_methods_table.options.label'|trans }}
+
+ {{ form_widget(form, {'attr': {'class': 'marello-payment-rule-method-configs-collection row-oro'}}) }}
+ {{ form_errors(form) }}
+
+
+ {{ UI.addButton({
+ 'path': path('marello_payment_methods_configs_rule_create'),
+ 'entity_label': 'marello.payment.paymentmethodsconfigsrule.entity_short_label'|trans
+ }) }}
+
+ {% endif %}
+{% endblock %}
diff --git a/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/macros.html.twig b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/macros.html.twig
new file mode 100644
index 000000000..ae9c00480
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/macros.html.twig
@@ -0,0 +1,24 @@
+{% macro renderPaymentMethodsConfigs(methodConfigs, currency) %}
+ {%- spaceless -%}
+ -
+ {%- for methodConfig in methodConfigs -%}
+
- + {%- set paymentMethodData = { + 'identifier': methodConfig.method, + 'options': methodConfig.options, + } -%} + {%- include marello_payment_method_config_template(methodConfig.method) with { + 'currency': currency, + 'methodData': paymentMethodData + } -%} + + {%- endfor -%} +
+ {% for name, value in methodData.options %} + {{ name ~ ': ' ~ value }}
+ {% endfor %} +{% endspaceless %} diff --git a/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/update.html.twig b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/update.html.twig new file mode 100644 index 000000000..3dc814106 --- /dev/null +++ b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/update.html.twig @@ -0,0 +1,132 @@ +{% extends 'OroUIBundle:actions:update.html.twig' %} +{% import 'OroUIBundle::macros.html.twig' as UI %} +{% oro_title_set({params : {"%id%": entity.id|default('N/A'|trans)} }) %} + +{% set formAction = entity.id ? path('marello_payment_methods_configs_rule_update', { 'id': entity.id }) : path('marello_payment_methods_configs_rule_create') %} + +{% block pageHeader %} + {% if entity.id %} + {% set breadcrumbs = { + 'entity': entity, + 'indexPath': path('marello_payment_methods_configs_rule_index'), + 'indexLabel': 'marello.payment.paymentmethodsconfigsrule.entity_short_plural_label'|trans, + 'entityTitle': entity.rule.name|slice(0, 50) + } %} + {{ parent() }} + {% else %} + {% set breadcrumbs = { + 'indexLabel': 'Create', + 'entityTitle': 'Payment Rule', + 'indexPath': path('marello_payment_methods_configs_rule_create') + } %} + {% set title = 'oro.ui.create_entity'|trans({'%entityName%': 'marello.payment.paymentmethodsconfigsrule.entity_short_label'|trans}) %} + {% include 'OroUIBundle::page_title_block.html.twig' with { title: title } %} + {% endif %} +{% endblock pageHeader %} + +{% block navButtons %} + {{ parent() }} + + {{ UI.cancelButton(path('marello_payment_methods_configs_rule_index')) }} + {% if entity.id and is_granted('marello_payment_methods_configs_rule_update') or is_granted('omarello_payment_methods_configs_rule_create') %} + {% set html = '' %} + {% if is_granted('marello_payment_methods_configs_rule_view') %} + {% set html = UI.saveAndCloseButton({ + 'route': 'marello_payment_methods_configs_rule_view', + 'params': {'id': '$id'} + }) %} + {% endif %} + {% set html = html ~ UI.saveAndStayButton({ + 'route': 'marello_payment_methods_configs_rule_update', + 'params': {'id': '$id'} + }) %} + + {{ UI.dropdownSaveButton({'html': html}) }} + {% endif %} +{% endblock navButtons %} + +{% block marello_payment_rule_methods %} + {% set updateFlag = constant('Marello\\Bundle\\ShippingBundle\\Form\\Handler\\ShippingMethodsConfigsRuleHandler::UPDATE_FLAG') %} +
+ {{ block('marello_payment_rule_add_method_widget') }}
+
+ {% if form.method.vars.choices|length == 0 %}
+
+{% endblock %}
+
+{% block marello_payment_rule_add_method_widget %}
+
+
+ {{ 'marello.payment.sections.paymentrule_configurations.no_methods.message'|trans }}
+
+
+ {% endif %}
+
+ {{ form_widget(form.methodConfigs) }}
+
+
+{% endblock %}
+
+{% block content_data %}
+ {% set id = 'payment-methods-configs-rule-edit' %}
+
+ {% set dataBlocks = [
+ {
+ 'title': 'marello.payment.sections.general'|trans,
+ 'class': 'active',
+ 'subblocks': [
+ {
+ 'data': [
+ form_row(form.rule.enabled),
+ form_row(form.rule.name),
+ form_row(form.rule.sortOrder),
+ form_row(form.currency),
+ form_row(form.rule.stopProcessing),
+ ]
+ },
+ ]
+ },
+ {
+ 'title': 'marello.payment.sections.destination'|trans,
+ 'subblocks': [
+ {
+ 'data': [
+ form_widget(form.destinations, {'attr': {'class': 'marello-payment-rule-collection marello-payment-rule-destinations-collection row-oro'}}),
+ ]
+ }
+ ]
+ },
+ {
+ 'title': 'marello.payment.sections.paymentrule_configurations.label'|trans,
+ 'content_attr': {
+ 'class': 'payment-rule-methods-wrapper'
+ },
+ 'subblocks': [{
+ 'data': [
+ block('marello_payment_rule_methods')
+ ]
+ }]
+ }] %}
+
+ {% set data = {
+ 'formErrors': form_errors(form)|nl2br,
+ 'dataBlocks': dataBlocks
+ } %}
+
+ {{ parent() }}
+{% endblock %}
diff --git a/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/view.html.twig b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/view.html.twig
new file mode 100644
index 000000000..af8fbab53
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Resources/views/PaymentMethodsConfigsRule/view.html.twig
@@ -0,0 +1,69 @@
+{% extends 'OroUIBundle:actions:view.html.twig' %}
+{% import 'OroUIBundle::macros.html.twig' as UI %}
+{% import 'OroEntityConfigBundle::macros.html.twig' as entityConfig %}
+{% import 'MarelloPaymentBundle:PaymentMethodsConfigsRule:macros.html.twig' as PayRuleMacro %}
+
+{% oro_title_set({params : {"%label%": entity.rule.name|default('N/A') }}) %}
+
+{% block pageHeader %}
+ {% set breadcrumbs = {
+ 'entity': entity,
+ 'indexPath': path('marello_payment_methods_configs_rule_index'),
+ 'indexLabel': 'marello.payment.paymentmethodsconfigsrule.entity_short_plural_label'|trans,
+ 'entityTitle': entity.rule.name|default('N/A'|trans)
+ } %}
+ {{ parent() }}
+{% endblock pageHeader %}
+
+{% block content_data %}
+ {% import 'OroUIBundle::macros.html.twig' as UI %}
+
+ {%- set paymentRuleInformation -%}
+
+ {{ form_row(form.method, {'attr': {'class': ' no-uniform '}}) }}
+
+
+ {{ form.vars.add_label|default('oro.form.collection.add')|trans }}
+
+
+ {{ form.vars.add_label|default('oro.form.collection.add_all')|trans }}
+
+
+
+ {%- endset -%}
+
+ {% set dataBlocks = [
+ {
+ 'title': 'oro.entity_config.block_titles.general.label'|trans,
+ 'class': 'active',
+ 'subblocks': [
+ {'data' : [paymentRuleInformation]}
+ ]
+ }
+ ] %}
+
+ {% set id = 'marello-payment-rule-view' %}
+ {% set data = {'dataBlocks': dataBlocks} %}
+
+ {{ parent() }}
+{% endblock content_data %}
+
+{% block stats %}
+ {# Must be empty, because parent view uses this block to render dates, which are not implemented in this entity #}
+{% endblock stats %}
diff --git a/src/Marello/Bundle/PaymentBundle/RuleFiltration/Basic/BasicMethodsConfigsRulesFiltrationService.php b/src/Marello/Bundle/PaymentBundle/RuleFiltration/Basic/BasicMethodsConfigsRulesFiltrationService.php
new file mode 100644
index 000000000..45504128b
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/RuleFiltration/Basic/BasicMethodsConfigsRulesFiltrationService.php
@@ -0,0 +1,48 @@
+filtrationService = $filtrationService;
+ $this->paymentContextToRulesValueConverter = $converter;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getFilteredPaymentMethodsConfigsRules(
+ array $paymentMethodsConfigsRules,
+ PaymentContextInterface $context
+ ) {
+ $arrayContext = $this->paymentContextToRulesValueConverter->convert($context);
+
+ return $this->filtrationService->getFilteredRuleOwners(
+ $paymentMethodsConfigsRules,
+ $arrayContext
+ );
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/RuleFiltration/MethodsConfigsRulesFiltrationServiceInterface.php b/src/Marello/Bundle/PaymentBundle/RuleFiltration/MethodsConfigsRulesFiltrationServiceInterface.php
new file mode 100644
index 000000000..662e214bd
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/RuleFiltration/MethodsConfigsRulesFiltrationServiceInterface.php
@@ -0,0 +1,20 @@
+initClient();
+ $this->client->useHashNavigation(true);
+ $this->loadFixtures(
+ [
+ LoadPaymentMethodsConfigsRulesWithConfigs::class,
+ LoadUserData::class
+ ]
+ );
+ $this->paymentMethodProvider = static::getContainer()->get('marello_payment.payment_method.composite_provider');
+ $this->translator = static::getContainer()->get('translator');
+ }
+
+ public function testIndexWithoutCreate()
+ {
+ $this->initClient([], static::generateBasicAuthHeader(LoadUserData::USER_VIEWER, LoadUserData::USER_VIEWER));
+ $crawler = $this->client->request('GET', $this->getUrl('marello_payment_methods_configs_rule_index'));
+ $result = $this->client->getResponse();
+ static::assertHtmlResponseStatusCodeEquals($result, 200);
+ static::assertEquals(0, $crawler->selectLink('Create Payment Rule')->count());
+ }
+
+ /**
+ * @return string
+ */
+ public function testCreate()
+ {
+ $this->initClient(
+ [],
+ static::generateBasicAuthHeader(LoadUserData::USER_VIEWER_CREATOR, LoadUserData::USER_VIEWER_CREATOR)
+ );
+ $crawler = $this->client->request('GET', $this->getUrl('marello_payment_methods_configs_rule_create'));
+
+ /** @var Form $form */
+ $form = $crawler
+ ->selectButton('Save and Close')
+ ->form();
+
+ $name = 'New Rule';
+
+ $formValues = $form->getPhpValues();
+ $formValues['marello_payment_methods_configs_rule']['rule']['name'] = $name;
+ $formValues['marello_payment_methods_configs_rule']['rule']['enabled'] = false;
+ $formValues['marello_payment_methods_configs_rule']['currency'] = 'USD';
+ $formValues['marello_payment_methods_configs_rule']['rule']['sortOrder'] = 1;
+ $formValues['marello_payment_methods_configs_rule']['destinations'] =
+ [
+ [
+ 'postalCodes' => '54321',
+ 'country' => 'FR',
+ 'region' => 'FR-75'
+ ]
+ ];
+ $formValues['marello_payment_methods_configs_rule']['methodConfigs'] =
+ [
+ [
+ 'method' => $this->getPaymentTermIdentifier(),
+ 'options' => '',
+ ]
+ ];
+
+ $this->client->followRedirects(true);
+ $crawler = $this->client->request($form->getMethod(), $form->getUri(), $formValues);
+
+ static::assertHtmlResponseStatusCodeEquals($this->client->getResponse(), 200);
+
+ $html = $crawler->html();
+
+ $this->assertContains('Payment rule has been saved', $html);
+ $this->assertContains('No', $html);
+
+ return $name;
+ }
+
+ /**
+ * @depends testCreate
+ *
+ * @param string $name
+ */
+ public function testIndex($name)
+ {
+ $auth = static::generateBasicAuthHeader(LoadUserData::USER_VIEWER_CREATOR, LoadUserData::USER_VIEWER_CREATOR);
+ $this->initClient([], $auth);
+ $crawler = $this->client->request('GET', $this->getUrl('marello_payment_methods_configs_rule_index'));
+ $result = $this->client->getResponse();
+ static::assertHtmlResponseStatusCodeEquals($result, 200);
+ static::assertContains('marello-payment-methods-configs-rule-grid', $crawler->html());
+ $href = $crawler->selectLink('Create Payment Rule')->attr('href');
+ static::assertEquals($this->getUrl('marello_payment_methods_configs_rule_create'), $href);
+
+ $response = $this->client->requestGrid(
+ [
+ 'gridName' => 'marello-payment-methods-configs-rule-grid',
+ 'marello-payment-methods-configs-rule-grid[_sort_by][id]' => 'ASC',
+ ]
+ );
+
+ static::getJsonResponseContent($response, 200);
+ }
+
+ /**
+ * @depends testCreate
+ *
+ * @param string $name
+ */
+ public function testView($name)
+ {
+ $this->initClient([], static::generateBasicAuthHeader());
+ $paymentRule = $this->getPaymentMethodsConfigsRuleByName($name);
+
+ $crawler = $this->client->request(
+ 'GET',
+ $this->getUrl('marello_payment_methods_configs_rule_view', ['id' => $paymentRule->getId()])
+ );
+
+ $result = $this->client->getResponse();
+ static::assertHtmlResponseStatusCodeEquals($result, 200);
+
+ $html = $crawler->html();
+
+ $this->assertContains($paymentRule->getRule()->getName(), $html);
+ $destination = $paymentRule->getDestinations();
+ $this->assertContains((string)$destination[0], $html);
+ $methodConfigs = $paymentRule->getMethodConfigs();
+ $label = $this->paymentMethodProvider
+ ->getPaymentMethod($methodConfigs[0]->getMethod())
+ ->getLabel();
+ $this->assertContains($this->translator->trans($label), $html);
+ }
+
+ /**
+ * @depends testCreate
+ *
+ * @param string $name
+ *
+ * @return PaymentMethodsConfigsRule|object|null
+ */
+ public function testUpdate($name)
+ {
+ $paymentRule = $this->getPaymentMethodsConfigsRuleByName($name);
+
+ $this->assertNotEmpty($paymentRule);
+
+ $id = $paymentRule->getId();
+ $crawler = $this->client->request(
+ 'GET',
+ $this->getUrl('marello_payment_methods_configs_rule_update', ['id' => $id])
+ );
+
+ /** @var Form $form */
+ $form = $crawler->selectButton('Save and Close')->form();
+
+ $newName = 'New name for new rule';
+ $formValues = $form->getPhpValues();
+ $formValues['marello_payment_methods_configs_rule']['rule']['name'] = $newName;
+ $formValues['marello_payment_methods_configs_rule']['rule']['enabled'] = false;
+ $formValues['marello_payment_methods_configs_rule']['currency'] = 'USD';
+ $formValues['marello_payment_methods_configs_rule']['rule']['sortOrder'] = 1;
+ $formValues['marello_payment_methods_configs_rule']['destinations'] =
+ [
+ [
+ 'postalCodes' => '54321',
+ 'country' => 'TH',
+ 'region' => 'TH-83'
+ ]
+ ];
+ $formValues['marello_payment_methods_configs_rule']['methodConfigs'] =
+ [
+ [
+ 'method' => $this->getPaymentTermIdentifier(),
+ 'options' => '',
+ ]
+ ];
+
+ $this->client->followRedirects(true);
+ $crawler = $this->client->request($form->getMethod(), $form->getUri(), $formValues);
+
+ static::assertHtmlResponseStatusCodeEquals($this->client->getResponse(), 200);
+ $html = $crawler->html();
+ static::assertContains('Payment rule has been saved', $html);
+
+ $paymentRule = $this->getPaymentMethodsConfigsRuleByName($newName);
+ static::assertEquals($id, $paymentRule->getId());
+
+ $destination = $paymentRule->getDestinations();
+ static::assertEquals('TH', $destination[0]->getCountry()->getIso2Code());
+ static::assertEquals('TH-83', $destination[0]->getRegion()->getCombinedCode());
+ static::assertEquals('54321', $destination[0]->getPostalCodes()->current()->getName());
+ $methodConfigs = $paymentRule->getMethodConfigs();
+ static::assertEquals($this->getPaymentTermIdentifier(), $methodConfigs[0]->getMethod());
+ static::assertFalse($paymentRule->getRule()->isEnabled());
+
+ return $paymentRule;
+ }
+
+ /**
+ * @depends testUpdate
+ *
+ * @param PaymentMethodsConfigsRule $paymentRule
+ */
+ public function testCancel(PaymentMethodsConfigsRule $paymentRule)
+ {
+ $paymentRule = $this->getPaymentMethodsConfigsRuleByName($paymentRule->getRule()->getName());
+
+ $this->assertNotEmpty($paymentRule);
+
+ $crawler = $this->client->request(
+ 'GET',
+ $this->getUrl('marello_payment_methods_configs_rule_update', ['id' => $paymentRule->getId()])
+ );
+
+ $link = $crawler->selectLink('Cancel')->link();
+ $this->client->click($link);
+ $response = $this->client->getResponse();
+
+ static::assertHtmlResponseStatusCodeEquals($response, 200);
+
+ $html = $response->getContent();
+
+ static::assertContains($paymentRule->getRule()->getName(), $html);
+ $destination = $paymentRule->getDestinations();
+ static::assertContains((string)$destination[0], $html);
+ $methodConfigs = $paymentRule->getMethodConfigs();
+ $label = $this->paymentMethodProvider
+ ->getPaymentMethod($methodConfigs[0]->getMethod())
+ ->getLabel();
+ static::assertContains($this->translator->trans($label), $html);
+ }
+
+ /**
+ * @depends testUpdate
+ *
+ * @param PaymentMethodsConfigsRule $paymentRule
+ *
+ * @return PaymentMethodsConfigsRule
+ */
+ public function testUpdateRemoveDestination(PaymentMethodsConfigsRule $paymentRule)
+ {
+ $this->assertNotEmpty($paymentRule);
+
+ $crawler = $this->client->request(
+ 'GET',
+ $this->getUrl('marello_payment_methods_configs_rule_update', ['id' => $paymentRule->getId()])
+ );
+
+ /** @var Form $form */
+ $form = $crawler->selectButton('Save and Close')->form();
+
+ $formValues = $form->getPhpValues();
+ $formValues['marello_payment_methods_configs_rule']['destinations'] = [];
+
+ $this->client->followRedirects(true);
+ $this->client->request($form->getMethod(), $form->getUri(), $formValues);
+
+ static::assertHtmlResponseStatusCodeEquals($this->client->getResponse(), 200);
+ $paymentRule = $this->getEntityManager()->find(
+ 'MarelloPaymentBundle:PaymentMethodsConfigsRule',
+ $paymentRule->getId()
+ );
+ static::assertCount(0, $paymentRule->getDestinations());
+
+ return $paymentRule;
+ }
+
+ public function testStatusDisableMass()
+ {
+ $this->initClient([], static::generateBasicAuthHeader());
+ /** @var PaymentMethodsConfigsRule $paymentRule1 */
+ $paymentRule1 = $this->getReference('payment_rule.1');
+ /** @var PaymentMethodsConfigsRule $paymentRule2 */
+ $paymentRule2 = $this->getReference('payment_rule.2');
+ $url = $this->getUrl(
+ 'marello_payment_methods_configs_massaction',
+ [
+ 'gridName' => 'marello-payment-methods-configs-rule-grid',
+ 'actionName' => 'disable',
+ 'inset' => 1,
+ 'values' => sprintf(
+ '%s,%s',
+ $paymentRule1->getId(),
+ $paymentRule2->getId()
+ )
+ ]
+ );
+ $this->ajaxRequest('GET', $url);
+ $result = $this->client->getResponse();
+ $data = json_decode($result->getContent(), true);
+ $this->assertTrue($data['successful']);
+ $this->assertSame(2, $data['count']);
+ $this->assertFalse(
+ $this
+ ->getPaymentMethodsConfigsRuleById($paymentRule1->getId())
+ ->getRule()
+ ->isEnabled()
+ );
+ $this->assertFalse(
+ $this
+ ->getPaymentMethodsConfigsRuleById($paymentRule2->getId())
+ ->getRule()
+ ->isEnabled()
+ );
+ }
+
+ /**
+ * @depends testStatusDisableMass
+ */
+ public function testStatusEnableMass()
+ {
+ $this->initClient([], static::generateBasicAuthHeader());
+ /** @var PaymentMethodsConfigsRule $paymentRule1 */
+ $paymentRule1 = $this->getReference('payment_rule.1');
+ /** @var PaymentMethodsConfigsRule $paymentRule2 */
+ $paymentRule2 = $this->getReference('payment_rule.2');
+ $url = $this->getUrl(
+ 'marello_payment_methods_configs_massaction',
+ [
+ 'gridName' => 'marello-payment-methods-configs-rule-grid',
+ 'actionName' => 'enable',
+ 'inset' => 1,
+ 'values' => sprintf(
+ '%s,%s',
+ $paymentRule1->getId(),
+ $paymentRule2->getId()
+ )
+ ]
+ );
+ $this->ajaxRequest('GET', $url);
+ $result = $this->client->getResponse();
+ $data = json_decode($result->getContent(), true);
+ $this->assertTrue($data['successful']);
+ $this->assertSame(2, $data['count']);
+ $this->assertTrue(
+ $this
+ ->getPaymentMethodsConfigsRuleById($paymentRule1->getId())
+ ->getRule()
+ ->isEnabled()
+ );
+ $this->assertTrue(
+ $this
+ ->getPaymentMethodsConfigsRuleById($paymentRule2->getId())
+ ->getRule()
+ ->isEnabled()
+ );
+ }
+
+ public function testPaymentMethodsConfigsRuleEditWOPermission()
+ {
+ $authParams = static::generateBasicAuthHeader(LoadUserData::USER_VIEWER, LoadUserData::USER_VIEWER);
+ $this->initClient([], $authParams);
+
+ /** @var PaymentMethodsConfigsRule $paymentRule */
+ $paymentRule = $this->getReference('payment_rule.1');
+
+ $this->client->request(
+ 'GET',
+ $this->getUrl('marello_payment_methods_configs_rule_update', ['id' => $paymentRule->getId()])
+ );
+
+ static::assertJsonResponseStatusCodeEquals($this->client->getResponse(), 403);
+ }
+
+ public function testPaymentMethodsConfigsRuleEdit()
+ {
+ $authParams = static::generateBasicAuthHeader(LoadUserData::USER_EDITOR, LoadUserData::USER_EDITOR);
+ $this->initClient([], $authParams);
+
+ /** @var PaymentMethodsConfigsRule $paymentRule */
+ $paymentRule = $this->getReference('payment_rule.1');
+
+ $crawler = $this->client->request(
+ 'GET',
+ $this->getUrl('marello_payment_methods_configs_rule_update', ['id' => $paymentRule->getId()])
+ );
+
+ static::assertHtmlResponseStatusCodeEquals($this->client->getResponse(), 200);
+
+ /** @var Form $form */
+ $form = $crawler->selectButton('Save')->form();
+
+ $rule = $paymentRule->getRule();
+ $form['marello_payment_methods_configs_rule[rule][enabled]'] = !$rule->isEnabled();
+ $form['marello_payment_methods_configs_rule[rule][name]'] = $rule->getName() . ' new name';
+ $form['marello_payment_methods_configs_rule[rule][sortOrder]'] = $rule->getSortOrder() + 1;
+ $form['marello_payment_methods_configs_rule[currency]'] = $paymentRule->getCurrency() === 'USD' ? 'EUR' : 'USD';
+ $form['marello_payment_methods_configs_rule[rule][stopProcessing]'] = !$rule->isStopProcessing();
+ $form['marello_payment_methods_configs_rule[destinations][0][postalCodes]'] = '11111';
+
+ $this->client->followRedirects(true);
+ $crawler = $this->client->submit($form);
+
+ static::assertHtmlResponseStatusCodeEquals($this->client->getResponse(), 200);
+ static::assertContains('Payment rule has been saved', $crawler->html());
+ }
+
+ public function testDeleteButtonNotVisible()
+ {
+ $authParams = static::generateBasicAuthHeader(LoadUserData::USER_VIEWER, LoadUserData::USER_VIEWER);
+ $this->initClient([], $authParams);
+
+ $response = $this->client->requestGrid(
+ ['gridName' => 'marello-payment-methods-configs-rule-grid'],
+ [],
+ true
+ );
+
+ $result = static::getJsonResponseContent($response, 200);
+
+ $this->assertEquals(false, isset($result['metadata']['massActions']['delete']));
+ }
+
+ /**
+ * @return ObjectManager|null
+ */
+ protected function getEntityManager()
+ {
+ return static::getContainer()
+ ->get('doctrine')
+ ->getManagerForClass('MarelloPaymentBundle:PaymentMethodsConfigsRule');
+ }
+
+ /**
+ * @param string $name
+ *
+ * @return PaymentMethodsConfigsRule|null
+ */
+ protected function getPaymentMethodsConfigsRuleByName($name)
+ {
+ /** @var RuleInterface $rule */
+ $rule = $this
+ ->getEntityManager()
+ ->getRepository('MarelloRuleBundle:Rule')
+ ->findOneBy(['name' => $name]);
+
+ return $this
+ ->getEntityManager()
+ ->getRepository('MarelloPaymentBundle:PaymentMethodsConfigsRule')
+ ->findOneBy(['rule' => $rule]);
+ }
+
+ /**
+ * @param int $id
+ *
+ * @return PaymentMethodsConfigsRule|null
+ */
+ protected function getPaymentMethodsConfigsRuleById($id)
+ {
+ return $this->getEntityManager()
+ ->getRepository('MarelloPaymentBundle:PaymentMethodsConfigsRule')
+ ->find($id);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodConfigsWithFakeMethods.php b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodConfigsWithFakeMethods.php
new file mode 100644
index 000000000..1db26c407
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodConfigsWithFakeMethods.php
@@ -0,0 +1,83 @@
+getPaymentMethodConfigsData() as $reference => $data) {
+ $this->loadPaymentMethodConfig($reference, $data, $manager);
+ }
+
+ $manager->flush();
+ }
+
+ /**
+ * @return array
+ */
+ protected function getPaymentMethodConfigsData()
+ {
+ return Yaml::parse(file_get_contents(__DIR__.'/data/payment_method_configs_with_fake_methods.yml'));
+ }
+
+ /**
+ * @param string $reference
+ * @param array $data
+ * @param ObjectManager $manager
+ */
+ private function loadPaymentMethodConfig($reference, $data, ObjectManager $manager)
+ {
+ $methodsConfigsRule = $this->getPaymentMethodsConfigsRule($data['methods_configs_rule']);
+
+ $methodConfig = $this->createMethodConfig($methodsConfigsRule, $data['method']);
+
+ $manager->persist($methodConfig);
+
+ $this->setReference($reference, $methodConfig);
+ }
+
+ /**
+ * @param PaymentMethodsConfigsRule $configsRule
+ * @param string $method
+ *
+ * @return PaymentMethodConfig
+ */
+ private function createMethodConfig(PaymentMethodsConfigsRule $configsRule, $method)
+ {
+ $methodConfig = new PaymentMethodConfig();
+
+ return $methodConfig->setMethodsConfigsRule($configsRule)
+ ->setMethod($method);
+ }
+
+ /**
+ * @param string $reference
+ *
+ * @return PaymentMethodsConfigsRule|object
+ */
+ private function getPaymentMethodsConfigsRule($reference)
+ {
+ return $this->getReference($reference);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodsConfigsRules.php b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodsConfigsRules.php
new file mode 100644
index 000000000..75b39894b
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodsConfigsRules.php
@@ -0,0 +1,79 @@
+getPaymentMethodsConfigsRulesData() as $reference => $data) {
+ $this->loadPaymentMethodsConfigsRule($reference, $data, $manager);
+ }
+
+ $manager->flush();
+ }
+
+ /**
+ * @return array
+ */
+ protected function getPaymentMethodsConfigsRulesData()
+ {
+ return Yaml::parse(file_get_contents(__DIR__.'/data/payment_methods_configs_rules.yml'));
+ }
+
+ /**
+ * @param string $reference
+ * @param array $data
+ * @param ObjectManager $manager
+ */
+ private function loadPaymentMethodsConfigsRule($reference, $data, ObjectManager $manager)
+ {
+ $rule = $this->buildRule($reference, $data['rule']);
+
+ $configRule = $this->createMethodsConfigsRule($rule, $data['currency']);
+
+ $manager->persist($configRule);
+
+ $this->setReference($reference, $configRule);
+ }
+
+ /**
+ * @param RuleInterface $rule
+ * @param $currency
+ *
+ * @return PaymentMethodsConfigsRule
+ */
+ private function createMethodsConfigsRule(RuleInterface $rule, $currency)
+ {
+ $configRule = new PaymentMethodsConfigsRule();
+
+ return $configRule->setRule($rule)
+ ->setCurrency($currency);
+ }
+
+ /**
+ * @param string $reference
+ * @param array $ruleData
+ *
+ * @return RuleInterface
+ */
+ private function buildRule($reference, $ruleData)
+ {
+ $rule = new Rule();
+
+ return $rule->setName($reference)
+ ->setEnabled($ruleData['enabled'])
+ ->setSortOrder($ruleData['sortOrder'])
+ ->setExpression($ruleData['expression']);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodsConfigsRulesWithConfigs.php b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodsConfigsRulesWithConfigs.php
new file mode 100644
index 000000000..d15b56083
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadPaymentMethodsConfigsRulesWithConfigs.php
@@ -0,0 +1,206 @@
+getPaymentRuleData() as $reference => $data) {
+ $this->loadPaymentRule($reference, $data, $manager);
+ }
+
+ $manager->flush();
+ }
+
+ /**
+ * @return array
+ */
+ protected function getPaymentRuleData(): array
+ {
+ return Yaml::parse(file_get_contents(__DIR__.'/data/payment_methods_configs_rules_with_configs.yml'));
+ }
+
+ /**
+ * @param string $reference
+ * @param array $data
+ * @param ObjectManager $manager
+ */
+ private function loadPaymentRule($reference, $data, ObjectManager $manager)
+ {
+ $rule = $this->buildRule($reference, $data);
+ $configRule = $this->buildMethodsConfigsRule($reference, $data, $rule, $manager);
+
+ $this->setReference($reference, $configRule);
+
+ $manager->persist($configRule);
+ }
+
+ /**
+ * @param string $reference
+ * @param array $data
+ * @param RuleInterface $rule
+ * @param ObjectManager $manager
+ *
+ * @return PaymentMethodsConfigsRule
+ */
+ protected function buildMethodsConfigsRule(
+ string $reference,
+ array $data,
+ RuleInterface $rule,
+ ObjectManager $manager
+ ) {
+ $configRule = new PaymentMethodsConfigsRule();
+
+ $configRule
+ ->setRule($rule)
+ ->setCurrency($data['currency'])
+ ->setOrganization($this->getOrganization());
+
+ $this->setDestinations($configRule, $manager, $data);
+ $this->setMethodConfigs($configRule, $manager, $data);
+
+ return $configRule;
+ }
+
+ /**
+ * @param string $reference
+ * @param array $data
+ *
+ * @return Rule
+ */
+ protected function buildRule(string $reference, array $data)
+ {
+ $rule = new Rule();
+
+ $rule->setName($reference)
+ ->setEnabled($data['rule']['enabled'])
+ ->setSortOrder($data['rule']['sortOrder'])
+ ->setExpression($data['rule']['expression']);
+
+ return $rule;
+ }
+
+ /**
+ * @param PaymentMethodsConfigsRule $configRule
+ * @param ObjectManager $manager
+ * @param array $data
+ */
+ private function setDestinations(PaymentMethodsConfigsRule $configRule, ObjectManager $manager, $data)
+ {
+ if (!array_key_exists('destinations', $data)) {
+ return;
+ }
+
+ foreach ($data['destinations'] as $destination) {
+ /** @var Country $country */
+ $country = $manager
+ ->getRepository('OroAddressBundle:Country')
+ ->findOneBy(['iso2Code' => $destination['country']]);
+
+ $paymentRuleDestination = new PaymentMethodsConfigsRuleDestination();
+ $paymentRuleDestination
+ ->setMethodsConfigsRule($configRule)
+ ->setCountry($country);
+
+ if (array_key_exists('region', $destination)) {
+ /** @var Region $region */
+ $region = $manager
+ ->getRepository('OroAddressBundle:Region')
+ ->findOneBy(['combinedCode' => $destination['country'].'-'.$destination['region']]);
+ $paymentRuleDestination->setRegion($region);
+ }
+
+ if (array_key_exists('postalCodes', $destination)) {
+ foreach ($destination['postalCodes'] as $postalCode) {
+ $destinationPostalCode = new PaymentMethodsConfigsRuleDestinationPostalCode();
+ $destinationPostalCode->setName($postalCode['name'])
+ ->setDestination($paymentRuleDestination);
+
+ $paymentRuleDestination->addPostalCode($destinationPostalCode);
+ }
+ }
+
+ $manager->persist($paymentRuleDestination);
+ $configRule->addDestination($paymentRuleDestination);
+ }
+ }
+
+ /**
+ * @param PaymentMethodsConfigsRule $configRule
+ * @param ObjectManager $manager
+ * @param array $data
+ */
+ private function setMethodConfigs(PaymentMethodsConfigsRule $configRule, ObjectManager $manager, $data)
+ {
+ if (!array_key_exists('methodConfigs', $data)) {
+ return;
+ }
+
+ $methodConfig = $this->buildMethodConfig($configRule);
+ $configRule->addMethodConfig($methodConfig);
+
+ $manager->persist($methodConfig);
+ }
+
+ /**
+ * @param PaymentMethodsConfigsRule $configRule
+ *
+ * @return PaymentMethodConfig
+ */
+ private function buildMethodConfig(PaymentMethodsConfigsRule $configRule)
+ {
+ $methodConfig = new PaymentMethodConfig();
+
+ $methodConfig
+ ->setMethodsConfigsRule($configRule)
+ ->setMethod($this->getPaymentTermIdentifier());
+
+ return $methodConfig;
+ }
+
+ /**
+ * @return Organization
+ */
+ private function getOrganization()
+ {
+ return $this->container->get('doctrine')
+ ->getRepository('OroOrganizationBundle:Organization')
+ ->getFirst();
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadUserData.php b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadUserData.php
new file mode 100644
index 000000000..1c3d14c35
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/LoadUserData.php
@@ -0,0 +1,113 @@
+ [
+ [
+ 'class' => PaymentMethodsConfigsRule::class,
+ 'acls' => [
+ [
+ AbstractLoadMultipleUserData::ACL_PERMISSION => 'VIEW',
+ AbstractLoadMultipleUserData::ACL_LEVEL => 'SYSTEM',
+ ],
+ ],
+ ],
+ [
+ 'class' => Channel::class,
+ 'acls' => [
+ [
+ AbstractLoadMultipleUserData::ACL_PERMISSION => 'VIEW',
+ AbstractLoadMultipleUserData::ACL_LEVEL => 'SYSTEM',
+ ],
+ ],
+ ],
+ ],
+ self::ROLE_EDIT => [
+ [
+ 'class' => PaymentMethodsConfigsRule::class,
+ 'acls' => [
+ [
+ AbstractLoadMultipleUserData::ACL_PERMISSION => 'EDIT',
+ AbstractLoadMultipleUserData::ACL_LEVEL => 'SYSTEM',
+ ],
+ ],
+ ],
+ ],
+ self::ROLE_CREATE => [
+ [
+ 'class' => PaymentMethodsConfigsRule::class,
+ 'acls' => [
+ [
+ AbstractLoadMultipleUserData::ACL_PERMISSION => 'CREATE',
+ AbstractLoadMultipleUserData::ACL_LEVEL => 'SYSTEM',
+ ],
+ ],
+ ],
+ ],
+ ];
+
+ /**
+ * @var array
+ */
+ protected $users = [
+ [
+ 'email' => 'payment-user-viewer@example.com',
+ 'username' => self::USER_VIEWER,
+ 'password' => self::USER_VIEWER,
+ 'firstname' => 'PaymentUser1FN',
+ 'lastname' => 'PaymentUser1LN',
+ 'roles' => [self::ROLE_VIEW],
+ ],
+ [
+ 'email' => 'payment-user-editor@example.com',
+ 'username' => self::USER_EDITOR,
+ 'password' => self::USER_EDITOR,
+ 'firstname' => 'PaymentUser2FN',
+ 'lastname' => 'PaymentUser2LN',
+ 'roles' => [self::ROLE_VIEW, self::ROLE_EDIT],
+ ],
+ [
+ 'email' => 'payment-user-viewer-creator@example.com',
+ 'username' => self::USER_VIEWER_CREATOR,
+ 'password' => self::USER_VIEWER_CREATOR,
+ 'firstname' => 'PaymentUser2FN',
+ 'lastname' => 'PaymentUser2LN',
+ 'roles' => [self::ROLE_VIEW, self::ROLE_CREATE],
+ ]
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getRolesData()
+ {
+ return $this->roles;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getUsersData()
+ {
+ return $this->users;
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_method_configs_with_fake_methods.yml b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_method_configs_with_fake_methods.yml
new file mode 100644
index 000000000..e6dc6fc28
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_method_configs_with_fake_methods.yml
@@ -0,0 +1,15 @@
+payment_rule.1.method_config.1:
+ methods_configs_rule: payment_rule.1
+ method: ups
+
+payment_rule.2.method_config.1:
+ methods_configs_rule: payment_rule.2
+ method: flat_rate
+
+payment_rule.3.method_config.1:
+ methods_configs_rule: payment_rule.3
+ method: dpd
+
+payment_rule.3.method_config_without_type_configs:
+ methods_configs_rule: payment_rule.3
+ method: ups
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_methods_configs_rules.yml b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_methods_configs_rules.yml
new file mode 100644
index 000000000..778939764
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_methods_configs_rules.yml
@@ -0,0 +1,27 @@
+payment_rule.1:
+ rule:
+ enabled: true
+ sortOrder: 0
+ expression: 'true'
+ currency: 'EUR'
+
+payment_rule.2:
+ rule:
+ enabled: true
+ sortOrder: 1
+ expression: 'true'
+ currency: 'EUR'
+
+payment_rule.3:
+ rule:
+ enabled: false
+ sortOrder: 2
+ expression: 'true'
+ currency: 'EUR'
+
+payment_rule.4:
+ rule:
+ enabled: true
+ sortOrder: 3
+ expression: 'true'
+ currency: 'EUR'
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_methods_configs_rules_with_configs.yml b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_methods_configs_rules_with_configs.yml
new file mode 100644
index 000000000..64b6d3be0
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/DataFixtures/data/payment_methods_configs_rules_with_configs.yml
@@ -0,0 +1,205 @@
+payment_rule.1:
+ rule:
+ enabled: true
+ sortOrder: 0
+ expression: 'true'
+ currency: 'EUR'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: true
+ options:
+ type: 'per_order'
+ price: 10
+ destinations:
+ -
+ postalCodes:
+ -
+ name: '12345'
+ country: 'US'
+ region: 'NY'
+payment_rule.2:
+ rule:
+ enabled: true
+ sortOrder: 1
+ expression: 'true'
+ currency: 'EUR'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: true
+ options:
+ type: 'per_item'
+ price: 10
+ destinations:
+ -
+ country: 'US'
+ -
+ country: 'FR'
+ region: 'FR-75'
+payment_rule.3:
+ rule:
+ enabled: false
+ sortOrder: 2
+ expression: 'true'
+ currency: 'EUR'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: true
+ options:
+ type: 'per_item'
+ price: 10
+ destinations:
+ -
+ country: 'US'
+ region: 'NY'
+ -
+ country: 'FR'
+payment_rule.4:
+ rule:
+ enabled: true
+ sortOrder: 2
+ expression: 'true'
+ currency: 'EUR'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: true
+ options:
+ type: 'per_item'
+ price: 10
+ destinations:
+ -
+ postalCodes:
+ -
+ name: '12345'
+ -
+ name: '12346'
+ country: 'US'
+ region: 'NY'
+payment_rule.5:
+ rule:
+ enabled: true
+ sortOrder: 2
+ expression: 'true'
+ currency: 'EUR'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: true
+ options:
+ type: 'per_item'
+ price: 10
+payment_rule.6:
+ rule:
+ enabled: true
+ sortOrder: 2
+ expression: 'true'
+ currency: 'EUR'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: true
+ options:
+ type: 'per_item'
+ price: 10
+ destinations:
+ -
+ country: 'FR'
+payment_rule.7:
+ rule:
+ enabled: true
+ sortOrder: 3
+ expression: 'true'
+ currency: 'EUR'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: true
+ options:
+ type: 'per_item'
+ price: 10
+ destinations:
+ -
+ postalCodes:
+ -
+ name: '12346'
+ country: 'US'
+ region: 'NY'
+payment_rule.8:
+ rule:
+ enabled: true
+ sortOrder: 3
+ expression: 'true'
+ currency: 'EUR'
+ destinations:
+ -
+ country: 'US'
+ region: 'AL'
+payment_rule.9:
+ rule:
+ enabled: true
+ sortOrder: 0
+ expression: 'true'
+ currency: 'USD'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: true
+ options:
+ type: 'per_order'
+ price: 10
+payment_rule.10:
+ rule:
+ enabled: true
+ sortOrder: 0
+ expression: 'true'
+ currency: 'UAH'
+payment_rule.11:
+ rule:
+ enabled: false
+ sortOrder: 0
+ expression: 'true'
+ currency: 'UAH'
+payment_rule.12:
+ rule:
+ enabled: true
+ sortOrder: 0
+ expression: 'true'
+ currency: 'UAH'
+ destinations:
+ -
+ country: 'US'
+ region: 'NY'
+payment_rule_without_type_configs:
+ rule:
+ enabled: true
+ sortOrder: 0
+ expression: 'true'
+ currency: 'USD'
+ methodConfigs:
+ -
+ typeConfigs: []
+payment_rule_with_disabled_type_configs:
+ rule:
+ enabled: true
+ sortOrder: 0
+ expression: 'true'
+ currency: 'USD'
+ methodConfigs:
+ -
+ typeConfigs:
+ -
+ enabled: false
+ options:
+ type: 'per_order'
+ price: 10
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/Entity/Repository/PaymentMethodConfigRepositoryTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Functional/Entity/Repository/PaymentMethodConfigRepositoryTest.php
new file mode 100644
index 000000000..11ad631e0
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/Entity/Repository/PaymentMethodConfigRepositoryTest.php
@@ -0,0 +1,51 @@
+initClient([], static::generateBasicAuthHeader());
+ $this->loadFixtures([
+ LoadPaymentMethodConfigsWithFakeMethods::class,
+ ]);
+
+ $this->repository = static::getContainer()->get('doctrine')
+ ->getRepository('MarelloPaymentBundle:PaymentMethodConfig');
+ }
+
+ public function testDeleteByMethod()
+ {
+ $method = 'ups';
+
+ static::assertNotEmpty($this->repository->findByMethod($method));
+
+ $this->repository->deleteByMethod($method);
+
+ static::assertEmpty($this->repository->findByMethod($method));
+ }
+
+ public function testDeleteMethodConfigByIds()
+ {
+ $ids = [
+ $this->getReference('payment_rule.3.method_config_without_type_configs')->getId(),
+ ];
+
+ $this->repository->deleteByIds($ids);
+
+ static::assertEmpty($this->repository->findBy(['id' => $ids]));
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/Entity/Repository/PaymentMethodsConfigsRuleRepositoryTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Functional/Entity/Repository/PaymentMethodsConfigsRuleRepositoryTest.php
new file mode 100644
index 000000000..cf1a50636
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/Entity/Repository/PaymentMethodsConfigsRuleRepositoryTest.php
@@ -0,0 +1,248 @@
+initClient([], static::generateBasicAuthHeader());
+ $this->client->useHashNavigation(true);
+
+ $this->loadFixtures([
+ LoadPaymentMethodsConfigsRulesWithConfigs::class,
+ ]);
+
+ $this->em = static::getContainer()->get('doctrine')
+ ->getManagerForClass('MarelloPaymentBundle:PaymentMethodsConfigsRule');
+ $this->repository = $this->em->getRepository('MarelloPaymentBundle:PaymentMethodsConfigsRule');
+ }
+
+ /**
+ * @param array $entities
+ *
+ * @return array
+ */
+ private function getEntitiesIds(array $entities)
+ {
+ return array_map(function ($entity) {
+ return $entity->getId();
+ }, $entities);
+ }
+
+ /**
+ * @dataProvider getByDestinationAndCurrencyDataProvider
+ *
+ * @param array $shippingAddressData
+ * @param string $currency
+ * @param PaymentMethodsConfigsRule[] $expectedRules
+ */
+ public function testGetByDestinationAndCurrency(array $shippingAddressData, $currency, array $expectedRules)
+ {
+ $expectedRulesIds = $this->getEntitiesIds($this->getEntitiesByReferences($expectedRules));
+ $actualRules = $this->repository->getByDestinationAndCurrency(
+ $this->createShippingAddress($shippingAddressData),
+ $currency
+ );
+
+ $this->assertEquals($expectedRulesIds, $this->getEntitiesIds($actualRules));
+ }
+
+ /**
+ * @return array
+ */
+ public function getByDestinationAndCurrencyDataProvider()
+ {
+ return [
+ [
+ 'shippingAddress' => [
+ 'country' => 'US',
+ 'region' => [
+ 'combinedCode' => 'US-NY',
+ 'code' => 'NY',
+ ],
+ 'postalCode' => '12345',
+ ],
+ 'currency' => 'EUR',
+ 'expectedRulesIds' => [
+ 'payment_rule.1',
+ 'payment_rule.2',
+ 'payment_rule.3',
+ 'payment_rule.4',
+ 'payment_rule.5',
+ ]
+ ],
+ ];
+ }
+
+ public function testGetByCurrencyWithoutDestination()
+ {
+ $currency = 'UAH';
+ $expectedRules = $this->getEntitiesByReferences([
+ 'payment_rule.10',
+ 'payment_rule.11'
+ ]);
+
+ $actualRules = $this->repository->getByCurrencyWithoutDestination($currency);
+
+ $this->assertEquals($this->getEntitiesIds($expectedRules), $this->getEntitiesIds($actualRules));
+ }
+
+ public function testGetRulesWithoutPaymentMethods()
+ {
+ $rulesWithoutPaymentMethods = $this->repository->getRulesWithoutPaymentMethods();
+ $enabledRulesWithoutPaymentMethods = $this->repository->getRulesWithoutPaymentMethods(true);
+
+ static::assertCount(4, $rulesWithoutPaymentMethods);
+ static::assertCount(3, $enabledRulesWithoutPaymentMethods);
+ }
+
+ public function testDisableRulesWithoutPaymentMethods()
+ {
+ $this->repository->disableRulesWithoutPaymentMethods();
+
+ $rulesWithoutPaymentMethods = $this->repository->getRulesWithoutPaymentMethods();
+ $enabledRulesWithoutPaymentMethods = $this->repository->getRulesWithoutPaymentMethods(true);
+
+ static::assertCount(4, $rulesWithoutPaymentMethods);
+ static::assertCount(0, $enabledRulesWithoutPaymentMethods);
+ }
+
+ public function testGetRulesByMethod()
+ {
+ $rulesByExistingMethod = $this->repository->getRulesByMethod($this->getPaymentTermIdentifier());
+
+ $expectedRuleReferences = [
+ 'payment_rule.1',
+ 'payment_rule.2',
+ 'payment_rule.3',
+ 'payment_rule.4',
+ 'payment_rule.5',
+ 'payment_rule.6',
+ 'payment_rule.7',
+ 'payment_rule.9',
+ 'payment_rule_without_type_configs',
+ 'payment_rule_with_disabled_type_configs',
+ ];
+ foreach ($expectedRuleReferences as $expectedRuleReference) {
+ static::assertContains($this->getReference($expectedRuleReference), $rulesByExistingMethod);
+ }
+
+ $rulesByNotExistingMethod = $this->repository->getRulesByMethod('not_existing_method');
+ static::assertCount(0, $rulesByNotExistingMethod);
+ }
+
+ /**
+ * @dataProvider getEnabledRulesByMethodDataProvider
+ *
+ * @param string[] $expectedRuleReferences
+ */
+ public function testGetEnabledRulesByMethod(array $expectedRuleReferences)
+ {
+ $actualRules = $this->repository->getEnabledRulesByMethod($this->getPaymentTermIdentifier());
+
+ foreach ($expectedRuleReferences as $expectedRuleReference) {
+ static::assertContains($this->getReference($expectedRuleReference), $actualRules);
+ }
+ }
+
+ /**
+ * @return array
+ */
+ public function getEnabledRulesByMethodDataProvider()
+ {
+ return [
+ [
+ 'expectedRuleReferences' => [
+ 'payment_rule.1',
+ 'payment_rule.2',
+ 'payment_rule.4',
+ 'payment_rule.5',
+ 'payment_rule.6',
+ 'payment_rule.7',
+ 'payment_rule.9',
+ 'payment_rule_without_type_configs',
+ 'payment_rule_with_disabled_type_configs',
+ ]
+ ]
+ ];
+ }
+
+ /**
+ * @param array $rules
+ *
+ * @return array
+ */
+ protected function getEntitiesByReferences(array $rules)
+ {
+ return array_map(function ($ruleReference) {
+ return $this->getReference($ruleReference);
+ }, $rules);
+ }
+
+ /**
+ * @param array $data
+ *
+ * @return AddressInterface|object
+ */
+ protected function createShippingAddress(array $data)
+ {
+ return $this->getEntity(ShippingAddressStub::class, [
+ 'country' => new Country($data['country']),
+ 'region' => $this->getEntity(
+ Region::class,
+ [
+ 'code' => $data['region']['code'],
+ ],
+ [
+ 'combinedCode' => $data['region']['combinedCode'],
+ ]
+ ),
+ 'postalCode' => $data['postalCode'],
+ ]);
+ }
+
+ public function testGetByCurrency()
+ {
+ $expectedRules = $this->getEntitiesByReferences([
+ 'payment_rule.10',
+ 'payment_rule.11',
+ 'payment_rule.12'
+ ]);
+
+ $this->assertEquals(
+ $this->getEntitiesIds($expectedRules),
+ $this->getEntitiesIds($this->repository->getByCurrency('UAH'))
+ );
+ }
+
+ public function testGetByCurrencyWhenCurrencyNotExists()
+ {
+ $this->assertEmpty($this->repository->getByCurrency('WON'));
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Functional/Helper/PaymentTermIntegrationTrait.php b/src/Marello/Bundle/PaymentBundle/Tests/Functional/Helper/PaymentTermIntegrationTrait.php
new file mode 100644
index 000000000..56986a17c
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Functional/Helper/PaymentTermIntegrationTrait.php
@@ -0,0 +1,34 @@
+getChannelReference();
+
+ return sprintf('payment_term_%s', $channel->getId());
+ }
+
+ /**
+ * @return Channel
+ */
+ protected function getChannelReference()
+ {
+ return $this->getReference(LoadPaymentTermIntegration::REFERENCE_PAYMENT_TERM);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Checker/PaymentMethodEnabledByIdentifierCheckerTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Checker/PaymentMethodEnabledByIdentifierCheckerTest.php
new file mode 100644
index 000000000..15b062faf
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Checker/PaymentMethodEnabledByIdentifierCheckerTest.php
@@ -0,0 +1,85 @@
+method = $this->createMock(PaymentMethodInterface::class);
+
+ $this->shippingMethodProvider = $this->createMock(PaymentMethodProviderInterface::class);
+
+ $this->shippingMethodEnabledByIdentifierChecker = new PaymentMethodEnabledByIdentifierChecker(
+ $this->shippingMethodProvider
+ );
+ }
+
+ public function testIsEnabledForEnabledMethod()
+ {
+ $identifier = 'shipping_method_1';
+
+ $this->method
+ ->expects(static::once())
+ ->method('isEnabled')
+ ->willReturn(true);
+
+ $this->shippingMethodProvider
+ ->expects(static::any())
+ ->method('getPaymentMethod')
+ ->with($identifier)
+ ->willReturn($this->method);
+
+ $this->assertTrue($this->shippingMethodEnabledByIdentifierChecker->isEnabled($identifier));
+ }
+
+ public function testIsEnabledForDisabledMethod()
+ {
+ $identifier = 'shipping_method_1';
+
+ $this->method
+ ->expects(static::once())
+ ->method('isEnabled')
+ ->willReturn(false);
+
+ $this->shippingMethodProvider
+ ->expects(static::any())
+ ->method('getPaymentMethod')
+ ->with($identifier)
+ ->willReturn($this->method);
+
+ $this->assertFalse($this->shippingMethodEnabledByIdentifierChecker->isEnabled($identifier));
+ }
+
+ public function testIsEnabledForNotExistingMethod()
+ {
+ $identifier = 'shipping_method_1';
+
+ $this->shippingMethodProvider
+ ->expects(static::any())
+ ->method('getPaymentMethod')
+ ->with($identifier)
+ ->willReturn(null);
+
+ $this->assertFalse($this->shippingMethodEnabledByIdentifierChecker->isEnabled($identifier));
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Checker/PaymentRuleEnabledCheckerTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Checker/PaymentRuleEnabledCheckerTest.php
new file mode 100644
index 000000000..b569312f4
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Checker/PaymentRuleEnabledCheckerTest.php
@@ -0,0 +1,63 @@
+methodEnabledChecker = $this->createMock(
+ PaymentMethodEnabledByIdentifierCheckerInterface::class
+ );
+
+ $this->ruleChecker = new PaymentRuleEnabledChecker($this->methodEnabledChecker);
+ }
+
+ public function testCanBeEnabledForOneEnabledMethod()
+ {
+ $this->methodEnabledChecker->expects(static::at(1))
+ ->method('isEnabled')
+ ->willReturn(true);
+
+ $rule = $this->getRuleMock();
+
+ static::assertTrue($this->ruleChecker->canBeEnabled($rule));
+ }
+
+ public function testCanBeEnabledForNoEnabledMethods()
+ {
+ $rule = $this->getRuleMock();
+
+ static::assertFalse($this->ruleChecker->canBeEnabled($rule));
+ }
+
+ /**
+ * @return PaymentMethodsConfigsRule|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private function getRuleMock()
+ {
+ $rule = $this->createMock(PaymentMethodsConfigsRule::class);
+ $rule->expects(static::any())
+ ->method('getMethodConfigs')
+ ->willReturn([
+ new PaymentMethodConfig(), new PaymentMethodConfig()
+ ]);
+
+ return $rule;
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/HasApplicablePaymentMethodsTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/HasApplicablePaymentMethodsTest.php
new file mode 100644
index 000000000..9baec11c3
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/HasApplicablePaymentMethodsTest.php
@@ -0,0 +1,144 @@
+paymentMethodProvider = $this->createMock(PaymentMethodProviderInterface::class);
+
+ $this->paymentMethodsViewsProvider = $this
+ ->getMockBuilder(PaymentMethodsViewsProviderInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->condition = new HasApplicablePaymentMethods(
+ $this->paymentMethodProvider,
+ $this->paymentMethodsViewsProvider
+ );
+ }
+
+ protected function tearDown()
+ {
+ unset($this->condition, $this->paymentMethodProvider);
+ }
+
+ public function testGetName()
+ {
+ $this->assertEquals(HasApplicablePaymentMethods::NAME, $this->condition->getName());
+ }
+
+ /**
+ * @expectedException \Oro\Component\ConfigExpression\Exception\InvalidArgumentException
+ * @expectedExceptionMessage Missing "paymentContext" option
+ */
+ public function testInitializeInvalid()
+ {
+ $this->assertInstanceOf(
+ 'Oro\Component\ConfigExpression\Condition\AbstractCondition',
+ $this->condition->initialize([])
+ );
+ }
+
+ public function testInitialize()
+ {
+ $this->assertInstanceOf(
+ 'Oro\Component\ConfigExpression\Condition\AbstractCondition',
+ $this->condition->initialize([self::METHOD, new \stdClass()])
+ );
+ }
+
+ /**
+ * @dataProvider evaluateProvider
+ * @param array $methods
+ * @param bool $expected
+ */
+ public function testEvaluate($methods, $expected)
+ {
+ $method = $this->createMock('Marello\Bundle\PaymentBundle\Method\PaymentMethodInterface');
+ $this->paymentMethodProvider->expects($this->any())->method('getPaymentMethod')->willReturn($method);
+
+ $this->paymentMethodsViewsProvider->expects($this->once())
+ ->method('getApplicableMethodsViews')
+ ->willReturn($methods);
+
+ $this->condition->initialize(['paymentContext' => new PaymentContext([])]);
+ $this->assertEquals($expected, $this->condition->evaluate([]));
+ }
+
+ /**
+ * @return array
+ */
+ public function evaluateProvider()
+ {
+ return [
+ 'no_rules_no_methods' => [
+ 'methods' => [],
+ 'expected' => false,
+ ],
+ 'with_rules_no_methods' => [
+ 'methods' => [],
+ 'expected' => false,
+ ],
+ 'with_rules_and_methods' => [
+ 'methods' => ['flat_rate'],
+ 'expected' => true,
+ ],
+ ];
+ }
+
+ public function testToArray()
+ {
+ $stdClass = new \stdClass();
+ $this->condition->initialize(['paymentContext' => $stdClass]);
+ $result = $this->condition->toArray();
+
+ $key = '@' . HasApplicablePaymentMethods::NAME;
+
+ $this->assertInternalType('array', $result);
+ $this->assertArrayHasKey($key, $result);
+
+ $resultSection = $result[$key];
+ $this->assertInternalType('array', $resultSection);
+ $this->assertArrayHasKey('parameters', $resultSection);
+ $this->assertContains($stdClass, $resultSection['parameters']);
+ }
+
+ public function testCompile()
+ {
+ $toStringStub = new ToStringStub();
+ $options = ['paymentContext' => $toStringStub];
+
+ $this->condition->initialize($options);
+ $result = $this->condition->compile('$factory');
+ $this->assertEquals(
+ sprintf(
+ '$factory->create(\'%s\', [%s])',
+ HasApplicablePaymentMethods::NAME,
+ $toStringStub
+ ),
+ $result
+ );
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/PaymentMethodHasPaymentRulesTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/PaymentMethodHasPaymentRulesTest.php
new file mode 100644
index 000000000..6603f4031
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/PaymentMethodHasPaymentRulesTest.php
@@ -0,0 +1,148 @@
+repository = $this->getMockBuilder(PaymentMethodsConfigsRuleRepository::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->propertyPath = $this->createMock(PropertyPathInterface::class);
+ $this->propertyPath->expects($this->any())
+ ->method('__toString')
+ ->will($this->returnValue(self::PROPERTY_PATH_NAME));
+ $this->propertyPath->expects($this->any())
+ ->method('getElements')
+ ->will($this->returnValue([self::PROPERTY_PATH_NAME]));
+
+ $this->paymentMethodHasPaymentRulesCondition = new PaymentMethodHasPaymentRules($this->repository);
+ }
+
+ public function testGetName()
+ {
+ $this->assertEquals(
+ PaymentMethodHasPaymentRules::NAME,
+ $this->paymentMethodHasPaymentRulesCondition->getName()
+ );
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage Missing "method_identifier" option
+ */
+ public function testInitializeInvalid()
+ {
+ $this->assertInstanceOf(
+ PaymentMethodHasPaymentRules::class,
+ $this->paymentMethodHasPaymentRulesCondition->initialize([])
+ );
+ }
+
+ public function testInitialize()
+ {
+ $this->assertInstanceOf(
+ PaymentMethodHasPaymentRules::class,
+ $this->paymentMethodHasPaymentRulesCondition->initialize(['method_identifier'])
+ );
+ }
+
+ /**
+ * @dataProvider evaluateProvider
+ *
+ * @param PaymentMethodsConfigsRule[] $rules
+ * @param bool $expected
+ */
+ public function testEvaluate($rules, $expected)
+ {
+ $this->repository->expects(static::once())
+ ->method('getRulesByMethod')
+ ->willReturn($rules);
+
+ $this->paymentMethodHasPaymentRulesCondition->initialize(['method_identifier']);
+ $this->assertEquals($expected, $this->paymentMethodHasPaymentRulesCondition->evaluate([]));
+ }
+
+ /**
+ * @return array
+ */
+ public function evaluateProvider()
+ {
+ return [
+ 'no_rules' => [
+ 'rules' => [],
+ 'expected' => false,
+ ],
+ 'with_rules' => [
+ 'rules' => [
+ new PaymentMethodsConfigsRule(),
+ new PaymentMethodsConfigsRule(),
+ ],
+ 'expected' => true,
+ ],
+ ];
+ }
+
+ public function testToArray()
+ {
+ $result = $this->paymentMethodHasPaymentRulesCondition->initialize([$this->propertyPath])->toArray();
+
+ $this->assertEquals(
+ sprintf('$%s', self::PROPERTY_PATH_NAME),
+ $result['@marello_payment_method_has_payment_rules']['parameters'][0]
+ );
+ }
+
+ public function testCompile()
+ {
+ $result = $this->paymentMethodHasPaymentRulesCondition->compile('$factoryAccessor');
+
+ $this->assertContains('$factoryAccessor->create(\'marello_payment_method_has_payment_rules\'', $result);
+ }
+
+ public function testSetContextAccessor()
+ {
+ /** @var ContextAccessorInterface|\PHPUnit\Framework\MockObject\MockObject $contextAccessor * */
+ $contextAccessor = $this->getMockBuilder(ContextAccessorInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->paymentMethodHasPaymentRulesCondition->setContextAccessor($contextAccessor);
+
+ $reflection = new \ReflectionProperty(
+ get_class($this->paymentMethodHasPaymentRulesCondition),
+ 'contextAccessor'
+ );
+ $reflection->setAccessible(true);
+
+ $this->assertInstanceOf(
+ get_class($contextAccessor),
+ $reflection->getValue($this->paymentMethodHasPaymentRulesCondition)
+ );
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/ToStringStub.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/ToStringStub.php
new file mode 100644
index 000000000..d680a605b
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Condition/ToStringStub.php
@@ -0,0 +1,12 @@
+priceMock = $this->createMock(Price::class);
+
+ $this->productHolderMock = $this->createMock(OrderItem::class);
+
+ $this->productHolderMock->method('getId')->willReturn(static::TEST_ENTITY_ID);
+
+ $this->productMock = $this->createMock(Product::class);
+
+ $this->productMock->method('getSku')->willReturn(static::TEST_PRODUCT_SKU);
+ $this->productMock->method('getId')->willReturn(static::TEST_PRODUCT_ID);
+ }
+
+ /**
+ * @return array
+ */
+ protected function getPaymentLineItemParams()
+ {
+ return [
+ PaymentLineItem::FIELD_PRICE => $this->priceMock,
+ PaymentLineItem::FIELD_QUANTITY => self::TEST_QUANTITY,
+ PaymentLineItem::FIELD_PRODUCT_HOLDER => $this->productHolderMock,
+ PaymentLineItem::FIELD_PRODUCT => $this->productMock,
+ PaymentLineItem::FIELD_PRODUCT_SKU => self::TEST_PRODUCT_SKU,
+ PaymentLineItem::FIELD_WEIGHT => self::TEST_WEIGHT,
+ PaymentLineItem::FIELD_ENTITY_IDENTIFIER => self::TEST_ENTITY_ID,
+ ];
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/Builder/Basic/BasicPaymentContextBuilderTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/Builder/Basic/BasicPaymentContextBuilderTest.php
new file mode 100644
index 000000000..dfaed1b70
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/Builder/Basic/BasicPaymentContextBuilderTest.php
@@ -0,0 +1,208 @@
+customerMock = $this->createMock(Customer::class);
+ $this->lineItemsCollectionMock = $this->createMock(PaymentLineItemCollectionInterface::class);
+ $this->lineItemsCollectionMock
+ ->expects(static::any())
+ ->method('toArray')
+ ->willReturn([$this->createMock(PaymentLineItemInterface::class)]);
+ $this->billingAddressMock = $this->createMock(AddressInterface::class);
+ $this->shippingAddressMock = $this->createMock(AddressInterface::class);
+ $this->shippingOriginMock = $this->createMock(AddressInterface::class);
+ $this->subtotalMock = $this->createMock(Price::class);
+ $this->sourceEntityMock = $this->createMock(Order::class);
+ $this->shippingOriginMock = $this->createMock(AddressInterface::class);
+ $this->paymentLineItemCollectionFactory = $this->createMock(PaymentLineItemCollectionFactoryInterface::class);
+ $this->paymentLineItemCollectionFactory
+ ->expects(static::any())
+ ->method('createPaymentLineItemCollection')
+ ->willReturn($this->lineItemsCollectionMock);
+ }
+
+ public function testFullContextBuilding()
+ {
+ $paymentMethod = 'paymentMethod';
+ $currency = 'usd';
+ $entityId = '12';
+
+ $builder = new BasicPaymentContextBuilder(
+ $this->sourceEntityMock,
+ $entityId,
+ $this->paymentLineItemCollectionFactory
+ );
+
+ $builder
+ ->setCurrency($currency)
+ ->setSubTotal($this->subtotalMock)
+ ->setLineItems($this->lineItemsCollectionMock)
+ ->setShippingAddress($this->shippingAddressMock)
+ ->setBillingAddress($this->billingAddressMock)
+ ->setCustomer($this->customerMock)
+ ->setPaymentMethod($paymentMethod)
+ ->setShippingOrigin($this->shippingOriginMock);
+
+ $expectedContext = $this->getExpectedFullContext(
+ $paymentMethod,
+ $currency,
+ $entityId,
+ $this->shippingOriginMock
+ );
+ $context = $builder->getResult();
+
+ $this->assertEquals($expectedContext, $context);
+ }
+
+ public function testOptionalFields()
+ {
+ $entityId = '12';
+
+ $builder = new BasicPaymentContextBuilder(
+ $this->sourceEntityMock,
+ $entityId,
+ $this->paymentLineItemCollectionFactory
+ );
+ $builder->setShippingOrigin($this->shippingOriginMock);
+
+ $expectedContext = $this->getExpectedContextWithoutOptionalFields(
+ $entityId,
+ $this->shippingOriginMock
+ );
+
+ $context = $builder->getResult();
+
+ $this->assertEquals($expectedContext, $context);
+ }
+
+ public function testWithoutOrigin()
+ {
+ $paymentMethod = 'paymentMethod';
+ $currency = 'usd';
+ $entityId = '12';
+
+ $builder = new BasicPaymentContextBuilder(
+ $this->sourceEntityMock,
+ $entityId,
+ $this->paymentLineItemCollectionFactory
+ );
+
+ $builder
+ ->setCurrency($currency)
+ ->setSubTotal($this->subtotalMock)
+ ->setLineItems($this->lineItemsCollectionMock)
+ ->setShippingAddress($this->shippingAddressMock)
+ ->setBillingAddress($this->billingAddressMock)
+ ->setCustomer($this->customerMock)
+ ->setPaymentMethod($paymentMethod);
+
+ $expectedContext = $this->getExpectedFullContext(
+ $paymentMethod,
+ $currency,
+ $entityId,
+ null
+ );
+ $context = $builder->getResult();
+
+ $this->assertEquals($expectedContext, $context);
+ }
+
+ /**
+ * @param string $paymentMethod
+ * @param string $currency
+ * @param int $entityId
+ * @param AddressInterface|null $shippingOrigin
+ *
+ * @return PaymentContext
+ */
+ private function getExpectedFullContext($paymentMethod, $currency, $entityId, AddressInterface $shippingOrigin = null)
+ {
+ $params = [
+ PaymentContext::FIELD_CUSTOMER => $this->customerMock,
+ PaymentContext::FIELD_LINE_ITEMS => $this->lineItemsCollectionMock,
+ PaymentContext::FIELD_BILLING_ADDRESS => $this->billingAddressMock,
+ PaymentContext::FIELD_SHIPPING_ADDRESS => $this->shippingAddressMock,
+ PaymentContext::FIELD_SHIPPING_ORIGIN => $shippingOrigin,
+ PaymentContext::FIELD_PAYMENT_METHOD => $paymentMethod,
+ PaymentContext::FIELD_CURRENCY => $currency,
+ PaymentContext::FIELD_SUBTOTAL => $this->subtotalMock,
+ PaymentContext::FIELD_SOURCE_ENTITY => $this->sourceEntityMock,
+ PaymentContext::FIELD_SOURCE_ENTITY_ID => $entityId,
+ ];
+ $params = array_diff_key($params, array_filter($params, 'is_null'));
+
+ return new PaymentContext($params);
+ }
+
+ /**
+ * @param int $entityId
+ * @param AddressInterface $shippingOrigin
+ *
+ * @return PaymentContext
+ */
+ private function getExpectedContextWithoutOptionalFields($entityId, AddressInterface $shippingOrigin)
+ {
+ $params = [
+ PaymentContext::FIELD_LINE_ITEMS => $this->lineItemsCollectionMock,
+ PaymentContext::FIELD_SHIPPING_ORIGIN => $shippingOrigin,
+ PaymentContext::FIELD_SOURCE_ENTITY => $this->sourceEntityMock,
+ PaymentContext::FIELD_SOURCE_ENTITY_ID => $entityId,
+ ];
+ $params = array_diff_key($params, array_filter($params, 'is_null'));
+
+ return new PaymentContext($params);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/Builder/Basic/Factory/BasicPaymentContextBuilderFactoryTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/Builder/Basic/Factory/BasicPaymentContextBuilderFactoryTest.php
new file mode 100644
index 000000000..c5d56eb5f
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/Builder/Basic/Factory/BasicPaymentContextBuilderFactoryTest.php
@@ -0,0 +1,46 @@
+lineItemsCollectionFactoryMock = $this->createMock(PaymentLineItemCollectionFactoryInterface::class);
+ $this->sourceEntityMock = $this->createMock(Order::class);
+ }
+
+ public function testCreateBuilder()
+ {
+ $entityId = '12';
+
+ $builderFactory = new BasicPaymentContextBuilderFactory($this->lineItemsCollectionFactoryMock);
+
+ $builder = $builderFactory->createPaymentContextBuilder(
+ $this->sourceEntityMock,
+ $entityId
+ );
+
+ $expectedBuilder = new BasicPaymentContextBuilder(
+ $this->sourceEntityMock,
+ $entityId,
+ $this->lineItemsCollectionFactoryMock
+ );
+
+ $this->assertEquals($expectedBuilder, $builder);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Builder/Basic/BasicPaymentLineItemBuilderTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Builder/Basic/BasicPaymentLineItemBuilderTest.php
new file mode 100644
index 000000000..74ba06c27
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Builder/Basic/BasicPaymentLineItemBuilderTest.php
@@ -0,0 +1,48 @@
+productHolderMock
+ );
+
+ $builder
+ ->setProduct($this->productMock)
+ ->setPrice($this->priceMock)
+ ->setProductSku(self::TEST_PRODUCT_SKU)
+ ->setWeight(self::TEST_WEIGHT);
+
+ $shippingLineItem = $builder->getResult();
+
+ $expectedPaymentLineItem = new PaymentLineItem($this->getPaymentLineItemParams());
+
+ $this->assertEquals($expectedPaymentLineItem, $shippingLineItem);
+ }
+
+ public function testOptionalBuild()
+ {
+ $builder = new BasicPaymentLineItemBuilder(
+ self::TEST_QUANTITY,
+ $this->productHolderMock
+ );
+
+ $shippingLineItem = $builder->getResult();
+
+ $expectedPaymentLineItem = new PaymentLineItem([
+ PaymentLineItem::FIELD_QUANTITY => self::TEST_QUANTITY,
+ PaymentLineItem::FIELD_PRODUCT_HOLDER => $this->productHolderMock,
+ PaymentLineItem::FIELD_ENTITY_IDENTIFIER => self::TEST_ENTITY_ID
+ ]);
+
+ $this->assertEquals($expectedPaymentLineItem, $shippingLineItem);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Builder/Basic/Factory/BasicPaymentLineItemBuilderFactoryTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Builder/Basic/Factory/BasicPaymentLineItemBuilderFactoryTest.php
new file mode 100644
index 000000000..60ab2d9dc
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Builder/Basic/Factory/BasicPaymentLineItemBuilderFactoryTest.php
@@ -0,0 +1,39 @@
+productHolderMock = $this->createMock(OrderItem::class);
+ }
+
+ public function testCreate()
+ {
+ $quantity = 15;
+
+ $builderFactory = new BasicPaymentLineItemBuilderFactory();
+
+ $builder = $builderFactory->createBuilder(
+ $quantity,
+ $this->productHolderMock
+ );
+
+ $expectedBuilder = new BasicPaymentLineItemBuilder(
+ $quantity,
+ $this->productHolderMock
+ );
+
+ $this->assertEquals($expectedBuilder, $builder);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Collection/ArrayCollectionDoctrine/DoctrinePaymentLineItemCollectionFactoryTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Collection/ArrayCollectionDoctrine/DoctrinePaymentLineItemCollectionFactoryTest.php
new file mode 100644
index 000000000..b1e075300
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Collection/ArrayCollectionDoctrine/DoctrinePaymentLineItemCollectionFactoryTest.php
@@ -0,0 +1,42 @@
+createPaymentLineItemCollection($paymentLineItems);
+
+ $this->assertEquals($paymentLineItems, $collection->toArray());
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage Expected: Marello\Bundle\PaymentBundle\Context\PaymentLineItemInterface
+ */
+ public function testFactoryWithException()
+ {
+ $paymentLineItems = [
+ new OrderItem(),
+ new OrderItem(),
+ new OrderItem(),
+ new OrderItem(),
+ ];
+
+ $collectionFactory = new DoctrinePaymentLineItemCollectionFactory();
+ $collectionFactory->createPaymentLineItemCollection($paymentLineItems);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Collection/ArrayCollectionDoctrine/DoctrinePaymentLineItemCollectionTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Collection/ArrayCollectionDoctrine/DoctrinePaymentLineItemCollectionTest.php
new file mode 100644
index 000000000..9366966fa
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/LineItem/Collection/ArrayCollectionDoctrine/DoctrinePaymentLineItemCollectionTest.php
@@ -0,0 +1,23 @@
+assertEquals($paymentLineItems, $collection->toArray());
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentContextMockTrait.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentContextMockTrait.php
new file mode 100644
index 000000000..0fabb40c3
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentContextMockTrait.php
@@ -0,0 +1,19 @@
+createMock(PaymentContextInterface::class);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentContextTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentContextTest.php
new file mode 100644
index 000000000..ae09e8f85
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentContextTest.php
@@ -0,0 +1,102 @@
+customerMock = $this->getMockBuilder(Customer::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->lineItemsCollectionMock = $this->createMock(PaymentLineItemCollectionInterface::class);
+ $this->billingAddressMock = $this->createMock(AddressInterface::class);
+ $this->shippingAddressMock = $this->createMock(AddressInterface::class);
+ $this->shippingOriginMock = $this->createMock(AddressInterface::class);
+ $this->subtotalMock = $this->getMockBuilder(Price::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->sourceEntityMock = $this->getMockBuilder(Order::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ }
+
+ public function testConstructionAndGetters()
+ {
+ $paymentMethod = 'paymentMethod';
+ $currency = 'usd';
+ $entityId = '12';
+
+ $params = [
+ PaymentContext::FIELD_CUSTOMER => $this->customerMock,
+ PaymentContext::FIELD_LINE_ITEMS => $this->lineItemsCollectionMock,
+ PaymentContext::FIELD_BILLING_ADDRESS => $this->billingAddressMock,
+ PaymentContext::FIELD_SHIPPING_ADDRESS => $this->shippingAddressMock,
+ PaymentContext::FIELD_SHIPPING_ORIGIN => $this->shippingOriginMock,
+ PaymentContext::FIELD_PAYMENT_METHOD => $paymentMethod,
+ PaymentContext::FIELD_CURRENCY => $currency,
+ PaymentContext::FIELD_SUBTOTAL => $this->subtotalMock,
+ PaymentContext::FIELD_SOURCE_ENTITY => $this->sourceEntityMock,
+ PaymentContext::FIELD_SOURCE_ENTITY_ID => $entityId,
+ ];
+
+ $shippingContext = new PaymentContext($params);
+
+ $getterValues = [
+ PaymentContext::FIELD_CUSTOMER => $shippingContext->getCustomer(),
+ PaymentContext::FIELD_LINE_ITEMS => $shippingContext->getLineItems(),
+ PaymentContext::FIELD_BILLING_ADDRESS => $shippingContext->getBillingAddress(),
+ PaymentContext::FIELD_SHIPPING_ADDRESS => $shippingContext->getShippingAddress(),
+ PaymentContext::FIELD_SHIPPING_ORIGIN => $shippingContext->getShippingOrigin(),
+ PaymentContext::FIELD_PAYMENT_METHOD => $shippingContext->getPaymentMethod(),
+ PaymentContext::FIELD_CURRENCY => $shippingContext->getCurrency(),
+ PaymentContext::FIELD_SUBTOTAL => $shippingContext->getSubtotal(),
+ PaymentContext::FIELD_SOURCE_ENTITY => $shippingContext->getSourceEntity(),
+ PaymentContext::FIELD_SOURCE_ENTITY_ID => $shippingContext->getSourceEntityIdentifier(),
+ ];
+
+ $this->assertEquals($params, $getterValues);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentLineItemTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentLineItemTest.php
new file mode 100644
index 000000000..aa841e6f1
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Context/PaymentLineItemTest.php
@@ -0,0 +1,35 @@
+getPaymentLineItemParams();
+
+ $shippingLineItem = new PaymentLineItem($shippingLineItemParams);
+
+ $this->assertEquals($shippingLineItemParams[PaymentLineItem::FIELD_PRICE], $shippingLineItem->getPrice());
+ $this->assertEquals(
+ $shippingLineItemParams[PaymentLineItem::FIELD_QUANTITY],
+ $shippingLineItem->getQuantity()
+ );
+ $this->assertEquals(
+ $shippingLineItemParams[PaymentLineItem::FIELD_PRODUCT_HOLDER],
+ $shippingLineItem->getProductHolder()
+ );
+ $this->assertEquals($shippingLineItemParams[PaymentLineItem::FIELD_PRODUCT], $shippingLineItem->getProduct());
+ $this->assertEquals(
+ $shippingLineItemParams[PaymentLineItem::FIELD_PRODUCT_SKU],
+ $shippingLineItem->getProductSku()
+ );
+ $this->assertEquals($shippingLineItemParams[PaymentLineItem::FIELD_WEIGHT], $shippingLineItem->getWeight());
+ $this->assertEquals(
+ $shippingLineItemParams[PaymentLineItem::FIELD_ENTITY_IDENTIFIER],
+ $shippingLineItem->getEntityIdentifier()
+ );
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Converter/Basic/PaymentContextToRuleValuesConverterTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Converter/Basic/PaymentContextToRuleValuesConverterTest.php
new file mode 100644
index 000000000..e6b7b3ebf
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Converter/Basic/PaymentContextToRuleValuesConverterTest.php
@@ -0,0 +1,107 @@
+factory = new DecoratedProductLineItemFactory(
+ $this->createMock(VirtualFieldsProductDecoratorFactory::class)
+ );
+
+ $this->shippingContextToRuleValuesConverter = new BasicPaymentContextToRulesValueConverter(
+ $this->factory
+ );
+ }
+
+ /**
+ * @dataProvider convertDataProvider
+ * @param PaymentContext $context
+ */
+ public function testConvert(PaymentContext $context)
+ {
+ $expectedValues = [
+ 'lineItems' => array_map(function (PaymentLineItem $lineItem) use ($context) {
+ return $this->factory
+ ->createLineItemWithDecoratedProductByLineItem($context->getLineItems()->toArray(), $lineItem);
+ }, $context->getLineItems()->toArray()),
+ 'shippingOrigin' => $context->getShippingOrigin(),
+ 'billingAddress' => $context->getBillingAddress(),
+ 'shippingAddress' => $context->getShippingAddress(),
+ 'paymentMethod' => $context->getPaymentMethod(),
+ 'currency' => $context->getCurrency(),
+ 'subtotal' => $context->getSubtotal(),
+ 'customer' => $context->getCustomer(),
+ 'company' => $context->getCompany(),
+ 'total' => $context->getTotal()
+ ];
+ $this->assertEquals($expectedValues, $this->shippingContextToRuleValuesConverter->convert($context));
+ }
+
+ /**
+ * @return array
+ */
+ public function convertDataProvider()
+ {
+ return [
+ [
+ 'context' => new PaymentContext([
+ PaymentContext::FIELD_LINE_ITEMS => new DoctrinePaymentLineItemCollection([
+ new PaymentLineItem([
+ PaymentLineItem::FIELD_PRODUCT => $this->getEntity(Product::class, ['id' => 1]),
+ ]),
+ ]),
+ PaymentContext::FIELD_SHIPPING_ORIGIN => $this->getEntity(ShippingAddressStub::class, [
+ 'region' => $this->getEntity(Region::class, [
+ 'code' => 'CA',
+ ], ['US-CA']),
+ ]),
+ PaymentContext::FIELD_BILLING_ADDRESS => $this->getEntity(ShippingAddressStub::class, [
+ 'country' => new Country('US'),
+ ]),
+ PaymentContext::FIELD_SHIPPING_ADDRESS => $this->getEntity(ShippingAddressStub::class, [
+ 'country' => new Country('US'),
+ 'region' => $this->getEntity(Region::class, [
+ 'code' => 'CA',
+ ], ['US-CA']),
+ 'postalCode' => '90401',
+ ]),
+ PaymentContext::FIELD_PAYMENT_METHOD => 'integration_payment_method',
+ PaymentContext::FIELD_CURRENCY => 'USD',
+ PaymentContext::FIELD_SUBTOTAL => Price::create(10.0, 'USD'),
+ PaymentContext::FIELD_CUSTOMER => (new Customer())->setFirstName('Customer Name'),
+ ]),
+ ],
+ ];
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodConfigTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodConfigTest.php
new file mode 100644
index 000000000..0b92579ea
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodConfigTest.php
@@ -0,0 +1,26 @@
+ 'test']],
+ ['methodsConfigsRule', new PaymentMethodsConfigsRule()],
+ ];
+
+ $entity = new PaymentMethodConfig();
+
+ $this->assertPropertyAccessors($entity, $properties);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleDestinationPostalCodeTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleDestinationPostalCodeTest.php
new file mode 100644
index 000000000..49771e1ce
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleDestinationPostalCodeTest.php
@@ -0,0 +1,26 @@
+country = $this->createMockCountry();
+ $this->region = $this->createMockRegion();
+
+ $this->shippingRuleDestination = $this->getEntity(
+ 'Marello\Bundle\PaymentBundle\Entity\PaymentMethodsConfigsRuleDestination',
+ [
+ 'region' => $this->region,
+ 'country' => $this->country,
+ 'postalCodes' => new ArrayCollection([$this->createPostalCode('123')]),
+ ]
+ );
+ }
+
+ public function testProperties()
+ {
+ $properties = [
+ ['id', 1],
+ ['region', new Region('code')],
+ ['regionText', 'text'],
+ ['country', new Country('UA')],
+ ['methodsConfigsRule', new PaymentMethodsConfigsRule()],
+ ];
+
+ $destination = new PaymentMethodsConfigsRuleDestination();
+ static::assertPropertyAccessors($destination, $properties);
+ static::assertPropertyCollection(
+ $destination,
+ 'postalCodes',
+ $this->createPostalCode('123')
+ );
+ }
+
+ public function testGetRegionName()
+ {
+ $this->assertEquals('RegionName', $this->shippingRuleDestination->getRegionName());
+ $this->shippingRuleDestination->setRegion(null);
+ $this->assertEquals('', $this->shippingRuleDestination->getRegionName());
+ }
+
+ public function testGetRegionCode()
+ {
+ $this->assertEquals('RegionCode', $this->shippingRuleDestination->getRegionCode());
+ $this->shippingRuleDestination->setRegion(null);
+ $this->assertEquals('', $this->shippingRuleDestination->getRegionCode());
+ }
+
+ public function testGetCountryName()
+ {
+ $this->assertEquals('CountryName', $this->shippingRuleDestination->getCountryName());
+ $this->shippingRuleDestination->setCountry(null);
+ $this->assertEquals('', $this->shippingRuleDestination->getCountryName());
+ }
+
+ public function testGetCountryIso2()
+ {
+ $this->assertEquals('CountryIso2', $this->shippingRuleDestination->getCountryIso2());
+ $this->shippingRuleDestination->setCountry(null);
+ $this->assertEquals('', $this->shippingRuleDestination->getCountryIso2());
+ }
+
+ public function testGetCountryIso3()
+ {
+ $this->assertEquals('CountryIso3', $this->shippingRuleDestination->getCountryIso3());
+ $this->shippingRuleDestination->setCountry(null);
+ $this->assertEquals('', $this->shippingRuleDestination->getCountryIso3());
+ }
+
+ /**
+ * @dataProvider toStringDataProvider
+ *
+ * @param array $data
+ * @param string $expectedString
+ */
+ public function testToString(array $data, $expectedString)
+ {
+ $entity = (string) $this->getEntity(
+ 'Marello\Bundle\PaymentBundle\Entity\PaymentMethodsConfigsRuleDestination',
+ $data
+ );
+ $this->assertEquals($expectedString, $entity);
+ }
+
+ /**
+ * @return array
+ */
+ public function toStringDataProvider()
+ {
+ return [
+ 'all' => [
+ 'data' => [
+ 'country' => $this->createMockCountry(),
+ 'region' => $this->createMockRegion(),
+ 'postalCodes' => new ArrayCollection([$this->createPostalCode('12345')]),
+ ],
+ 'expectedString' => 'RegionName, CountryName 12345'
+ ],
+ 'country and postal code' => [
+ 'data' => [
+ 'country' => $this->createMockCountry(),
+ 'region' => null,
+ 'postalCodes' => new ArrayCollection([
+ $this->createPostalCode('12345'),
+ $this->createPostalCode('54321'),
+ ]),
+ ],
+ 'expectedString' => 'CountryName 12345, 54321'
+ ],
+ 'country and region' => [
+ 'data' => [
+ 'country' => $this->createMockCountry('SecondCountryName'),
+ 'region' => $this->createMockRegion('SecondRegionName'),
+ 'postalCodes' => new ArrayCollection(),
+ ],
+ 'expectedString' => 'SecondRegionName, SecondCountryName'
+ ],
+ 'only country' => [
+ 'data' => [
+ 'country' => $this->createMockCountry(),
+ 'region' => null,
+ 'postalCodes' => new ArrayCollection(),
+ ],
+ 'expectedString' => 'CountryName'
+ ]
+ ];
+ }
+
+ /**
+ * @param string $name
+ * @param string $iso2
+ * @param string $iso3
+ * @return \PHPUnit\Framework\MockObject\MockObject
+ */
+ protected function createMockCountry($name = 'CountryName', $iso2 = 'CountryIso2', $iso3 = 'CountryIso3')
+ {
+ $result = $this->getMockBuilder('Oro\Bundle\AddressBundle\Entity\Country')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $result->expects($this->any())
+ ->method('__toString')
+ ->will($this->returnValue($name));
+ $result->expects($this->any())
+ ->method('getName')
+ ->will($this->returnValue($name));
+ $result->expects($this->any())
+ ->method('getIso2Code')
+ ->will($this->returnValue($iso2));
+ $result->expects($this->any())
+ ->method('getIso3Code')
+ ->will($this->returnValue($iso3));
+
+ return $result;
+ }
+
+ /**
+ * @param string $name
+ * @param string $code
+ * @return \PHPUnit\Framework\MockObject\MockObject
+ */
+ protected function createMockRegion($name = 'RegionName', $code = 'RegionCode')
+ {
+ $result = $this->createMock('Oro\Bundle\AddressBundle\Entity\Region', [], ['combinedCode']);
+ $result->expects($this->any())
+ ->method('__toString')
+ ->will($this->returnValue($name));
+ $result->expects($this->any())
+ ->method('getName')
+ ->will($this->returnValue($name));
+ $result->expects($this->any())
+ ->method('getCode')
+ ->will($this->returnValue($code));
+ return $result;
+ }
+
+ /**
+ * @param string $name
+ * @return PaymentMethodsConfigsRuleDestinationPostalCode
+ */
+ protected function createPostalCode($name)
+ {
+ return (new PaymentMethodsConfigsRuleDestinationPostalCode())->setName($name);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleMockTrait.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleMockTrait.php
new file mode 100644
index 000000000..0f4d3552a
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleMockTrait.php
@@ -0,0 +1,19 @@
+createMock(PaymentMethodsConfigsRule::class);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleTest.php
new file mode 100644
index 000000000..01aaa8dc1
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Entity/PaymentMethodsConfigsRuleTest.php
@@ -0,0 +1,32 @@
+paymentMethodProvider = new CompositePaymentMethodProvider();
+
+ $this->provider = $this->getMockBuilder(PaymentMethodProviderInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ }
+
+ public function testGetMethods()
+ {
+ $paymentMethods = $this->paymentMethodProvider->getPaymentMethods();
+ $this->assertInternalType('array', $paymentMethods);
+ $this->assertEmpty($paymentMethods);
+ }
+
+ public function testRegistry()
+ {
+ $method = $this->createMock(PaymentMethodInterface::class);
+
+ $this->provider->expects($this->once())
+ ->method('getPaymentMethods')
+ ->willReturn(['test_name' => $method]);
+
+ $this->provider->expects($this->once())
+ ->method('getPaymentMethod')
+ ->with('test_name')
+ ->willReturn($method);
+
+ $this->provider->expects($this->once())
+ ->method('hasPaymentMethod')
+ ->with('test_name')
+ ->willReturn(true);
+
+ $this->paymentMethodProvider->addProvider($this->provider);
+ $this->assertEquals($method, $this->paymentMethodProvider->getPaymentMethod('test_name'));
+ $this->assertEquals(['test_name' => $method], $this->paymentMethodProvider->getPaymentMethods());
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage There is no payment method for "wrong_name" identifier
+ */
+ public function testRegistryWrongMethod()
+ {
+ $this->paymentMethodProvider->getPaymentMethod('wrong_name');
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/BasicMethodRemovalEventDispatcherTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/BasicMethodRemovalEventDispatcherTest.php
new file mode 100644
index 000000000..e98c800e8
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/BasicMethodRemovalEventDispatcherTest.php
@@ -0,0 +1,37 @@
+eventDispatcher = $this->createMock(EventDispatcherInterface::class);
+
+ $this->dispatcher = new BasicMethodRemovalEventDispatcher($this->eventDispatcher);
+ }
+
+ public function testDispatch()
+ {
+ $methodId = 'method';
+ $this->eventDispatcher->expects($this->once())
+ ->method('dispatch')
+ ->with(MethodRemovalEvent::NAME, new MethodRemovalEvent($methodId));
+
+ $this->dispatcher->dispatch($methodId);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/BasicMethodRenamingEventDispatcherTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/BasicMethodRenamingEventDispatcherTest.php
new file mode 100644
index 000000000..d6b926e61
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/BasicMethodRenamingEventDispatcherTest.php
@@ -0,0 +1,38 @@
+eventDispatcher = $this->createMock(EventDispatcherInterface::class);
+
+ $this->dispatcher = new BasicMethodRenamingEventDispatcher($this->eventDispatcher);
+ }
+
+ public function testDispatch()
+ {
+ $oldId = 'old_id';
+ $newId = 'new_id';
+ $this->eventDispatcher->expects($this->once())
+ ->method('dispatch')
+ ->with(MethodRenamingEvent::NAME, new MethodRenamingEvent($oldId, $newId));
+
+ $this->dispatcher->dispatch($oldId, $newId);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/MethodRemovalEventTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/MethodRemovalEventTest.php
new file mode 100644
index 000000000..135a5c21c
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/MethodRemovalEventTest.php
@@ -0,0 +1,17 @@
+assertSame($methodId, $event->getMethodIdentifier());
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/MethodRenamingEventTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/MethodRenamingEventTest.php
new file mode 100644
index 000000000..ec365e1eb
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Event/MethodRenamingEventTest.php
@@ -0,0 +1,19 @@
+assertSame($oldId, $event->getOldMethodIdentifier());
+ $this->assertSame($newId, $event->getNewMethodIdentifier());
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/IntegrationRemovalListenerTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/IntegrationRemovalListenerTest.php
new file mode 100644
index 000000000..f03ff07da
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/IntegrationRemovalListenerTest.php
@@ -0,0 +1,96 @@
+channelType = 'payment_method';
+ $this->identifierGenerator = $this->createMock(IntegrationIdentifierGeneratorInterface::class);
+ $this->dispatcher = $this->createMock(MethodRemovalEventDispatcherInterface::class);
+
+ $this->listener = new IntegrationRemovalListener(
+ $this->channelType,
+ $this->identifierGenerator,
+ $this->dispatcher
+ );
+ }
+
+ public function testPreRemove()
+ {
+ /** @var Channel|\PHPUnit\Framework\MockObject\MockObject $channel */
+ $channel = $this->createMock(Channel::class);
+ $channel->expects(static::once())
+ ->method('getType')
+ ->willReturn($this->channelType);
+
+ /** @var ChannelDeleteEvent|\PHPUnit\Framework\MockObject\MockObject $event */
+ $event = $this->createMock(ChannelDeleteEvent::class);
+ $event->expects(static::any())
+ ->method('getChannel')
+ ->willReturn($channel);
+
+ $identifier = 'method';
+
+ $this->identifierGenerator->expects(static::once())
+ ->method('generateIdentifier')
+ ->with($channel)
+ ->willReturn($identifier);
+
+ $this->dispatcher->expects(static::once())
+ ->method('dispatch')
+ ->with($identifier);
+
+ $this->listener->onRemove($event);
+ }
+
+ public function testPreRemoveOtherType()
+ {
+ /** @var Channel|\PHPUnit\Framework\MockObject\MockObject $channel */
+ $channel = $this->createMock(Channel::class);
+ $channel->expects(static::once())
+ ->method('getType')
+ ->willReturn('other_type');
+
+ /** @var ChannelDeleteEvent|\PHPUnit\Framework\MockObject\MockObject $event */
+ $event = $this->createMock(ChannelDeleteEvent::class);
+ $event->expects(static::any())
+ ->method('getChannel')
+ ->willReturn($channel);
+
+ $this->identifierGenerator->expects(static::never())
+ ->method('generateIdentifier');
+
+ $this->dispatcher->expects(static::never())
+ ->method('dispatch');
+
+ $this->listener->onRemove($event);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/MethodRenamingListenerTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/MethodRenamingListenerTest.php
new file mode 100644
index 000000000..2deeb0088
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/MethodRenamingListenerTest.php
@@ -0,0 +1,59 @@
+paymentMethodConfigRepository = $this->createMock(PaymentMethodConfigRepository::class);
+ $this->listener = new MethodRenamingListener($this->paymentMethodConfigRepository);
+ }
+
+ public function testOnMethodRename()
+ {
+ $oldId = 'old_name';
+ $newId = 'new_name';
+
+ /** @var MethodRenamingEvent|\PHPUnit\Framework\MockObject\MockObject $event */
+ $event = $this->createMock(MethodRenamingEvent::class);
+ $event->expects(static::any())
+ ->method('getOldMethodIdentifier')
+ ->willReturn($oldId);
+
+ $event->expects(static::any())
+ ->method('getNewMethodIdentifier')
+ ->willReturn($newId);
+
+ $config1 = $this->createMock(PaymentMethodConfig::class);
+ $config1->expects(static::once())
+ ->method('setMethod')
+ ->with($newId);
+ $config2 = $this->createMock(PaymentMethodConfig::class);
+ $config2->expects(static::once())
+ ->method('setMethod')
+ ->with($newId);
+
+ $this->paymentMethodConfigRepository->expects(static::once())
+ ->method('findByMethod')
+ ->with($oldId)
+ ->willReturn([$config1, $config2]);
+
+ $this->listener->onMethodRename($event);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/PaymentMethodDisableIntegrationListenerTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/PaymentMethodDisableIntegrationListenerTest.php
new file mode 100644
index 000000000..81f42964c
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/EventListener/PaymentMethodDisableIntegrationListenerTest.php
@@ -0,0 +1,111 @@
+channelType = 'integration_payment_method';
+
+ $this->methodIdentifierGenerator = $this->createMock(
+ IntegrationIdentifierGeneratorInterface::class
+ );
+ $this->handler = $this->createMock(
+ PaymentMethodDisableHandlerInterface::class
+ );
+ $this->event = $this->createMock(
+ ChannelDisableEvent::class
+ );
+ $this->listener = new PaymentMethodDisableIntegrationListener(
+ $this->channelType,
+ $this->methodIdentifierGenerator,
+ $this->handler
+ );
+ }
+
+ public function testOnIntegrationDisable()
+ {
+ $methodIdentifier = 'method_1';
+ $channel = $this->createMock(Channel::class);
+
+ $this->event
+ ->expects(static::once())
+ ->method('getChannel')
+ ->willReturn($channel);
+
+ $channel
+ ->expects(static::once())
+ ->method('getType')
+ ->willReturn($this->channelType);
+
+ $this->methodIdentifierGenerator
+ ->expects(static::once())
+ ->method('generateIdentifier')
+ ->with($channel)
+ ->willReturn($methodIdentifier);
+
+ $this->handler
+ ->expects(static::once())
+ ->method('handleMethodDisable')
+ ->with($methodIdentifier);
+
+ $this->listener->onIntegrationDisable($this->event);
+ }
+
+ public function testOnIntegrationDisableWithAnotherType()
+ {
+ $channel = $this->createMock(Channel::class);
+
+ $this->event
+ ->expects(static::once())
+ ->method('getChannel')
+ ->willReturn($channel);
+
+ $channel
+ ->expects(static::once())
+ ->method('getType')
+ ->willReturn('another_type');
+
+ $this->methodIdentifierGenerator
+ ->expects(static::never())
+ ->method('generateIdentifier');
+
+ $this->handler
+ ->expects(static::never())
+ ->method('handleMethodDisable');
+
+ $this->listener->onIntegrationDisable($this->event);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Handler/RulesPaymentMethodDisableHandlerDecoratorTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Handler/RulesPaymentMethodDisableHandlerDecoratorTest.php
new file mode 100644
index 000000000..1f790f4a1
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Handler/RulesPaymentMethodDisableHandlerDecoratorTest.php
@@ -0,0 +1,151 @@
+handler = $this->createMock(PaymentMethodDisableHandlerInterface::class);
+ $this->repository = $this->createMock(PaymentMethodsConfigsRuleRepository::class);
+ $this->paymentMethodProvider = $this->createMock(PaymentMethodProviderInterface::class);
+
+ $this->decorator = new RulesPaymentMethodDisableHandlerDecorator(
+ $this->handler,
+ $this->repository,
+ $this->paymentMethodProvider
+ );
+ }
+
+ /**
+ * @param string $disabledMethodId
+ * @param array $configs
+ * @param array $registryMap
+ *
+ * @dataProvider testHandleMethodDisableProvider
+ */
+ public function testHandleMethodDisable($disabledMethodId, $configs, $registryMap)
+ {
+ $this->handler->expects(self::once())->method('handleMethodDisable')->with($disabledMethodId);
+
+ $configMocks = [];
+ $registryMapValues = [];
+ $methods = [];
+ foreach ($registryMap as $methodId => $enabled) {
+ $methods[$methodId] = $this->createMock(PaymentMethodInterface::class);
+ $methods[$methodId]->expects(self::any())->method('isEnabled')->willReturn($enabled);
+ $registryMapValues[] = [$methodId, $methods[$methodId]];
+ }
+
+ $rules = [];
+ foreach ($configs as $configName => $config) {
+ $methodConfigs = [];
+ foreach ($config['methods'] as $methodId) {
+ $methodConfig = $this->createMock(PaymentMethodConfig::class);
+ $methodConfig->expects(self::once())->method('getMethod')->willReturn($methodId);
+ $methodConfigs[] = $methodConfig;
+ }
+ $rules[$configName] = $this->createMock(Rule::class);
+ $rules[$configName]->expects(self::exactly($config['rule_disabled']))->method('setEnabled')->with(false);
+
+ $configMock = $this->createMock(PaymentMethodsConfigsRule::class);
+ $configMock->expects(self::once())
+ ->method('getMethodConfigs')
+ ->willReturn($methodConfigs);
+ $configMock->expects(self::any())
+ ->method('getRule')
+ ->willReturn($rules[$configName]);
+ $configMocks[] = $configMock;
+ }
+
+ $this->paymentMethodProvider
+ ->method('getPaymentMethod')
+ ->will($this->returnValueMap($registryMapValues));
+
+ $this->repository->expects(self::once())
+ ->method('getEnabledRulesByMethod')
+ ->willReturn($configMocks);
+
+ $this->decorator->handleMethodDisable($disabledMethodId);
+ }
+
+ /**
+ * @return array
+ */
+ public function testHandleMethodDisableProvider()
+ {
+ return [
+ 'a_few_methods' =>
+ [
+ 'methodId' => 'method1',
+ 'configs' =>
+ [
+ 'config1' =>
+ [
+ 'methods' => ['method1', 'method2'],
+ 'rule_disabled' => 1,
+ ],
+ 'config2' =>
+ [
+ 'methods' => ['method1', 'method3'],
+ 'rule_disabled' => 0,
+ ]
+ ],
+ 'registry_map' =>
+ [
+ 'method1' => true,
+ 'method2' => false,
+ 'method3' => true,
+ ],
+ ],
+ 'only_method' =>
+ [
+ 'methodId' => 'method1',
+ 'configs' =>
+ [
+ 'config1' =>
+ [
+ 'methods' => ['method1'],
+ 'rule_disabled' => 1,
+ ],
+ ],
+ 'registry_map' =>
+ [
+ 'method1' => true,
+ ],
+ ],
+ ];
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/PaymentMethodViewCollectionTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/PaymentMethodViewCollectionTest.php
new file mode 100644
index 000000000..e8150352d
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/PaymentMethodViewCollectionTest.php
@@ -0,0 +1,212 @@
+createCollection();
+
+ $methodId = 'someMethodId';
+
+ $view = [
+ 'someField1' => 'someValue1',
+ 'someField2' => 'someValue2',
+ 'sortOrder' => 1
+ ];
+
+ $addResult = $collection->addMethodView($methodId, $view);
+
+ $actualView = $collection->getMethodView($methodId);
+
+ $this->assertEquals($collection, $addResult);
+ $this->assertNotNull($actualView);
+ $this->assertEquals($view, $actualView);
+ }
+
+ public function testGetMethodViewWhenNotExists()
+ {
+ $collection = $this->createCollection();
+
+ $methodId = 'someMethodId';
+
+ $actualView = $collection->getMethodView($methodId);
+
+ $this->assertNull($actualView);
+ }
+
+ public function testAddMethodViewWhenAlreadyExists()
+ {
+ $methodId = 'someMethodId';
+
+ $collection = $this->createCollection();
+
+ $view = [
+ 'someField1' => 'someValue1',
+ 'someField2' => 'someValue2',
+ 'sortOrder' => 1
+ ];
+
+ $collection->addMethodView($methodId, $view);
+
+ $view2 = [
+ 'someField3' => 'someValue4',
+ 'someField4' => 'someValue4',
+ 'sortOrder' => 1
+ ];
+
+ $addMethodViewResult = $collection->addMethodView($methodId, $view2);
+
+ $actualView = $collection->getMethodView($methodId);
+
+ $this->assertNotNull($actualView);
+ $this->assertEquals($view, $actualView);
+ $this->assertEquals($collection, $addMethodViewResult);
+ }
+
+ public function testHasMethodView()
+ {
+ $methodId = 'someMethodId';
+ $collection = $this->createCollection();
+
+ $collection->addMethodView($methodId, []);
+
+ $this->assertTrue($collection->hasMethodView($methodId));
+ }
+
+ public function testHasMethodViewNotExists()
+ {
+ $collection = $this->createCollection();
+
+ $this->assertFalse($collection->hasMethodView('someMethodId'));
+ }
+
+ public function testRemoveMethodView()
+ {
+ $methodId = 'someMethodId';
+ $collection = $this->createCollection();
+
+ $collection->addMethodView($methodId, []);
+
+ $this->assertTrue($collection->hasMethodView($methodId));
+
+ $removeResult = $collection->removeMethodView($methodId);
+
+ $this->assertEquals($collection, $removeResult);
+ $this->assertFalse($collection->hasMethodView($methodId));
+ }
+
+ public function testRemoveMethodViewWhenNotExists()
+ {
+ $methodId = 'someMethodId';
+ $collection = $this->createCollection();
+
+ $removeResult = $collection->removeMethodView($methodId);
+
+ $this->assertEquals($collection, $removeResult);
+ $this->assertFalse($collection->hasMethodView($methodId));
+ }
+
+ public function testGetAllMethodsViews()
+ {
+ $collection = $this->createCollection();
+
+ $this->assertEquals([], $collection->getAllMethodsViews());
+
+ $methodId = 'someMethodId';
+
+ $methodView = [
+ 'someField1' => 'someValue1',
+ 'someField2' => 'someValue2',
+ 'sortOrder' => 1
+ ];
+
+ $collection->addMethodView($methodId, $methodView);
+
+ $this->assertEquals([$methodId => $methodView], $collection->getAllMethodsViews());
+
+ $methodId2 = 'someOtherMethodId';
+
+ $methodView2 = [
+ 'someField1' => 'someValue1',
+ 'someField2' => 'someValue2',
+ 'sortOrder' => 1
+ ];
+
+ $collection->addMethodView($methodId2, $methodView2);
+
+ $this->assertEquals([$methodId => $methodView, $methodId2 => $methodView2], $collection->getAllMethodsViews());
+ }
+
+ public function testToArray()
+ {
+ $collection = $this->createCollection();
+
+ $methodId = 'someMethodId';
+
+ $methodView = [
+ 'someField1' => 'someValue1',
+ 'someField2' => 'someValue2',
+ 'sortOrder' => 1
+ ];
+
+ $collection->addMethodView($methodId, $methodView);
+
+ $methodId2 = 'someOtherMethodId';
+
+ $methodView2 = [
+ 'someField1' => 'someValue1',
+ 'someField2' => 'someValue2',
+ 'sortOrder' => 1
+ ];
+
+ $collection->addMethodView($methodId2, $methodView2);
+
+ $this->assertEquals(
+ [
+ $methodId => $methodView,
+ $methodId2 => $methodView2
+ ],
+ $collection->toArray()
+ );
+ }
+
+ public function testIsEmpty()
+ {
+ $collection = $this->createCollection();
+
+ $methodId = 'someMethodId';
+
+ $methodView = [
+ 'someField1' => 'someValue1',
+ 'someField2' => 'someValue2',
+ 'sortOrder' => 1
+ ];
+
+ $this->assertTrue($collection->isEmpty());
+
+ $collection->addMethodView($methodId, $methodView);
+
+ $this->assertFalse($collection->isEmpty());
+
+ $collection->clear();
+
+ $this->assertTrue($collection->isEmpty());
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/PaymentMethodViewFactoryTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/PaymentMethodViewFactoryTest.php
new file mode 100644
index 000000000..20f85b362
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/PaymentMethodViewFactoryTest.php
@@ -0,0 +1,53 @@
+paymentMethodProviderMock = $this
+ ->getMockBuilder(PaymentMethodProviderInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->paymentMethodViewFactory = new PaymentMethodViewFactory($this->paymentMethodProviderMock);
+ }
+
+ public function testCreateMethodView()
+ {
+ $methodId = 'someId';
+ $label = 'someLabel';
+ $sortOrder = 5;
+ $options = [
+ 'option1',
+ 'option2'
+ ];
+
+ $expected = [
+ 'identifier' => $methodId,
+ 'label' => $label,
+ 'sortOrder' => $sortOrder,
+ 'options' => $options
+ ];
+
+ $actual = $this->paymentMethodViewFactory->createMethodView($methodId, $label, $sortOrder, $options);
+
+ $this->assertEquals($expected, $actual);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Provider/ChannelPaymentMethodProviderTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Provider/ChannelPaymentMethodProviderTest.php
new file mode 100644
index 000000000..81c3f9c5f
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Method/Provider/ChannelPaymentMethodProviderTest.php
@@ -0,0 +1,136 @@
+doctrineHelper = $this->createMock(DoctrineHelper::class);
+ $repository = $this->createMock(ChannelRepository::class);
+
+ $this->doctrineHelper
+ ->method('getEntityRepository')
+ ->with('OroIntegrationBundle:Channel')
+ ->willReturn($repository);
+
+ $loadedChannel = $this->createChannel('ch_enabled');
+ $fetchedChannel = $this->createChannel('ch_disabled');
+
+ $this->enabledMethod = $this->createMock(PaymentMethodInterface::class);
+ $this->enabledMethod
+ ->method('getIdentifier')
+ ->willReturn('ups_10');
+
+ $this->disabledMethod = $this->createMock(PaymentMethodInterface::class);
+ $this->disabledMethod
+ ->method('getIdentifier')
+ ->willReturn('ups_20');
+
+ $this->methodFactory = $this->createMock(IntegrationPaymentMethodFactoryInterface::class);
+ $this->methodFactory
+ ->method('create')
+ ->will($this->returnValueMap([
+ [$loadedChannel, $this->enabledMethod],
+ [$fetchedChannel, $this->disabledMethod],
+ ]));
+
+ $this->provider = new ChannelPaymentMethodProvider(static::TYPE, $this->doctrineHelper, $this->methodFactory);
+
+ $doctrineEvent = $this->createLifecycleEventArgsMock();
+ $this->provider->postLoad($loadedChannel, $doctrineEvent);
+
+ $repository
+ ->method('findByTypeAndExclude')
+ ->will(static::returnCallback(function () use ($fetchedChannel, $doctrineEvent) {
+ $this->provider->postLoad($fetchedChannel, $doctrineEvent);
+ return [$fetchedChannel];
+ }));
+ }
+
+ public function testGetPaymentMethods()
+ {
+ $methods = $this->provider->getPaymentMethods();
+ static::assertCount(2, $methods);
+ $actualMethod = reset($methods);
+ static::assertSame($this->enabledMethod, $actualMethod);
+ }
+
+ public function testGetPaymentMethod()
+ {
+ $method = $this->provider->getPaymentMethod($this->enabledMethod->getIdentifier());
+ static::assertInstanceOf(PaymentMethodInterface::class, $method);
+ }
+
+ public function testHasPaymentMethod()
+ {
+ static::assertTrue($this->provider->hasPaymentMethod($this->enabledMethod->getIdentifier()));
+ }
+
+ public function testHasPaymentMethodFalse()
+ {
+ static::assertFalse($this->provider->hasPaymentMethod('wrong'));
+ }
+
+ /**
+ * @param string $name
+ *
+ * @return Channel
+ */
+ private function createChannel($name)
+ {
+ return $this->getEntity(
+ Channel::class,
+ ['id' => 20, 'name' => $name, 'type' => static::TYPE]
+ );
+ }
+
+ /**
+ * @return LifecycleEventArgs|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private function createLifecycleEventArgsMock()
+ {
+ return $this->createMock(LifecycleEventArgs::class);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/BasicPaymentMethodChoicesProviderTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/BasicPaymentMethodChoicesProviderTest.php
new file mode 100644
index 000000000..8e4979a52
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/BasicPaymentMethodChoicesProviderTest.php
@@ -0,0 +1,135 @@
+paymentMethodProvider = $this->createMock(PaymentMethodProviderInterface::class);
+ $this->translator = $this->createMock(TranslatorInterface::class);
+ $this->choicesProvider = new BasicPaymentMethodChoicesProvider(
+ $this->paymentMethodProvider,
+ $this->translator
+ );
+ }
+
+ /**
+ * @param array $methods
+ * @param array $result
+ * @param bool $translate
+ *
+ * @dataProvider methodsProvider
+ */
+ public function testGetMethods($methods, $result, $translate = false)
+ {
+ $translation = [
+ ['bank transfer', [], null, null, 'bank transfer translated'],
+ ['payment term', [], null, null, 'payment term translated'],
+ ];
+
+ $this->paymentMethodProvider->expects($this->once())
+ ->method('getPaymentMethods')
+ ->willReturn($methods);
+
+ $this->translator->expects($this->any())
+ ->method('trans')
+ ->will($this->returnValueMap($translation));
+
+ $this->assertEquals($result, $this->choicesProvider->getMethods($translate));
+ }
+
+ /**
+ * @return array
+ */
+ public function methodsProvider()
+ {
+ return
+ [
+ 'some_methods' =>
+ [
+ 'methods' =>
+ [
+ 'payment_term' => $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'payment_term',
+ 'sortOrder' => 1,
+ 'label' => 'payment term',
+ 'isEnabled' => false,
+ 'options' => [],
+ ]
+ ),
+ 'bank_transfer' => $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'bank_transfer',
+ 'sortOrder' => 1,
+ 'label' => 'bank transfer',
+ 'isEnabled' => true,
+ 'options' => [],
+ ]
+ ),
+ ],
+ 'result' => ['payment_term' => 'payment term', 'bank_transfer' => 'bank transfer'],
+ 'translate' => false,
+ ],
+ 'some_methods_with_translation' =>
+ [
+ 'methods' =>
+ [
+ 'bank_transfer' => $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'bank_transfer',
+ 'sortOrder' => 1,
+ 'label' => 'bank transfer',
+ 'isEnabled' => true,
+ 'options' => [],
+ ]
+ ),
+ 'payment_term' => $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'payment_term',
+ 'sortOrder' => 1,
+ 'label' => 'payment term',
+ 'isEnabled' => false,
+ 'options' => [],
+ ]
+ ),
+ ],
+ 'result' => ['bank_transfer' => 'bank transfer translated', 'payment_term' => 'payment term translated'],
+ 'translate' => true,
+ ],
+ 'no_methods' =>
+ [
+ 'methods' => [],
+ 'result' => [],
+ ],
+ ];
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/EnabledPaymentMethodChoicesProviderDecoratorTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/EnabledPaymentMethodChoicesProviderDecoratorTest.php
new file mode 100644
index 000000000..6e995f9b3
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/EnabledPaymentMethodChoicesProviderDecoratorTest.php
@@ -0,0 +1,178 @@
+paymentMethodProvider = $this->createMock(PaymentMethodProviderInterface::class);
+ $this->choicesProvider = $this->createMock(PaymentMethodChoicesProviderInterface::class);
+ $this->enabledChoicesProvider = new EnabledPaymentMethodChoicesProviderDecorator(
+ $this->paymentMethodProvider,
+ $this->choicesProvider
+ );
+ }
+
+ /**
+ * @param array $registryMap
+ * @param array $choices
+ * @param array $result
+ *
+ * @dataProvider methodsProvider
+ */
+ public function testGetMethods($registryMap, $choices, $result)
+ {
+ $this->paymentMethodProvider->expects($this->any())
+ ->method('getPaymentMethod')
+ ->will($this->returnValueMap($registryMap));
+
+ $this->choicesProvider->expects($this->once())
+ ->method('getMethods')
+ ->willReturn($choices);
+
+ $this->assertEquals($result, $this->enabledChoicesProvider->getMethods());
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @return array
+ */
+ public function methodsProvider()
+ {
+ return
+ [
+ 'all_methods_enabled' =>
+ [
+ 'methods_map' =>
+ [
+ [
+ 'bank_transfer',
+ $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'bank_transfer',
+ 'sortOrder' => 1,
+ 'label' => 'bank transfer',
+ 'isEnabled' => true,
+ 'options' => ['instructions'],
+ ]
+ ),
+ ],
+ [
+ 'payment_term',
+ $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'payment_term',
+ 'sortOrder' => 1,
+ 'label' => 'payment term',
+ 'isEnabled' => true,
+ 'options' => [],
+ ]
+ ),
+ ],
+ ],
+ 'choices' => ['payment_term' => 'payment term', 'bank_transfer' => 'bank transfer'],
+ 'result' => ['payment_term' => 'payment term', 'bank_transfer' => 'bank transfer'],
+ ],
+ 'some_methods_disabled' =>
+ [
+ 'methods_map' =>
+ [
+ [
+ 'bank_transfer',
+ $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'bank_transfer',
+ 'sortOrder' => 1,
+ 'label' => 'bank transfer',
+ 'isEnabled' => true,
+ 'options' => ['instructions'],
+ ]
+ ),
+ ],
+ [
+ 'payment_term',
+ $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'payment_term',
+ 'sortOrder' => 1,
+ 'label' => 'payment term',
+ 'isEnabled' => false,
+ 'options' => [],
+ ]
+ ),
+ ],
+ ],
+ 'choices' => ['bank_transfer' => 'bank transfer', 'payment_term' => 'payment term'],
+ 'result' => ['bank_transfer' => 'bank transfer'],
+ ],
+ 'all_disabled_methods' =>
+ [
+ 'methods_map' =>
+ [
+ [
+ 'bank_transfer',
+ $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'bank_transfer',
+ 'sortOrder' => 1,
+ 'label' => 'bank transfer',
+ 'isEnabled' => false,
+ 'options' => [],
+ ]
+ ),
+ ],
+ [
+ 'payment_term',
+ $this->getEntity(
+ PaymentMethodStub::class,
+ [
+ 'identifier' => 'payment_term',
+ 'sortOrder' => 1,
+ 'label' => 'payment term',
+ 'isEnabled' => false,
+ 'options' => [],
+ ]
+ ),
+ ],
+ ],
+ 'choices' => ['flat rate' => 'flat_rate', 'ups' => 'ups'],
+ 'result' => [],
+ ],
+ 'no_methods' =>
+ [
+ 'methods' => [],
+ 'choices' => [],
+ 'result' => [],
+ ],
+ ];
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/MethodsConfigsRule/Context/Basic/BasicMethodsConfigsRulesByContextProviderTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/MethodsConfigsRule/Context/Basic/BasicMethodsConfigsRulesByContextProviderTest.php
new file mode 100644
index 000000000..fb37624f5
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/MethodsConfigsRule/Context/Basic/BasicMethodsConfigsRulesByContextProviderTest.php
@@ -0,0 +1,114 @@
+repository = $this->createMock(PaymentMethodsConfigsRuleRepository::class);
+
+ $this->filtrationService = $this->createMock(MethodsConfigsRulesFiltrationServiceInterface::class);
+
+ $this->provider = new BasicMethodsConfigsRulesByContextProvider(
+ $this->filtrationService,
+ $this->repository
+ );
+ }
+
+ public function testGetAllFilteredPaymentMethodsConfigsWithBillingAddress()
+ {
+ $currency = 'USD';
+ $address = $this->createAddressMock();
+ $rulesFromDb = [
+ $this->createPaymentMethodsConfigsRuleMock(),
+ $this->createPaymentMethodsConfigsRuleMock(),
+ ];
+
+ $this->repository->expects(static::once())
+ ->method('getByDestinationAndCurrency')
+ ->with($address, $currency)
+ ->willReturn($rulesFromDb);
+
+ $this->repository->expects(static::never())
+ ->method('getByCurrencyWithoutDestination');
+
+ $context = $this->createPaymentContextMock();
+ $context->method('getCurrency')
+ ->willReturn($currency);
+ $context->method('getBillingAddress')
+ ->willReturn($address);
+
+ $expectedRules = [$this->createPaymentMethodsConfigsRuleMock()];
+
+ $this->filtrationService->expects(static::once())
+ ->method('getFilteredPaymentMethodsConfigsRules')
+ ->with($rulesFromDb)
+ ->willReturn($expectedRules);
+
+ static::assertSame(
+ $expectedRules,
+ $this->provider->getPaymentMethodsConfigsRules($context)
+ );
+ }
+
+ public function testGetAllFilteredPaymentMethodsConfigsWithoutShippingAddress()
+ {
+ $currency = 'USD';
+ $rulesFromDb = [$this->createPaymentMethodsConfigsRuleMock()];
+
+ $this->repository->expects(static::once())
+ ->method('getByCurrencyWithoutDestination')
+ ->with($currency)
+ ->willReturn($rulesFromDb);
+
+ $context = $this->createPaymentContextMock();
+ $context->method('getCurrency')
+ ->willReturn($currency);
+
+ $expectedRules = [$this->createPaymentMethodsConfigsRuleMock()];
+
+ $this->filtrationService->expects(static::once())
+ ->method('getFilteredPaymentMethodsConfigsRules')
+ ->with($rulesFromDb)
+ ->willReturn($expectedRules);
+
+ static::assertSame(
+ $expectedRules,
+ $this->provider->getPaymentMethodsConfigsRules($context)
+ );
+ }
+
+ /**
+ * @return AddressInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private function createAddressMock()
+ {
+ return $this->createMock(AddressInterface::class);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/MethodsConfigsRule/Context/RegardlessDestination/RegardlessDestinationMethodsConfigsRulesByContextProviderTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/MethodsConfigsRule/Context/RegardlessDestination/RegardlessDestinationMethodsConfigsRulesByContextProviderTest.php
new file mode 100644
index 000000000..16b011b02
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/MethodsConfigsRule/Context/RegardlessDestination/RegardlessDestinationMethodsConfigsRulesByContextProviderTest.php
@@ -0,0 +1,114 @@
+repository = $this->createMock(PaymentMethodsConfigsRuleRepository::class);
+
+ $this->filtrationService = $this->createMock(MethodsConfigsRulesFiltrationServiceInterface::class);
+
+ $this->provider = new RegardlessDestination\RegardlessDestinationMethodsConfigsRulesByContextProvider(
+ $this->filtrationService,
+ $this->repository
+ );
+ }
+
+ public function testGetAllFilteredPaymentMethodsConfigsWithBillingAddress()
+ {
+ $currency = 'USD';
+ $address = $this->createAddressMock();
+ $rulesFromDb = [$this->createPaymentMethodsConfigsRuleMock()];
+
+ $this->repository->expects(static::once())
+ ->method('getByDestinationAndCurrency')
+ ->with($address, $currency)
+ ->willReturn($rulesFromDb);
+
+ $this->repository->expects(static::never())
+ ->method('getByCurrency');
+
+ $context = $this->createPaymentContextMock();
+ $context->method('getCurrency')
+ ->willReturn($currency);
+ $context->method('getBillingAddress')
+ ->willReturn($address);
+
+ $expectedRules = [
+ $this->createPaymentMethodsConfigsRuleMock(),
+ $this->createPaymentMethodsConfigsRuleMock(),
+ ];
+
+ $this->filtrationService->expects(static::once())
+ ->method('getFilteredPaymentMethodsConfigsRules')
+ ->with($rulesFromDb)
+ ->willReturn($expectedRules);
+
+ static::assertSame(
+ $expectedRules,
+ $this->provider->getPaymentMethodsConfigsRules($context)
+ );
+ }
+
+ public function testGetAllFilteredPaymentMethodsConfigsWithoutBillingAddress()
+ {
+ $currency = 'USD';
+ $rulesFromDb = [$this->createPaymentMethodsConfigsRuleMock()];
+
+ $this->repository->expects(static::once())
+ ->method('getByCurrency')
+ ->with($currency)
+ ->willReturn($rulesFromDb);
+
+ $context = $this->createPaymentContextMock();
+ $context->method('getCurrency')
+ ->willReturn($currency);
+
+ $expectedRules = [$this->createPaymentMethodsConfigsRuleMock()];
+
+ $this->filtrationService->expects(static::once())
+ ->method('getFilteredPaymentMethodsConfigsRules')
+ ->with($rulesFromDb)
+ ->willReturn($expectedRules);
+
+ static::assertSame(
+ $expectedRules,
+ $this->provider->getPaymentMethodsConfigsRules($context)
+ );
+ }
+
+ /**
+ * @return AddressInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private function createAddressMock()
+ {
+ return $this->createMock(AddressInterface::class);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/Stub/PaymentMethodProviderStub.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/Stub/PaymentMethodProviderStub.php
new file mode 100644
index 000000000..94a3f3889
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/Stub/PaymentMethodProviderStub.php
@@ -0,0 +1,48 @@
+setIdentifier(self::METHOD_IDENTIFIER);
+
+ $this->method = $method;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getPaymentMethods()
+ {
+ return [$this->method->getIdentifier() => $this->method];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getPaymentMethod($name)
+ {
+ if ($name === $this->method->getIdentifier()) {
+ return $this->method;
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function hasPaymentMethod($name)
+ {
+ return $name === $this->method->getIdentifier();
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/Stub/PaymentMethodStub.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/Stub/PaymentMethodStub.php
new file mode 100644
index 000000000..ad649e6b6
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/Provider/Stub/PaymentMethodStub.php
@@ -0,0 +1,150 @@
+identifier;
+ }
+
+ /**
+ * @param string $identifier
+ * @return $this
+ */
+ public function setIdentifier($identifier)
+ {
+ $this->identifier = $identifier;
+
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getLabel()
+ {
+ return $this->label ?: $this->identifier . '.label';
+ }
+
+ /**
+ * @param string $label
+ * @return $this
+ */
+ public function setLabel($label)
+ {
+ $this->label = $label;
+
+ return $this;
+ }
+
+ /**
+ * @return int
+ */
+ public function getSortOrder()
+ {
+ return $this->sortOrder;
+ }
+
+ /**
+ * @param int $sortOrder
+ * @return $this
+ */
+ public function setSortOrder($sortOrder)
+ {
+ $this->sortOrder = $sortOrder;
+
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getOptionsConfigurationFormType()
+ {
+ return $this->optionsConfigurationFormType;
+ }
+
+ /**
+ * @param string $optionsConfigurationFormType
+ * @return $this
+ */
+ public function setOptionsConfigurationFormType($optionsConfigurationFormType)
+ {
+ $this->optionsConfigurationFormType = $optionsConfigurationFormType;
+
+ return $this;
+ }
+
+ /**
+ * @return boolean
+ */
+ public function isEnabled()
+ {
+ return $this->isEnabled;
+ }
+
+ /**
+ * @param boolean $isEnabled
+ * @return PaymentMethodStub
+ */
+ public function setEnabled($isEnabled)
+ {
+ $this->isEnabled = $isEnabled;
+ return $this;
+ }
+ /**
+ * @inheritDoc
+ */
+ public function getOptions()
+ {
+ return $this->options;
+ }
+
+ /**
+ * @param boolean $options
+ * @return PaymentMethodStub
+ */
+ public function setOptions($options)
+ {
+ $this->options = $options;
+ return $this;
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Tests/Unit/RuleFiltration/Basic/BasicMethodsConfigsRulesFiltrationServiceTest.php b/src/Marello/Bundle/PaymentBundle/Tests/Unit/RuleFiltration/Basic/BasicMethodsConfigsRulesFiltrationServiceTest.php
new file mode 100644
index 000000000..fb36cf77c
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Tests/Unit/RuleFiltration/Basic/BasicMethodsConfigsRulesFiltrationServiceTest.php
@@ -0,0 +1,96 @@
+filtrationService = $this->createMock(RuleFiltrationServiceInterface::class);
+ $this->paymentContextToRuleValuesConverter = $this
+ ->createMock(PaymentContextToRulesValueConverterInterface::class);
+
+ $this->basicMethodsConfigsRulesFiltrationService = new BasicMethodsConfigsRulesFiltrationService(
+ $this->filtrationService,
+ $this->paymentContextToRuleValuesConverter
+ );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function testGetFilteredPaymentMethodsConfigsRules()
+ {
+ $configRules = [
+ $this->createPaymentMethodsConfigsRule(),
+ $this->createPaymentMethodsConfigsRule(),
+ ];
+ $context = $this->createContextMock();
+ $values = [
+ 'currency' => 'USD',
+ ];
+
+ $this->paymentContextToRuleValuesConverter->expects(static::once())
+ ->method('convert')
+ ->with($context)
+ ->willReturn($values);
+
+ $expectedConfigRules = [
+ $this->createPaymentMethodsConfigsRule(),
+ $this->createPaymentMethodsConfigsRule(),
+ ];
+
+ $this->filtrationService->expects(static::once())
+ ->method('getFilteredRuleOwners')
+ ->with($configRules, $values)
+ ->willReturn($expectedConfigRules);
+
+ static::assertEquals(
+ $expectedConfigRules,
+ $this->basicMethodsConfigsRulesFiltrationService->getFilteredPaymentMethodsConfigsRules(
+ $configRules,
+ $context
+ )
+ );
+ }
+
+ /**
+ * @return PaymentContextInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private function createContextMock()
+ {
+ return $this->createMock(PaymentContextInterface::class);
+ }
+
+ /**
+ * @return PaymentMethodsConfigsRule|\PHPUnit\Framework\MockObject\MockObject
+ */
+ private function createPaymentMethodsConfigsRule()
+ {
+ return $this->createMock(PaymentMethodsConfigsRule::class);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentBundle/Twig/PaymentMethodExtension.php b/src/Marello/Bundle/PaymentBundle/Twig/PaymentMethodExtension.php
new file mode 100755
index 000000000..cea343cb2
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Twig/PaymentMethodExtension.php
@@ -0,0 +1,111 @@
+paymentMethodLabelFormatter = $paymentMethodLabelFormatter;
+ $this->dispatcher = $dispatcher;
+ $this->checker = $checker;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return static::PAYMENT_METHOD_EXTENSION_NAME;
+ }
+
+ /**
+ * @param string $paymentMethodName
+ *
+ * @return string Payment Method config template path
+ */
+ public function getPaymentMethodConfigRenderData($paymentMethodName)
+ {
+ $event = new PaymentMethodConfigDataEvent($paymentMethodName);
+ if (!array_key_exists($paymentMethodName, $this->configCache)) {
+ $this->dispatcher->dispatch(PaymentMethodConfigDataEvent::NAME, $event);
+ $template = $event->getTemplate();
+ if (!$template) {
+ $template = static::DEFAULT_METHOD_CONFIG_TEMPLATE;
+ }
+ $this->configCache[$paymentMethodName] = $template;
+ }
+
+ return $this->configCache[$paymentMethodName];
+ }
+
+ /**
+ * @param string $methodIdentifier
+ *
+ * @return bool
+ */
+ public function isPaymentMethodEnabled($methodIdentifier)
+ {
+ return $this->checker->isEnabled($methodIdentifier);
+ }
+
+ /**
+ * @return array
+ */
+ public function getFunctions()
+ {
+ return [
+ new TwigFunction(
+ 'marello_get_payment_method_label',
+ [$this->paymentMethodLabelFormatter, 'formatPaymentMethodLabel']
+ ),
+ new TwigFunction(
+ 'marello_payment_method_config_template',
+ [$this, 'getPaymentMethodConfigRenderData']
+ ),
+ new TwigFunction(
+ 'marello_payment_method_enabled',
+ [$this, 'isPaymentMethodEnabled']
+ )
+ ];
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Controller/PaymentTermController.php b/src/Marello/Bundle/PaymentTermBundle/Controller/PaymentTermController.php
index c0dc0ef48..5af2532b6 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Controller/PaymentTermController.php
+++ b/src/Marello/Bundle/PaymentTermBundle/Controller/PaymentTermController.php
@@ -4,20 +4,21 @@
use Marello\Bundle\PaymentTermBundle\Entity\PaymentTerm;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;
-class PaymentTermController extends Controller
+class PaymentTermController extends AbstractController
{
/**
- * @param Request $request
* @return array
*
- * @Route("/", name="marello_paymentterm_paymentterm_index")
- * @Template
+ * @Route(
+ * path="/",
+ * name="marello_paymentterm_paymentterm_index"
+ * )
+ * @Template("MarelloPaymentTermBundle:PaymentTerm:index.html.twig")
*/
- public function indexAction(Request $request)
+ public function indexAction()
{
return [
'entityClass' => PaymentTerm::class,
@@ -25,13 +26,15 @@ public function indexAction(Request $request)
}
/**
- * @param Request $request
* @return array|\Symfony\Component\HttpFoundation\RedirectResponse
*
- * @Route("/create", name="marello_paymentterm_paymentterm_create")
+ * @Route(
+ * path="/create",
+ * name="marello_paymentterm_paymentterm_create"
+ * )
* @Template("MarelloPaymentTermBundle:PaymentTerm:update.html.twig")
*/
- public function createAction(Request $request)
+ public function createAction()
{
$entity = new PaymentTerm();
@@ -39,14 +42,17 @@ public function createAction(Request $request)
}
/**
- * @param Request $request
* @param PaymentTerm $entity
* @return array|\Symfony\Component\HttpFoundation\RedirectResponse
*
- * @Route("/update/{id}", requirements={"id" = "\d+"}, name="marello_paymentterm_paymentterm_update")
+ * @Route(
+ * path="/update/{id}",
+ * requirements={"id" = "\d+"},
+ * name="marello_paymentterm_paymentterm_update"
+ * )
* @Template("MarelloPaymentTermBundle:PaymentTerm:update.html.twig")
*/
- public function updateAction(Request $request, PaymentTerm $entity)
+ public function updateAction(PaymentTerm $entity)
{
return $this->update($entity);
}
@@ -75,14 +81,17 @@ protected function update(PaymentTerm $entity)
}
/**
- * @param Request $request
* @param PaymentTerm $entity
* @return array
*
- * @Route("/view/{id}", requirements={"id" = "\d+"}, name="marello_paymentterm_paymentterm_view")
- * @Template
+ * @Route(
+ * path="/view/{id}",
+ * requirements={"id" = "\d+"},
+ * name="marello_paymentterm_paymentterm_view"
+ * )
+ * @Template("MarelloPaymentTermBundle:PaymentTerm:view.html.twig")
*/
- public function viewAction(Request $request, PaymentTerm $entity)
+ public function viewAction(PaymentTerm $entity)
{
return [
'entity' => $entity,
diff --git a/src/Marello/Bundle/PaymentTermBundle/Entity/PaymentTermSettings.php b/src/Marello/Bundle/PaymentTermBundle/Entity/PaymentTermSettings.php
new file mode 100644
index 000000000..f318823df
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/Entity/PaymentTermSettings.php
@@ -0,0 +1,98 @@
+labels = new ArrayCollection();
+ }
+
+ /**
+ * @return Collection|LocalizedFallbackValue[]
+ */
+ public function getLabels()
+ {
+ return $this->labels;
+ }
+
+ /**
+ * @param LocalizedFallbackValue $label
+ *
+ * @return PaymentTermSettings
+ */
+ public function addLabel(LocalizedFallbackValue $label)
+ {
+ if (!$this->labels->contains($label)) {
+ $this->labels->add($label);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param LocalizedFallbackValue $label
+ *
+ * @return PaymentTermSettings
+ */
+ public function removeLabel(LocalizedFallbackValue $label)
+ {
+ if ($this->labels->contains($label)) {
+ $this->labels->removeElement($label);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @return ParameterBag
+ */
+ public function getSettingsBag()
+ {
+ if (null === $this->settings) {
+ $this->settings = new ParameterBag([
+ self::SETTINGS_FIELD_LABELS => $this->getLabels()->toArray()
+ ]);
+ }
+
+ return $this->settings;
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Entity/Repository/PaymentTermSettingsRepository.php b/src/Marello/Bundle/PaymentTermBundle/Entity/Repository/PaymentTermSettingsRepository.php
new file mode 100644
index 000000000..38faa7834
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/Entity/Repository/PaymentTermSettingsRepository.php
@@ -0,0 +1,38 @@
+aclHelper = $aclHelper;
+ }
+
+ /**
+ * @return PaymentTermSettings[]
+ */
+ public function findWithEnabledChannel()
+ {
+ $qb = $this->createQueryBuilder('pts');
+
+ $qb
+ ->join('pts.channel', 'ch')
+ ->where('ch.enabled = true')
+ ->orderBy('pts.id');
+
+ return $this->aclHelper->apply($qb)->getResult();
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/EventListener/PaymentTermMethodViewListener.php b/src/Marello/Bundle/PaymentTermBundle/EventListener/PaymentTermMethodViewListener.php
new file mode 100644
index 000000000..5f4ee72f1
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/EventListener/PaymentTermMethodViewListener.php
@@ -0,0 +1,46 @@
+paymentTermProvider = $paymentTermProvider;
+ }
+
+ /**
+ * @param ApplicablePaymentMethodViewEvent $event
+ */
+ public function onApplicablePaymentMethodView(ApplicablePaymentMethodViewEvent $event)
+ {
+
+ if (strpos($event->getMethodId(), 'payment_term') !== false) {
+ $context = $event->getPaymentContext();
+ $options = $event->getOptions();
+ $paymentTerm = null;
+ if ($context->getCustomer()) {
+ $paymentTerm = $this->paymentTermProvider->getCustomerPaymentTerm($context->getCustomer());
+ }
+ if (!$paymentTerm) {
+ $paymentTerm = $this->paymentTermProvider->getDefaultPaymentTerm();
+ }
+ if ($paymentTerm) {
+ $options['code'] = $paymentTerm->getCode();
+ $options['term'] = $paymentTerm->getTerm();
+ $event->setOptions($options);
+ }
+ }
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Form/Type/PaymentTermChoiceType.php b/src/Marello/Bundle/PaymentTermBundle/Form/Type/PaymentTermChoiceType.php
index 1b1222a88..605422292 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Form/Type/PaymentTermChoiceType.php
+++ b/src/Marello/Bundle/PaymentTermBundle/Form/Type/PaymentTermChoiceType.php
@@ -2,7 +2,6 @@
namespace Marello\Bundle\PaymentTermBundle\Form\Type;
-use Marello\Bundle\PaymentTermBundle\Entity\PaymentTerm;
use Marello\Bundle\PaymentTermBundle\Provider\PaymentTermProvider;
use Oro\Bundle\LocaleBundle\Helper\LocalizationHelper;
use Symfony\Component\Form\AbstractType;
diff --git a/src/Marello/Bundle/PaymentTermBundle/Form/Type/PaymentTermSettingsType.php b/src/Marello/Bundle/PaymentTermBundle/Form/Type/PaymentTermSettingsType.php
new file mode 100644
index 000000000..00fa2f3b3
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/Form/Type/PaymentTermSettingsType.php
@@ -0,0 +1,61 @@
+add(
+ 'labels',
+ LocalizedFallbackValueCollectionType::class,
+ [
+ 'label' => 'marello.paymentterm.settings.labels.label',
+ 'required' => true,
+ 'entry_options' => ['constraints' => [new NotBlank()]],
+ ]
+ );
+ }
+
+ /**
+ * @param OptionsResolver $resolver
+ *
+ * @throws AccessException
+ */
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $resolver->setDefaults([
+ 'data_class' => PaymentTermSettings::class,
+ ]);
+ }
+
+ /**
+ * @return string
+ */
+ public function getBlockPrefix()
+ {
+ return self::BLOCK_PREFIX;
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Integration/PaymentTermChannelType.php b/src/Marello/Bundle/PaymentTermBundle/Integration/PaymentTermChannelType.php
new file mode 100644
index 000000000..363952058
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/Integration/PaymentTermChannelType.php
@@ -0,0 +1,27 @@
+identifierGenerator = $identifierGenerator;
+ $this->localizationHelper = $localizationHelper;
+ $this->integrationIconProvider = $integrationIconProvider;
+ }
+
+ /**
+ * @param Channel $channel
+ *
+ * @return ManualShippingMethod
+ */
+ public function create(Channel $channel)
+ {
+ $id = $this->identifierGenerator->generateIdentifier($channel);
+ $label = $this->getChannelLabel($channel);
+ $icon = $this->getIcon($channel);
+
+ return new PaymentTermMethod($id, $label, $icon, $channel->isEnabled());
+ }
+
+ /**
+ * @param Channel $channel
+ *
+ * @return string
+ */
+ private function getChannelLabel(Channel $channel)
+ {
+ /** @var ManualShippingSettings $transport */
+ $transport = $channel->getTransport();
+
+ return (string) $this->localizationHelper->getLocalizedValue($transport->getLabels());
+ }
+
+ /**
+ * @param Channel $channel
+ *
+ * @return string|null
+ */
+ private function getIcon(Channel $channel)
+ {
+ return $this->integrationIconProvider->getIcon($channel);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Method/PaymentTermMethod.php b/src/Marello/Bundle/PaymentTermBundle/Method/PaymentTermMethod.php
new file mode 100644
index 000000000..7e65dfd3d
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/Method/PaymentTermMethod.php
@@ -0,0 +1,100 @@
+identifier = $identifier;
+ $this->label = $label;
+ $this->icon = $icon;
+ $this->enabled = $enabled;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getIdentifier()
+ {
+ return $this->identifier;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function isEnabled()
+ {
+ return $this->enabled;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getLabel()
+ {
+ return $this->label;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getIcon()
+ {
+ return $this->icon;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getOptionsConfigurationFormType()
+ {
+ return HiddenType::class;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getOptions()
+ {
+ return [];
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getSortOrder()
+ {
+ return 10;
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Method/Provider/PaymentTermMethodProvider.php b/src/Marello/Bundle/PaymentTermBundle/Method/Provider/PaymentTermMethodProvider.php
new file mode 100644
index 000000000..9b4964bcd
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/Method/Provider/PaymentTermMethodProvider.php
@@ -0,0 +1,21 @@
+container) {
+ return;
+ }
+
+ $channel = $this->loadIntegration($manager);
+
+ $this->addMethodConfigToDefaultPaymentRule($manager, $channel);
+ }
+
+ /**
+ * @param ObjectManager $manager
+ *
+ * @return Channel
+ */
+ private function loadIntegration(ObjectManager $manager)
+ {
+ $label = (new LocalizedFallbackValue())->setString('Payment Term');
+
+ $transport = new PaymentTermSettings();
+ $transport->addLabel($label);
+
+ $channel = new Channel();
+ $channel->setType(PaymentTermChannelType::TYPE)
+ ->setName('Payment Term')
+ ->setEnabled(true)
+ ->setOrganization($this->getOrganization($manager))
+ ->setTransport($transport);
+
+ $manager->persist($channel);
+ $manager->flush();
+
+ return $channel;
+ }
+
+ /**
+ * @param ObjectManager $manager
+ * @param Channel $channel
+ */
+ private function addMethodConfigToDefaultPaymentRule(ObjectManager $manager, Channel $channel)
+ {
+ $methodConfig = new PaymentMethodConfig();
+ $methodConfig->setMethod($this->getIdentifier($channel));
+
+ $defaultPaymentRule = $this->getReference(CreateDefaultPaymentRule::DEFAULT_RULE_REFERENCE);
+ $defaultPaymentRule->addMethodConfig($methodConfig);
+
+ $manager->persist($defaultPaymentRule);
+ $manager->flush();
+ }
+
+ /**
+ * @param ObjectManager $manager
+ *
+ * @return Organization|object
+ */
+ private function getOrganization(ObjectManager $manager)
+ {
+ if ($this->hasReference(LoadOrganizationAndBusinessUnitData::REFERENCE_DEFAULT_ORGANIZATION)) {
+ return $this->getReference(LoadOrganizationAndBusinessUnitData::REFERENCE_DEFAULT_ORGANIZATION);
+ } else {
+ return $manager
+ ->getRepository('OroOrganizationBundle:Organization')
+ ->getFirst();
+ }
+ }
+
+ /**
+ * @param Channel $channel
+ *
+ * @return int|string
+ */
+ private function getIdentifier(Channel $channel)
+ {
+ return $this->container
+ ->get('marello_payment_term.method.identifier_generator.method')
+ ->generateIdentifier($channel);
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Migrations/Schema/MarelloPaymentTermBundleInstaller.php b/src/Marello/Bundle/PaymentTermBundle/Migrations/Schema/MarelloPaymentTermBundleInstaller.php
index df5ecbfef..2eb2125de 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Migrations/Schema/MarelloPaymentTermBundleInstaller.php
+++ b/src/Marello/Bundle/PaymentTermBundle/Migrations/Schema/MarelloPaymentTermBundleInstaller.php
@@ -16,7 +16,7 @@ class MarelloPaymentTermBundleInstaller implements Installation
*/
public function getMigrationVersion()
{
- return 'v1_0';
+ return 'v1_1';
}
/**
@@ -27,6 +27,8 @@ public function up(Schema $schema, QueryBag $queries)
self::createPaymentTermTable($schema);
self::createPaymentTermLabelsTable($schema);
self::createForeignKeys($schema);
+ self::createMarelloPaymentTermTransportLabelTable($schema);
+ self::addMarelloPaymentTermTransportLabelForeignKeys($schema);
}
/**
@@ -57,7 +59,22 @@ protected static function createPaymentTermLabelsTable(Schema $schema)
$table->setPrimaryKey(['paymentterm_id', 'localized_value_id']);
}
+
+ /**
+ * @param Schema $schema
+ */
+ protected static function createMarelloPaymentTermTransportLabelTable(Schema $schema)
+ {
+ $table = $schema->createTable('marello_payment_term_trans_lbl');
+
+ $table->addColumn('transport_id', 'integer', []);
+ $table->addColumn('localized_value_id', 'integer', []);
+ $table->setPrimaryKey(['transport_id', 'localized_value_id']);
+ $table->addIndex(['transport_id'], 'marello_payment_term_trans_label_transport_id', []);
+ $table->addUniqueIndex(['localized_value_id'], 'marello_payment_term_trans_label_localized_value_id', []);
+ }
+
/**
* @param Schema $schema
*/
@@ -77,4 +94,29 @@ protected static function createForeignKeys(Schema $schema)
['onDelete' => 'CASCADE']
);
}
+
+ /**
+ * @param Schema $schema
+ *
+ * @throws SchemaException
+ */
+ protected static function addMarelloPaymentTermTransportLabelForeignKeys(Schema $schema)
+ {
+ $table = $schema->getTable('marello_payment_term_trans_lbl');
+
+ $table->addForeignKeyConstraint(
+ $schema->getTable('oro_fallback_localization_val'),
+ ['localized_value_id'],
+ ['id'],
+ ['onDelete' => 'CASCADE', 'onUpdate' => null]
+ );
+
+ $table->addForeignKeyConstraint(
+ $schema->getTable('oro_integration_transport'),
+ ['transport_id'],
+ ['id'],
+ ['onDelete' => 'CASCADE', 'onUpdate' => null]
+ );
+ }
+
}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Migrations/Schema/v1_1/MarelloPaymentTermBundle.php b/src/Marello/Bundle/PaymentTermBundle/Migrations/Schema/v1_1/MarelloPaymentTermBundle.php
new file mode 100644
index 000000000..96f38fb1a
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/Migrations/Schema/v1_1/MarelloPaymentTermBundle.php
@@ -0,0 +1,63 @@
+createTable('marello_payment_term_trans_lbl');
+
+ $table->addColumn('transport_id', 'integer', []);
+ $table->addColumn('localized_value_id', 'integer', []);
+
+ $table->setPrimaryKey(['transport_id', 'localized_value_id']);
+ $table->addIndex(['transport_id'], 'marello_payment_term_trans_label_transport_id', []);
+ $table->addUniqueIndex(['localized_value_id'], 'marello_payment_term_trans_label_localized_value_id', []);
+ }
+
+ /**
+ * @param Schema $schema
+ *
+ * @throws SchemaException
+ */
+ protected static function addMarelloPaymentTermTransportLabelForeignKeys(Schema $schema)
+ {
+ $table = $schema->getTable('marello_payment_term_trans_lbl');
+
+ $table->addForeignKeyConstraint(
+ $schema->getTable('oro_fallback_localization_val'),
+ ['localized_value_id'],
+ ['id'],
+ ['onDelete' => 'CASCADE', 'onUpdate' => null]
+ );
+
+ $table->addForeignKeyConstraint(
+ $schema->getTable('oro_integration_transport'),
+ ['transport_id'],
+ ['id'],
+ ['onDelete' => 'CASCADE', 'onUpdate' => null]
+ );
+ }
+
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Provider/PaymentTermProvider.php b/src/Marello/Bundle/PaymentTermBundle/Provider/PaymentTermProvider.php
index 63ba1deaf..569fb149d 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Provider/PaymentTermProvider.php
+++ b/src/Marello/Bundle/PaymentTermBundle/Provider/PaymentTermProvider.php
@@ -2,7 +2,7 @@
namespace Marello\Bundle\PaymentTermBundle\Provider;
-use Marello\Bundle\OrderBundle\Entity\Customer;
+use Marello\Bundle\CustomerBundle\Entity\Customer;
use Marello\Bundle\PaymentTermBundle\DependencyInjection\Configuration;
use Marello\Bundle\PaymentTermBundle\Entity\PaymentTerm;
use Oro\Bundle\ConfigBundle\Config\ConfigManager;
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/config/form.yml b/src/Marello/Bundle/PaymentTermBundle/Resources/config/form.yml
index 2d740731b..826baa052 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Resources/config/form.yml
+++ b/src/Marello/Bundle/PaymentTermBundle/Resources/config/form.yml
@@ -12,6 +12,7 @@ services:
marello_payment_term.payment_term.form.handler:
class: 'Marello\Bundle\PaymentTermBundle\Form\Handler\PaymentTermFormHandler'
+ public: true
arguments:
- '@marello_payment_term.payment_term.form'
- '@request_stack'
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/config/oro/actions.yml b/src/Marello/Bundle/PaymentTermBundle/Resources/config/oro/actions.yml
index a24046cdf..9cbe5a65e 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Resources/config/oro/actions.yml
+++ b/src/Marello/Bundle/PaymentTermBundle/Resources/config/oro/actions.yml
@@ -23,3 +23,156 @@ operations:
'@and':
- '@equal': [$.isDeleteAllowed, true]
substitute_operation: DELETE
+
+ oro_integration_deactivate:
+ label: oro.integration.deactivate
+ preactions:
+ - '@assign_constant_value':
+ attribute: $.paymentTermType
+ value: Marello\Bundle\PaymentTermBundle\Integration\PaymentTermChannelType::TYPE
+ preconditions:
+ '@and':
+ - '@not_equal': [$type, $.paymentTermType]
+
+ oro_integration_delete:
+ label: oro.integration.delete
+ preactions:
+ - '@assign_constant_value':
+ attribute: $.paymentTermType
+ value: Marello\Bundle\PaymentTermBundle\Integration\PaymentTermChannelType::TYPE
+ preconditions:
+ '@and':
+ - '@not_equal': [$type, $.paymentTermType]
+
+ marello_payment_term_integration_deactivate:
+ label: oro.integration.deactivate
+ extends: oro_integration_deactivate
+ for_all_entities: false
+ for_all_datagrids: false
+ replace:
+ - preactions
+ - preconditions
+ - frontend_options
+ preactions:
+ - '@assign_constant_value':
+ attribute: $.paymentTermType
+ value: Marello\Bundle\PaymentTermBundle\Integration\PaymentTermChannelType::TYPE
+ - '@call_service_method':
+ attribute: $.actionAllowed
+ service: oro_integration.utils.edit_mode
+ method: isSwitchEnableAllowed
+ method_parameters: [$.data.editMode]
+ - '@call_service_method':
+ attribute: $.methodIdentifier
+ service: marello_payment_term.method.identifier_generator.method
+ method: generateIdentifier
+ method_parameters: [$.data]
+ - '@call_service_method':
+ attribute: $.linkGrid
+ service: marello_payment.helper.filtered_datagrid_route
+ method: generate
+ method_parameters: [{'methodConfigs': $.methodIdentifier}]
+ preconditions:
+ '@and':
+ - '@marello_payment_method_has_enabled_payment_rules':
+ parameters:
+ method_identifier: $.methodIdentifier
+ - '@equal': [$type, $.paymentTermType]
+ - '@equal': [$.actionAllowed, true]
+ - '@equal': [$.data.enabled, true]
+ frontend_options:
+ confirmation:
+ title: marello.payment.integration.deactivate.title
+ okText: marello.payment.integration.deactivate.button.okText
+ message: marello.payment.integration.deactivate.message
+ message_parameters:
+ linkGrid: $.linkGrid
+ component: oroui/js/standart-confirmation
+
+ marello_payment_term_integration_deactivate_without_rules:
+ label: oro.integration.deactivate
+ extends: marello_payment_term_integration_deactivate
+ for_all_entities: false
+ for_all_datagrids: false
+ replace:
+ - preconditions
+ - frontend_options
+ preconditions:
+ '@and':
+ - '@not':
+ - '@marello_payment_method_has_enabled_payment_rules':
+ parameters:
+ method_identifier: $.methodIdentifier
+ - '@equal': [$type, $.paymentTermType]
+ - '@equal': [$.actionAllowed, true]
+ - '@equal': [$.data.enabled, true]
+ frontend_options: ~
+
+ marello_payment_term_integration_delete:
+ label: oro.integration.delete
+ extends: oro_integration_delete
+ for_all_entities: false
+ for_all_datagrids: false
+ replace:
+ - preactions
+ - preconditions
+ - frontend_options
+ preactions:
+ - '@assign_constant_value':
+ attribute: $.paymentTermType
+ value: Marello\Bundle\PaymentTermBundle\Integration\PaymentTermChannelType::TYPE
+ - '@call_service_method':
+ service: oro_integration.utils.edit_mode
+ method: isEditAllowed
+ method_parameters: [$.data.editMode]
+ attribute: $.actionAllowed
+ - '@call_service_method':
+ attribute: $.methodIdentifier
+ service: marello_payment_term.method.identifier_generator.method
+ method: generateIdentifier
+ method_parameters: [$.data]
+ - '@call_service_method':
+ attribute: $.linkGrid
+ service: marello_payment.helper.filtered_datagrid_route
+ method: generate
+ method_parameters: [{'methodConfigs': $.methodIdentifier}]
+ preconditions:
+ '@and':
+ - '@marello_payment_method_has_payment_rules':
+ parameters:
+ method_identifier: $.methodIdentifier
+ - '@equal': [$type, $.paymentTermType]
+ - '@equal': [$.actionAllowed, true]
+ frontend_options:
+ confirmation:
+ title: marello.payment.integration.delete.title
+ okText: marello.payment.integration.delete.button.okText
+ message: marello.payment.integration.delete.message
+ message_parameters:
+ linkGrid: $.linkGrid
+ component: oroui/js/standart-confirmation
+
+ marello_payment_term_integration_delete_without_rules:
+ label: oro.integration.delete
+ extends: marello_payment_term_integration_delete
+ for_all_entities: false
+ for_all_datagrids: false
+ replace:
+ - preconditions
+ - frontend_options
+ preconditions:
+ '@and':
+ - '@not':
+ - '@marello_payment_method_has_payment_rules':
+ parameters:
+ method_identifier: $.methodIdentifier
+ - '@equal': [$type, $.paymentTermType]
+ - '@equal': [$.actionAllowed, true]
+ frontend_options:
+ title: oro.action.delete_entity
+ confirmation:
+ title: oro.action.delete_entity
+ message: oro.action.delete_confirm
+ message_parameters:
+ entityLabel: $name
+ component: oroui/js/delete-confirmation
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/config/oro/datagrids.yml b/src/Marello/Bundle/PaymentTermBundle/Resources/config/oro/datagrids.yml
index 091b503c4..617380eb3 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Resources/config/oro/datagrids.yml
+++ b/src/Marello/Bundle/PaymentTermBundle/Resources/config/oro/datagrids.yml
@@ -44,7 +44,7 @@ datagrids:
term:
data_name: term
default:
- label: '%oro_datagrid.extension.orm_sorter.class%::DIRECTION_ASC'
+ label: 'ASC'
properties:
id: ~
view_link:
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/config/services.yml b/src/Marello/Bundle/PaymentTermBundle/Resources/config/services.yml
index aaf989304..3ba8e354f 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Resources/config/services.yml
+++ b/src/Marello/Bundle/PaymentTermBundle/Resources/config/services.yml
@@ -1,3 +1,8 @@
+parameters:
+ marello_payment_term.method.identifier_prefix.payment_term: 'payment_term'
+ marello_payment_term.integration.channel.type: 'payment_term'
+ marello_payment_term.integration.transport.type: 'payment_term'
+
services:
marello_payment_term.provider.payment_term:
class: 'Marello\Bundle\PaymentTermBundle\Provider\PaymentTermProvider'
@@ -7,11 +12,65 @@ services:
marello_payment_term.provider.payment_term_delete_permission:
class: 'Marello\Bundle\PaymentTermBundle\Provider\PaymentTermDeletePermissionProvider'
+ public: true
arguments:
- '@oro_entity.doctrine_helper'
- '@marello_payment_term.provider.payment_term'
marello_payment_term.action_permissions.payment_term:
class: 'Marello\Bundle\PaymentTermBundle\Datagrid\PaymentTermActionPermissionProvider'
+ public: true
arguments:
- '@marello_payment_term.provider.payment_term_delete_permission'
+
+ marello_payment_term.integration.channel:
+ class: 'Marello\Bundle\PaymentTermBundle\Integration\PaymentTermChannelType'
+ public: true
+ tags:
+ - { name: oro_integration.channel, type: payment_term }
+
+ marello_payment_term.integration.transport:
+ class: 'Marello\Bundle\PaymentTermBundle\Integration\PaymentTermTransport'
+ public: false
+ tags:
+ - { name: oro_integration.transport, type: payment_term, channel_type: payment_term }
+
+ marello_payment_term.method.identifier_generator.method:
+ parent: oro_integration.generator.prefixed_identifier_generator
+ public: true
+ arguments:
+ - '%marello_payment_term.method.identifier_prefix.payment_term%'
+
+ marello_payment_term.factory.method:
+ class: 'Marello\Bundle\PaymentTermBundle\Method\Factory\PaymentTermMethodFromChannelFactory'
+ public: false
+ arguments:
+ - '@marello_payment_term.method.identifier_generator.method'
+ - '@oro_locale.helper.localization'
+ - '@oro_integration.provider.integration_icon'
+
+ marello_payment_term.payment_method_provider.payment_term:
+ class: 'Marello\Bundle\PaymentTermBundle\Method\Provider\PaymentTermMethodProvider'
+ public: false
+ arguments:
+ - '%marello_payment_term.integration.channel.type%'
+ - '@oro_entity.doctrine_helper'
+ - '@marello_payment_term.factory.method'
+ tags:
+ - { name: marello_payment.payment_method_provider }
+ - { name: doctrine.orm.entity_listener, entity: 'Oro\Bundle\IntegrationBundle\Entity\Channel', event: postLoad }
+
+ marello_payment_term.repository.payment_term_settings:
+ class: 'Marello\Bundle\PaymentTermBundle\Entity\Repository\PaymentTermSettingsRepository'
+ parent: oro_entity.abstract_repository
+ arguments:
+ - 'Marello\Bundle\PaymentTermBundle\Entity\PaymentTermSettings'
+ calls:
+ - [setAclHelper, ['@oro_security.acl_helper']]
+
+ marello_payment_term.event_listener.payment_term_method_view:
+ class: 'Marello\Bundle\PaymentTermBundle\EventListener\PaymentTermMethodViewListener'
+ arguments:
+ - '@marello_payment_term.provider.payment_term'
+ tags:
+ - { name: kernel.event_listener, event: marello_payment.applicable_payment_method_view, method: onApplicablePaymentMethodView }
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/public/img/payment-term-logo.png b/src/Marello/Bundle/PaymentTermBundle/Resources/public/img/payment-term-logo.png
new file mode 100644
index 000000000..bed373482
Binary files /dev/null and b/src/Marello/Bundle/PaymentTermBundle/Resources/public/img/payment-term-logo.png differ
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/translations/messages.en.yml b/src/Marello/Bundle/PaymentTermBundle/Resources/translations/messages.en.yml
index 3a2550566..281bb9c40 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Resources/translations/messages.en.yml
+++ b/src/Marello/Bundle/PaymentTermBundle/Resources/translations/messages.en.yml
@@ -24,3 +24,9 @@ marello:
term.label: "Term"
id.label: "ID"
labels.label: "Label"
+
+ settings:
+ label: 'Payment Term Settings'
+ labels.label: 'Label'
+ channel_type:
+ label: 'Payment Term'
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/index.html.twig b/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/index.html.twig
index 7c4307858..ee137e6cc 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/index.html.twig
+++ b/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/index.html.twig
@@ -5,7 +5,7 @@
{% set gridName = 'marello-paymentterm-grid' %}
{% block navButtons %}
- {% if resource_granted('marello_paymentterm_paymentterm_create') %}
+ {% if is_granted('marello_paymentterm_paymentterm_create') %}
{{ UI.addButton({
'path': path('marello_paymentterm_paymentterm_create'),
'entity_label': 'marello.paymentterm.entity_label'|trans
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/update.html.twig b/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/update.html.twig
index 0ed832082..bb4e501ce 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/update.html.twig
+++ b/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/update.html.twig
@@ -1,4 +1,5 @@
{% extends 'OroUIBundle:actions:update.html.twig' %}
+{% import 'OroUIBundle::macros.html.twig' as UI %}
{% import 'OroDataGridBundle::macros.html.twig' as dataGrid %}
{% form_theme form with 'OroFormBundle:Form:fields.html.twig' %}
{% if form.vars.value.id %}
@@ -12,9 +13,9 @@
{{ parent() }}
{{ UI.cancelButton(path('marello_paymentterm_paymentterm_index')) }}
- {% if resource_granted('marello_paymentterm_paymentterm_update') %}
+ {% if is_granted('marello_paymentterm_paymentterm_update') %}
{% set html = '' %}
- {% if resource_granted('marello_paymentterm_paymentterm_view') %}
+ {% if is_granted('marello_paymentterm_paymentterm_view') %}
{% set html = UI.saveAndCloseButton({
'route': 'marello_paymentterm_paymentterm_view',
'params': {'id': '$id'}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/view.html.twig b/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/view.html.twig
index 3b6e96b68..90315bb5c 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/view.html.twig
+++ b/src/Marello/Bundle/PaymentTermBundle/Resources/views/PaymentTerm/view.html.twig
@@ -1,4 +1,5 @@
{% extends 'OroUIBundle:actions:view.html.twig' %}
+{% import 'OroUIBundle::macros.html.twig' as UI %}
{% import 'OroDataGridBundle::macros.html.twig' as dataGrid %}
{% import 'OroEntityConfigBundle::macros.html.twig' as entityConfig %}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Tests/Functional/Controller/SystemConfigurationControllerTest.php b/src/Marello/Bundle/PaymentTermBundle/Tests/Functional/Controller/SystemConfigurationControllerTest.php
index 10a76db04..30bc17a43 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Tests/Functional/Controller/SystemConfigurationControllerTest.php
+++ b/src/Marello/Bundle/PaymentTermBundle/Tests/Functional/Controller/SystemConfigurationControllerTest.php
@@ -2,7 +2,6 @@
namespace Marello\Bundle\PaymenttermBundle\Tests\Functional\Controller;
-use Marello\Bundle\PaymentTermBundle\Form\Type\PaymentTermType;
use Marello\Bundle\PaymentTermBundle\Tests\Functional\DataFixtures\LoadPaymentTermsData;
use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase;
use Symfony\Component\HttpFoundation\Response;
@@ -46,7 +45,7 @@ public function testSystemConfiguration()
$crawler->filter('select[name="payment_config[marello_payment_term___default_payment_term][value]"]')
);
- $form = $crawler->selectbutton('Save settings')->form();
+ $form = $crawler->selectButton('Save settings')->form();
$selectField = $form['payment_config[marello_payment_term___default_payment_term][value]'];
static::assertEquals(
@@ -89,7 +88,7 @@ public function testSystemConfigurationUpdate()
$result = $this->client->getResponse();
$this->assertHtmlResponseStatusCodeEquals($result, Response::HTTP_OK);
- $form = $crawler->selectbutton('Save settings')->form();
+ $form = $crawler->selectButton('Save settings')->form();
$selectField = $form['payment_config[marello_payment_term___default_payment_term][value]'];
static::assertEquals(
diff --git a/src/Marello/Bundle/PaymentTermBundle/Tests/Functional/DataFixtures/LoadPaymentTermIntegration.php b/src/Marello/Bundle/PaymentTermBundle/Tests/Functional/DataFixtures/LoadPaymentTermIntegration.php
new file mode 100644
index 000000000..62632a7a5
--- /dev/null
+++ b/src/Marello/Bundle/PaymentTermBundle/Tests/Functional/DataFixtures/LoadPaymentTermIntegration.php
@@ -0,0 +1,54 @@
+setString('Payment Term');
+
+ $transport = new PaymentTermSettings();
+ $transport->addLabel($label);
+
+ $channel = new Channel();
+ $channel->setType(PaymentTermChannelType::TYPE)
+ ->setName('Payment Term')
+ ->setEnabled(true)
+ ->setTransport($transport)
+ ->setOrganization($this->getOrganization());
+
+ $manager->persist($channel);
+ $manager->flush();
+
+ $this->setReference(self::REFERENCE_PAYMENT_TERM, $channel);
+ }
+
+
+ /**
+ * @return Organization
+ */
+ private function getOrganization()
+ {
+ return $this->container->get('doctrine')
+ ->getRepository('OroOrganizationBundle:Organization')
+ ->getFirst();
+ }
+}
diff --git a/src/Marello/Bundle/PaymentTermBundle/Tests/Unit/Provider/PaymentTermDeletePermissionProviderTest.php b/src/Marello/Bundle/PaymentTermBundle/Tests/Unit/Provider/PaymentTermDeletePermissionProviderTest.php
index 652caf152..529d96833 100644
--- a/src/Marello/Bundle/PaymentTermBundle/Tests/Unit/Provider/PaymentTermDeletePermissionProviderTest.php
+++ b/src/Marello/Bundle/PaymentTermBundle/Tests/Unit/Provider/PaymentTermDeletePermissionProviderTest.php
@@ -38,6 +38,8 @@ public function setUp()
}
/**
+ * @param PaymentTerm $paymentTerm
+ * @param bool $expectedValue
* @dataProvider isDeleteAllowedDataProvider
*/
public function testIsDeleteAllowed(PaymentTerm $paymentTerm, bool $expectedValue)
diff --git a/src/Marello/Bundle/PdfBundle/Controller/DownloadController.php b/src/Marello/Bundle/PdfBundle/Controller/DownloadController.php
new file mode 100644
index 000000000..0b86fa99f
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Controller/DownloadController.php
@@ -0,0 +1,18 @@
+container->get('marello_pdf.request_handler.composite')->handle($request);
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/DocumentTableProviderPass.php b/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/DocumentTableProviderPass.php
new file mode 100644
index 000000000..0e671ce1e
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/DocumentTableProviderPass.php
@@ -0,0 +1,25 @@
+hasDefinition(self::PROVIDER_SERVICE_ID)) {
+ $definition = $container->getDefinition(self::PROVIDER_SERVICE_ID);
+
+ $services = $container->findTaggedServiceIds(self::TAG_NAME);
+ foreach ($services as $serviceId => $tags) {
+ $definition->addMethodCall('addProvider', [new Reference($serviceId)]);
+ }
+ }
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/RenderParameterProviderPass.php b/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/RenderParameterProviderPass.php
new file mode 100644
index 000000000..22476e3f3
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/RenderParameterProviderPass.php
@@ -0,0 +1,25 @@
+hasDefinition(self::PROVIDER_SERVICE_ID)) {
+ $definition = $container->getDefinition(self::PROVIDER_SERVICE_ID);
+
+ $services = $container->findTaggedServiceIds(self::TAG_NAME);
+ foreach ($services as $serviceId => $tags) {
+ $definition->addMethodCall('addProvider', [new Reference($serviceId)]);
+ }
+ }
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/RequestHandlersPass.php b/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/RequestHandlersPass.php
new file mode 100644
index 000000000..859fb59a0
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/DependencyInjection/CompilerPass/RequestHandlersPass.php
@@ -0,0 +1,25 @@
+hasDefinition(self::PROVIDER_SERVICE_ID)) {
+ $definition = $container->getDefinition(self::PROVIDER_SERVICE_ID);
+
+ $services = $container->findTaggedServiceIds(self::TAG_NAME);
+ foreach ($services as $serviceId => $tags) {
+ $definition->addMethodCall('addHandler', [new Reference($serviceId)]);
+ }
+ }
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/DependencyInjection/Configuration.php b/src/Marello/Bundle/PdfBundle/DependencyInjection/Configuration.php
new file mode 100644
index 000000000..06d825b73
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/DependencyInjection/Configuration.php
@@ -0,0 +1,80 @@
+root(self::CONFIG_NAME);
+
+ SettingsBuilder::append(
+ $rootNode,
+ [
+ self::CONFIG_KEY_PAPER_SIZE => ['value' => self::PAPER_SIZE_A4],
+ self::CONFIG_KEY_LOCALIZATION => ['value' => null],
+ self::CONFIG_KEY_COMPANY_ADDRESS => ['value' => null],
+ self::CONFIG_KEY_COMPANY_EMAIL => ['value' => null],
+ self::CONFIG_KEY_LOGO => ['value' => null],
+ self::CONFIG_KEY_COMPANY_PHONE => ['value' => null],
+ self::CONFIG_KEY_COMPANY_BANK => ['value' => null],
+ self::CONFIG_KEY_COMPANY_COC => ['value' => null],
+ self::CONFIG_KEY_EMAIL_WORKFLOW_TRANSITION => ['value' => null],
+ self::CONFIG_KEY_EMAIL_SENDER_NAME => ['value' => null],
+ self::CONFIG_KEY_EMAIL_SENDER_EMAIL => ['value' => null],
+ self::CONFIG_KEY_EMAIL_BCC => ['value' => null],
+ ]
+ );
+
+ return $treeBuilder;
+ }
+
+ /**
+ * @param string $name
+ * @return string
+ */
+ public static function getConfigKeyByName(string $name): string
+ {
+ return TreeUtils::getConfigKey(self::CONFIG_NAME, $name, ConfigManager::SECTION_MODEL_SEPARATOR);
+ }
+
+ /**
+ * @param string $name
+ * @return string
+ */
+ public static function getFieldKeyByName(string $name): string
+ {
+ return TreeUtils::getConfigKey(self::CONFIG_NAME, $name, ConfigManager::SECTION_VIEW_SEPARATOR);
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/DependencyInjection/MarelloPdfExtension.php b/src/Marello/Bundle/PdfBundle/DependencyInjection/MarelloPdfExtension.php
new file mode 100644
index 000000000..424d1868c
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/DependencyInjection/MarelloPdfExtension.php
@@ -0,0 +1,30 @@
+processConfiguration($configuration, $configs);
+
+ $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+ $loader->load('services.yml');
+
+ $container->prependExtensionConfig(Configuration::CONFIG_NAME, $config);
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Exception/PaperSizeNotSetException.php b/src/Marello/Bundle/PdfBundle/Exception/PaperSizeNotSetException.php
new file mode 100644
index 000000000..ba09e65b4
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Exception/PaperSizeNotSetException.php
@@ -0,0 +1,11 @@
+passedOptions = $options;
+ }
+
+ public function create(array $options = [])
+ {
+ return new Mpdf($this->getOptions($options));
+ }
+
+ protected function getOptions(array $options = [])
+ {
+ if ($this->options === null) {
+ $this->options = array_merge($this->defaultOptions, $this->passedOptions);
+ }
+
+ return array_merge($this->options, $options);
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Form/Configurator/DocumentConfigurator.php b/src/Marello/Bundle/PdfBundle/Form/Configurator/DocumentConfigurator.php
new file mode 100644
index 000000000..9e1f8f84f
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Form/Configurator/DocumentConfigurator.php
@@ -0,0 +1,77 @@
+configHandler = $configHandler;
+ }
+
+ /**
+ * @param FormBuilderInterface $builder
+ */
+ public function buildForm(FormBuilderInterface $builder): void
+ {
+ $builder->addEventListener(
+ FormEvents::PRE_SET_DATA,
+ function (FormEvent $event) {
+ if ($event->getData() === null) {
+ return;
+ }
+
+ $form = $event->getForm();
+ $data = $event->getData();
+ $configManager = $this->configHandler->getConfigManager();
+ if ($data[PdfConfig::getFieldKeyByName(PdfConfig::CONFIG_KEY_LOCALIZATION)]['value'] === null) {
+ $data[PdfConfig::getFieldKeyByName(PdfConfig::CONFIG_KEY_LOCALIZATION)]['value'] =
+ $configManager->get(LocaleConfig::getConfigKeyByName(LocaleConfig::DEFAULT_LOCALIZATION));
+ $event->setData($data);
+ }
+
+ $this->setEnabledLocalizations($form, $configManager);
+ }
+ );
+ }
+
+ /**
+ * @param FormInterface $form
+ * @param ConfigManager $configManager
+ */
+ private function setEnabledLocalizations(FormInterface $form, ConfigManager $configManager): void
+ {
+ $form = $form->get(PdfConfig::getFieldKeyByName(PdfConfig::CONFIG_KEY_LOCALIZATION));
+
+ $options = $form->get('value')
+ ->getConfig()
+ ->getOptions();
+
+ $options[LocaleConfig::ENABLED_LOCALIZATIONS] = $configManager->get(
+ LocaleConfig::getConfigKeyByName(LocaleConfig::ENABLED_LOCALIZATIONS)
+ );
+
+ $form->add('value', LocalizationSelectionType::class, $options);
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Form/Type/WorkflowTransitionSelectType.php b/src/Marello/Bundle/PdfBundle/Form/Type/WorkflowTransitionSelectType.php
new file mode 100644
index 000000000..9e5f21f97
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Form/Type/WorkflowTransitionSelectType.php
@@ -0,0 +1,59 @@
+workflowManager = $workflowManager;
+ }
+
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $resolver->setRequired('workflow')
+ ->setDefault('choices', function (Options $options) {
+ return $this->getWorkflowStepChoices($options['workflow']);
+ })
+ ->setDefaults([
+ 'required' => false,
+ ])
+ ;
+ }
+
+ protected function getWorkflowStepChoices($workflowName)
+ {
+ $workflow = $this->getWorkflow($workflowName);
+ $configuration = $workflow->getDefinition()->getConfiguration();
+
+ $choices = [];
+ foreach (array_keys($configuration['transitions']) as $transition) {
+ $choices[$this->formatTransitionName($transition)] = $transition;
+ }
+
+ return $choices;
+ }
+
+ protected function formatTransitionName($transition)
+ {
+ return ucfirst(str_replace('_', ' ', $transition));
+ }
+
+ protected function getWorkflow($workflowName)
+ {
+ return $this->workflowManager->getWorkflow($workflowName);
+ }
+
+ public function getParent()
+ {
+ return ChoiceType::class;
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Lib/View/EmptyDisplayLine.php b/src/Marello/Bundle/PdfBundle/Lib/View/EmptyDisplayLine.php
new file mode 100644
index 000000000..922236697
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Lib/View/EmptyDisplayLine.php
@@ -0,0 +1,26 @@
+fields[$field] = [null];
+ }
+ }
+
+ public function offsetExists($key)
+ {
+ return isset($this->fields[$key]) || array_key_exists($key, $this->fields);
+ }
+
+ public function offsetGet($key)
+ {
+ if ($this->offsetExists($key) === false) {
+ throw $this->createInvalidArgumentException($key);
+ }
+
+ return $this->fields[$key];
+ }
+
+ public function offsetSet($key, $value)
+ {
+ if ($this->offsetExists($key) === false) {
+ throw $this->createInvalidArgumentException($key);
+ }
+
+ if (!is_array($value)) {
+ $value = [$value];
+ }
+
+ $this->fields[$key] = $value;
+ $this->recalculateHeight();
+ }
+
+ public function offsetUnset($key)
+ {
+ if ($this->offsetExists($key) === false) {
+ throw $this->createInvalidArgumentException($key);
+ }
+
+ $this->fields[$key] = [null];
+ }
+
+ public function getHeight()
+ {
+ return $this->height;
+ }
+
+ public function getDisplayLines()
+ {
+ $lines = [];
+ for ($i = 0; $i < $this->height; $i++) {
+ $line = [];
+
+ foreach (array_keys($this->fields) as $key) {
+ $line[$key] = $this->fields[$key][$i] ?? null;
+ }
+
+ $lines[] = $line;
+ }
+
+ return $lines;
+ }
+
+ public function isEmpty()
+ {
+ foreach ($this->fields as $field) {
+ if (count($field) > 1 || reset($field) !== null) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ protected function recalculateHeight()
+ {
+ $this->height = max(array_map('count', $this->fields));
+ }
+
+ private function createInvalidArgumentException($key)
+ {
+ return new \InvalidArgumentException(sprintf(
+ 'Key "%s" does not exist in %s object with keys %s',
+ $key,
+ __CLASS__,
+ implode(', ', array_keys($this->fields))
+ ));
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Lib/View/Table.php b/src/Marello/Bundle/PdfBundle/Lib/View/Table.php
new file mode 100644
index 000000000..4fc28c6a2
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Lib/View/Table.php
@@ -0,0 +1,90 @@
+maxHeight = $maxHeight;
+ $this->headerHeight = $headerHeight;
+ $this->footerHeight = $footerHeight;
+ $this->lines = new ArrayCollection();
+ }
+
+ public function disableHeader()
+ {
+ $this->headerEnabled = false;
+
+ return $this;
+ }
+
+ public function disableFooter()
+ {
+ $this->footerEnabled = false;
+
+ return $this;
+ }
+
+ public function getLines()
+ {
+ $lines = clone $this->lines;
+
+ for ($i = $this->getHeight(); $i < $this->getMaxHeight(); $i++) {
+ $lines[] = new EmptyLine();
+ }
+
+ return $lines;
+ }
+
+ public function addLine(Line $line)
+ {
+ $this->lines[] = $line;
+
+ $this->height += $line->getHeight();
+
+ return $this;
+ }
+
+ public function getHeight()
+ {
+ return $this->height;
+ }
+
+ public function getMaxHeight()
+ {
+ $height = $this->maxHeight;
+ if ($this->headerEnabled) {
+ $height -= $this->headerHeight;
+ }
+ if ($this->footerEnabled) {
+ $height -= $this->footerHeight;
+ }
+
+ return $height;
+ }
+
+ public function fitsLine(Line $line)
+ {
+ $height = $this->getHeight();
+ $height += $line->getHeight();
+
+ return $height <= $this->getMaxHeight();
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/MarelloPdfBundle.php b/src/Marello/Bundle/PdfBundle/MarelloPdfBundle.php
new file mode 100644
index 000000000..0bbae1bf8
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/MarelloPdfBundle.php
@@ -0,0 +1,21 @@
+addCompilerPass(new RenderParameterProviderPass());
+ $container->addCompilerPass(new DocumentTableProviderPass());
+ $container->addCompilerPass(new RequestHandlersPass());
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Provider/DocumentTableProvider.php b/src/Marello/Bundle/PdfBundle/Provider/DocumentTableProvider.php
new file mode 100644
index 000000000..4f2150097
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Provider/DocumentTableProvider.php
@@ -0,0 +1,24 @@
+providers[] = $provider;
+ }
+
+ public function getTables($entity)
+ {
+ foreach ($this->providers as $provider) {
+ if ($provider->supports($entity)) {
+ return $provider->getTables($entity);
+ }
+ }
+
+ return [];
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Provider/Render/ConfigValuesProvider.php b/src/Marello/Bundle/PdfBundle/Provider/Render/ConfigValuesProvider.php
new file mode 100644
index 000000000..4480076e9
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Provider/Render/ConfigValuesProvider.php
@@ -0,0 +1,43 @@
+config = $config;
+ $this->parameters = $parameters;
+ }
+
+ public function supports($entity, array $options)
+ {
+ return true;
+ }
+
+ public function getParams($entity, array $options)
+ {
+ $params = [];
+ foreach ($this->parameters as $key => $configKey) {
+ $params[$key] = $this->getConfigValue($configKey, $entity, $options);
+ }
+
+ return $params;
+ }
+
+ protected function getConfigValue($configKey, $entity, array $options)
+ {
+ $scopeIdentifier = $options[self::SCOPE_IDENTIFIER_KEY] ?? null;
+
+ return $this->config->get($configKey, false, false, $scopeIdentifier);
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Provider/Render/EntityProvider.php b/src/Marello/Bundle/PdfBundle/Provider/Render/EntityProvider.php
new file mode 100644
index 000000000..15af87c77
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Provider/Render/EntityProvider.php
@@ -0,0 +1,18 @@
+ $entity];
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Provider/Render/LocalizationProvider.php b/src/Marello/Bundle/PdfBundle/Provider/Render/LocalizationProvider.php
new file mode 100644
index 000000000..eb1430e55
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Provider/Render/LocalizationProvider.php
@@ -0,0 +1,118 @@
+config = $config;
+ $this->doctrine = $doctrine;
+ $this->localizationParameterName = $localizationParameterName;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @param $entity
+ * @param array $options
+ * @return bool
+ */
+ public function supports($entity, array $options)
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @param $entity
+ * @param array $options
+ * @return array
+ */
+ public function getParams($entity, array $options)
+ {
+ $params = [];
+ $localizationId = (int)$this->getConfigValue($this->localizationParameterName, $options);
+ $localization = $this->doctrine
+ ->getManagerForClass(Localization::class)
+ ->find(Localization::class, $localizationId);
+
+ if (null === $localization) {
+ $localizationAwareEntity = null;
+ if ($entity instanceof LocalizationAwareInterface) {
+ $localizationAwareEntity = $entity;
+ } elseif ($entity instanceof SalesChannelAwareInterface) {
+ $localizationAwareEntity = $entity->getSalesChannel();
+ }
+
+ if ($this->chainLocalizationProvider && null !== $localizationAwareEntity) {
+ $localization = $this->chainLocalizationProvider->getLocalization($localizationAwareEntity);
+ }
+ }
+
+ if ($localization) {
+ $params['localization'] = $localization;
+ $params['language'] = $localization->getLanguageCode();
+ $params['locale'] = $localization->getLanguageCode();
+ }
+
+ return $params;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @param $configKey
+ * @param array $options
+ * @return mixed
+ */
+ protected function getConfigValue($configKey, array $options)
+ {
+ $scopeIdentifier = $options[self::SCOPE_IDENTIFIER_KEY] ?? null;
+
+ return $this->config->get($configKey, false, false, $scopeIdentifier);
+ }
+
+ /**
+ * {@inheritdoc}
+ * @param EntityLocalizationProviderInterface $chainProvider
+ */
+ public function setChainLocalizationProvider(EntityLocalizationProviderInterface $chainProvider)
+ {
+ $this->chainLocalizationProvider = $chainProvider;
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Provider/RenderParameterProviderInterface.php b/src/Marello/Bundle/PdfBundle/Provider/RenderParameterProviderInterface.php
new file mode 100644
index 000000000..7fd67e2b9
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Provider/RenderParameterProviderInterface.php
@@ -0,0 +1,9 @@
+providers[] = $provider;
+ }
+
+ public function getParams($entity, array $options = [])
+ {
+ $params = [];
+
+ foreach ($this->providers as $provider) {
+ if ($provider->supports($entity, $options)) {
+ $params = array_merge($params, $provider->getParams($entity, $options));
+ }
+ }
+
+ return $params;
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Provider/TableProviderInterface.php b/src/Marello/Bundle/PdfBundle/Provider/TableProviderInterface.php
new file mode 100644
index 000000000..64f7d6d20
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Provider/TableProviderInterface.php
@@ -0,0 +1,10 @@
+config = $config;
+ $this->sizeConfig = [
+ self::KEY_MAX_HEIGHT => $maxHeight,
+ self::KEY_MAX_TEXT_WIDTH => $maxTextWidth,
+ self::KEY_FIRST_PAGE_INFO => $firstPageInfoHeight,
+ self::KEY_LAST_PAGE_INFO => $lastPageInfoHeight,
+ ];
+ }
+
+ public function getMaxHeight(SalesChannel $salesChannel)
+ {
+ return $this->getValue($salesChannel, self::KEY_MAX_HEIGHT);
+ }
+
+ public function getMaxTextWidth(SalesChannel $salesChannel)
+ {
+ return $this->getValue($salesChannel, self::KEY_MAX_TEXT_WIDTH);
+ }
+
+ public function getFirstPageInfoHeight(SalesChannel $salesChannel)
+ {
+ return $this->getValue($salesChannel, self::KEY_FIRST_PAGE_INFO);
+ }
+
+ public function getLastPageInfoHeight(SalesChannel $salesChannel)
+ {
+ return $this->getValue($salesChannel, self::KEY_LAST_PAGE_INFO);
+ }
+
+ protected function getValue(SalesChannel $salesChannel, $key)
+ {
+ $compoundValue = $this->sizeConfig[$key];
+ if (!is_array($compoundValue)) {
+ return $compoundValue;
+ }
+
+ if (!isset($compoundValue[$this->getPaperSize($salesChannel)])) {
+ throw new PaperSizeNotSetException($this->getPaperSize($salesChannel), $key);
+ }
+
+ return $compoundValue[$this->getPaperSize($salesChannel)];
+ }
+
+ private function getPaperSize(SalesChannel $salesChannel)
+ {
+ if (!isset($this->paperSizes[$salesChannel->getId()])) {
+ $this->paperSizes[$salesChannel->getId()] = $this->fetchPaperSize($salesChannel);
+ }
+
+ return $this->paperSizes[$salesChannel->getId()];
+ }
+
+ private function fetchPaperSize(SalesChannel $salesChannel)
+ {
+ return $this->getConfigValue(Configuration::CONFIG_KEY_PAPER_SIZE, $salesChannel);
+ }
+
+ private function getConfigValue($configKey, SalesChannel $salesChannel)
+ {
+ $key = sprintf('%s.%s', Configuration::CONFIG_NAME, $configKey);
+
+ return $this->config->get($key, false, false, $salesChannel);
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Renderer/HtmlRenderer.php b/src/Marello/Bundle/PdfBundle/Renderer/HtmlRenderer.php
new file mode 100644
index 000000000..117611cd6
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Renderer/HtmlRenderer.php
@@ -0,0 +1,39 @@
+pdfWriterFactory = $pdfWriterFactory;
+ }
+
+ public function render($input)
+ {
+ $writer = $this->getWriter();
+
+ $writer->WriteHTML($input);
+
+ return $writer->Output(null, Destination::STRING_RETURN);
+ }
+
+ public function renderToFile($input, $filename)
+ {
+ $writer = $this->getWriter();
+
+ $writer->WriteHTML($input);
+
+ return $writer->Output($filename, Destination::FILE);
+ }
+
+ protected function getWriter()
+ {
+ return $this->pdfWriterFactory->create();
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Renderer/TwigRenderer.php b/src/Marello/Bundle/PdfBundle/Renderer/TwigRenderer.php
new file mode 100644
index 000000000..a2c3a2587
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Renderer/TwigRenderer.php
@@ -0,0 +1,38 @@
+renderer = $renderer;
+ $this->twig = $twig;
+ }
+
+ public function render($template, array $params = [])
+ {
+ return $this->renderer->render($this->renderTwig($template, $params));
+ }
+
+ public function renderToFile($template, array $params, $filename)
+ {
+ return $this->renderer->renderToFile($this->renderTwig($template, $params), $filename);
+ }
+
+ public function renderBase64($template, array $params = [])
+ {
+ return base64_encode($this->render($template, $params));
+ }
+
+ protected function renderTwig($template, array $params = [])
+ {
+ return $this->twig->render($template, $params);
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Request/CompositePdfRequestHandler.php b/src/Marello/Bundle/PdfBundle/Request/CompositePdfRequestHandler.php
new file mode 100644
index 000000000..0d7065ee8
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Request/CompositePdfRequestHandler.php
@@ -0,0 +1,43 @@
+handlers[] = $handler;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function isApplicable(Request $request)
+ {
+ return true;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function handle(Request $request)
+ {
+ foreach ($this->handlers as $handler) {
+ if ($handler->isApplicable($request)) {
+ return $handler->handle($request);
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/src/Marello/Bundle/PdfBundle/Request/PdfRequestHandlerInterface.php b/src/Marello/Bundle/PdfBundle/Request/PdfRequestHandlerInterface.php
new file mode 100644
index 000000000..f25aa35b1
--- /dev/null
+++ b/src/Marello/Bundle/PdfBundle/Request/PdfRequestHandlerInterface.php
@@ -0,0 +1,21 @@
+
+
+ {{ UI.renderProperty('marello.rule.name.label'|trans, entity.rule.name) }}
+ {{ UI.renderProperty('marello.rule.enabled.label'|trans, entity.rule.enabled ?
+ 'marello.rule.enabled.yes.label'|trans
+ :
+ 'marello.rule.enabled.no.label'|trans
+ ) }}
+ {{ UI.renderProperty('marello.rule.sort_order.label'|trans, entity.rule.sortOrder) }}
+ {{ UI.renderProperty('marello.payment.paymentmethodsconfigsrule.currency.label'|trans, entity.currency) }}
+
+ {% if entity.destinations.count %}
+ {{ UI.renderHtmlProperty(
+ 'marello.payment.paymentmethodsconfigsrule.destinations.label'|trans,
+ UI.renderList(entity.destinations)) }}
+ {% endif %}
+
+ {% if entity.methodConfigs.count %}
+ {{ UI.renderHtmlProperty(
+ 'marello.payment.paymentmethodsconfigsrule.method_configs.label'|trans,
+ PayRuleMacro.renderPaymentMethodsConfigs(entity.methodConfigs, entity.currency)) }}
+ {% endif %}
+
+
+ {{ entityConfig.renderDynamicFields(entity) }}
+
+
+ {% if logo is not null %}
+ 
+ {% endif %}
+
+