marellocommerce
diff --git a/‎src/Marello/Bundle/CustomerBundle/Controller/CustomerController.php
-2 b/‎src/Marello/Bundle/CustomerBundle/Controller/CustomerController.php
-2
diff --git a/‎src/Marello/Bundle/CustomerBundle/Resources/config/oro/datagrids.yml
+9 b/‎src/Marello/Bundle/CustomerBundle/Resources/config/oro/datagrids.yml
+9
diff --git a/‎src/Marello/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadSalesChannelTypesData.php
+15 b/‎src/Marello/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadSalesChannelTypesData.php
+15
diff --git a/‎src/Marello/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadSalesData.php
+20-2 b/‎src/Marello/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadSalesData.php
+20-2
diff --git a/‎src/Marello/Bundle/InventoryBundle/DependencyInjection/Configuration.php
+6 b/‎src/Marello/Bundle/InventoryBundle/DependencyInjection/Configuration.php
+6
diff --git a/‎src/Marello/Bundle/InventoryBundle/Model/InventoryBalancer/InventoryBalancer.php
+5 b/‎src/Marello/Bundle/InventoryBundle/Model/InventoryBalancer/InventoryBalancer.php
+5
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/config/oro/system_configuration.yml
+26-1 b/‎src/Marello/Bundle/InventoryBundle/Resources/config/oro/system_configuration.yml
+26-1
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/config/services.yml
+2 b/‎src/Marello/Bundle/InventoryBundle/Resources/config/services.yml
+2
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/translations/messages.en.yml
+5 b/‎src/Marello/Bundle/InventoryBundle/Resources/translations/messages.en.yml
+5
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/translations/tooltips.en.yml
+1-1 b/‎src/Marello/Bundle/InventoryBundle/Resources/translations/tooltips.en.yml
+1-1
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/translations/validators.en.yml
+3-3 b/‎src/Marello/Bundle/InventoryBundle/Resources/translations/validators.en.yml
+3-3
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/views/Inventory/update.html.twig
+12 b/‎src/Marello/Bundle/InventoryBundle/Resources/views/Inventory/update.html.twig
+12
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/views/Inventory/view.html.twig
+11 b/‎src/Marello/Bundle/InventoryBundle/Resources/views/Inventory/view.html.twig
+11
diff --git a/‎src/Marello/Bundle/InventoryBundle/Validator/InventoryOrderOnDemandValidator.php
+22-5 b/‎src/Marello/Bundle/InventoryBundle/Validator/InventoryOrderOnDemandValidator.php
+22-5
diff --git a/‎src/Marello/Bundle/InvoiceBundle/Entity/AbstractInvoice.php
+1-1 b/‎src/Marello/Bundle/InvoiceBundle/Entity/AbstractInvoice.php
+1-1
diff --git a/‎src/Marello/Bundle/InvoiceBundle/Entity/AbstractInvoiceItem.php
+1-1 b/‎src/Marello/Bundle/InvoiceBundle/Entity/AbstractInvoiceItem.php
+1-1
diff --git a/‎src/Marello/Bundle/OrderBundle/Form/Type/OrderItemType.php
+1 b/‎src/Marello/Bundle/OrderBundle/Form/Type/OrderItemType.php
+1
diff --git a/‎src/Marello/Bundle/PurchaseOrderBundle/EventListener/Doctrine/PurchaseOrderOnOrderOnDemandCreationListener.php
+21 b/‎src/Marello/Bundle/PurchaseOrderBundle/EventListener/Doctrine/PurchaseOrderOnOrderOnDemandCreationListener.php
+21
diff --git a/‎src/Marello/Bundle/PurchaseOrderBundle/Resources/config/services.yml
+2 b/‎src/Marello/Bundle/PurchaseOrderBundle/Resources/config/services.yml
+2
@@ -3,8 +3,6 @@
 namespace Marello\Bundle\CustomerBundle\Controller;
 
 use Marello\Bundle\CustomerBundle\Entity\Customer;
-use Oro\Bundle\NoteBundle\Entity\Note;
-use Oro\Bundle\NoteBundle\Entity\Repository\NoteRepository;
 use Oro\Bundle\SecurityBundle\Annotation\AclAncestor;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
@@ -165,10 +165,14 @@ datagrids:
             query:
                 select:
                     - company.createdAt
+                    - company.companyNumber
                     - company.updatedAt
         options:
             entity_pagination: true
         columns:
+            companyNumber:
+                label:          marello.customer.company.company_number.label
+                frontend_type:  string
             createdAt:
                 label:          oro.ui.created_at
                 frontend_type:  datetime
@@ -177,6 +181,9 @@ datagrids:
                 frontend_type:  datetime
         filters:
             columns:
+                companyNumber:
+                    type:  string
+                    data_name:  company.companyNumber
                 createdAt:
                     type: datetime
                     data_name: company.createdAt
@@ -185,6 +192,8 @@ datagrids:
                     data_name: company.updatedAt
         sorters:
             columns:
+                companyNumber:
+                    data_name: company.companyNumber
                 createdAt:
                     data_name: company.createdAt
                 updatedAt:
 
@@ -0,0 +1,15 @@
+<?php
+
+namespace Marello\Bundle\DemoDataBundle\Migrations\Data\Demo\ORM;
+
+use Marello\Bundle\SalesBundle\Migrations\Data\ORM\LoadSalesChannelTypesData as BaseLoadSalesChannelTypesData;
+
+class LoadSalesChannelTypesData extends BaseLoadSalesChannelTypesData
+{
+    /** @var array */
+    protected $data = [
+        'pos' => 'Pos',
+        'webshop' => 'Webshop',
+        'marketplace' => 'Marketplace'
+    ];
+}
@@ -5,9 +5,9 @@
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-
 use Marello\Bundle\SalesBundle\Entity\SalesChannel;
 use Marello\Bundle\SalesBundle\Entity\SalesChannelGroup;
+use Marello\Bundle\SalesBundle\Entity\SalesChannelType;
 use Marello\Bundle\SalesBundle\Migrations\Data\ORM\LoadSalesChannelGroupData as MigrationLoadSalesChannelGroupData;
 
 class LoadSalesData extends AbstractFixture implements DependentFixtureInterface
@@ -95,6 +95,7 @@ public function getDependencies()
     {
         return [
             MigrationLoadSalesChannelGroupData::class,
+            LoadSalesChannelTypesData::class
         ];
     }
 
@@ -118,7 +119,7 @@ protected function loadSalesChannels()
 
         foreach ($this->data as $values) {
             $channel = (new SalesChannel($values['name']))
-                ->setChannelType($values['type'])
+                ->setChannelType($this->findTypeByName($values['type']))
                 ->setCode($values['code'])
                 ->setCurrency($values['currency'])
                 ->setOwner($organization)
@@ -131,4 +132,21 @@ protected function loadSalesChannels()
 
         $this->manager->flush();
     }
+
+    /**
+     * @param string $name
+     * @return null|SalesChannelType
+     */
+    private function findTypeByName($name)
+    {
+        $type = $this->manager
+            ->getRepository(SalesChannelType::class)
+            ->find($name);
+
+        if ($type) {
+            return $type;
+        }
+
+        return null;
+    }
 }
@@ -36,6 +36,12 @@ public function getConfigTreeBuilder()
                 ],
                 'balance_threshold_percentage' => [
                     'value' => 0.20
+                ],
+                'inventory_on_demand_enabled' => [
+                    'value' => false
+                ],
+                'inventory_on_demand' => [
+                    'value' => false
                 ]
             ]
         );
 
@@ -265,6 +265,11 @@ public function generateResult($linkedWhgToScgs, $sortedWhgLevels, $product, $fl
             $reservedInventoryQuantity = $this->getReservedInventoryForProductScgs($product, $scgs);
             $totalInventoryToBalance = ($inventoryTotalForWhg - $reservedInventoryQuantity);
 
+            // prevent balanced inventory below 0.
+            if ($totalInventoryToBalance < 0) {
+                $totalInventoryToBalance = 0;
+            }
+
             /** @var BalancedResultObject[] $balancedResults */
             $balancedResults = $strategy->getResults($product, $scgs, $totalInventoryToBalance);
             $this->processResults($balancedResults, $product, $flushManager);
 
@@ -9,7 +9,11 @@ system_configuration:
             title: marello.inventory.system_configuration.groups.inventory.balacing.general.label
         inventory_balancing_strategy:
             title: marello.inventory.system_configuration.groups.inventory.balacing.strategy.label
-
+        inventory_on_demand:
+            title: marello.inventory.system_configuration.groups.inventory.on_demand.title
+            icon: fa-cog
+        inventory_on_demand_general:
+            title: marello.inventory.system_configuration.groups.inventory.on_demand.general.label
     fields:
         marello_inventory.balance_threshold_percentage:
             data_type: percent
@@ -30,6 +34,21 @@ system_configuration:
                 constraints:
                     - NotBlank: ~
 
+        marello_inventory.inventory_on_demand_enabled:
+            data_type: boolean
+            type: Oro\Bundle\ConfigBundle\Form\Type\ConfigCheckbox
+            options:
+                label: marello.inventory.system_configuration.fields.inventory_on_demand_enabled.label
+                required: false
+
+        marello_inventory.inventory_on_demand:
+            data_type: boolean
+            type: Oro\Bundle\ConfigBundle\Form\Type\ConfigCheckbox
+            options:
+                label: marello.inventory.system_configuration.fields.inventory_on_demand.label
+                tooltip: marello.inventory.system_configuration.fields.inventory_on_demand
+                required: false
+
     tree:
         system_configuration:
             marello:
@@ -44,3 +63,9 @@ system_configuration:
                                     inventory_balancing_strategy:
                                         children:
                                             - marello_inventory.balancing_strategy
+                            inventory_on_demand:
+                                children:
+                                    inventory_on_demand_general:
+                                        children:
+                                            - marello_inventory.inventory_on_demand_enabled
+                                            - marello_inventory.inventory_on_demand
@@ -200,6 +200,8 @@ services:
 
     marello_inventory.form.inventory_order_on_demand_validator:
         class: 'Marello\Bundle\InventoryBundle\Validator\InventoryOrderOnDemandValidator'
+        calls:
+            - [setConfigManager, ['@oro_config.manager']]
         tags:
             - { name: validator.constraint_validator, alias: marello_inventory.order_on_demand_validator }
 
 
@@ -184,9 +184,14 @@ marello:
                     back_pre_orders:
                         title:              Backorders/Pre-orders
                         general.label:      General
+                    on_demand:
+                        title:              Inventory On Demand
+                        general.label:      General
             fields:
                 balancing_strategy.label:                     Strategy
                 balance_threshold_percentage.label:           Threshold Percentage
+                inventory_on_demand.label:                    Use Purchase Order with inventory on demand
+                inventory_on_demand_enabled.label:            Enable Inventory On Demand
         messages:
             success:
                 warehouse.saved:        Warehouse has been saved successfully
 
@@ -8,7 +8,7 @@ marello:
         system_configuration:
             fields:
                 balance_threshold_percentage: Threshold for when the balancer should rebalance the inventory for a product. This threshold is used in the calculation between the current inventory and the original balanced inventory quantity.
-
+                inventory_on_demand: Enabling this feature will require you to connect suppliers to Products, failing to do so will result in weird behaviour and issues.
         form:
             tooltip:
                 max_qty_to_backorder: Limit the number of items that can be ordered in one order. Leave blank if no restriction applies.
 
@@ -8,6 +8,6 @@ marello:
 
                     inventoryitem:
                         desired_should_be_greater_than_purchase_inventory: Desired Inventory needs to be greater than or equal to the Purchase Inventory
-                        order_on_demand_not_allowed_supplier: Order On Demand can't be allowed if Product has no Supplier
-                        order_on_demand_not_allowed_backorder: Order On Demand can't be allowed if Backorder allowed
-                        order_on_demand_not_allowed_preorder: Order On Demand can't be allowed if Pre-Order allowed
+                        order_on_demand_not_allowed_supplier: Order On Demand is not allowed if Product has no Supplier configured
+                        order_on_demand_not_allowed_backorder: Order On Demand is not allowed if Backorder allowed
+                        order_on_demand_not_allowed_preorder: Order On Demand is not allowed if Pre-Order allowed
@@ -181,6 +181,18 @@
         }
     ] %}
 
+    {% set orderOnDemandAllowed = oro_config_value('marello_inventory.inventory_on_demand_enabled') %}
+    {% if orderOnDemandAllowed %}
+        {% set dataBlocks = dataBlocks|merge([{
+            'title': 'marello.inventory.inventoryitem.section.orderondemand.label'|trans,
+            'useSpan': false,
+            'subblocks': [
+                { 'data' : [orderOnDemandInfoWidget] }
+            ]
+        }])
+        %}
+    {% endif %}
+
     {% set data = {
         'formErrors': form_errors(form)? form_errors(form) : null,
         'dataBlocks': dataBlocks,
 
@@ -199,6 +199,17 @@
             }]
         }])
     %}
+    {% set orderOnDemandAllowed = oro_config_value('marello_inventory.inventory_on_demand_enabled') %}
+    {% if orderOnDemandAllowed %}
+        {% set dataBlocks = dataBlocks|merge([{
+            'title': 'marello.inventory.inventoryitem.section.orderondemand.label'|trans,
+            'useSpan': false,
+            'subblocks': [
+                { 'data' : [orderOnDemandInfoWidget] }
+            ]
+        }])
+        %}
+    {% endif %}
 
     {% set data = { 'dataBlocks': dataBlocks } %}
     {{ parent() }}
 
@@ -6,10 +6,15 @@
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
+use Oro\Bundle\ConfigBundle\Config\ConfigManager;
+
 use Marello\Bundle\InventoryBundle\Entity\InventoryItem;
 
 class InventoryOrderOnDemandValidator extends ConstraintValidator
 {
+    /** @var ConfigManager $configManager */
+    private $configManager;
+
     /**
      * Checks if the passed entity is unique in collection.
      * @param mixed $entity
@@ -22,11 +27,15 @@ public function validate($entity, Constraint $constraint)
             return;
         }
         $product = $entity->getProduct();
-        if ($entity->isOrderOnDemandAllowed() &&
-            (!$product->getPreferredSupplier() || $product->getSuppliers()->count() === 0)) {
-            $this->context->buildViolation($constraint->message)
-                ->atPath('orderOnDemandAllowed')
-                ->addViolation();
+        if ($this->configManager->get('marello_inventory.inventory_on_demand_enabled') &&
+            $this->configManager->get('marello_inventory.inventory_on_demand')
+        ) {
+            if ($entity->isOrderOnDemandAllowed() &&
+                (!$product->getPreferredSupplier() || $product->getSuppliers()->count() === 0)) {
+                $this->context->buildViolation($constraint->message)
+                    ->atPath('orderOnDemandAllowed')
+                    ->addViolation();
+            }
         }
         if ($entity->isOrderOnDemandAllowed() && $entity->isBackorderAllowed()) {
             $this->context
@@ -45,4 +54,12 @@ public function validate($entity, Constraint $constraint)
                 ->addViolation();
         }
     }
+
+    /**
+     * @param ConfigManager $configManager
+     */
+    public function setConfigManager(ConfigManager $configManager)
+    {
+        $this->configManager = $configManager;
+    }
 }
@@ -27,7 +27,7 @@
  * @ORM\Entity(repositoryClass="Marello\Bundle\InvoiceBundle\Entity\Repository\AbstractInvoiceRepository")
  * @ORM\InheritanceType("SINGLE_TABLE")
  * @ORM\DiscriminatorColumn(name="type", type="string")
- * @ORM\DiscriminatorMap({"invoice" = "Invoice", "creditmemo" = "Creditmemo"})
+ * @ORM\DiscriminatorMap({"invoice" = "Marello\Bundle\InvoiceBundle\Entity\Invoice", "creditmemo" = "Marello\Bundle\InvoiceBundle\Entity\Creditmemo"})
  * @ORM\Table(name="marello_invoice_invoice")
  * @Oro\Config(
  *      routeView="marello_invoice_invoice_view",
 
@@ -31,7 +31,7 @@
  * @ORM\Table(name="marello_invoice_invoice_item")
  * @ORM\InheritanceType("SINGLE_TABLE")
  * @ORM\DiscriminatorColumn(name="invoice_item_type", type="string")
- * @ORM\DiscriminatorMap({"invoiceitem" = "InvoiceItem", "creditmemoitem" = "CreditmemoItem"})
+ * @ORM\DiscriminatorMap({"invoiceitem" = "Marello\Bundle\InvoiceBundle\Entity\InvoiceItem", "creditmemoitem" = "Marello\Bundle\InvoiceBundle\Entity\CreditmemoItem"})
  * @ORM\HasLifecycleCallbacks()
  */
 abstract class AbstractInvoiceItem implements
 
@@ -59,6 +59,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ]
             ])
             ->add('productUnit', TextType::class, [
+                'mapped' => false,
                 'attr' => [
                     'readonly' => true
                 ]
 
@@ -5,6 +5,9 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
+
+use Oro\Bundle\ConfigBundle\Config\ConfigManager;
+
 use Marello\Bundle\InventoryBundle\Entity\Warehouse;
 use Marello\Bundle\InventoryBundle\Entity\WarehouseChannelGroupLink;
 use Marello\Bundle\InventoryBundle\Provider\AvailableInventoryProvider;
@@ -30,6 +33,9 @@ class PurchaseOrderOnOrderOnDemandCreationListener
      */
     private $availableInventoryProvider;
 
+    /** @var ConfigManager $configManager */
+    private $configManager;
+
     /**
      * @param AvailableInventoryProvider $availableInventoryProvider
      */
@@ -47,6 +53,13 @@ public function postPersist(LifecycleEventArgs $args)
         if (!$entity instanceof Order) {
             return;
         }
+
+        if (!$this->configManager->get('marello_inventory.inventory_on_demand_enabled')
+            || !$this->configManager->get('marello_inventory.inventory_on_demand')
+        ) {
+            return;
+        }
+
         $orderOnDemandItems = [];
         $salesChannel = $entity->getSalesChannel();
         foreach ($entity->getItems() as $item) {
@@ -210,4 +223,12 @@ private function getLinkedWarehouse(Order $order, EntityManager $manager)
 
         return !empty($linkedWarehouses) ? reset($linkedWarehouses) : null;
     }
+
+    /**
+     * @param ConfigManager $configManager
+     */
+    public function setConfigManager(ConfigManager $configManager)
+    {
+        $this->configManager = $configManager;
+    }
 }
@@ -55,6 +55,8 @@ services:
         class: Marello\Bundle\PurchaseOrderBundle\EventListener\Doctrine\PurchaseOrderOnOrderOnDemandCreationListener
         arguments:
             - '@marello_inventory.provider.available_inventory_provider'
+        calls:
+            - ['setConfigManager', ['@oro_config.manager']]
         tags:
             - { name: doctrine.event_listener, event: postPersist }
             - { name: doctrine.event_listener, event: postFlush }
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,12 @@ public function getConfigTreeBuilder()`
`36`	`36`	`],`
`37`	`37`	`'balance_threshold_percentage' => [`
`38`	`38`	`'value' => 0.20`
	`39`	`+ ],`
	`40`	`+ 'inventory_on_demand_enabled' => [`
	`41`	`+ 'value' => false`
	`42`	`+ ],`
	`43`	`+ 'inventory_on_demand' => [`
	`44`	`+ 'value' => false`
`39`	`45`	`]`
`40`	`46`	`]`
`41`	`47`	`);`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`59`	`59`	`]`
`60`	`60`	`])`
`61`	`61`	`->add('productUnit', TextType::class, [`
	`62`	`+ 'mapped' => false,`
`62`	`63`	`'attr' => [`
`63`	`64`	`'readonly' => true`
`64`	`65`	`]`