Order item custom options #12

clicktrend · 2017-01-23T09:00:57Z

There is no field for custom options of a an ordered item. I think it's a required field to handle orders in Marello. Please add a field to show custom options. This field can be a "data" field where custom options can be stored serialized.

24198 · 2017-01-23T13:36:30Z

Hi @clicktrend,

The custom options are not required nor are they actually implemented. You could use the data field to store such options for now. We'll have a look at the custom options case, in order to see how we should process them.

Thank you for your input!

Kind Regards,

Jaimy

clicktrend · 2017-01-23T13:44:36Z

I need a "data" field on table "marello_order_order_item". Unfortunally it doesn't exists.

I don't know your plans but I will extend that table with my custom bundle.

Thanks

24198 · 2017-03-08T13:55:08Z

Hi @clicktrend,

Sorry I misunderstood the intent and the place of where you would actually wanted the data field. At this very moment we don't have any plans to act on the custom options, since we don't have a use case for this yet. Adding the extra data field on order should give you the functionality you're looking for.

Kind Regards,

Jaimy Casteleijn

clicktrend · 2017-11-10T11:06:10Z

Hi @24198

I decided to extend your order bundle to save custom options. To make it happen you have to call the parent constructor of the mapped superclass. Please add "parent::__construct();" to OrderItem.php

24198 · 2017-11-23T08:21:44Z

Hi @clicktrend,

We've applied calling the parent constructor in the OrderItem in the next release. This will be scheduled by the end of the month. I will also apply the fix in our previous versions and release them too.

Thank you for your support and questions

Kinds Regards,

Jaimy Casteleijn

Removed asset-packagist from composer repositories

…c69360 2c693602ba - remove locks from master eb9e7f1494 Merge branch 'release/3.1' 23f1e134f3 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 786d0ea03b - Preparing release changes ab64cf19b7 Merge branch 'release/3.1' 312e02f712 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 4008073cb3 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 3ddb40ec46 - preparing release 0952e4bcfc - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 55e28918e1 Merge branch 'bugfix/MAR10001-0-products-grid-not-displaying' into develop bdda30a02a - Added deployment type to parameters dist 72c8624d9e - updated oro platform daf631c001 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 d61cb2e294 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 c83358c425 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 56f8a41ae2 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 101d153b65 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 7568f464d4 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 2d285790fc Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily e08d90a30c Merge branch 'maintenance/3.0' 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - 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 7b7407c525 - 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 957c32637c - 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 d20075c92a - 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 b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - 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 3e3951649c - 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 e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - 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) db865d076d - 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) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) ea450262e9 - added config to include M2 bundle - updated dev.json/dev.lock with M2 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - 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 b6d7f1772b - 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 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - 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 1f2c18c580 - 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 093dcc25e7 - 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 f26ffdd5e8 - 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 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order 066d775e84 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' c5697c673a Squashed 'applications/marello-application/' changes from 3a5a0ae59..ce3588041 f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - 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 3baf789b98 - 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 9ede319aa5 - 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 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 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 e45d0240e1 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 b4e915f610 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 0418a66a16 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 cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) d719683eda MM-25: Add logic for product prices and inventory synchronization (#50) a0b0778d37 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 afe8e2fc25 - 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 bdf568e0c4 - 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 33fc001a70 - 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 c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39a687ee30 - 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 4c54cd3881 - 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 39efef0623 - 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 aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 229daedc7d Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 96e7019bf1 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container b997306298 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension cd128f1c0a - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 c019a6c549 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 b1c499415d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 c4b1b9e202 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 02aab5af34 - added missing validator translations regarding shipping method rules and configs a61f403be2 - added missing validator translations regarding shipping method rules and configs bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 6ab3d583ca - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 357cc7021d - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 392920547f MM-13: Implement initial products export (#49) e3d1dbecce MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 558ee27c60 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 7478a591d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 3caff5cccc - 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 e2a0f4859c - 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 336ff49858 - 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 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 701ced59d6 - 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 c9bb1d065d - 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 1309973a1c - 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 84f6cdbe70 - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper ad17b0a0fc - Updated OrderWorkflowStart event listen…

…b6e75 c4b6e750e8 - Preparing release changes ba0ce71e0b - preparing release 58deaedf82 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 01cf94a008 - Added deployment type to parameters dist b4ebc04473 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 11938e95b6 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 f1243cf07c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 0f2d344502 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 10e78edaac Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 fb872d35ea Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 873568bfac Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - 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 7b7407c525 - 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 957c32637c - 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 d20075c92a - 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 b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - 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 3e3951649c - 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 e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - 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) db865d076d - 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) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - 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 b6d7f1772b - 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 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - 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 1f2c18c580 - 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 093dcc25e7 - 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 f26ffdd5e8 - 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 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false e353da748f Merge branch 'feature/magento2-integr' into testmerge-magentoint a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - 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 3baf789b98 - 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 9ede319aa5 - 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 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 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 e45d0240e1 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 b4e915f610 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 0418a66a16 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 cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) d719683eda MM-25: Add logic for product prices and inventory synchronization (#50) a0b0778d37 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 afe8e2fc25 - 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 bdf568e0c4 - 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 33fc001a70 - 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 c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39a687ee30 - 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 4c54cd3881 - 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 39efef0623 - 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 aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 229daedc7d Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 96e7019bf1 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container b997306298 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension cd128f1c0a - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 c019a6c549 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 b1c499415d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 c4b1b9e202 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 02aab5af34 - added missing validator translations regarding shipping method rules and configs a61f403be2 - added missing validator translations regarding shipping method rules and configs bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 6ab3d583ca - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 357cc7021d - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 392920547f MM-13: Implement initial products export (#49) e3d1dbecce MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 558ee27c60 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 7478a591d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 3caff5cccc - 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 e2a0f4859c - 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 336ff49858 - 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 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 701ced59d6 - 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 c9bb1d065d - 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 1309973a1c - 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 84f6cdbe70 - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper ad17b0a0fc - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper a2acb0843c - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 019f2cb11e - 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 a2215e6341 - 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 11ceb32ac8 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the even…

…cf448 14cf448bca Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' 7b3b196d0d - remove locks from master c7cc25978e Merge branch 'release/3.1' 7620a00274 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' df48ae575b - Preparing release changes 3ac2782f9e Merge branch 'release/3.1' c4d74b57fa Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' dbcd9e8b59 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 582e4796b1 - preparing release c41c15110e - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 1d0c1d56c1 - Added deployment type to parameters dist eff2d014a6 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 0106f8a6af Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 f77b7fe9e9 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 6b79a0e49b Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 20aa67991d Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 f43a14f52c Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 03b2e7d2e1 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily a68a19e0fb Merge branch 'maintenance/3.0' 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello 0a97e336bb Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 142c71fb47 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 745cf53163 Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - 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 7b7407c525 - 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 957c32637c - 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 d20075c92a - 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 b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - 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 3e3951649c - 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 e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - 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) db865d076d - 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) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - 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 b6d7f1772b - 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 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - 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 1f2c18c580 - 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 093dcc25e7 - 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 f26ffdd5e8 - 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 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order b2975e504c - removed composer.lock file from master d1962908d2 - removed composer.lock file from master 318b676f80 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' 184c988b5a Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 352786456e Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9551e1b315 Merge branch 'feature/magento2-integr' into testmerge-magentoint a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - 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 3baf789b98 - 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 9ede319aa5 - 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 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 008b3d87cc Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 3591a99162 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 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 e45d0240e1 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 b4e915f610 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 0418a66a16 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 cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 8d3b8b802f Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) d719683eda MM-25: Add logic for product prices and inventory synchronization (#50) a0b0778d37 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 afe8e2fc25 - 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 bdf568e0c4 - 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 33fc001a70 - 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 c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39a687ee30 - 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 4c54cd3881 - 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 39efef0623 - 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 aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 aac7ce894f Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 229daedc7d Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 0b13d63771 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 96e7019bf1 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container b997306298 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension cd128f1c0a - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 6f93c98ca0 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 c019a6c549 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 b1c499415d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 c4b1b9e202 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 02aab5af34 - added missing validator translations regarding shipping method rules and configs a61f403be2 - added missing validator translations regarding shipping method rules and configs bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 6ab3d583ca - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 357cc7021d - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 392920547f MM-13: Implement initial products export (#49) e3d1dbecce MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 09eab30cbe Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 558ee27c60 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 7478a591d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 3caff5cccc - 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 e2a0f4859c - 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 336ff49858 - 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 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to ma…

15fbabcec1 Merge branch 'release/3.1' 6b2714be79 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' c0d61547e5 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' ca47f3cca9 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 2e629b27fe - Added code to the search results of the autocomplete in the warehouse group edit page where warehouses can be selected that are not assigned to a warehousegroup 022ef1cf61 - Added small changes for batches; - added delivery date to batch form bc22c7b02f - reverted the change with adding the warehouse code in the select box of the warehouse selection field in the inventory update, it made a greater mess than it cleared things up 7698d64336 - Updated auto complete label in warehouse select result 1114b665ed Merge branch 'develop' into feature/MAR10001-894 30868b4c8b Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 667f4eb92a Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 d3783f294c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 455eddd360 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 158709d60e Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 18fa4e9a86 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 8758592c62 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid fff6c382ba Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 2c90732536 Merge branch 'task/MAR10001-0-layout-fixes' into develop 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 4ed8185f33 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 0339533106 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 76b9c1c270 Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 114b508780 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 7a56ff54b1 multiple fixes 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 23fe6937ec Merge branch 'maintenance/3.0' 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 5871e21a0d Merge branch 'task/MAR10001-0-update-strategy-results-provider' into develop 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 1000f2aef1 Merge branch 'task/MAR10001-0-cs-fix' into develop b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f5b4980ca7 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 7fb82d1f0e Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation b113472dee Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - 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 7b7407c525 - 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 957c32637c - 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 d20075c92a - 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 b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - 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 3e3951649c - 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 e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - 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) db865d076d - 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) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - 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 b6d7f1772b - 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 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past aeadb25673 Merge branch 'task/MAR10001-905-add-managed-inventory-checkbox-external-wh' into develop efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 1c4da715f3 Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - 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 1f2c18c580 - 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 093dcc25e7 - 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 f26ffdd5e8 - 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 7982aa00f0 Merge branch 'bugfix/MAR10001-0-fixed-wh-not-saved-on-group-after-edit' into develop d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 6fd92437f6 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f035dbfb24 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' c5697c673a Squashed 'applications/marello-application/' changes from 3a5a0ae59..ce3588041 f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - 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 3baf789b98 - 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 9ede319aa5 - 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 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template ec1ee49ad9 Merge branch 'maintenance/3.0' into develop 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 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 e45d0240e1 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 b4e915f610 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 0418a66a16 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 cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file ac776c9713 Merge branch 'maintenance/3.0' into develop 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) d719683eda MM-25: Add logic for product prices and inventory synchronization (#50) a0b0778d37 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 afe8e2fc25 - 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 bdf568e0c4 - 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 33fc001a70 - 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 c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39a687ee30 - 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 4c54cd3881 - 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 39efef0623 - 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 aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 76c7d3fa43 Merge branch 'maintenance/3.0' into develop 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 229daedc7d Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 96e7019bf1 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container b997306298 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension cd128f1c0a - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 c019a6c549 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 b1c499415d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 c4b1b9e202 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 02aab5af34 - added missing validator translations regarding shipping method rules and configs a61f403be2 - added missing validator translations regarding shipping method rules and configs bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 6ab3d583ca - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 357cc7021d - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 392920547f MM-13: Implement initial products export (#49) e3d1dbecce MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 558ee27c60 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 7478a591d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 f1a4f1df96 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 3caff5cccc - 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 e2a0f4859c - 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 336ff49858 - 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 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 701ced59d6 - 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 c9bb1d065d - 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 1309973a1c - 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 84f6cdbe70 - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper ad17b0a0fc - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper a2acb0843c - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 019f2cb11e - 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 a2215e6341 - 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 11ceb32ac8 - 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 494f56e683 - 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 df0ac8930c - 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 2ad444e881 - 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 6cfe92ab4c MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 94ab6bc9f9 MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 592e2e78bd MM-23: Add logic to process changes in integration (#47) 024bee396f MM-23: Add logic to process changes in integration (#47) 05f765e4e2 MM-23: Add logic to process changes in integration (#47) fad55ac8bf MM-23: Add logic to process changes in integration (#47) d8b6058ee9 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG t…

73c2e39ff5 - Added minor fixes to purchase orders view and form 7b00a7d73c - Added possibility to update cost via marello-supplier-product-grid c0e9f673c7 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 1591559098 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 9a16f4759c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 26a030ac69 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 cf8c669f62 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 dcc89ded95 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 746d1e3655 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - 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 957c32637c - 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 b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - 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 e15f975b1f - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - 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) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - 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 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - 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 093dcc25e7 - 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 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 9ede319aa5 - 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 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme b4e915f610 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 0418a66a16 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 cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 61b2f271b5 - removed commit reference in validation file 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 33fc001a70 - 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 c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39efef0623 - 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 aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 336ff49858 - 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 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 1309973a1c - 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 a2acb0843c - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 11ceb32ac8 - 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 2ad444e881 - 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 6cfe92ab4c MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 94ab6bc9f9 MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 05f765e4e2 MM-23: Add logic to process changes in integration (#47) fad55ac8bf MM-23: Add logic to process changes in integration (#47) d8b6058ee9 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 2aee6d3b49 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration c3bef1c448 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 4406e2a284 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 87dcfff50e - 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 083de421f6 - 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 ab608edd2b - 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 ad5384966f - 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 68bd901249 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge bcf5253da6 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge e892dc0a67 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge a1b93de21b - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge d15af99353 - removed required asterisk from Description on SalesChannel as this is not a required field a0222c768f - removed required asterisk from description as this is not required in the SCG eb7399a08c - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings 28712fcf66 - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings c03fc2da12 - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings 3fa5e8ec03 - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings ae6334aba3 - moved the order of some of the orocommerce settings for clarity 12c4499df0 - moved the order of some of the orocommerce settings for clarity 9c85201da9 - moved the order of some of the orocommerce settings for clarity 13e3f7d255 - moved the order of some of the orocommerce settings for clarity c25873ac3f - added SalesChannelGroup as OroCommerce integration settings - added migrations to update existing integrations with new SalesChannelGroup option - updated validation for OroCommerce integration settings to validate SalesChannelGroup - updated translations 24896b6986 - added SalesChannelGroup as OroCommerce integration settings - added migrations to update existing integrations with new SalesChannelGroup option - updated validation for OroCommerce integration settings to validate SalesChannelGroup - updated translations 67ffe45da0 - added SalesChannelGroup as OroCommerce integration settings - added migrations to update existing integrations with new SalesChannelGroup option - updated validation for OroCommerce integration settings to validate SalesChannelGroup - updated translations dd92a56b5c - added SalesChannelGroup as OroCommerce integration settings - added migrations to update existing integrations with new SalesChannelGroup option - updated validation for OroCommerce integration settings to validate SalesChannelGroup - updated translations ffcc7dc62d MM-22: Add logic to process changes in Sales Channel (#46) 9a5cdbd888 MM-22: Add logic to process changes in Sales Channel (#46) bf1e4788c4 - removed unused configuration settings like backOrder, inventoryThreshold and lowInventoryThreshold from OroCommerce integration and product syncs - Added additional logic to set the Product 'In Stock' when balancedInventoryLevels are updated - Added additional logic to set the Product 'backOrder' based on the related InventoryItem - Added migrations to 'reset' the existing settings on existing integrations - Updated installer to exclude the settings from installing in the first place - Updated OroCommerce entity to keep the methods used for the removed settings, but mark them as deprecated for BC 38fd895ab7 - removed unused configuration settings like backOrder, inventoryThreshold and lowInventoryThreshold from OroCommerce integration and product syncs - Added additional logic to set the Product 'In Stock' when balancedInventoryLevels are updated - Added additional logic to set the Product 'backOrder' based on the related InventoryItem - Added migrations to 'reset' the existing settings on existing integrations - Updated installer to exclude the settings from installing in the first place - Updated OroCommerce entity to keep the methods used for the removed settings, but mark them as deprecated for BC 2ba6ba1575 - removed unused configuration settings like backOrder, inventoryThreshold and lowInventoryThreshold from OroCommerce integration and product syncs - Added additional logic to set the Product 'In Stock' when balancedInventoryLevels are updated - Added additional logic to set the Product 'backOrder' based on the related InventoryItem - Added migrations to 'reset' the existing settings on existing integrations - Updated installer to exclude the settings from installing in the first place - Updated OroCommerce entity to keep the methods used for the removed settings, but mark them as deprecated for BC 2dceba6bad - removed unused configuration settings like backOrder, inventoryThreshold and lowInventoryThreshold from OroCommerce integration and product syncs - Added additional logic to set the Product 'In Stock' when balancedInventoryLevels are updated - Added additional logic to set the Product 'backOrder' based on the related InventoryItem - Added migrations to 'reset' the existing settings on existing integrations - Updated installer to exclude the settings from installing in the first place - Updated OroCommerce entity to keep the methods used for the removed settings, but mark them as deprecated for BC d89262688c - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant c546b47376 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant d3cfa40240 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant 6b150cb679 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant f9267bb6d5 - CS fix 7e89ed28e3 - CS fix dbc3194dd2 - CS fix 4e9e48a4ba - CS fix ce2d93d916 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed 0a6076b111 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed f9a0655fa3 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed 9829660eb0 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed e0bdf49899 - Updated validation on WarehouseGroup, remove required asterisk on description 31bdc5eda8 - Updated validation on WarehouseGroup, remove required asterisk on description e603454188 - Updated validation on WarehouseGroup, remove required asterisk on description f8038adc41 - updated validation for OroCommerce integration settings 0c2aeaaa5e - updated validation for OroCommerce integration settings 8314d7327e - updated validation for OroCommerce integration settings 701745ff58 - updated validation for OroCommerce integration settings 6a9d75ff94 - Updated clearing the entity manager just for the Company instead of all entities to prevent new found relations when trying to write a new batch to the DB f2288df414 - Updated clearing the entity manager just for the Company instead of all entities to prevent new found relations when trying to write a new batch to the DB d278e25e8c - Updated clearing the entity manager just for the Company instead of all entities to prevent new found relations when trying to write a new batch to the DB af76c9a68f - Updated clearing the entity manager just for the Company instead of all entities to prevent new found relations when trying to write a new batch to the DB 2050b367db MM-8: Add logic for tax class dictionary synchronization (#45) f4bb00dcb4 MM-8: Add logic for tax class dictionary synchronization (#45) 25661dabcd Removed asset-packagist from composer repositories - it's not used anymore in oro/platform:4.1+ - all the nodejs dependencies should be managed with npm, see https://doc.oroinc.com/frontend/javascript/composer-js-dependencies/ 30a0ff05db MM-11: Implement product export functionality (#44) 3c5155b8b5 MM-11: Implement product export functionality (#44) c65cb2ed99 - updated dev.json and dev.lock for demo environment 201fc5dfc3 - updated versions in the orocommerce bridge README 930ab7eef1 - updated versions in the orocommerce bridge README f8968197e7 - updated versions in the orocommerce bridge README 67d6b6587d - updated versions in the orocommerce bridge README 9fece1a81d - updated versions in the orocommerce bridge README 4a6266634b MM-6: Prepare logic for dictionary synchronization (#40) a1be2edf45 MM-6: Prepare logic for dictionary synchronization (#40) ffba2a1d74 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 7caed33836 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 c739b3fe03 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 80428e27aa Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 ae866d1d45 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 1030452d14 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 0ec7b8203d - removed white space ba236b5858 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 f2e5b1beb6 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 0398dad86e Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 71601ac931 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 a056889ea6 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 0ea53416a9 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 7786de3574 - updated composer.lock files fda4c69ffa - updated composer.lock files b5bbefb015 - updated composer.lock files 63cef79bb3 - changed author name to correct company e36deb83cc - changed author name to correct company db6734954b - changed author name to correct company b3bd4f727a - changed author name to correct company e1d2281bdf - changed author name to correct company 6772f6e0f7 - remove internal versions 423efea057 - remove internal versions 1ee395e3f2 - remove internal versions 7df294bbb0 - remove internal versions 62cc46645a - remove internal versions a2c162db66 - remove internal versions d80badafbc - remove internal versions bc77406765 - remov…

f688b50538 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 22397d3dc9 - fixed layout on payment popup on Invoice/Creditmemo f17b373a72 - Added product unit as additional information to OrderItem on order create abdb830d3b - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 5612933352 - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 41316ec514 - added manage batches inventory link on inventory level grid on inventory item view e88e920f8e - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 58b9be4595 - Added taxIdentificationNumber below company number on invoice entity view d6301d05b7 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 2c93950ff7 - Added small changes for batches; - added delivery date to batch form e388935ab9 - Fixed issue with selecting organization when creating products and purchase order ac4434b31f - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip 01e83b08bc - Added organization to query for finding a specific sku for an organization b131e18705 - removed old query reference c4a592aeeb bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 7cef74f82f - Added different calculation for total due on order view dae0a29474 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 3cede794ad - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 468cb34678 Merge branch 'develop' into feature/MAR10001-930 89284c7368 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver c76ce7b2a3 - added hasColumn() checks on fields that might already be added in previous version d37fb2f87f - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 3896c6a4b2 - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 2094b8cf33 - Added fix for query on postgresql where customer tax identification is copied to company tax identification 09e90351ba Merge branch 'develop' into feature/MAR10001-894 9f3ab2f01a Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop c23d429fcd - Added minor fixes to purchase orders view and form 68a27031b9 - Added possibility to update cost via marello-supplier-product-grid a72855bef3 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 1c28c9ce6c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 9bf8fdef63 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 54c8d906fa Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 7ebf9da685 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 36d32c1249 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 2d021771e4 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 06235763a6 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop 3a6fd4c389 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty f24d48ed8c - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 747adb97af - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data eb19d4a8ad Merge branch 'develop' into feature/MAR10001-935 ea5c5088b5 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item a094c2634f - added additional check before loading the purchase price in the Purchase Order Item 15b4e6cb17 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop dee9b894a0 - Added support to display extended fields on SalesChannel view & grid 087ed4444a - Added support to display extended fields on SalesChannel view & grid bfa263ae83 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 20fde261ad - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 54f2d06e8e Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 01fbdd19db - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely 2759c63d9b Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number fd7bff72f7 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number bb2f91c41b Merge branch 'bugfix/MAR10001-966-product-categories' into develop 5b638da647 - updated product category grid on the category view to take the localized value of product name into account a61fefe603 - updated product category grid on the category view to take the localized value of product name into account dc38902182 Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 0d046ca00d - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 03e80ec3a6 Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 59a5feccdb - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 92c620677e Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop 4eebed688b - added default ACL config value for Tax Related entities 8ab3d7e3f8 - added default ACL config value for Tax Related entities dac4dc3188 Merge branch 'task/MAR10001-0-layout-fixes' into develop 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 8cd21c566f - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 2954aa3a72 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 3742532428 - fix issue with trying to display data based on an entity that isn't available f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order ea7a6f8020 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 2fc02ae6dc Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields 45c33db503 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields e6a0344817 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord e989f1fc2d - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 131e3b5d63 Merge branch 'task/MAR10001-0-validation-fixes' into develop 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message f298a72c0f - Updated validation groups for Order validation - Added SKU to the available inventory validation message a8827625f5 Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit e9202e08c1 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit f14ebf3682 Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 8ba3d9fc9e - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification a987a95dec Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d6e420f96b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... a6045d1519 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 490196e5c4 multiple fixes d062de0b81 multiple fixes 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 463b03d7b0 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 c9908e12ec - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 36185ab409 Merge branch 'maintenance/3.0' into develop 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0abc2d46e6 Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit a2792d890a Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity c7acf10796 Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 19aaa9bd4e Merge branch 'task/MAR10001-0-fix-shipping-context' into develop 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f52eb64642 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 66c6e9974d MAR10001-935: Payment updates 2 ecd633e008 - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 05648340d7 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators cdbd1cbf21 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1b2884586a - added order status change for 'new' workflows in Marello cf01fd46ee Merge branch 'task/MAR10001-0-add-order-status' into develop e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation f7a39f6d2c Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 3015ccf731 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch a60a9fb91e Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - 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 957c32637c - 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 b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - 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 e15f975b1f - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - 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) 0217ff2fa4 Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8f5d044cb4 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 30fb36f650 Merge branch 'task/MAR10001-0-price-alignment' into develop 126c8037f3 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - 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 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 06529fa9d3 Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) e399a910b7 Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 37b9dbe178 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - 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 093dcc25e7 - 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 b05d611cba - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned cf62473106 - fixed unique constraints format...again :') 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group f0e9db681f Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 9ede319aa5 - 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 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 72b1da841c Merge branch 'feature/MAR10001-931' into develop 26b3ac14f9 - 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 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 6f7909c19c - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department 54ccd14fbf - fix OrderExtension test to include the new twig functions 1c40490752 Merge branch 'feature/MAR10001-920' into develop b7a8b98991 MAR10001-931: Update Order and OrderItem entities with additional fields 2fd9aa4727 Merge branch 'maintenance/3.0' into develop 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme a135353941 MAR10001-930: fixes for filtration on products grid b4e915f610 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 0418a66a16 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 cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel ebded99bbf Merge branch 'maintenance/3.0' into develop 61b2f271b5 - removed commit reference in validation file 44ac30aadf Merge branch 'maintenance/3.0' into develop 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 377f2a89cc Merge branch 'feature/MAR10001-909' into develop df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 13433d841b MAR10001-909: Add Company ID to Company dc85219029 - renamed Company code to Company number - added pdf translation - moved company number on the PDF db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9dafd0f20e Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 33fc001a70 - 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 c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass d4e4078d31 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 39efef0623 - 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 aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 42add63a2f MAR10001-909: Add Company ID to Company 3f68d97330 Merge branch 'maintenance/3.0' into develop bb988382ef MAR10001-909: Add Company ID to Company 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 db5418534a Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 336ff49858 - 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 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 1309973a1c - 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 a2acb0843c - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 11ceb32ac8 - 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 aef5acf6f6 MAR10001-930: Cache seems to be invalidated quite frequently which results in pages being visited before increased loading times 2ad444e881 - 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 6cfe92ab4c MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 94ab6bc9f9 MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 05f765e4e2 MM-23: Add logic to process changes in integration (#47) fad55ac8bf MM-23: Add logic to process changes in integration (#47) d8b6058ee9 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 2aee6d3b49 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration c3bef1c448 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 4406e2a284 - ad…

279fe1bc86 feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 88ae7896c1 Merge branch 'bugfix/MAR10001-1032' into feature/MAR10001-1006-update-oro-platform-42 b05fc09c5b bugfix/MAR10001-1032: - Fixed bug with Global Access organization not being able to place orders, create payments or payment rules in non global access organization - Prevent Order workflow start when order is created from Global Access organization as this would result an error with permissions - Added changes for EE to make sure the correct organization parameters are available on templates to prevent Organization selector loop 4ec893642a MAR10001-1006: Update platform to Oro BAP 4.2 - fix functional tests - remove some deprecation code usages that causes warnings 41171a7623 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist 2e4a87e21f Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 2d3f89bd1b MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 7030ac3019 - Upgrade to Oro 4.2.7 - Fixes for PHP 8.0.x - Added fix for exposing fos js routes in marello enterprise application - Updated Dockerfile && docker-compose-ee.yml file for upgrade f4e4aeb338 Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 784764f06d Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform 0eabb98b00 Merge branch 'maintenance/3.1' into develop 8a08067fbf Merge branch 'MAR10001-PR70' into develop 00128c339b Merge branch 'MAR10001-PR70' into maintenance/3.1 9562cff113 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 b4bdb5ed61 Merge branch 'MAR10001-PR68' into develop bbe9eb391c Merge branch 'MAR10001-PR68' into maintenance/3.1 d0a1ce5231 Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 68555d9f81 specify full namespaces in Doctrine DiscriminatorMap 080bcf6957 task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled a7a369c052 - added hasColumn() checks on fields that might already be added in previous version 5785eec93c Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 af75dccc7d task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand eec7e33ad2 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 b16f33e432 - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 2931a51910 - Fixed namespaces and classes 6f788f4559 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform e77b664c43 - updated platform to 4.2.3 on all main applications and combinations 6ef2b5e27f Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 9dc9caef3d - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages 02f98f1a6b Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop ccd40f89e3 - added company number column, filter and sorter 6c7baa64a1 Merge branch 'merge-service-points-30' into maintenance/3.1 fb1d1de1ec Merge branch 'feature/MAR10001-880' into merge-service-points-30 def0844f51 Merge branch 'feature/MAR10001-880' into merge-service-points-30 7d75794fd8 - fixed dev lock 0e5e29cacc Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 0f47ce5a2f Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' c175c4d68a Merge branch 'release/3.1' cc1e89390b Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' a2ca4c4c0f Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 4759dcee01 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's f12e7445f2 - Added code to the search results of the autocomplete in the warehouse group edit page where warehouses can be selected that are not assigned to a warehousegroup 802c0c14c4 - Added small changes for batches; - added delivery date to batch form 544c17d676 - reverted the change with adding the warehouse code in the select box of the warehouse selection field in the inventory update, it made a greater mess than it cleared things up 432cf81a6c - Updated auto complete label in warehouse select result a94e79051b Merge branch 'develop' into feature/MAR10001-894 805d94991b Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 73c2e39ff5 - Added minor fixes to purchase orders view and form 0b1879a301 - Added minor fixes to purchase orders view and form 7b00a7d73c - Added possibility to update cost via marello-supplier-product-grid 4cb837d99e - Added possibility to update cost via marello-supplier-product-grid d988063513 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 c0e9f673c7 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 3069f275bb Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 38a10dfb15 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 1591559098 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 2723bd7afc Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 4755dd691f Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 9a16f4759c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 bc32cb42b7 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 b5c449bbc9 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 26a030ac69 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 fcc9e1e722 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 5c27b93bbc Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 cf8c669f62 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 f7387ee61e Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 576c87b1ca Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 dcc89ded95 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 0846a6df72 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 167302fd9a Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 7ffe8718dd Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 746d1e3655 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d4218be7f9 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item d8cd80b1f3 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid c5e866d484 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration f1ae5c3303 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid ac086a6ded - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 7e67af6717 Non expected return type (interface non-implemented) e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number e4a5112b28 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account ff92270199 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid fb27de8910 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 1052506523 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities de4c45eeee - added default ACL config value for Tax Related entities b5bf25335b Merge branch 'task/MAR10001-0-layout-fixes' into develop 77b3abb5b5 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done e533e03e10 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order 69c3020333 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 b30e6a2520 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 ecea175e47 Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 2bd389315c - Added rendering for additional data block with dynamic entity fields bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields 2fe8c53f8c - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord fb69b55c17 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 ca7f87a72f Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message bbc7ca82d4 - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit c139869cdd - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 2e6dbe33e4 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal a523e45f44 - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 2b47b38c52 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 90cf75975c multiple fixes 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 5860ffb378 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 3b86ae620f Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 10d5b30b15 - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 5fd45f1314 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer e74ce7c9da Merge branch 'task/MAR10001-0-update-strategy-results-provider' into develop 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 728e339bc4 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 5675d759f4 MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) ea13d6431f MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 741e626a94 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) e704e9f817 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 5da39e3540 Merge branch 'task/MAR10001-0-cs-fix' into develop b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit dedeb1b760 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 9d80633813 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates f92a60615c - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 2c3af6f865 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 626ff0f791 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 4508d883e0 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 659a93cd7f - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 7be50e1d62 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications e05990244d - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 937c296313 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment d361e5f802 MAR10001-880: Service points updates(fixed conflicts) a1c7b2417b MAR10001-880: Service points updates 4e22ff4ed0 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 4cf0ed2a9a Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 844127142c - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start bb33a03a95 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators fbf2ac9d63 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 08f9f1d274 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 42df0cbd63 - added order status change for 'new' workflows in Marello a544ca495f Merge branch 'task/MAR10001-0-add-order-status' into develop e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation ca16950dcb - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 3bec073565 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop 7669b9bc84 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid c973ae11de - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... e170523420 - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 510f97ff39 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 0ceb77aa0e Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 33eba24280 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 138d8bd39b Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 b59babdb5d Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 755418949b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 b70a3aafea Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch 7f802ec1a8 - renamed migrations to take newer versions of migrations into account on the develop branch fc3fef43e7 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 04df3e3b2b - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 67e95573e7 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - 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 7b7407c525 - 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 908ee7f8c6 - 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 957c32637c - 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 d20075c92a - 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 a9eb6a504e - 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 b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 0b36166c18 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - 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 3e3951649c - 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 eef4e6752b - 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 e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view f0c438ae3e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters f0f2ad364e - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - 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) db865d076d - 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) be907e3fd3 - 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) 6a16bdb3be Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address c2b00f020f - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 875b87ad02 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 3b5dabf1b4 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 34d7283e7f Merge branch 'task/MAR10001-0-price-alignment' into develop 8e65bc594d Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 8dfe5fec90 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 ee15adbefb Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 6788d78ee1 - Added the replenishment field to the variant grid for seeing continuation of the product 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 0f366ad09f - 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 088c985264 - 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 b6d7f1772b - 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 ebc8363e17 - added validation message for DeliveryDate if date is not set in the future 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future a89e9104aa - Added deliveryDate validation to make sure the date is set in the future and not in the past 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past eaf95dab0d Merge branch 'task/MAR10001-905-add-managed-inventory-checkbox-external-wh' into develop efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses c264f475bf Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 0954d2ec6a Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1a40be8e75 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cc84bcd04a Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 38eba16600 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop fec2210535 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 413ab5a54d - 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 702ee6d54d - 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 1f2c18c580 - 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 a2d4afdd38 - 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 093dcc25e7 - 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 f26ffdd5e8 - 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 fd18d4d126 - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned 2732b90f59 - fixed unique constraints format...again :') 30af93134c Merge branch 'bugfix/MAR10001-0-fixed-wh-not-saved-on-group-after-edit' into develop d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 638cda5e39 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 2bb72991d5 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 bac1e39cb9 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 2dab594b86 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree e8d76690cb Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false bbf94da23a MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - 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 3baf789b98 - 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 9ede319aa5 - 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 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 61a95f2361 Merge branch 'feature/MAR10001-931' into develop 51055f06a5 - 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 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 7eca964b6c - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department e7c8029bbf - fix OrderExtension test to include the new twig functions 7377e59bc1 Merge branch 'feature/MAR10001-920' into develop e388452303 MAR10001-931: Update Order and OrderItem entities with additional fields 51798aa66f Merge branch 'maintenance/3.0' into develop 9b3d3fe985 Merge branch 'maintenance/3.0' into develop 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 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 e45d0240e1 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 b4e915f610 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 0418a66a16 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 cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 1af4a2e4d5 Merge branch 'maintenance/3.0' into develop 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file a380ca34ba Merge branch 'maintenance/3.0' into develop 039ba0a816 Merge branch 'maintenance/3.0' into develop 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 fe7ee95d06 Merge branch 'feature/MAR10001-909' into develop 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR1…

…f7c2f39b 82f7c2f39b - prepare 3.2 CE release cb0ecc1dec - prepare release CE 7ca7b24465 feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() be34ba534a MAR10001-1006: Update platform to Oro BAP 4.2 - update dev.lock with the latest version of oro d05cff4186 feature/MAR10001-1006-update-oro-platform-42: - updated environments with build image of marello-application && marello-application-ee - removed old environment setup files - added dev.lock for marello-application 6d2ce90a42 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist 0155416f70 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 278244ab91 Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 a6b49570bf Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform acaeb255f3 Merge branch 'maintenance/3.1' into develop fd8e94e121 Merge branch 'MAR10001-PR70' into develop c4fa8afd68 Merge branch 'MAR10001-PR70' into maintenance/3.1 987ef4a549 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 1cb4b73b8c Merge branch 'MAR10001-PR68' into develop 39a51636f5 Merge branch 'MAR10001-PR68' into maintenance/3.1 e258dab41e Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 68555d9f81 specify full namespaces in Doctrine DiscriminatorMap 080bcf6957 task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled a7a369c052 - added hasColumn() checks on fields that might already be added in previous version 5785eec93c Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 af75dccc7d task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand eec7e33ad2 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 b16f33e432 - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 994a321cb6 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform 8ef70d1ce8 - updated platform to 4.2.3 on all main applications and combinations f631fb1553 - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages ccd40f89e3 - added company number column, filter and sorter def0844f51 Merge branch 'feature/MAR10001-880' into merge-service-points-30 0e5e29cacc Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 d73c76042b Merge branch 'release/3.1' 729b4de506 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' c4b6e750e8 - Preparing release changes d525fa02e7 Merge branch 'release/3.1' 506b740301 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 75a95e0cad Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' ba0ce71e0b - preparing release 58deaedf82 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 01cf94a008 - Added deployment type to parameters dist 73c2e39ff5 - Added minor fixes to purchase orders view and form 0b1879a301 - Added minor fixes to purchase orders view and form 7b00a7d73c - Added possibility to update cost via marello-supplier-product-grid 4cb837d99e - Added possibility to update cost via marello-supplier-product-grid b4ebc04473 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 c0e9f673c7 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 3069f275bb Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 11938e95b6 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 1591559098 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 2723bd7afc Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 f1243cf07c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 9a16f4759c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 bc32cb42b7 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 0f2d344502 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 26a030ac69 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 fcc9e1e722 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 10e78edaac Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 cf8c669f62 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 f7387ee61e Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 fb872d35ea Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 dcc89ded95 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 0846a6df72 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 873568bfac Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 7ffe8718dd Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 746d1e3655 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d4218be7f9 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item d8cd80b1f3 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid c5e866d484 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration f1ae5c3303 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid ac086a6ded - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 7e67af6717 Non expected return type (interface non-implemented) e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number e4a5112b28 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account ff92270199 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid fb27de8910 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 1052506523 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities de4c45eeee - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done e533e03e10 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order 69c3020333 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 b30e6a2520 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields 2fe8c53f8c - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord fb69b55c17 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 ca7f87a72f Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message bbc7ca82d4 - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit c139869cdd - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 2e6dbe33e4 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal a523e45f44 - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 2b47b38c52 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 6ad0f70854 Merge branch 'maintenance/3.0' 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 5860ffb378 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 3b86ae620f Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 10d5b30b15 - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 5fd45f1314 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 728e339bc4 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 5675d759f4 MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) ea13d6431f MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 741e626a94 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) e704e9f817 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit dedeb1b760 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 9d80633813 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates f92a60615c - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 2c3af6f865 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 626ff0f791 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 659a93cd7f - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 7be50e1d62 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications e05990244d - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 937c296313 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment d361e5f802 MAR10001-880: Service points updates(fixed conflicts) a1c7b2417b MAR10001-880: Service points updates 4cf0ed2a9a Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 844127142c - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start bb33a03a95 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators fbf2ac9d63 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 08f9f1d274 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 42df0cbd63 - added order status change for 'new' workflows in Marello a544ca495f Merge branch 'task/MAR10001-0-add-order-status' into develop e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation ca16950dcb - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 7669b9bc84 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid c973ae11de - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... e170523420 - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 510f97ff39 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 0ceb77aa0e Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 33eba24280 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 138d8bd39b Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 b59babdb5d Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 755418949b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 b70a3aafea Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch 7f802ec1a8 - renamed migrations to take newer versions of migrations into account on the develop branch fc3fef43e7 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 04df3e3b2b - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 67e95573e7 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - 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 7b7407c525 - 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 908ee7f8c6 - 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 957c32637c - 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 d20075c92a - 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 a9eb6a504e - 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 b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 0b36166c18 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - 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 3e3951649c - 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 eef4e6752b - 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 e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view f0c438ae3e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters f0f2ad364e - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - 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) db865d076d - 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) be907e3fd3 - 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) 6a16bdb3be Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address c2b00f020f - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 875b87ad02 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 3b5dabf1b4 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 34d7283e7f Merge branch 'task/MAR10001-0-price-alignment' into develop 8e65bc594d Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 8dfe5fec90 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 ee15adbefb Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 6788d78ee1 - Added the replenishment field to the variant grid for seeing continuation of the product 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 0f366ad09f - 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 088c985264 - 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 b6d7f1772b - 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 ebc8363e17 - added validation message for DeliveryDate if date is not set in the future 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future a89e9104aa - Added deliveryDate validation to make sure the date is set in the future and not in the past 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses c264f475bf Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1a40be8e75 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cc84bcd04a Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 38eba16600 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop fec2210535 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 413ab5a54d - 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 702ee6d54d - 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 1f2c18c580 - 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 a2d4afdd38 - 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 093dcc25e7 - 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 f26ffdd5e8 - 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 fd18d4d126 - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned 2732b90f59 - fixed unique constraints format...again :') 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 638cda5e39 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order b2975e504c - removed composer.lock file from master 318b676f80 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 bac1e39cb9 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 2dab594b86 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree e8d76690cb Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false bbf94da23a MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false e353da748f Merge branch 'feature/magento2-integr' into testmerge-magentoint a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - 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 3baf789b98 - 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 9ede319aa5 - 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 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 61a95f2361 Merge branch 'feature/MAR10001-931' into develop 51055f06a5 - 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 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 7eca964b6c - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department e7c8029bbf - fix OrderExtension test to include the new twig functions 7377e59bc1 Merge branch 'feature/MAR10001-920' into develop e388452303 MAR10001-931: Update Order and OrderItem entities with additional fields 9b3d3fe985 Merge branch 'maintenance/3.0' into develop 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 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 e45d0240e1 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 b4e915f610 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 0418a66a16 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 cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 1af4a2e4d5 Merge branch 'maintenance/3.0' into develop 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file 039ba0a816 Merge branch 'maintenance/3.0' into develop 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 fe7ee95d06 Merge branch 'feature/MAR10001-909' into develop 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company 58bb42c0bd - renamed Company code to Company number - added pdf translation - moved company number on the PDF db7dd5e612 MM-25: Add…

24198 added the open for contribution label Apr 25, 2017

24198 added a commit that referenced this issue Feb 4, 2021

Merge pull request #12 from anyt/3.0

f497f93

Removed asset-packagist from composer repositories

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Order item custom options #12

Order item custom options #12

clicktrend commented Jan 23, 2017

24198 commented Jan 23, 2017

clicktrend commented Jan 23, 2017

24198 commented Mar 8, 2017

clicktrend commented Nov 10, 2017

24198 commented Nov 23, 2017

Order item custom options #12

Order item custom options #12

Comments

clicktrend commented Jan 23, 2017

24198 commented Jan 23, 2017

clicktrend commented Jan 23, 2017

24198 commented Mar 8, 2017

clicktrend commented Nov 10, 2017

24198 commented Nov 23, 2017