Squashed 'package/marello/' changes from dac3d53..e2134fd

e2134fd Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0
324cba8 - renamed migrations to take newer versions of migrations into account on the develop branch
7fc60c7 - updated return notifications with ProductUnit on line items - added migration to update existing templates
4e71779 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations
7b7407c - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null
d20075c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field
544f773 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved
3e39516 - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper
34cb160 - Added unitOfMeasurement to the InventoryItem view
b5ab255 - added unitOfMeasurement to InventoryItem grid with filters and sorters
db865d0 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem)
3cc166c - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address
584f866 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0
f0b0ccd Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0
e170548 - Added the replenishment field to the variant grid for seeing continuation of the product
b6d7f17 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right
b150ac8 - added validation message for DeliveryDate if date is not set in the future
5b6426f - Added deliveryDate validation to make sure the date is set in the future and not in the past
32f7b4c Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0
1f2c18c - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress
f26ffdd - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection
6490937 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0
a913e8d - remove disabled code from SalesChannelType form type
af094b9 Merge branch 'feature/magento2-integr' into testmerge-magentoint
0a5c725 - removing BC break from order view regarding payments
3baf789 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet
4a509e5 MAR10001-931: Update Order and OrderItem entities with additional fields
ba7bed3 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0
27b7007 - fixed issue with checking companyNumber on null while trying to render the PDF template
f16cfe6 - fixed issue with misquoting the columns on the unique constraint in the Company entity
f5ed9ad Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0
7bd2784 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form
125bbe8 - removed commit reference in validation file
1c0060e Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0
34dbdfe - renamed Company code to Company number - added pdf translation - moved company number on the PDF
68d20ae MAR10001-909: Add Company ID to Company
d719683 MM-25: Add logic for product prices and inventory synchronization (#50)
bdf568e - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null
4c54cd3 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information
229daed Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0
96e7019 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0
cd128f1 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension
c019a6c Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0
c4b1b9e Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0
a61f403 - added missing validator translations regarding shipping method rules and configs
357cc70 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file
3929205 MM-13: Implement initial products export (#49)
7478a59 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0
e2a0f48 - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group
c9bb1d0 - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null
ad17b0a - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper
a2215e6 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager
df0ac89 - fixed issue with product duplication error when the action group registry is not a public service anymore, created a provider that injects said service and retrieving it via the provider that has been created as a public service
592e2e7 MM-23: Add logic to process changes in integration (#47)
d543090 - dropped unique index on integration ID on SalesChannel to allow a SalesChannelGroup with multiple SC's be connected to the integration - moved some fields around in the integration settings form - updated the OroCommerce integration event listener to take into account the integration is now linked to a SalesChannelGroup and not a single SalesChannel
9f3d6dc - removed required asterisk from Description on SalesChannel as this is not a required field
5cc3984 - removed required asterisk from description as this is not required in the SCG
d9db8bb MM-22: Add logic to process changes in Sales Channel (#46)
854eab6 MM-8: Add logic for tax class dictionary synchronization (#45)
e2ebbb0 MM-6: Prepare logic for dictionary synchronization (#40)
9968fae MM-4: Create Magento2 integration form - Added missed constraints
4ce69ce MM-4: Create Magento2 integration form

git-subtree-dir: package/marello
git-subtree-split: e2134fd

Author: 24198

src/Marello/Bundle/CustomerBundle/Migrations/Schema/MarelloCustomerBundleInstaller.php

@@ -34,7 +34,7 @@ class MarelloCustomerBundleInstaller implements
      */
     public function getMigrationVersion()
     {
-        return 'v1_4';
+        return 'v1_4_1';
     }
 
     /**
@@ -106,8 +106,6 @@ protected function createMarelloCustomerTable(Schema $schema)
         $table->addColumn('tax_identification_number', 'string', ['notnull' => false, 'length' => 255]);
         $table->addColumn('company_id', 'integer', ['notnull' => false]);
         $table->setPrimaryKey(['id']);
-        $table->addUniqueIndex(['primary_address_id'], 'UNIQ_75C456C9F5B7AF75');
-        $table->addUniqueIndex(['shipping_address_id'], 'UNIQ_75C456C94D4CFF2B');
         $table->addIndex(['organization_id']);
 
         $this->attachmentExtension->addAttachmentAssociation($schema, $table->getName());

src/Marello/Bundle/CustomerBundle/Migrations/Schema/v1_4_1/MarelloCustomerBundle.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Marello\Bundle\CustomerBundle\Migrations\Schema\v1_4_1;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtension;
+use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtensionAwareInterface;
+
+use Marello\Bundle\CustomerBundle\Migrations\Schema\MarelloCustomerBundleInstaller;
+
+class MarelloCustomerBundle implements Migration
+{
+    /**
+     * @inheritDoc
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable(MarelloCustomerBundleInstaller::MARELLO_CUSTOMER_TABLE);
+        // drop unique indexes for customer primary and shipping address
+        if ($table->hasIndex('UNIQ_75C456C9F5B7AF75')) {
+            $table->dropIndex('UNIQ_75C456C9F5B7AF75');
+        }
+
+        if ($table->hasIndex('UNIQ_75C456C94D4CFF2B')) {
+            $table->dropIndex('UNIQ_75C456C94D4CFF2B');
+        }
+
+        if ($table->hasForeignKey('FK_AD0CE5A24D4CFF2B')) {
+            $table->removeForeignKey('FK_AD0CE5A24D4CFF2B');
+            $table->addForeignKeyConstraint(
+                $schema->getTable('marello_address'),
+                ['shipping_address_id'],
+                ['id'],
+                ['onDelete' => null, 'onUpdate' => null]
+            );
+        }
+        if ($table->hasForeignKey('FK_AD0CE5A2CB134313')) {
+            $table->removeForeignKey('FK_AD0CE5A2CB134313');
+            $table->addForeignKeyConstraint(
+                $schema->getTable('marello_address'),
+                ['primary_address_id'],
+                ['id'],
+                ['onDelete' => null, 'onUpdate' => null]
+            );
+        }
+    }
+}

src/Marello/Bundle/InventoryBundle/Entity/InventoryItem.php

@@ -282,6 +282,21 @@ class InventoryItem extends ExtendInventoryItem implements ProductAwareInterface
      */
     protected $enableBatchInventory;
 
+    /**
+     * @var \Extend\Entity\EV_Marello_Product_Unit
+     * @Oro\ConfigField(
+     *      defaultValues={
+     *          "dataaudit"={
+     *              "auditable"=true
+     *          },
+     *          "importexport"={
+     *              "excluded"=true
+     *          }
+     *      }
+     * )
+     */
+    protected $productUnit;
+
     /**
      * InventoryItem constructor.
      *
@@ -594,4 +609,23 @@ public function setEnableBatchInventory($enableBatchInventory)
 
         return $this;
     }
+
+    /**
+     * @return \Extend\Entity\EV_Marello_Product_Unit
+     */
+    public function getProductUnit()
+    {
+        return $this->productUnit;
+    }
+
+    /**
+     * @param string $productUnit
+     * @return $this
+     */
+    public function setProductUnit($productUnit)
+    {
+        $this->productUnit = $productUnit;
+
+        return $this;
+    }
 }

src/Marello/Bundle/InventoryBundle/EventListener/OnProductCreateEventListener.php

@@ -58,6 +58,7 @@ protected function createInventoryItem(Product $entity)
         $result = $this->inventoryItemManager->createInventoryItem($entity);
         if ($result) {
             $inventoryItem = $this->checkReplenishment($result);
+            $inventoryItem = $this->checkProductUnit($inventoryItem);
             $this->em->persist($inventoryItem);
             $classMeta = $this->em->getClassMetadata(get_class($inventoryItem));
             $this->unitOfWork->computeChangeSet($classMeta, $inventoryItem);
@@ -81,6 +82,23 @@ protected function checkReplenishment($item)
         return $item;
     }
 
+    /**
+     * @param InventoryItem $item
+     * @return mixed
+     */
+    protected function checkProductUnit($item)
+    {
+        if (!$item->getProductUnit()) {
+            // get default product unit option
+            $productUnit = $this->inventoryItemManager->getDefaultProductUnit();
+            if ($productUnit) {
+                $item->setProductUnit($productUnit);
+            }
+        }
+
+        return $item;
+    }
+
     /**
      * @param array $records
      * @return array

src/Marello/Bundle/InventoryBundle/Form/Type/InventoryItemType.php

@@ -126,6 +126,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label' => 'marello.inventory.inventoryitem.enable_batch_inventory.label'
                 ]
             )
+            ->add(
+                'productUnit',
+                EnumChoiceType::class,
+                [
+                    'enum_code' => 'marello_product_unit',
+                    'required'  => false,
+                    'label'     => 'marello.inventory.inventoryitem.product_unit.label',
+                ]
+            )
             ->addEventListener(FormEvents::PRE_SET_DATA, [$this, 'preSetDataListener']);
         if ($this->subscriber !== null) {
             $builder->addEventSubscriber($this->subscriber);

src/Marello/Bundle/InventoryBundle/Manager/InventoryItemManager.php

@@ -2,10 +2,13 @@
 
 namespace Marello\Bundle\InventoryBundle\Manager;
 
-use Marello\Bundle\InventoryBundle\Entity\InventoryItem;
-use Marello\Bundle\ProductBundle\Entity\Product;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
+use Oro\Bundle\EntityExtendBundle\Entity\Repository\EnumValueRepository;
+
+use Marello\Bundle\ProductBundle\Entity\Product;
+use Marello\Bundle\InventoryBundle\Entity\InventoryItem;
+use Marello\Bundle\ProductBundle\Migrations\Data\ORM\LoadProductUnitData;
 
 class InventoryItemManager implements InventoryItemManagerInterface
 {
@@ -76,6 +79,18 @@ public function getDefaultReplenishment()
         return $repo->findOneBy(['default' => 1]);
     }
 
+    /**
+     * Get default product unit for InventoryItem
+     * @return null|object
+     */
+    public function getDefaultProductUnit()
+    {
+        $productUnit = ExtendHelper::buildEnumValueClassName(LoadProductUnitData::PRODUCT_UNIT_ENUM_CLASS);
+        /** @var EnumValueRepository $repo */
+        $repo = $this->doctrineHelper->getEntityRepository($productUnit);
+        return $repo->findOneByDefault(true);
+    }
+
     /**
      * Get an InventoryItem to delete based on the Product
      * @param $product

src/Marello/Bundle/InventoryBundle/Manager/InventoryItemManagerInterface.php

@@ -2,6 +2,8 @@
 
 namespace Marello\Bundle\InventoryBundle\Manager;
 
+// @todo next release add getDefaultUnitOfMeasurement() as interface method
+
 interface InventoryItemManagerInterface
 {
     public function createInventoryItem($product);

src/Marello/Bundle/InventoryBundle/Migrations/Schema/MarelloInventoryBundleInstaller.php

@@ -25,7 +25,7 @@ class MarelloInventoryBundleInstaller implements Installation, ExtendExtensionAw
      */
     public function getMigrationVersion()
     {
-        return 'v2_4';
+        return 'v2_5_1';
     }
 
     /**
@@ -89,6 +89,17 @@ protected function createMarelloInventoryItemTable(Schema $schema)
                 'extend' => ['owner' => ExtendScope::OWNER_CUSTOM],
             ]
         );
+        $this->extendExtension->addEnumField(
+            $schema,
+            $table,
+            'productUnit',
+            'marello_product_unit',
+            false,
+            false,
+            [
+                'extend' => ['owner' => ExtendScope::OWNER_SYSTEM],
+            ]
+        );
 
         $table->setPrimaryKey(['id']);
         $table->addUniqueIndex(['product_id'], 'UNIQ_40B8D0414584665A', []);

src/Marello/Bundle/InventoryBundle/Migrations/Schema/v2_5_1/UpdateInventoryItemTable.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Marello\Bundle\InventoryBundle\Migrations\Schema\v2_5_1;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope;
+use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtension;
+use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtensionAwareInterface;
+
+class UpdateInventoryItemTable implements Migration, ExtendExtensionAwareInterface
+{
+    const INVENTORY_ITEM_TABLE_NAME = 'marello_inventory_item';
+    /**
+     * @var ExtendExtension
+     */
+    protected $extendExtension;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $this->updateInventoryItemTable($schema);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @param Schema $schema
+     * @param QueryBag $queries
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    protected function updateInventoryItemTable(Schema $schema)
+    {
+        $table = $schema->getTable(self::INVENTORY_ITEM_TABLE_NAME);
+        $this->extendExtension->addEnumField(
+            $schema,
+            $table,
+            'productUnit',
+            'marello_product_unit',
+            false,
+            false,
+            [
+                'extend' => ['owner' => ExtendScope::OWNER_SYSTEM],
+            ]
+        );
+    }
+
+    /**
+     * Sets the ExtendExtension
+     *
+     * @param ExtendExtension $extendExtension
+     */
+    public function setExtendExtension(ExtendExtension $extendExtension)
+    {
+        $this->extendExtension = $extendExtension;
+    }
+}

src/Marello/Bundle/InventoryBundle/Resources/config/oro/datagrids.yml

@@ -8,6 +8,7 @@ datagrids:
                     - p.denormalizedDefaultName as productName
                     - p.sku as productSku
                     - i.enableBatchInventory as enableBatchInventory
+                    - productUnit.name as productUnit
                     - COALESCE(SUM(il.inventory), 0) AS inventoryQty
                     - COALESCE(SUM(il.allocatedInventory), 0) AS allocatedInventoryQty
                     - COALESCE(SUM(il.inventory - il.allocatedInventory), 0) AS virtualInventoryQty
@@ -17,6 +18,7 @@ datagrids:
                     left:
                         - { join: i.product, alias: p }
                         - { join: i.inventoryLevels, alias: il }
+                        - { join: i.productUnit, alias: productUnit }
                 groupBy: i.id
         columns:
             productSku:
@@ -29,6 +31,10 @@ datagrids:
                 label:              marello.product.names.label
                 frontend_type:      string
                 data_name:          productName
+            productUnit:
+                label:              marello.inventory.inventoryitem.product_unit.label
+                frontend_type:      string
+                data_name:          productUnit
             enableBatchInventory:
                 label:              marello.inventory.inventoryitem.enable_batch_inventory.label
                 frontend_type:      boolean
@@ -49,6 +55,7 @@ datagrids:
             columns:
                 productSku:             { data_name: p.sku }
                 productName:            { data_name: p.denormalizedDefaultName }
+                productUnit:            { data_name: productUnit }
                 enableBatchInventory:   { data_name: enableBatchInventory }
                 inventoryQty:           { data_name: inventoryQty }
                 allocatedInventoryQty:  { data_name: allocatedInventoryQty }
@@ -63,6 +70,10 @@ datagrids:
                 productName:
                     type:             string
                     data_name:        p.denormalizedDefaultName
+                productUnit:
+                    type:             enum
+                    data_name:        productUnit
+                    enum_code:        marello_product_unit
                 enableBatchInventory:
                     type:             boolean
                     data_name:        enableBatchInventory

src/Marello/Bundle/InventoryBundle/Resources/translations/messages.en.yml

@@ -76,8 +76,10 @@ marello:
             pre_orders_datetime.label:     Pre-orders Datetime
             order_on_demand_allowed.label: Order on demand allowed
             enable_batch_inventory.label:  Enable Batch Inventory
+            product_unit.label:            Unit
 
             section:
+                unit_of_measurement.label:  Unit of Measurement
                 backorder_preorder.label:   Backorder/Pre-order
                 backorder.label:            Backorder
                 preorder.label:             Pre-order

src/Marello/Bundle/InventoryBundle/Resources/views/Inventory/update.html.twig

@@ -47,6 +47,18 @@
                             'title': 'marello.product.product_information'|trans
                         }) }}
                     </div>
+                    <div class="box-type1">
+                        <div class="title">
+                            <span class="widget-title">{{ 'marello.inventory.inventoryitem.section.unit_of_measurement.label'|trans }}</span>
+                        </div>
+                        <div class="widget-content">
+                            <div class="row-fluid form-horizontal">
+                                <div class="responsive-block">
+                                    {{ form_row(form.productUnit) }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

src/Marello/Bundle/InventoryBundle/Resources/views/Inventory/view.html.twig

@@ -40,6 +40,18 @@
                             'title': 'marello.product.product_information'|trans
                         }) }}
                     </div>
+                    <div class="box-type1">
+                        <div class="title">
+                            <span class="widget-title">{{ 'marello.inventory.inventoryitem.section.unit_of_measurement.label'|trans }}</span>
+                        </div>
+                        <div class="widget-content">
+                            <div class="row-fluid form-horizontal">
+                                <div class="responsive-block">
+                                    {{ UI.renderProperty('marello.inventory.inventoryitem.product_unit.label'|trans, entity.productUnit|default('N/A')) }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>