marellocommerce
diff --git a/‎composer.json‎
Lines changed: 1 addition & 1 deletion b/‎composer.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Marello/Bundle/CustomerBundle/Controller/CustomerController.php‎
Lines changed: 0 additions & 2 deletions b/‎src/Marello/Bundle/CustomerBundle/Controller/CustomerController.php‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/Marello/Bundle/CustomerBundle/Resources/config/oro/datagrids.yml‎
Lines changed: 9 additions & 0 deletions b/‎src/Marello/Bundle/CustomerBundle/Resources/config/oro/datagrids.yml‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Marello/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadSalesChannelTypesData.php‎
Lines changed: 15 additions & 0 deletions b/‎src/Marello/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadSalesChannelTypesData.php‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Marello/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadSalesData.php‎
Lines changed: 20 additions & 2 deletions b/‎src/Marello/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadSalesData.php‎
Lines changed: 20 additions & 2 deletions
diff --git a/‎src/Marello/Bundle/InventoryBundle/DependencyInjection/Configuration.php‎
Lines changed: 6 additions & 0 deletions b/‎src/Marello/Bundle/InventoryBundle/DependencyInjection/Configuration.php‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Marello/Bundle/InventoryBundle/Model/InventoryBalancer/InventoryBalancer.php‎
Lines changed: 6 additions & 0 deletions b/‎src/Marello/Bundle/InventoryBundle/Model/InventoryBalancer/InventoryBalancer.php‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/config/oro/system_configuration.yml‎
Lines changed: 26 additions & 1 deletion b/‎src/Marello/Bundle/InventoryBundle/Resources/config/oro/system_configuration.yml‎
Lines changed: 26 additions & 1 deletion
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/config/services.yml‎
Lines changed: 2 additions & 0 deletions b/‎src/Marello/Bundle/InventoryBundle/Resources/config/services.yml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Marello/Bundle/InventoryBundle/Resources/translations/messages.en.yml‎
Lines changed: 5 additions & 0 deletions b/‎src/Marello/Bundle/InventoryBundle/Resources/translations/messages.en.yml‎
Lines changed: 5 additions & 0 deletions
@@ -23,7 +23,7 @@
         "oro/platform": "4.1.*",
         "oro/platform-serialised-fields": "4.1.*",
         "oro/calendar-bundle": "4.1.*",
-        "mpdf/mpdf": "^7.1"
+        "mpdf/mpdf": "^8.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
 
@@ -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
                 ]
             ]
         );
 
@@ -67,10 +67,16 @@ public function __construct(
      */
     public function balanceInventory(Product $product, $isFixed = false, $flushManager = false)
     {
+        // no status, no balancing!
+        if (!$product->getStatus()) {
+            return;
+        }
+
         // check if product is enabled, if not do not (re)balance
         if (ProductStatus::DISABLED === $product->getStatus()->getName()) {
             return;
         }
+
         /** @var InventoryItem $inventoryItem */
         $inventoryItem = $this->getInventoryItemFromProduct($product);
 
 
@@ -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
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`	`);`