From 9536aace135ecd468733ef940ba39f116809abfe Mon Sep 17 00:00:00 2001 From: Hotlander Date: Wed, 12 Jan 2022 17:31:42 +0100 Subject: [PATCH] Squashed 'package/marello-enterprise/' changes from c0f33b1479..15fbabcec1 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 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 1606efa9a9 - 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 d543090db2 - 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 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 e89e45bd41 - removed required asterisk from Description on SalesChannel as this is not a required field 9f3d6dcf26 - removed required asterisk from Description on SalesChannel as this is not a required field d15af99353 - removed required asterisk from Description on SalesChannel as this is not a required field 530a6a785a - removed required asterisk from description as this is not required in the SCG 5cc3984955 - removed required asterisk from description as this is not required in the SCG 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 d9db8bb1de MM-22: Add logic to process changes in Sales Channel (#46) 951f48f5e3 MM-22: Add logic to process changes in Sales Channel (#46) 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 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 854eab6874 MM-8: Add logic for tax class dictionary synchronization (#45) 006abe2a60 MM-8: Add logic for tax class dictionary synchronization (#45) 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 807c62ee05 Merge branch 'feature/MAR10001-911' into develop 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 e2ebbb0fe0 MM-6: Prepare logic for dictionary synchronization (#40) f502e9d83d MM-6: Prepare logic for dictionary synchronization (#40) 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 009273cdf0 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 036c5320f9 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 1ee395e3f2 - remove internal versions 7df294bbb0 - remove internal versions 62cc46645a - remove internal versions a2c162db66 - remove internal versions d80badafbc - remove internal versions bc77406765 - removed old backup of dev.lock cbcca40cfa - removed old backup of dev.lock b7ac5c4648 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail a6c8d71bf1 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail 0af7900071 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail 2fd2458468 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail 5898702ee0 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail dd463395b3 Merge pull request #39 from marellocommerce/ticket/MM-4 09b538fc0e MM-4: Create Magento2 integration form - Added Website Provider e34beb4eb6 MM-4: Create Magento2 integration form - Added Website Provider 2fb2f72d9c MAR10001-911: Update Product with SKU and organization unique index 8e43137058 Merge branch 'feature/MAR10001-791' into release/3.1 8e74560385 - added entity_grid_all_view_label to all relevant entities on EE 1b8ad2f033 - added entity_grid_all_view_label to all relevant entities on CE e97ee886c4 - added entity_grid_all_view_label to all relevant entities on CE 9a7b89e4e8 - added entity_grid_all_view_label to all relevant entities on CE f7db87ae6d - added entity_grid_all_view_label to all relevant entities on CE 5cb990d5c1 - updated pricing js views in order to be able to disable channelpricing without errors in the console c04039d9a3 - updated pricing js views in order to be able to disable channelpricing without errors in the console 5151ba6e09 - updated pricing js views in order to be able to disable channelpricing without errors in the console 87e55f348d - added invoice type to the invoice/creditmemo view for clarification ae9617e182 - added invoice type to the invoice/creditmemo view for clarification 08bb45be80 - added invoice type to the invoice/creditmemo view for clarification f76705554c - updated phpunit configuration in all applications to have both config tests separate b03f754417 - updated phpunit configuration in all applications to have both config tests separate aa749af6d0 - updated phpunit configuration in all applications to have both config tests separate 9968fae46c MM-4: Create Magento2 integration form - Added missed constraints 46fa92458b MM-4: Create Magento2 integration form - Added missed constraints e074a12413 MM-4: Create Magento2 integration form - Added missed constraints a9e8ffec37 - fixed issue with incorrect route names in the entity config of the AbstractInvoice entity which prevented users from using the entity management on Invoice related entities - fixed some of the confusing labels as creditmemo's were labled Invoice instead of Creditmemo c596c8b9dc - fixed issue with incorrect route names in the entity config of the AbstractInvoice entity which prevented users from using the entity management on Invoice related entities - fixed some of the confusing labels as creditmemo's were labled Invoice instead of Creditmemo dca167258f - fixed issue with incorrect route names in the entity config of the AbstractInvoice entity which prevented users from using the entity management on Invoice related entities - fixed some of the confusing labels as creditmemo's were labled Invoice instead of Creditmemo 8eed856c01 - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge 484773799f - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge 6d302dc60e - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge 26d6b44ff5 - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge ec4af3fa94 - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge a15cffae52 - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge 841254f200 - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge ae6e002fb5 Merge branch 'feature/MAR10001-870' into maintenance/3.0 2c338e8d85 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 ac4d899ad3 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 921fe63141 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 69e04b3257 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 e729631f65 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 da4b84932c Merge branch 'feature/MAR10001-870' into develop 367e2f785b - fixed functional of POcrons tests by updating the groupby clause in ProductRepository 94fc20956b - fixed functional of POcrons tests by updating the groupby clause in ProductRepository f73b83e789 - fixed functional of POcrons tests by updating the groupby clause in ProductRepository bc72318236 MAR10001-879: Changes for correct selecting products by SKU and Organization 8ec2cc1c04 MAR10001-879: Changes for correct selecting products by SKU and Organization d9d4c04457 MAR10001-879: Changes for correct selecting products by SKU and Organization 5dc9e2df1f MAR10001-879: Changes for correct selecting products by SKU and Organization a15962db4a MAR10001-879: Changes for correct selecting products by SKU and Organization cec83bf310 - CS fix b1b4c5f547 - CS fix 5fc05ab999 - CS fix 3c3193d817 - CS fix f486542281 - CS fix 820a955b0d MM-4: Create Magento2 integration form 4ce69ce7bf MM-4: Create Magento2 integration form d019c62e9c MM-4: Create Magento2 integration form 2dcfeab878 MM-4: Create Magento2 integration form 0f5e14d87d MAR10001-879: code optimization 17d087d497 MAR10001-879: code optimization 3a006b6a7a MAR10001-879: code optimization 66eeb3713c MAR10001-879: code optimization bb10bbdf03 MAR10001-879: code optimization e98c29675c Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 1683a51f2f Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 8e74b04956 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 0e64bc67a9 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 97f3a2b4cf Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 59af438517 MAR10001-879: Made ProductImage sync conditional 502cd3d14e MAR10001-879: Made ProductImage sync conditional 53d1dbdc01 MAR10001-879: Made ProductImage sync conditional 56dbca52a3 MAR10001-879: Made ProductImage sync conditional b5ed3a10c3 MAR10001-879: Made ProductImage sync conditional b6b75be9ec - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL c08e272334 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL feef586d9a - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL f5955e667d - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL 00221c7884 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL 4f3dd1d8f4 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL 54527f543f - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL 84432f0d4f - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL 2889f4838c - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL cc9c68c95c - updated application to enable API (backend) in tests and dev by default as functional api tests where failing - updated paths and configs for testing psr and setting up the test environment d5c8946442 - fixed InvoiceDownload functional test, name of pdf changed during changes made for creditmemo ff9ee70498 - fixed InvoiceDownload functional test, name of pdf changed during changes made for creditmemo 5562f2fd92 - fixed InvoiceDownload functional test, name of pdf changed during changes made for creditmemo 0194dfd98f Merge branch 'maintenance/3.0' into feature/MAR10001-870 e81b49a3ac Merge branch 'maintenance/3.0' into feature/MAR10001-870 d4d6281323 Merge branch 'maintenance/3.0' into feature/MAR10001-870 81e5d37a00 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge 9a43144606 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge 1d117d3ebb MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge c18c469bb4 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge 98d0936890 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge 0ca99bb97f MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge a6972e36d6 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge a5e560b763 - Added old Magento - Marello bundle 186075abc3 - updated creditmemo/invoice pdf's with company from the customer address instead of the Company from the customer itself - updated the address widget to include the company from the address to display on different views like Order, Invoice etc.. dc6b45c87c - updated creditmemo/invoice pdf's with company from the customer address instead of the Company from the customer itself - updated the address widget to include the company from the address to display on different views like Order, Invoice etc.. 163ab2dd72 - updated creditmemo/invoice pdf's with company from the customer address instead of the Company from the customer itself - updated the address widget to include the company from the address to display on different views like Order, Invoice etc.. 52e46f489f - added pdf template for creditmemo - added requesthandler for creditmemo pdf - updated translations for creditmemo pdf - added company to pdf's dcf92775eb - added pdf template for creditmemo - added requesthandler for creditmemo pdf - updated translations for creditmemo pdf - added company to pdf's 6eaf912334 - added pdf template for creditmemo - added requesthandler for creditmemo pdf - updated translations for creditmemo pdf - added company to pdf's 4daeeb4100 - added company to invoice view - moved company above the 'general' customer info on order view - added company to invoice pdf b008e03666 - added company to invoice view - moved company above the 'general' customer info on order view - added company to invoice pdf a38aa282f1 - added company to invoice view - moved company above the 'general' customer info on order view - added company to invoice pdf c602bf3711 - fixed issue with denormalizedDefaultName not being used in the autocomplete handler in finding subscription products in autocomplete f6eb2f7d42 - made the status handler services for enabling/disabling datagrid row actions public for enabling/disabling rules on row action 2120861964 - updated services to be public in order to use the mass action handler and enable/disable wfa rules 5fa1b47849 - removed `selectAll` from datagrids that were having issues with selecting rows only when having pgsql as db driver 7dd6ec0ec6 - removed `selectAll` from datagrids that were having issues with selecting rows only when having pgsql as db driver 334d4689dd - removed `selectAll` from datagrids that were having issues with selecting rows only when having pgsql as db driver 88bde4b840 - reverted ReplenishmentOrderRepository as service to fix the issue with alllocated cron command 31970709bc - added svg as defautlt file and image upload mime type in the configs of EE and CE 5b7ad91293 - added svg as defautlt file and image upload mime type in the configs of EE and CE 4157272412 - added svg as defautlt file and image upload mime type in the configs of EE and CE 38507aaac6 Merge branch 'task/MAR10001-901-balanced-inventorylevels-disabled-products' into maintenance/3.0 054de9b5e6 Merge branch 'task/MAR10001-901-balanced-inventorylevels-disabled-products' into maintenance/3.0 32d4681d98 Merge branch 'task/MAR10001-901-balanced-inventorylevels-disabled-products' into maintenance/3.0 ef2993d7cc - Updated (balanced) inventory grids to have most of the same columns in the same order as the Product grid - Added additional checks for disabled products before balancing and checking saleschannels that are actually assigned to the saleschannelgroups that will be available for balancing - Added additional listeners for rebalancing and resetting the balancedinventory levels when ProductStatus is changed and Saleschannels are assigned or removed from the product 171910cce4 - Updated (balanced) inventory grids to have most of the same columns in the same order as the Product grid - Added additional checks for disabled products before balancing and checking saleschannels that are actually assigned to the saleschannelgroups that will be available for balancing - Added additional listeners for rebalancing and resetting the balancedinventory levels when ProductStatus is changed and Saleschannels are assigned or removed from the product f2f389aeb3 - Updated (balanced) inventory grids to have most of the same columns in the same order as the Product grid - Added additional checks for disabled products before balancing and checking saleschannels that are actually assigned to the saleschannelgroups that will be available for balancing - Added additional listeners for rebalancing and resetting the balancedinventory levels when ProductStatus is changed and Saleschannels are assigned or removed from the product f1f4a5ad1d - Updated (balanced) inventory grids to have most of the same columns in the same order as the Product grid - Added additional checks for disabled products before balancing and checking saleschannels that are actually assigned to the saleschannelgroups that will be available for balancing - Added additional listeners for rebalancing and resetting the balancedinventory levels when ProductStatus is changed and Saleschannels are assigned or removed from the product 8f8c7033f2 - Fixed inventory levels on inventory item view when having PostgreSQL as db driver 01cde107d0 - Fixed inventory levels on inventory item view when having PostgreSQL as db driver 49eb395d4f - Fixed inventory levels on inventory item view when having PostgreSQL as db driver 43aa94ca6f Merge branch 'maintenance/3.0' into feature/MAR10001-870 af6c1eccd5 Merge branch 'maintenance/3.0' into feature/MAR10001-870 78fb50571c Merge branch 'maintenance/3.0' into feature/MAR10001-870 bc604f62ff Merge branch 'maintenance/3.0' into feature/MAR10001-870 c8466a6cf4 Merge branch 'maintenance/3.0' into feature/MAR10001-870 f9141663b1 Merge branch 'maintenance/3.0' into feature/MAR10001-870 92ef92c413 Merge branch 'maintenance/3.0' into feature/MAR10001-870 c5f31cd112 Merge branch 'maintenance/3.0' into feature/MAR10001-870 0e4c60e14f Merge branch 'maintenance/3.0' into feature/MAR10001-870 c53c6782bf MAR10001-791: Marello Payments - fixed functional tests - fixed Invoice totalPaid, totalDue calculations 1627feb35c MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 1419be6990 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 3b208857bf MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 9557f9f9de MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 5ea3876e8d MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 2f77bc73b7 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 0b89b0075e MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce ded9eb48f8 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 1d6be9ac34 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 893ecac4de - added scripts to be run by supervisor for the demo environment 574af6cef5 - updated demo environment with oro 4.1.x - updated custom login page - removed deprecated ways of overriding templates ef767f3c50 - updated demo environment with oro 4.1.x - updated custom login page - removed deprecated ways of overriding templates 6bdbfb364e - updated demo environment with oro 4.1.x - updated custom login page - removed deprecated ways of overriding templates 22bbbc77a2 Merge branch 'release/3.0.1' into maintenance/3.0 0d795fb0c8 Merge branch 'release/3.0.1' into maintenance/3.0 c9ead58d33 Merge branch 'release/3.0.1' into maintenance/3.0 ead8291918 Merge branch 'release/3.0.1' into maintenance/3.0 8d09dbd5a4 Merge branch 'release/3.0.1' into maintenance/3.0 5586db4523 Merge branch 'release/3.0.1' into maintenance/3.0 9732235bf3 Merge branch 'release/3.0.1' into maintenance/3.0 01e6aa6d4e Merge branch 'release/3.0.1' into maintenance/3.0 aaf7f4aa5a Merge branch 'release/3.0.1' into maintenance/3.0 a55ceb2294 - updated composer.lock for EE version - updated dev.lock for EE version 60a151a2a5 - updated composer.lock for EE version - updated dev.lock for EE version 52c03bcccf - updated composer.lock for EE version - updated dev.lock for EE version b571f41f0b Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 01a9ec1abd Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 6bf6b41682 Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 a9ae475161 Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 34e755cead Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 4a989db21a Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 ed44e956ff Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 a15f5553b8 Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 c1fd0bd2be Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 65bb567ac2 Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 58a641fe4f Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 88ed3db3ad Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 4962214662 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 6d3430069d Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 693300c5a2 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 f8771ff591 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 23c2a362d4 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 215fcca0e8 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 6ab08a6b2c Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 f80db3e93d Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 bb115a61b5 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 99a5a44c2f Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 bcbe43b989 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 b7be13b167 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 d5d6f5363b Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 e425173a26 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 1edc8002c8 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 6957b8927b Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 cd25d63954 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 f62102ab93 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 94a52e71cf Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 0e20992a44 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 0003b6b5a1 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 4d05495de5 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 12f55eaf19 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 e956ca5781 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 611a7ee8f4 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 9e1d6599f8 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 b5506d5d1c Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 1bbf00a57c Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 a5af3f8451 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 09c1fb2cb3 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 d1992c38d9 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 3abc0ddfd2 - Updated 'all time' query to include the start date and not only the date greater than the start date to include all orders 06455d8c17 - Updated 'all time' query to include the start date and not only the date greater than the start date to include all orders 33cfffa12b - Updated 'all time' query to include the start date and not only the date greater than the start date to include all orders 95692bc09a - CS fixe 7c804a38b6 - CS fixe ada51508dc - CS fixe 3ff6e22290 Merge branch 'maintenance/3.0' into feature/MAR10001-867 5d74461724 Merge branch 'maintenance/3.0' into feature/MAR10001-867 1334d61722 Merge branch 'maintenance/3.0' into feature/MAR10001-867 4c11c1d62e - updated composer.json to internal versions 02ba853038 - updated composer.json to internal versions 5a85d153eb - updated composer.json to internal versions 351787d22e - updated composer.json to internal versions ff1bc8b9aa - updated composer.json to internal versions 22321c860f Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 592e6ebde2 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 1b93a365d5 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 5c0cdba991 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 56d714b6f7 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 7a45e6671f Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 8a6e16a075 Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 2c8c34371d Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 4751ced650 Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 c72676c95a Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 82d04bc51b Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 7efff3da56 Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 40bf80f478 Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 f0f8b4fc1c Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 5f57185b4e Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 85f169e16c Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 419acaeb8d Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 6390b63dc9 - updated composer.lock files c9fa1e0104 - updated composer.lock files e7d1198a8c -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 a58b75669e -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 09151f0784 -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 948029ef0c -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 9c0afd120e Squashed 'package/marello-enterprise/' changes from 37e37f3fd..ded77d2b1 f4e957f386 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 7609487d70 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 12be661be2 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 f5b07591a6 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 30750447d3 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 7a19697269 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 4c6e751366 - removed internal versions d96e7a8cea - removed internal versions 67ffebf670 - removed internal versions e00b588534 - removed internal versions f149de71ae - removed internal versions e4f0f7c443 - removed internal versions 3d2358094b - removed internal versions fba4fec434 - added check to see if emails are already enabled by the user, otherwise the migration will fail because of it c4a4501edc - added check to see if emails are already enabled by the user, otherwise the migration will fail because of it ac692d8ae8 - fixed issue with sending localized email notifications - fixed shipped order confirmation email template - fixed functional tests for sendProcessor fb8fb35757 - fixed issue with sending localized email notifications - fixed shipped order confirmation email template - fixed functional tests for sendProcessor f9e8f90d9b fixed failed repository 62e29a4d2e fixed failed repository b385cb55da - CS fix - Added fix for existing attributes to configure them correctly to show them in attribute groups and retain the original data 534e7a9ce8 - CS fix - Added fix for existing attributes to configure them correctly to show them in attribute groups and retain the original data 70af4bb256 - moved the image of the product view to separate template file in order try to control the divs better 52ee491337 - moved the image of the product view to separate template file in order try to control the divs better aaa5db0ba9 - switch createdAt and tags columns in product grid using the buildAfter event b9d69f2aa2 - switch createdAt and tags columns in product grid using the buildAfter event eb376862db - added inline editing for product status in product grid 33bf0ececf - added inline editing for product status in product grid 80a4a684e1 - added inline edit for tags - added inline edit for sku - shuffled some columns around in the product grid - removed taxcode as default column c022cb103d - added inline edit for tags - added inline edit for sku - shuffled some columns around in the product grid - removed taxcode as default column 6c2339f01b - added Product tags in entity config - added migration to enable product tags for existing products 9947994c98 - added Product tags in entity config - added migration to enable product tags for existing products cb68105b4e - Added email as activity to Marello Customer which allows to show emails being sent with the Customer as context in the customer view dc0a487ee1 - Added email as activity to Marello Customer which allows to show emails being sent with the Customer as context in the customer view 4288a9980f - Added Additional data fields to Order entity - updated div's on the additional data of the product view 8625e0fc74 - Added Additional data fields to Order entity - updated div's on the additional data of the product view fdfac1fb22 - updated migrations to deal with postgres update, works on mysql too 29f977554a - updated migrations to deal with postgres update, works on mysql too 0b55c0be0d - removed annotations from Customer entity to prevent issues with update schema, when creating fields on entities, when running postgresql a85a5adf4d - removed annotations from Customer entity to prevent issues with update schema, when creating fields on entities, when running postgresql 9811262e87 - added postgres volume fix for postgres data to marello-ee environment 6c91870db5 - Added save and new buttons to warehouse, warehouse group and warehouse channel group linking on the create and update views - changed selectAll to false in 'not-linked-saleschannelgroups-grid', SalesChannelGroup datagrid, as it was not possible to add a SCG to a WHG with postgres installed 1ed26e0c4c - Added save and new buttons to SalesChannel and SalesChannelGroup create and update views 05ee3ad51f - Added save and new buttons to SalesChannel and SalesChannelGroup create and update views 6ea50a3658 - Added save and new buttons to Tax Jurisdictions, Tax Rates, Tax Rules and Tax Codes on both create and update views 893a18e4c9 - Added save and new buttons to Tax Jurisdictions, Tax Rates, Tax Rules and Tax Codes on both create and update views b0daa12a2d - remove old dev.lock 269f4299d4 Merge branch '3.0-test' into maintenance/3.0 165c1d492d Merge branch '3.0-test' into maintenance/3.0 267668e294 Merge branch '3.0-test' into maintenance/3.0 b98065a61f Merge branch '3.0-test' into maintenance/3.0 12bb5ec6c7 Merge branch '3.0-test' into maintenance/3.0 321b4b87b6 merged maintenance/3.0 branch into 3.0-test 4689652d9a merged maintenance/3.0 branch into 3.0-test 06f39b07ca merged maintenance/3.0 branch into 3.0-test 705c0aef72 merged maintenance/3.0 branch into 3.0-test 17e7186a58 merged maintenance/3.0 branch into 3.0-test 62eebadc47 merged maintenance/3.0 branch into 3.0-test 580d7902bd - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment 3c4622f567 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment 0e2d6aa340 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment e8be4cc2b0 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment a1339e555d - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment 8289fb5f4a - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment 9ba6413745 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment 8588df8421 fixed problem with schema update bcc540e0a3 fixed problem with schema update 31eb42e312 fixed problem with schema update d543339c37 fixed problem with schema update 5951dca681 fixed problem with schema update 11d653461e fixed problem with schema update 7ef8975fed Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 0addc6222d Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 e78554d2ea Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 384c8dcff3 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 6886259a5b Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 1c881efdd0 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 e57c8ced09 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 a33b509850 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 59dcb245a8 Merge branch 'feature/MAR10001-759' ce2418bbca Merge branch 'feature/MAR10001-759' 971c391b04 Merge branch 'feature/MAR10001-759' e1bb79cec0 Merge branch 'feature/MAR10001-759' 45feb75731 Merge branch 'feature/MAR10001-759' cc79ee36c9 Merge branch 'feature/MAR10001-759' 6402d99b8d - updated orocommerce docker environment - fixed change trigger in the settings in order to prevent infinite loading on the integration settings page f96a520a08 - updated orocommerce docker environment - fixed change trigger in the settings in order to prevent infinite loading on the integration settings page 8dfaaeb24a - updated orocommerce docker environment - fixed change trigger in the settings in order to prevent infinite loading on the integration settings page 1bd6d9dfca made productName not audittable field 2f4338a245 made productName not audittable field 89e3f00b00 MAR10001-867: Order statistics error when selecting 'All Time' as Date Range da99088575 MAR10001-867: Order statistics error when selecting 'All Time' as Date Range 1225a0b8bc MAR10001-867: Order statistics error when selecting 'All Time' as Date Range dd00670db1 - added postgres as additional db in the environment 9ced059f31 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched 41b3b04bd9 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched f730fbf399 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched 7524e1c994 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched 03d09caff6 - added PHP env variable to xdebug enable/disable script, should be executed as root though 3b11d96734 - updated oro platform version to 3.1.15 - added script to enable / disable xdebug, can only be used when logged in as root in the container 0bb7a665e3 - Added composer.lock files for 3.0 applications 822d144153 - Added composer.lock files for 3.0 applications 96c522751b - Added composer.lock files for 3.0 applications 93c4cfdd0a - removed internal version in Marello EE - updated not merged translations - updated version number in EE Readme - updated dev dependencies in EE / CE applications - updated author name in packages's composer.json 9a873c6d2b - removed internal version in Marello EE - updated not merged translations - updated version number in EE Readme - updated dev dependencies in EE / CE applications - updated author name in packages's composer.json 87b2e523e6 - removed internal version in Marello EE - updated not merged translations - updated version number in EE Readme - updated dev dependencies in EE / CE applications - updated author name in packages's composer.json e77b276a34 - removed internal version in Marello EE - updated not merged translations - updated version number in EE Readme - updated dev dependencies in EE / CE applications - updated author name in packages's composer.json 934520ffb3 Merge branch 'develop' into test 67f866e696 Merge branch 'develop' into test e64c5f450c Merge branch 'develop' into test eed5ce92e0 Merge branch 'develop' into test 5a70cd49b7 Merge branch 'develop' into test 3af0c5fffd Merge branch 'develop' into test f4f118742f Merge branch 'develop' into test 1525d31989 Merge branch 'develop' into test 9c0eb594db Merge branch 'develop' into test dfe3bf071e Merge branch 'develop' into test 9e6eb4672b Merge branch '3.0' into test b4ab3b4d43 Merge branch '3.0' into test 1f5ae8a3e2 Merge branch '3.0' into test bbad71a89f Merge branch '3.0' into test 890bc4cd4c Merge branch '3.0' into test a519308b9b Merge branch '3.0' into test 6100286167 Merge branch '3.0' into test a5e986a4f4 Merge branch '3.0' into test d04751d088 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test ede9d7ae54 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test f8a01d3a39 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test d8709e3f93 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test 7088e36dfe Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test a8790f512f Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test bf520c8655 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test d835663a29 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test da7cde497c Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test a333afc458 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test 8aa57825b5 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 4af2d1224b Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 2e0404f7a6 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test fa6c0c7845 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 9636ea8c2f Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test ef8feb9cf4 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 9e42a0e4ce Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 34761314d5 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 69b7fa1ae8 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 9df8a7f459 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 713139f055 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 6b36f8e74a Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test b40bb0337b Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 11bc636c28 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 58dfdb090d Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test c649100e69 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 1099432af8 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 6f2590e9fb Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 1c586d9531 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test dd82db1a85 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 114bdbfed1 Merge branch '3.0' into develop a6b36c9151 Merge branch '3.0' into develop 4a6e5ee5a7 Merge branch '3.0' into develop 2137599641 Merge branch '3.0' into develop 0baf3790cc Merge branch '3.0' into develop e9d43839f2 Merge branch '3.0' into develop 96222d5f7e Merge branch '3.0' into develop eb6c994ee7 Merge branch '3.0' into develop 925d0cda93 Merge branch '3.0' into develop afa4007f7d Merge branch '3.0' into develop 9c441bb428 - updated environments with :delegated parameter on docker env - added 'final' steps on workflows - removed deletion of old customer data in order to preserve possible extended fields and keep issues with old foreign keys at bay - updated UPGRADE file in order to specify additional step for Marello upgrade to 3.0 for smooth transition - updated README of EE in order to update the current requirements for Marello 3.0 applications c37c0c4973 - updated environments with :delegated parameter on docker env - added 'final' steps on workflows - removed deletion of old customer data in order to preserve possible extended fields and keep issues with old foreign keys at bay - updated UPGRADE file in order to specify additional step for Marello upgrade to 3.0 for smooth transition - updated README of EE in order to update the current requirements for Marello 3.0 applications 56ce6dd81f - updated environments with :delegated parameter on docker env - added 'final' steps on workflows - removed deletion of old customer data in order to preserve possible extended fields and keep issues with old foreign keys at bay - updated UPGRADE file in order to specify additional step for Marello upgrade to 3.0 for smooth transition - updated README of EE in order to update the current requirements for Marello 3.0 applications 307d647635 - updated environments with :delegated parameter on docker env - added 'final' steps on workflows - removed deletion of old customer data in order to preserve possible extended fields and keep issues with old foreign keys at bay - updated UPGRADE file in order to specify additional step for Marello upgrade to 3.0 for smooth transition - updated README of EE in order to update the current requirements for Marello 3.0 applications 8ae2b5183d - Added migration to include organization id on the purchase order item fb41ce6313 - Added migration to include organization id on the purchase order item f893f486fb - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig 508514d0ca - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig fc63a64ea8 - removed .class parameters from service container and replaced it with the FQCNs 92c57efbb3 - removed .class parameters from service container and replaced it with the FQCNs 9017c02e86 - removed .class parameters from service container and replaced it with the FQCNs e363aef874 - removed .class parameters from service container and replaced it with the FQCNs 48c97f4620 - removed .class parameters from service container and replaced it with the FQCNs fb3e61844f - removed .class parameters from service container and replaced it with the FQCNs 6fd10ac38f - removed marello_product.entity.class parameter from service container and replaced it with the FQCN 629536482f - removed marello_product.entity.class parameter from service container and replaced it with the FQCN 4c92df6eb8 - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN 5d1f28d9c5 - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN d9413157fd - Merged improvements for PDF capabilities - Updated entities with SalesChannelAwareInterface who were already had a 'getSalesChannel()' method available - Renamed the ChannelAwareInterface to SalesChannelAwareInterface for clarity and consistency - Renamed the old SalesChannelAwareInterface to SalesChannelsAwareInterface to indicate the differences in interfaces, this one will have functions to add, remove and get multiple SalesChannels instead of a single SalesChannel 78007481f2 - Merged improvements for PDF capabilities - Updated entities with SalesChannelAwareInterface who were already had a 'getSalesChannel()' method available - Renamed the ChannelAwareInterface to SalesChannelAwareInterface for clarity and consistency - Renamed the old SalesChannelAwareInterface to SalesChannelsAwareInterface to indicate the differences in interfaces, this one will have functions to add, remove and get multiple SalesChannels instead of a single SalesChannel 0ed506b627 - PSR2 CS fixes in PDF/InvoiceBundle 8efe746ae3 - PSR2 CS fixes in PDF/InvoiceBundle 1b39222fec Merge branch '3.0' into feature/MAR10001-849 1c6d22261f - fixing config for test environment on marello application ee 5a693c4aa6 - fixing config for test environment on marello application ee 0bc0302318 - fixing config for test environment on marello application ee 2628572c6e merged branch 3.0 into feature/MAR10001-849 d03befa357 merged branch 3.0 into feature/MAR10001-849 dfe53172b2 MAR10001-849: PDF Bundle improvements 075711af75 MAR10001-849: PDF Bundle improvements 00fc776d45 - updated text-extended composer script to run a predefined phpcs.xml - updated packingslip datagrid to fix the issue with the warehouse filter and sorter - updated config yml files in order to fix the issue with API test failing b472d9b2ab - updated text-extended composer script to run a predefined phpcs.xml - updated packingslip datagrid to fix the issue with the warehouse filter and sorter - updated config yml files in order to fix the issue with API test failing 31c4451cb6 - Updated servicepoints application for testing Marello EE/CE with all extensions (subscription and servicepoints) a2f6ad93ec - Updated ProductAttributeControllerTest to test the index but not the actual creation of the attributes, during issues with creating multiple fields - Enabled index test of the ShippingMethodConfigRule of the ShippingMethodConfigsRuleControllerTest as we forgot to enable it after debugging issue with the failed test, also removed debugging logs 1db16b95a4 - Updated ProductAttributeControllerTest to test the index but not the actual creation of the attributes, during issues with creating multiple fields - Enabled index test of the ShippingMethodConfigRule of the ShippingMethodConfigsRuleControllerTest as we forgot to enable it after debugging issue with the failed test, also removed debugging logs d102f04de5 - Fixed issue with entity classes defined in the service container instead of using the FQCN ef927c5b32 - Fixed issue with entity classes defined in the service container instead of using the FQCN bca58d27af - updated unique keys for certain entities in order to have both the schema's and annotations in line with each other - updated delete operation tests to use the FQCN instead of a service container parameter as entity class a683c33859 - updated unique keys for certain entities in order to have both the schema's and annotations in line with each other - updated delete operation tests to use the FQCN instead of a service container parameter as entity class 2628b0f524 - Added missing translation labels 0304e242d4 - Added missing translation labels da1f3b6450 - updated check if template is not null to be more strict in the EmailTemplateManager - updated SendProcessorTest with setting the correct exception when trying to find a localized template and there is no result 9fdba86e34 - updated check if template is not null to be more strict in the EmailTemplateManager - updated SendProcessorTest with setting the correct exception when trying to find a localized template and there is no result 57ac313220 - Updated unit tests to use and test the new underlying structure of resizing images e77a1709a5 - Updated unit tests to use and test the new underlying structure of resizing images 9a75008d73 - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method df25a1a923 - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method b4f37e53b7 - fixed OrderExtensionTest since the OrderItemStatuses have become enum's which are hard to mock during the nature of enums being extended entities, overcoming the issue by creating a stub class which will allow us to mock the class 84ce25c829 - fixed OrderExtensionTest since the OrderItemStatuses have become enum's which are hard to mock during the nature of enums being extended entities, overcoming the issue by creating a stub class which will allow us to mock the class 6caf7cc26e - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated fef0188d85 - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated f46b14197e - Updated InventoryLevelLogGridListenerTest with the removal of the previous join, it will not check if it's being called - Updated phpunit.xml.dist of servicepoints application to remove deprecated attributes - Updated phpunit.xml.dist of marello-ee application with uncommenting the Oro TestFramework in order to check on DB and translation keys 4a2ff4511a - Updated InventoryLevelLogGridListenerTest with the removal of the previous join, it will not check if it's being called - Updated phpunit.xml.dist of servicepoints application to remove deprecated attributes - Updated phpunit.xml.dist of marello-ee application with uncommenting the Oro TestFramework in order to check on DB and translation keys f57cbc9063 - Updated InventoryLevelLogGridListenerTest with the removal of the previous join, it will not check if it's being called - Updated phpunit.xml.dist of servicepoints application to remove deprecated attributes - Updated phpunit.xml.dist of marello-ee application with uncommenting the Oro TestFramework in order to check on DB and translation keys 6c24878f82 - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints 9bfc69cfbc - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints d951a31a8b - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints c77fecb2ff - Added phpcs.xml file for removing multiple arguments from commandline when running phpcs - updated dev.json to use new arguments when testing psr - fixed last CS of PSR2 since ORM data migrations are now being included in the config 83d1c18cc9 - Added phpcs.xml file for removing multiple arguments from commandline when running phpcs - updated dev.json to use new arguments when testing psr - fixed last CS of PSR2 since ORM data migrations are now being included in the config 10a9d1685f - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories 1ea7a22ca0 - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories 4f4187aed8 - 65% done on PSR2 PHPCS fixes - updated command that will execute the PSR check to exclude migrations and test directories - [WIP]: add phpcs.xml to root directory for a more clean configuration instead of stuffing the command line with .... 8b27ee7f7b - 65% done on PSR2 PHPCS fixes - updated command that will execute the PSR check to exclude migrations and test directories - [WIP]: add phpcs.xml to root directory for a more clean configuration instead of stuffing the command line with .... b4870ca06d Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns 3117d44ef2 Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns cf64f65650 - merged updated inventory batch layout and moved some widgets around - updated data migrations of shipping/payment integrations because of the removal of the entity parameter classes of Oro f3472c0c43 - merged updated inventory batch layout and moved some widgets around - updated data migrations of shipping/payment integrations because of the removal of the entity parameter classes of Oro df0fcbccc7 Merge branch 'feature/MAR10001-837' into 3.0 7202f6f613 Merge branch 'feature/MAR10001-837' into 3.0 be43918c2b MAR10001-847: Fix prices in product datagrid f182782920 MAR10001-847: Fix prices in product datagrid 6b2dbed92c - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications a723a049e8 - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications c65bdb6659 - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications c5f98d78f8 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class' fdc34d1805 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class' 3bc836b3b3 Merge branch 'feature/MAR10001-845' into 3.0 a25c53d798 Merge branch 'feature/MAR10001-845' into 3.0 868358afeb MAR10001-837: Inventory batch layout a4eaccac52 MAR10001-837: Inventory batch layout 211a10bf50 - Added schema installer for ServicePointBundle - Updated installer of invoice bundle during installation errors on Postgres - Reverted changes made on Product datagrid during not showing products on the product grid 18c03a80c2 - Added schema installer for ServicePointBundle - Updated installer of invoice bundle during installation errors on Postgres - Reverted changes made on Product datagrid during not showing products on the product grid 73d934dfdd - updated css for subgrid in service points facilities in businesshoursoverrides 117f9f62da MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener 5357d6bce5 MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener a363109117 - removed double button defintion on the add businesshours button 8b7c6496f0 - fixed close button on row of the business hours grid 075f0bf83b - removed required asterisk from phone and email on servicepoint facility entity form fields - updated save and stay button which will now point to the service point facility instead of the index of service points - updated typo in acl check with the correct identifier from the service point facility acl id's - updated translation for email and phone to be the same with the others inthe application 8925acb5cd - updated navigation items by swapping facilities and servicepoints in the menu - removed the height of business hours override td table in favor of restoring the height in the workflow display in page titles where applicable - added quick product navigation to purchase order item grid 597a04178a - updated navigation items by swapping facilities and servicepoints in the menu - removed the height of business hours override td table in favor of restoring the height in the workflow display in page titles where applicable - added quick product navigation to purchase order item grid f51087f4e2 Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0 d7e7ce49d9 Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0 d8f105f061 - updated src/*Kernel.php files for complying with 4.1-rc4 in the service point environment 12720663ab - removed empty line from services.yml 0d8954f9d1 - removed empty line from services.yml 740e160ec5 Merge branch 'feature/MAR10001-842' into 3.0 e55a049358 Merge branch 'feature/MAR10001-842' into 3.0 3bb865687a - removed deprecations from different classes, some inf favor of constructor dependency injection - fixed default user&password for initializing db's in the docker container 73a71cce50 - removed deprecations from different classes, some inf favor of constructor dependency injection - fixed default user&password for initializing db's in the docker container 2f206b5109 Merge branch 'feature/MAR10001-776' into 3.0 1c7d2b853b Merge branch 'feature/MAR10001-776' into 3.0 c9330d8292 - updated environment files with additional flags for volumes in order to hopefully speed up some of the waiting times with docker for mac... - updated volume definition for percona (using named volume instead of the volume from a separate container) since it broke with the old definition 199e00ff3c Merge branch 'feature/MAR10001-776' into 3.0 494e2f90ed Merge branch 'feature/MAR10001-776' into 3.0 05bb6fac57 MAR10001-776: Inventory Batches - fixed bug in replenishment 303f913153 MAR10001-776: Inventory Batches - fixed bug in replenishment 8fe1d877f9 - added composer.lock f6d4aeccce - preparations for release ea4e297f95 - preparations for release c0208675c3 Merge branch 'feature/MAR10001-776' into 3.0 0a026b8d64 Merge branch 'feature/MAR10001-776' into 3.0 cbe43f2574 - removed service-points from subscription environment c1365aac41 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched 2e291ce07d - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched 1b58ec9fbe MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled 3fa665e4f5 MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled 01a6b683fe - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to 681d380833 - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to 01f05ce618 - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs 89d1eabd2c - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs 767e7ddb4b MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 16afee1057 MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 3a3eaf9f6f [WIP] - working on the migration from existing inventory level logs to the new data structure for it - fixing issue where the inventory level log is being removed as soon as an inventory level is deleted - added additional columns to the inventorylevellog in order to be able to have a history of movements for the whole inventory item - updated data grid in order to display the log based on different columns and identifiers - updated enterprise grid listener for displaying different column as warehouse label - added warehouseName as human readable reference of which inventory level it was a movement of - removed FK on inventory level in order to keep the inventorylevel log 50dbd2da0f [WIP] - working on the migration from existing inventory level logs to the new data structure for it - fixing issue where the inventory level log is being removed as soon as an inventory level is deleted - added additional columns to the inventorylevellog in order to be able to have a history of movements for the whole inventory item - updated data grid in order to display the log based on different columns and identifiers - updated enterprise grid listener for displaying different column as warehouse label - added warehouseName as human readable reference of which inventory level it was a movement of - removed FK on inventory level in order to keep the inventorylevel log 1d7aa3c527 - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid cbbf7eb2e7 - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid a1ea4de3da - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge b03a78deee - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge c91932aa53 - updated InventoryBatchCollection options to `allow_add` and ensure users are able to manually add batches - Added an add InventoryBatch button to the bottom of the InventoryBatchCollection 837a1cb536 - updated InventoryBatchCollection options to `allow_add` and ensure users are able to manually add batches - Added an add InventoryBatch button to the bottom of the InventoryBatchCollection 0a4cca65fe - fixed issue with InventoryManager and InventoryLevelFixture where they used to initialize an InventoryItem with a warehouse, which is not necessary anymore - Added action button for enabling Inventory Batches via a button instead of having a checkbox in the form 8078037228 - fixed issue with InventoryManager and InventoryLevelFixture where they used to initialize an InventoryItem with a warehouse, which is not necessary anymore - Added action button for enabling Inventory Batches via a button instead of having a checkbox in the form 0b78eb5bb5 - Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 - Removed deprecated property 'warehouse' from InventoryItem, constructor of InventoryItem and getters and setters for the property f58e758923 - Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 - Removed deprecated property 'warehouse' from InventoryItem, constructor of InventoryItem and getters and setters for the property 76c588e062 - added service points as volume to the subscription environment to test compatibility 0111f1aa0f MAR10001-776: Inventory Batches - created Inventory Balance trigger in order to update balanced inventory - added manual creation of InventoryBatch on the inventory batch update page e43263d81e MAR10001-776: Inventory Batches - created Inventory Balance trigger in order to update balanced inventory - added manual creation of InventoryBatch on the inventory batch update page 45e20209a7 - updated applications (most used application variations) with new OroRequirements which require at least PHP 7.1.13 - updated dev.lock files with OroPlatform 4.1.0-rc4 and related packages (calendar, platform-enterprise etc.) - updated docker-compose files to include php 7.3.13 as version to build - updated .gitignore files to include the package.json - add package-lock.json files as this will be the locked npm package versions file - updated activity_list.provider tag to include FQCN for the activity 6cb3c26d51 - updated applications (most used application variations) with new OroRequirements which require at least PHP 7.1.13 - updated dev.lock files with OroPlatform 4.1.0-rc4 and related packages (calendar, platform-enterprise etc.) - updated docker-compose files to include php 7.3.13 as version to build - updated .gitignore files to include the package.json - add package-lock.json files as this will be the locked npm package versions file - updated activity_list.provider tag to include FQCN for the activity d0bea2d50c - updated applications (most used application variations) with new OroRequirements which require at least PHP 7.1.13 - updated dev.lock files with OroPlatform 4.1.0-rc4 and related packages (calendar, platform-enterprise etc.) - updated docker-compose files to include php 7.3.13 as version to build - updated .gitignore files to include the package.json - add package-lock.json files as this will be the locked npm package versions file - updated activity_list.provider tag to include FQCN for the activity 142bd04e70 - updated applications (most used application variations) with new OroRequirements which require at least PHP 7.1.13 - updated dev.lock files with OroPlatform 4.1.0-rc4 and related packages (calendar, platform-enterprise etc.) - updated docker-compose files to include php 7.3.13 as version to build - updated .gitignore files to include the package.json - add package-lock.json files as this will be the locked npm package versions file - updated activity_list.provider tag to include FQCN for the activity 0e73dd2771 - fixed issue with collection in collection js on a custom grid 0d69779f00 - Moved 'old' customerAddressMap template and placeholder from CustomerBundle to generic addressMap in the AddressBundle for reusability - Removed old template and placeholder of customerAddressMap - Servicepoints map now uses placeholder from the AddressBundle instead of embedded implementation 11076a73c7 - Moved 'old' customerAddressMap template and placeholder from CustomerBundle to generic addressMap in the AddressBundle for reusability - Removed old template and placeholder of customerAddressMap - Servicepoints map now uses placeholder from the AddressBundle instead of embedded implementation d523c425de - [WIP] remove debug dumps from form types 3f4cd26509 [WIP] merging of service points b5b3012a34 - test updated business overrides ee24f453a6 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid 29b13f0d25 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid 0777c24dfa Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 8293ec9d79 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 333c8a997a Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 75f723b8ff Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 3c1ae9c60c Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 155fa1cbe1 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 92509fab63 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 843b1f1ff7 - updated dev.json and dev.lock to include service points into subscription application 8ad8d982f0 - updated code to comply with Oro platform rc3 e918cb5bd5 CRH19001-18; Redo styling of servicepointfacility businesshours 8e8b55c8a2 CRH19001-18; Change date formtype 155aa20cd9 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 5566be4d86 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 bcf2a5e455 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 0fd370a4cd Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 eff1346180 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 a2e8b550bd Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 effe7c262e Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 38813ec893 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 ace3c3c875 - updated invoice email attachment template to match the subject of the invoice notification email 07b1405ec9 - updated invoice email attachment template to match the subject of the invoice notification email 80a8c02cb5 Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3 b312030dc3 Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3 b4f5c646d2 - updated SendEmailTemplateAttachmentAction with methods, properties and dependencies in order to make it work with 4.1-rc3 - updated template for invoice email to make it look like the original 8715f42e7f - updated SendEmailTemplateAttachmentAction with methods, properties and dependencies in order to make it work with 4.1-rc3 - updated template for invoice email to make it look like the original d6a164f1d9 - updated pdf labels and headers for invoice lines in pdf - added some css tweaks to pdf, smaller font size, line color changes - split the description in the invoice line item of pdf into productSku and productName and have separate columns for it in the pdf 46a796a0f5 - updated pdf labels and headers for invoice lines in pdf - added some css tweaks to pdf, smaller font size, line color changes - split the description in the invoice line item of pdf into productSku and productName and have separate columns for it in the pdf 3557bbb886 - updated customer update view to correctly display name in the tab of the browser addac75478 - updated customer update view to correctly display name in the tab of the browser 5dc00e92b8 - removed old bundle of Servicepoints, Servicepoints are now a separate package ba42fa28c0 - added PHP env variable to xdebug enable/disable script, should be executed as root though 54dbaeaa66 - added service points as new package - added docker-compose file for service points application 90131e0b52 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle d400840d4a - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle 6768938fa6 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle 5d496d1cc4 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices 7e3542d7f2 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices 5b55a5a667 - fix controller - fix view 8044e24432 - fix controller - fix view eeeb38df45 - fixed create return button on order view page after the status of items have been changed to enums instead of strings c90f9f877e - fixed create return button on order view page after the status of items have been changed to enums instead of strings 7d91b81385 - fixed order of import for multiple entity.js of purchase order 9c083debac - fixed order of import for multiple entity.js of purchase order cfa523fbfe - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone 566c591a93 - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone 13ed75e042 - reworked the multiple entities setup for purchase orders regarding js components 16401a9197 - reworked the multiple entities setup for purchase orders regarding js components e4a979bbda - fixed typo in item view of purchase orders ca6acace32 - fixed typo in item view of purchase orders eea5bc8f96 CRH19001-18; Change date formtype 214fda3618 CRH19001-18; Refactor form handler for business hours overrides b37ee7e07d - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle 472a9cd397 - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle fa6fff99ff CRH19001-18; Fix business hours overrides datagrid e4a4595602 - fixed issue with logo showing X as image when no image is found in the invoice - updated check, to check against the common parent of the Invoice & Creditmemo, the AbstractInvoice to make it work for both Invoice and Creditmemo 69dc88ddcb - fixed issue with logo showing X as image when no image is found in the invoice - updated check, to check against the common parent of the Invoice & Creditmemo, the AbstractInvoice to make it work for both Invoice and Creditmemo beac0f930b - fixed adding return items to return when creating it from the datagrid, status is now an enum and needs the id as identifier for checking the status instead of the object - make the the business rule mananager service public in order to use it in the process of authorizing the return items 46b730a636 - fixed adding return items to return when creating it from the datagrid, status is now an enum and needs the id as identifier for checking the status instead of the object - make the the business rule mananager service public in order to use it in the process of authorizing the return items 24fb484cb4 - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form c4b43af62f - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form 74a50674a0 Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 cde5c923dc Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 f199a782f7 - updated emailtemplate action to comply with php 7.2.x 972e96df84 - updated emailtemplate action to comply with php 7.2.x 978eb0dd4b - make service public in order to use the service within symfony 4.4.x framework on other places 2de47a726f - make service public in order to use the service within symfony 4.4.x framework on other places 221368d411 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 a52416f171 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 7c242820ac Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 1c917b970c Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 85e6b24059 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 a9aecfbcba Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 6cceb8a0c0 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 117b0a1bb5 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 d52e4c075a Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 c4f21d4a4d Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 49acc1d1b2 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 c4f53155da Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 db00c18af8 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 798eda2277 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 5528fd008a Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 ca01219a7b Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 035b3dad74 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 2676ce1e98 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 5a85e966d4 merged branch 3.0 into feature/MAR10001-776 b5706fd71a merged branch 3.0 into feature/MAR10001-776 0eb06cd636 MAR10001-776: InventoryBatches 59d9a3d8e4 MAR10001-776: InventoryBatches fe0fd423b2 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 927d5ea63b Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 adbfae33c5 Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3 340604b1fb Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3 5646cf3917 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 921fe5ea8d - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 75a354c1af - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 700c26091c - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 d8e6813ae3 CRH19001-18; Add business hours overrides 0a15f7262d - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription af22d5dae6 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription 6d48e393e9 CRH19001-18; Manage collections of business hours in form handler 9579a98c0e CRH19001-18; Always show all days in form 4da0643aab CRH19001-18; Fix validation 933389018e - fix first part of the OrderReplenishment JS module - [WIP]: bug when deleting a single row and adding it back again, in which it is rendered but not in the collection of added products f05ad3e519 - fix first part of the OrderReplenishment JS module - [WIP]: bug when deleting a single row and adding it back again, in which it is rendered but not in the collection of added products 2b58e79be7 CRH19001-18; Rewrite business hours datastructure [WIP] f1da27d4f4 CRH19001-18; Rewrite business hours datastructure [WIP] 61134e2220 CRH19001-18; Rewrite business hours datastructure [WIP] 63a17cd2ce - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings dfaa145d37 - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings f19daff121 - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings 9022213632 CRH19001-18; Update form view for business hours 4e80fc3261 CRH1900-18; Fix validation b8f04a298a Merge branch 'feature/CRH19001-18_Service-points' of github.com:marellocommerce/development-mono-repository into feature/CRH19001-18_Service-points 489c3a199d CRH19001-18; Updates to form theme b79a9e175e - updated marello EE dev.lock da27278a35 - updated marello EE dev.lock eb0aed5ac3 - updated marello EE dev.lock 3e280272a9 - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 32babeaf97 - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 7c5a437039 - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 267fa62e1d - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 149468e760 - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 6ac8ea99cf - updated dev.lock file 4e092ccf58 - updated all Marello CE bundles with the new format for webpack f28c0cb1bf - updated all Marello CE bundles with the new format for webpack 6cb908e8a1 CRH19001-18; Fix view page when no image selected a564abfe9c - updated Product related js components to comply with new webpack setup - Updated EmailTemplateManager for getting the localized email template were the old method has been removed 80f94a37a6 - updated Product related js components to comply with new webpack setup - Updated EmailTemplateManager for getting the localized email template were the old method has been removed ad6c2131da - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 441eabfee4 - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 547fbdd324 CRH19001-18; Add custom form theme for service point business hours b84a70fa03 MAR10001-776: Inventory Batches - new comments fixed 44e20349af MAR10001-776: Inventory Batches - new comments fixed 45771a659c CRH19001-18; Fix timezones of TimePeriod entities 38106e475a MAR10001-805: Error exporting inventory (and 'Download data template') - Error exporting inventory (and 'Download data template') - Change default text 'Oro' to 'Marello' in email Sender Name e6fb7d7f1c MAR10001-805: Error exporting inventory (and 'Download data template') - Error exporting inventory (and 'Download data template') - Change default text 'Oro' to 'Marello' in email Sender Name 09922f9be1 MAR10001-742; Add ability to add attachments to notifications from workflow action 64f6b6c71a MAR10001-742; Add ability to add attachments to notifications via SendProcessor 1a75cb6c22 MAR10001-742; Add attachments to Notification 226a7c3033 MAR10001-742; Add v1_0 migration for NotificationBundle dfd20aaf3c MAR10001-742; Fix typo 58c7d5b4c0 - reverted to old sticky note icon cb099f819e - reverted to old sticky note icon a289d5d6d0 - reverted to old sticky note icon 62874898f9 - reverted to old sticky note icon ecd8439d7b - changed the sticky note text - reverted commmented line in phpunit.xml f91da86e92 - changed the sticky note text - reverted commmented line in phpunit.xml 7f85cbf647 - changed the sticky note text - reverted commmented line in phpunit.xml 0e1fd69781 - changed the sticky note text - reverted commmented line in phpunit.xml 6c33dcd43a - fixed the sticky note description and logo - updated help link on the question icon on the top a4643f31f1 - fixed the sticky note description and logo - updated help link on the question icon on the top 1c09f2ffc3 - fixed the sticky note description and logo - updated help link on the question icon on the top 70b408265b - fixed the sticky note description and logo - updated help link on the question icon on the top b77a6477d1 MAR10001-13; Add white background color to PDF template 72ac6140e1 MAR10001-13; Add configuration button on sales channel view 5d37d51c67 CRH19001-18; Validate timeperiod validity 8d8e76a627 CRH19001-18; Allow multiple timeperiods per day 99d91a8210 - remove instore assistant bundle as we are going to move the code to a separate repo and introduce it as an extension fa44845a81 MAR10001-774: Remove increase / decrease external warehouses option 768a01a7cb MAR10001-774: Remove increase / decrease external warehouses option 22bd8eccb6 - CS fix ed203b0c8f - CS fix 00a6ae1f14 Merge branch 'feature/MAR10001-765' into 3.0 94321489ff Merge branch 'feature/MAR10001-765' into 3.0 83c26b737f Merge branch '3.0' into feature/MAR10001-776 9022d97d74 Merge branch '3.0' into feature/MAR10001-776 9b42d84459 MAR10001-802: WFA rule index is not rendering e568a449c6 MAR10001-802: WFA rule index is not rendering d1dda734b8 MAR10001-765: Update InventoryRebalance Command d55ff32820 MAR10001-765: Update InventoryRebalance Command 8e5296cffc - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 92bd389cae - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json e2d2734ff7 - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 9c7e3e7247 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ b872ef545d - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ 63322bc219 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ eafbb01df2 - updated dev.lock for subscription application 2dfe6785a0 - updated to 4.1-beta on marello-ce f57d8e52a6 MAR10001-776: Inventory Batches - bug fixed 629a329be9 MAR10001-776: Inventory Batches - bug fixed 378e30871d MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order 4b4aeda1fb - Added more fixes regarding the changed DI in the Controller as the service locator is more limited than the 'normal' one - Aliased classes to service ids in order to get the subscribed services correctly in the Controller c959e764b0 - Added more fixes regarding the changed DI in the Controller as the service locator is more limited than the 'normal' one - Aliased classes to service ids in order to get the subscribed services correctly in the Controller ae0d1e5fa4 - Added OrderDashboardController as a service tagged with the container.service_subscriber in order to fix issues with private dependencies instead of using regular DI - Fixed issue with private service which provides data to a dashboard widget ec65164263 - Added OrderDashboardController as a service tagged with the container.service_subscriber in order to fix issues with private dependencies instead of using regular DI - Fixed issue with private service which provides data to a dashboard widget 037356b75e Merge branch 'feature/MAR10001-770' into 3.0 7f6d929cd8 Merge branch 'feature/MAR10001-770' into 3.0 35d62109e3 Merge branch 'feature/MAR10001-775' into maintenance/2.2 f771579e26 Merge branch 'feature/MAR10001-775' into maintenance/2.2 8e1f6a3bb9 Merge branch 'feature/MAR10001-775' into maintenance/2.2 c22231ea7b Merge branch 'feature/MAR10001-775' into maintenance/2.2 62f224bb15 Merge branch 'feature/MAR10001-775' into maintenance/2.2 d4ae28dc34 Merge branch 'feature/MAR10001-775' into 3.0 2bc2068614 Merge branch 'feature/MAR10001-775' into 3.0 049ba94966 Merge branch 'feature/MAR10001-769' into 3.0 506d260f82 Merge branch 'feature/MAR10001-769' into 3.0 9c10d0f447 Merge branch 'feature/MAR10001-769' into 3.0 f9d9a0af37 Merge branch 'feature/MAR10001-769' into 3.0 3f705f51b5 Merge branch 'feature/MAR10001-769' into 3.0 839171474f Merge branch 'feature/MAR10001-769' into 3.0 5ba9371722 Merge branch 'feature/MAR10001-769' into 3.0 0d9d511a55 Merge branch 'feature/MAR10001-769' into 3.0 ec9b1abce8 Merge branch 'feature/MAR10001-769' into 3.0 d6e5b80b8b - updated dev.lock with Oro Platform beta 4.1 34c7de8315 - updated dev.lock with Oro Platform beta 4.1 f193e2e133 - updated dev.lock with Oro Platform beta 4.1 584c25297d MAR10001-776: Inventory Batches - removed temp code 535256678f MAR10001-776: Inventory Batches 8971b7d352 - added SymfonyRequirements to ee environment - [WIP]: updated assignSalesChannels.twig, still not able to mass assign saleschannels to products - updated order view to switch invoices and packingslip grids as it seems a more logical order for displaying the data - removed unnecessary divs which where messing up the css on some datagrids d667791e97 - added SymfonyRequirements to ee environment - [WIP]: updated assignSalesChannels.twig, still not able to mass assign saleschannels to products - updated order view to switch invoices and packingslip grids as it seems a more logical order for displaying the data - removed unnecessary divs which where messing up the css on some datagrids e50c584aad - added SymfonyRequirements to ee environment - [WIP]: updated assignSalesChannels.twig, still not able to mass assign saleschannels to products - updated order view to switch invoices and packingslip grids as it seems a more logical order for displaying the data - removed unnecessary divs which where messing up the css on some datagrids a549d06cb7 - Fixed issue with deprecated dependency of OrderWarehousesProvider where the service definition was updated but not the class itself - Updated dev.lock file for Marello CE to include Oro 4.x - Added SymfonyRequirements to git as this is not being installed via composer anymore - Updated phpunit.xml.dist by removing incompatible notation of logging incomplete tests - Updated composer.json and dev.json files to include symfony require as extra to use symfony flex globally 79f5b578a8 - Fixed issue with deprecated dependency of OrderWarehousesProvider where the service definition was updated but not the class itself - Updated dev.lock file for Marello CE to include Oro 4.x - Added SymfonyRequirements to git as this is not being installed via composer anymore - Updated phpunit.xml.dist by removing incompatible notation of logging incomplete tests - Updated composer.json and dev.json files to include symfony require as extra to use symfony flex globally ba9384fdc5 - Fixed issue with deprecated dependency of OrderWarehousesProvider where the service definition was updated but not the class itself - Updated dev.lock file for Marello CE to include Oro 4.x - Added SymfonyRequirements to git as this is not being installed via composer anymore - Updated phpunit.xml.dist by removing incompatible notation of logging incomplete tests - Updated composer.json and dev.json files to include symfony require as extra to use symfony flex globally b8a588b862 - added PHP env variable to xdebug enable/disable script, should be executed as root though 246a3f557d - updated oro platform version to 3.1.15 - added script to enable / disable xdebug, can only be used when logged in as root in the container 065f7b6344 - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer d706766a08 - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer 05e4821c29 - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer 578f5c06d1 Merge branch '3.0' into feature/MAR10001-770 44b247ded6 fixed bug on order create page 524643c95f - updated composer.lock file to include 2.2.2 marello ce 314d22c283 Merge commit '6598534c16cde2c3e1c4989cbf79c56f99b9d43f' into maintenance/2.2 f0a8b2515d Merge commit '6598534c16cde2c3e1c4989cbf79c56f99b9d43f' into maintenance/2.2 b705bafb38 Merge commit '6598534c16cde2c3e1c4989cbf79c56f99b9d43f' into maintenance/2.2 7ec1a890cc Merge commit '6598534c16cde2c3e1c4989cbf79c56f99b9d43f' into maintenance/2.2 6598534c16 Squashed 'package/marello-enterprise/' changes from c61c7491a..37e37f3fd ea615dd2db - updated dev.lock 24e5f0ee73 - updated dev.lock 7c068c4307 - updated dev.lock eb8079a0cd MAR10001-770: Order statistics widget: filter by SalesChannel 8d2a612f5c - Added migration to include organization id on the purchase order item e16b9c845f - Added migration to include organization id on the purchase order item 2367e1a81c - Added data column to PurchaseOrder 28cd82dd14 - Added data column to PurchaseOrder b0babecac2 MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first 521a1b4c4d MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first dd11206d22 MAR10001-759: Update OroCommerce bridge for Marello 2.2 - fixed functional tests 7849fd5d1d MAR10001-759: Update OroCommerce bridge for Marello 2.2 - fixed functional tests f3e7a147a2 MAR10001-759: Update OroCommerce bridge for Marello 2.2 - fixed functional tests 56b00f1d93 MAR10001-766: OroCommerce Bridge 8bd36631ec MAR10001-766: OroCommerce Bridge b921ad9823 MAR10001-766: OroCommerce Bridge 9905593639 MAR10001-766: OroCommerce Bridge 7f70b6c874 MAR10001-766: OroCommerce Bridge 6564be8e11 MAR10001-766: OroCommerce Bridge 16ae5b829c Merge branch 'develop' into feature/MAR10001-769 8e689452ad Merge branch 'develop' into feature/MAR10001-769 4c1b3b6e34 Merge branch 'feature/MAR10001-758' into develop 9c65960803 Merge branch 'feature/MAR10001-758' into develop 51117a9676 Merge branch 'feature/MAR10001-758' into develop dc829a58e0 Merge branch 'feature/MAR10001-758' into develop 888ed94f41 Merge branch 'feature/MAR10001-758' into develop 9ec5c53b25 Merge branch 'feature/MAR10001-758' into maintenance/2.2 1c12d4a00e Merge branch 'feature/MAR10001-758' into maintenance/2.2 448d5ce5f1 Merge branch 'feature/MAR10001-758' into maintenance/2.2 f82e0da9b4 Merge branch 'feature/MAR10001-758' into maintenance/2.2 cdcc959d0b Merge branch 'feature/MAR10001-758' into maintenance/2.2 56c5923ae3 Merge branch 'feature/MAR10001-758' into maintenance/2.2 bf194ee534 Merge branch 'feature/MAR10001-758' into maintenance/2.2 6e46a54245 Merge branch 'feature/MAR10001-758' into maintenance/2.2 0c10103be6 - CS fixes bb0509f4d1 Merge branch 'maintenance/2.2' of https://github.com/marellocommerce/development-mono-repository into maintenance/2.2 29a87ef26c Merge branch 'maintenance/2.2' of https://github.com/marellocommerce/development-mono-repository into maintenance/2.2 3bad4f4419 Merge branch 'maintenance/2.2' of https://github.com/marellocommerce/development-mono-repository into maintenance/2.2 7987383f7f - updated composer lock 2c66b035f2 - updated composer lock 3c4906221b - updated composer lock bd47ceb8c3 Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 4123fa917b Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 4ac9a3ad9b Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 6698e050da Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 60ca61550a Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 0beb28cb27 Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 9e01626219 Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 ace9130ae9 Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 b7793747fe Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 f232e41040 Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 3997133ccb Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 c623a59f9d Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 b621ed1a60 Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 c233aab259 Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 961e948704 Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 f926daf9e0 Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 2be768f90b Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 dd9d83d0b3 - updated composer locks afaa92779f - updated composer locks df2851f74b - updated composer locks c2c0b2d2ad - updated branch aliases 917712b6ea - updated branch aliases 85339def08 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 97cf4384b8 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 6cd756dcbc Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 c26d99dc7e Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 461907dd49 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 b263cd47fa Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 13c2d8643c Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 3e51432923 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 f305e73e05 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 7d8b387bd9 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 de30018cc9 MAR10001-759: Update OroCommerce bridge for Marello 2.2 9ba92d4d1d MAR10001-759: Update OroCommerce bridge for Marello 2.2 89e45898c9 MAR10001-759: Update OroCommerce bridge for Marello 2.2 40bfb9b0c7 MAR10001-759: Update OroCommerce bridge for Marello 2.2 0c7cd9df56 - CS fixes - Changed php version back to 7.1 1f47903e24 - CS fixes - Changed php version back to 7.1 3c28147569 temp 89b37c67fa CRH19001-18; Add API e7c73ea2f1 CRH19001-18; Add map to service point view page 1f5bd6417a CRH19001-18; Add service point image to view 9602b4d85d CRH19001-18; Add EntityConfig 098d8a3c09 CRH19001-18; Add ACL d72e6df1a0 CRH19001-18; Add controllers and views 9b6236f50b Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 6214e2f894 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket bf5d7fd127 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 62a21e6d83 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 63fdff6e1a Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 8b76808837 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 531fdfd623 Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 eb0f9bcf9f Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 5368114c7c Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 357be1b9d6 Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 e096805c6c Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 bf7766a324 Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 369323d8f3 - updated oro platform version to 3.1.15 - added script to enable / disable xdebug, can only be used when logged in as root in the container 022b0fb908 MAR10001-759: Update OroCommerce bridge for Marello 2.2 764f61cb3c MAR10001-759: Update OroCommerce bridge for Marello 2.2 0cf1559c97 MAR10001-759: Update OroCommerce bridge for Marello 2.2 c182dff9f5 MAR10001-759: Update OroCommerce bridge for Marello 2.2 576bb7a37e MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels 7268b2ec97 Merge branch 'develop' into feature/MAR10001-758 6ed2ee3b8f Merge branch 'develop' into feature/MAR10001-758 86b05abace Merge branch 'develop' into feature/MAR10001-758 4101edae14 Merge branch 'develop' into feature/MAR10001-758 91025a00f9 Merge branch 'develop' into feature/MAR10001-758 300748905b MAR10001-769: Show 'Cost' currency on de Product edit page f977f8d44d CRH19001-18; Add Forms e7102eb764 CRH19001-18; Add validation 6ea7e2a07d CRH19001-18; Add translations 2c67c47b6e CRH19001-18; Add data model a30498b615 CRH19001-18; Add ServicePointBundle c30a707e20 - Changed column source on invoice and creditmemo items product sku and name 55b120e785 Merge branch 'feature/MAR10001-674' into develop 587b04eb9e Merge branch 'feature/MAR10001-674' into develop 0e871be0d3 Merge branch 'feature/MAR10001-674' into develop 19f19cd6a8 Merge branch 'feature/MAR10001-674' into develop 1bbae89fd9 Merge branch 'feature/MAR10001-674' into develop fbe899bb14 - Disabled OrderOnDemand widget in Inventory view / update in order to prevent the usage of the unfinished feauture 8ac2b474ce Merge branch 'feature/MAR10001-674' into develop 302b650ca6 Merge branch 'feature/MAR10001-674' into develop 5566edeca2 Merge branch 'feature/MAR10001-674' into develop 12e90cb137 Merge branch 'feature/MAR10001-674' into develop 0677f6f2ab Merge branch 'feature/MAR10001-674' into develop 7c5122a9e4 Merge branch 'bugfix/MAR10001-764-stop-override-orderitem-status-when-already-set' into develop d5e544f1d2 - Added check to prevent overriding OrderItemStatus when already set on creation dc0798474f Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop d0555826ec Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop b2bcc90c18 Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop d7ee5e2f61 Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop 05b83582a7 Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop 95f964466c - Added additional check to verify there is a product to get the inventory item from when passed back to the import processor 175007317b - Added additional check to inventory level update strategy to check wether the product of the 'associated' inventory level exists before importing and throwing errors a90e865dd5 removed useless fields from oro_entity_config_field 6b806ed42a fixed bug in Migrations versions bb41270dac fixed bug in Migrations versions 707ecbe733 fixed bug in OrderBundle migration 569f684730 fixed bug in SubscriptionBundle migration 307c073b68 merged branch develop into 3.0 179b987a6b merged branch develop into 3.0 76bcab34cc merged branch develop into 3.0 c9cd872bf0 merged branch develop into 3.0 7fe0a507fa merged branch develop into 3.0 d2310ab3de Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop c92641ab75 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop bfdce95011 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop 4e94825f7b Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop 5c7608f531 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop aa1245cd62 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1 3aaed094a6 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1 aeb134498a Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1 7250a94a1d Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1 3ad8c02e15 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1 710093e2e8 Merge branch 'task/MAR10001-add-orocommerce' into develop b2df2440cd Merge branch 'task/MAR10001-add-orocommerce' into develop 75a0d26dcb Merge branch 'task/MAR10001-add-orocommerce' into develop ceea903901 Merge branch 'task/MAR10001-add-orocommerce' into develop 5fd4f66247 Merge branch 'task/MAR10001-add-orocommerce' into develop 138ad9af2e - Added fix for multiple post requests at once which results in infinite loading in Integration setup a4a2449855 - Added fix for multiple post requests at once which results in infinite loading in Integration setup 0f5bf0b678 - Added fix for multiple post requests at once which results in infinite loading in Integration setup 6d18aa62ed Merge pull request #8 from marellocommerce/feature/MAR10001-730 bb7a398899 merge branch 3.0 into feature/MAR10001-730 833bad8655 merge branch 3.0 into feature/MAR10001-730 1d4694ef84 merge branch 3.0 into feature/MAR10001-730 d6b6e8660f Merge pull request #13 from marellocommerce/feature/MAR10001-714 c4afcddd66 merge branch 3.0 into feature/MAR10001-714 4ecbb62094 merge branch 3.0 into feature/MAR10001-714 0aeb9b47e9 merge branch 3.0 into feature/MAR10001-714 001219c94e Merge pull request #6 from marellocommerce/feature/MAR10001-725 e60026c0cf MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bug in migrations in InventoryBundle related to renaming column from system to is_system 129178a480 Merge branch '3.0' into feature/MAR10001-725 fe9409f242 Merge branch '3.0' into feature/MAR10001-725 280cc8b6cc Merge branch '3.0' into feature/MAR10001-725 cca6c69d29 Merge pull request #16 from marellocommerce/feature/MAR10001-751 283fe126e9 Merge pull request #5 from marellocommerce/feature/MAR10001-718 01b39c873e Merge branch '3.0' into feature/MAR10001-718 f53a6e5076 Merge branch '3.0' into feature/MAR10001-718 030d5c1251 Merge branch '3.0' into feature/MAR10001-718 092fdfbb9d - finetuned composer json files for oro commerce d1debd7a1b - finetuned composer json files for oro commerce abd030821e - finetuned composer json files for oro commerce e3a0a7f002 - finetuned composer json files for oro commerce 7195cab6a0 - finetuned composer json files for oro commerce 09dc350d06 Merge commit '80a9b1c23bdc0bb816b9af20e62fa24b9d623dbb' into task/MAR10001-add-orocommerce 6ef037fda9 Merge commit '80a9b1c23bdc0bb816b9af20e62fa24b9d623dbb' into task/MAR10001-add-orocommerce fe42acc58b Merge commit '80a9b1c23bdc0bb816b9af20e62fa24b9d623dbb' into task/MAR10001-add-orocommerce 80a9b1c23b Squashed 'package/marello-orocommerce-api-bridge/' changes from ecac365de..9eb94f4eb 6cd2dfa46a Merge commit '4454d8fd3b5e66385213767d87d080a25fec5625' into task/MAR10001-add-orocommerce ff3ef85567 Merge commit '4454d8fd3b5e66385213767d87d080a25fec5625' into task/MAR10001-add-orocommerce c1f8a583c9 Merge commit '4454d8fd3b5e66385213767d87d080a25fec5625' into task/MAR10001-add-orocommerce 4454d8fd3b Squashed 'package/marello-orocommerce-api-bridge/' changes from b6a29d02f..ecac365de 769f1e86a0 Squashed 'package/marello-orocommerce-bridge/' changes from 91b03b552..6507f0941 963a6757e7 Merge commit '769f1e86a03cc1c4bc3758bcec7aa910ffae8014' into task/MAR10001-add-orocommerce 8f3a1c3c56 Merge commit '769f1e86a03cc1c4bc3758bcec7aa910ffae8014' into task/MAR10001-add-orocommerce 13e34cd81f Merge commit '769f1e86a03cc1c4bc3758bcec7aa910ffae8014' into task/MAR10001-add-orocommerce ece038eda4 Merge commit '769f1e86a03cc1c4bc3758bcec7aa910ffae8014' into task/MAR10001-add-orocommerce 889c68db38 Squashed 'package/marello-orocommerce-bridge/' changes from e3ec6e73b..91b03b552 fa33d127c6 Merge commit '889c68db3841df5caf550aa0dbca7420b3026ec6' into task/MAR10001-add-orocommerce ce250506e2 Merge commit '889c68db3841df5caf550aa0dbca7420b3026ec6' into task/MAR10001-add-orocommerce 83c763367a Merge commit '889c68db3841df5caf550aa0dbca7420b3026ec6' into task/MAR10001-add-orocommerce 0256c83087 Merge commit '889c68db3841df5caf550aa0dbca7420b3026ec6' into task/MAR10001-add-orocommerce 7252beed30 Merge commit 'ea1c49242dd34dbb7d8b32c2ba4e154490d8182a' as 'package/marello-orocommerce-api-bridge' ea1c49242d Squashed 'package/marello-orocommerce-api-bridge/' content from commit b6a29d02f 7e5697d39b Merge commit 'ea1c49242dd34dbb7d8b32c2ba4e154490d8182a' as 'package/marello-orocommerce-api-bridge' 39d9bfe528 - added bridges - added orocommerce application aaa58d3156 Squashed 'package/marello-orocommerce-bridge/' content from commit e3ec6e73b 6afe454082 Merge commit 'aaa58d315606b1e6487d191ba26e03f9b8931b32' as 'package/marello-orocommerce-bridge' 6952245a60 Merge commit 'aaa58d315606b1e6487d191ba26e03f9b8931b32' as 'package/marello-orocommerce-bridge' 5f477af80c Merge commit 'aaa58d315606b1e6487d191ba26e03f9b8931b32' as 'package/marello-orocommerce-bridge' 71db3ce901 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop 7512f071d1 - updated PurchaseOrderBundle schema versions to take the 'next' version of Marello (2.2) into account d73ea9ae38 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop 9c7ccaf042 - updated migration version in the installer 7202bfe739 - Added ownership to SubscriptionItem - Added migrations for adding Organization column - Added migration to update current SubscriptionItems 52ba661178 - Added Organization ownership to ReplenishmentOrderItem - Added migration to update current ReplenishmentOrderItems - Added translation for Organization label - Updated installer migration to include Organization column 8c73f7d0d5 - CS fix b70304bc27 - Added Organization ownership to PurchaseOrderItem - Added translation for Organization label on PurchaseOrderItem - Added migration to update current PurchaseOrderItem with Organization - Added migration to add column for ownership to PurchaseOrderItem table - Added translation for Organization label on ReturnItem 637f8d2c6a - Added translations for Return item and Refund item organization labels - Added Organization ownership to RefundItem - Added migrations to update current RefundItems with Organization - Added migrations to add ogranization colum to RefundItem table a8f9c35e37 - Updated gitinore - Added new packages for Servicepoints extensions a555b12792 - Added migration for updating existing InvoiceItems with Organization - Added migration for adding ownership to ReturnItems - Added migration for updating existing ReturnItems with Organization 5ba860910b MAR10001-751: Rename columns to 6384bf6f05 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bugs 5a857bb8a3 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed CustomerBundle - fixed PaymentTermBundle f35d8ed986 merge develop branch into feature/MAR10001-717 ' b83b49733a merge develop branch into feature/MAR10001-717 ' c43c205c55 merge develop branch into feature/MAR10001-717 ' 7cdec15630 - Added migration to update current credit/invoice items with organization based on the parent entity's organization ee7a90f3a6 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels 3a1bc50896 - updated PackingSlipItem test to include organization - Added translation for PackingSlipItem organization de62d5e7fc - Added migrations for updating current OrderItems & PackingSlipItems to set the organization based of their parent entity - Added Ownership config to PackingSlipItem - Added migration to add the new organization column on PackingSlipItem b3289517ae - Added ownership field to Oro config fb4ee24d0e - Added organization ownership to InvoiceItems - Added translations for organization - Added migration to update schema with organization 4a22160234 - Added organization ownership to OrderItem for applying ACL when reports are created with the items e2afce7916 - Added Organization ownership to Supplier entity - Added test to verify the organization is set when a new supplier is being created 0560b598c0 MAR10001-674: Order on demand - updated OOD validator - fixed bugs in order items statuses changing c14e032d37 - updated rendering of OrderNumber link and SalesChannel link on various views for quick navigation - added quick navigation link to customer on Invoice view 0a125277ff - Added product sku rendering link to RefundItem's datagrid for quick navigation b75a0feedb - Added product SKU rendering link to ReturnItems grid for quick navigation 9751e25166 - Added product sku rendering link to PackingSlip item grid for quick navigation 39748338ab - Added product sku link rendering to Invoice Item grid for quick navigation 8fefd604ab - Added product sku link rendering to order item's product in order item datagrid 463944678c - Added quick navigation rendering link for product SKU's as macro and template for Twig templates - Added quick navigation product sku link to datagrids of Inventory related datagrids - Updated rendering product sku link in inventory view pages - Updated rendering product sku link in order's hero widget c0676a6c04 - Updated rendering of orderNumber in datagrid to check ACL access and handle rendering of both an id and object of order - Added rendering a view link to latest order grid in dashboard widget for quick navigation c6a281d227 - Added quick navigation for customer on Order View - Updated quick navigation for SalesChannel link on Order View 380e497b26 MAR10001-714: Payment methods db23ececee - remove commented code e9b64d7f68 merge develop branch into feature/MAR10001-714 0224b109e6 merge develop branch into feature/MAR10001-714 82ec9c0919 merge develop branch into feature/MAR10001-714 e72322a6e9 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow a7a5395e02 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 7b74dbfcc3 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow c480aba0ca Merge branch 'develop' of https://github.com/marellocommerce/development-mono-repository into develop b20df453d0 - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 67d9342054 - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' c493008414 - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 1e7da78868 Honor Symfony environment in supervisor scripts 1c72d0e130 Add php-imagick to Docker build 3a63712391 MAR10001-742; Add tests c95a0b0b06 MAR10001-742; Check if invoice workflow transition is set 03c4906f85 MAR10001-742; Remove debug code de05c5220c MAR10001-742; Add workflow actions to send invoice e-mail 3a7e886633 MAR10001-742; Add translation 8ddfe8f280 MAR10001-742; Add migration for invoice e-mail template c25804f193 MAR10001-742; Add IsSendEmailTransition workflow condition 64349d0d3f merged develop branch into feature/MAR10001-714 branch 97efccedcc merged develop branch into feature/MAR10001-714 branch 8da266898a merged develop branch into feature/MAR10001-714 branch 37486c5096 Merge branch 'feature/MAR10001-674' into develop ff41bab0de - added :cached to mounted volumes in docker environments 2c421255e0 - Reverted changes that break BC, added comments where BC would break if we would keep the changes in the Interface - Added alternatives to provide same functionality but without BC breaks 3fc17b488f Merge branch 'develop' into feature/MAR10001-674 f510e5e19d Merge branch 'develop' into feature/MAR10001-674 3756c617f6 Merge branch 'develop' into feature/MAR10001-674 d25864bad6 - CS fix -> fixed docblock b01364b330 Merge branch 'feature/MAR10001-739_Payment-term-invoice' into develop fae1a7678d Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 426cf1331d - Added Migrations to update entity_config tables and entity_config_field tables to set auditable to false for InventoryLevel && BalancedInventoryLevel 0e82586f1a Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 49b04a6eb4 Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop ac060193ca Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop bbdd5074f7 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 0f88aff1ae Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow b9336a3e95 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 8115928f31 - removed the trigger of a rebalance when installing to reduce additional messages in queue - refactored the trigger of rebalancing when a SalesChannelGroups are created or deleted to only rebalance products linked to those SalesChannelGroups 1ce5e63376 - Added check to prevent sorting on null when no products have been found and linked to any warehouse when creating order and moving through the workflow df802075d7 MAR10001-742; Add e-mail settings about sending invoices 5e7ef3c6c9 MAR10001-739; Fix migration namespace 5fbba482f1 - CS Fixes 4dc4961f0d Merge branch 'feature/MAR10001-674' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-674 168300575b MAR10001-674: Order on Demand - fixed warehouses calculations for order 5d2a6d7b2b - remove unused code from validator 4396273c57 - remove unused code from validator 4a8fa2a9e6 - remove unused code from validator cf735c4e26 - Removed unused code - Added CS fixes where necessary f1fd3bc9a0 MAR10001-674: Order on Demand 5efbbca84a MAR10001-674: Order on Demand d476c9f176 MAR10001-674: Order on Demand 41618a9dd2 MAR10001-674: Order on Demand 2deed762d6 - Updated dev.lock files - Updated oro platform to version 3.1.13 67bb3f3c38 - Updated dev.lock files - Updated oro platform to version 3.1.13 04633bc13d - Updated dev.lock files - Updated oro platform to version 3.1.13 619588b177 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php df51be6076 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php c02fb74592 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php 48c3fe84bc backmerged develop branch into feature/MAR10001-730 branch f433537de9 backmerged develop branch into feature/MAR10001-730 branch 0149f775d8 backmerged develop branch into feature/MAR10001-730 branch 921943ce63 MAR10001-730: Update CustomerBundle with Customer 71e7a0293d MAR10001-742; Add workflow action to send email with attachment 1f59a1a5ee MAR10001-739; Add payment term to invoice view f42f90d3c4 MAR10001-739; Calculate invoice due date 65c22d3ced MAR10001-739; Add payment term during invoice generation dd544924b5 MAR10001-739; Add getCustomerPaymentTerm to PaymentTermProvider acd2605d16 MAR10001-739; Add payment term to invoice model 6822d396f7 - platform update d34728108e - platform update f505f98e6a - platform update a27aaf8204 MAR10001-13; Add demo data for invoice configuration b097ee5b30 Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop ad00b51a25 - Fixed typo in class name 3e84f2beba Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop 719a063019 - Small CS fixes; new line on end of file, formatting ano function over multiple lines d2036237da MAR10001-730: Move Customer 38062962fd MAR10001-13; Add functional test 5330a7a2b6 MAR10001-13; Update TableSizeProviderTest 08984cfa54 - remove composer.lock file from marello application ee for branch 7c52792b20 - remove composer.lock file from marello application ee for branch b93a47fea6 - remove composer.lock file from marello application ee for branch 21f7309837 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 a29d4626e5 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 3bac1551f7 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 58c444a4bb Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 84d9f42bf6 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 026eeea575 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 9d3be5f4b8 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 11c85f2940 Update OroRequirements check to be compatible with Oro Platform 3.1.x 55928b7d55 Update OroRequirements check to be compatible with Oro Platform 3.1.x fbd1a8575b Update OroRequirements check to be compatible with Oro Platform 3.1.x 804bf575e8 Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements c168f3d6fa Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements 666b7774c2 Merge branch 'feature/MAR10001-676-purchase-order-notification' into develop f315f266f6 - Updated demo data for PO in order to make sure there are actually POitem candiates for creating a PO 04646f2eeb - Added test to verify correct registration of cron command - updated code to include correct registration of cron command dfb9264e6f MAR10001-13; PdfBundle unit tests a8786902a9 MAR10001-13; Fix PDF bugs e10f6128a9 - Updated tests to cover ProductRepository getPoItemCandidates - Updated inventory data fixture for tests to include data for InventoryItems - Added test for cron command to verify sending the notification for PO advise - Updated ProductData fixture to set a preferedsupplier on a product c368cd66ff Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification 8aa0dde8e4 Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification 822cfa9388 Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification e3df425201 - Added test to verify the working of the saving of the notification as activity target 078ef54b83 - updated phpdocblock removing parameter that isn't there anymore 208061f25d - updated query for including purchaseInventory when selecting purchaseOrderItemCandidates 087fc14140 - Updated SendProcessor to keep BC by having a setter and property for saving the notification as activity instead of adding a method parameter - Updated POACommand to set the property on the SendProcessor and use a constant as exit code 95b01563f2 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 173bfa3938 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 9f411716b5 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 7fa59ae41e Merge branch 'develop' into feature/MAR10001-725 a560e5f7da Merge branch 'develop' into feature/MAR10001-725 509e0860bb Merge branch 'develop' into feature/MAR10001-725 0493b3a243 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification d177468128 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 6615f6e93c Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 91c4fa786b MAR10001-13; Add PDF button to invoice view c077835fc0 - changed Warehouse Location to Pick location - Updated migrations, tests and translations c33ee9cde0 MAR10001-725: Update ProductBundle 1baa9b7857 MAR10001-744; PaymentTerm API tests ab31e31744 Merge branch 'feature/MAR10001-735-add-second-workflow' into develop e7251578fb Merge branch 'feature/MAR10001-735-add-second-workflow' into develop a55e3a5526 Merge branch 'feature/MAR10001-735-add-second-workflow' into develop 4f64716422 - Added an Interface to have some constants for order workflow names - Updated tests being more clean without the much duplicated code ed51bb00b8 MAR10001-744; Adjust tests for Company PaymentTerm aadf52cb00 MAR10001-744; Add PaymentTerm API f9c02676f3 MAR10001-744; Add payment term to Company view and form e14ed75aa0 MAR10001-744; Add test for PaymentTermSelectType 2517d6a254 MAR10001-744; Add PaymentTermSelectType 33d63c383c - Updated logic for moving default worfklows to pending when only one is active - Added test for logic to test scenario's where there is only a single one available, the entity not being eligible or when there is more than one available - Added tests to interact with default installation 1caecd7a2a MAR10001-744; Add payment term to Company model b0721f157e - Added first version of the OrderWorkflowStartListener for when a single workflow is active on the order and start it automatically 332075b3f5 - removed quotes from symfony environment variable in environments dockerfile in order to start the containers properly 7a5373bf1e - Fix inventory level tests for CE version 1c843e75d1 - removed quotes from symfony environment variable in environments dockerfile in order to start the containers properly 42a63f0157 Merge branch 'task/MAR10001-0-fix-inventory-level-functional-tests' into develop 34e4b00228 - Added warehouseLocation to InventoryLevel form fields e76e5f405a - updated type hint for getWarehouseLocation() in InventoryLevel - Updated datagrid of inventory level to include warehouseLocation - Updated inventory level collection form to include warehouseLocation a31462c039 - added warehouseLocation to inventory level form type dc084a2ec3 - Added Warehouselocation to InventoryLevel - Updated migrations to include warehouse location column - Added translation for new field warehouse location - Updated function/unit tests to test setting/getting and updating warehouse location 88e79d745a - Fix inventory level tests for CE version 421c729f95 - Fix inventory level tests for CE version 624ad7eb64 - added currency of root entity(Invoice) for formatting correctly in PDF's 9d67b999fe Merge branch 'feature/MAR10001-701_Payment-term' into develop a9d53df1aa Merge branch 'feature/MAR10001-701_Payment-term' into develop 22d50737f5 Merge branch 'feature/MAR10001-701_Payment-term' into develop 9f61728286 - Fixed check in PaymentTermDeletePermissionProvider to take into account a null result from the PaymentTermProvider - Fixed PaymentTermControllerTest to count the result of the loaded fixture and verify 'results' cfe52c06c1 - Show inventory level collection when empty for CE version be2e8069c6 - Adding PaymentTerm demo data - Updated payment term provider to check wether the id from the config exists before querying on the repository 6cd35635d4 - CS fixes e0cdf4d3a2 - removed unsued and duplicate class 9750757454 Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 e626a0473c Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 d4258fdc2a Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 c10208e7d9 Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 cbce68c6f2 Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 0db2b45216 Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 70bd6edbc8 Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs d8e37e7b34 Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs e82b412dbb Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs 3056bb3330 - updated lock files to have mpdf as dependency in lock files 9cf22afd8c - updated lock files to have mpdf as dependency in lock files a1b5127048 - updated lock files to have mpdf as dependency in lock files 711d773d87 Merge commit '9fa49926a0e01508f988164f88559744622be764' into feature/MAR10001-701_Payment-term 458932620f Merge commit '9fa49926a0e01508f988164f88559744622be764' into feature/MAR10001-701_Payment-term 7606d8f207 MAR10001-718: Refactor LocaleBundle - backmerged develop branch a3f5227e1a MAR10001-718: Refactor LocaleBundle - backmerged develop branch 0eb406c3dd MAR10001-718: Refactor LocaleBundle - backmerged develop branch 8a5c6906c1 MAR10001-717: Update applications with Oro platform 4.0.0 ee3a04f1a5 MAR10001-718: Refactor LocaleBundle 7f8fdce678 - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default e89f6ffc8b - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default 8a84e10f73 - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default f4ea5cef8e MAR10001-717: Update applications with Oro platform 4.0.0 47b1d78f8c MAR10001-717: Update applications with Oro platform 4.0.0 62ff36a54d MAR10001-717: Update applications with Oro platform 4.0.0 6c26b54c14 Merge branch 'develop' of https://github.com/marellocommerce/development-mono-repository into develop fdccea6a38 Merge branch 'develop' of https://github.com/marellocommerce/development-mono-repository into develop 944d472acd Merge branch 'develop' of https://github.com/marellocommerce/development-mono-repository into develop e400f45106 - removed unused code - todo add additional customer controller tests for create/update 8f6684e1ed - removed commented code 47c4337b6b - fixed testCompanyUpdateRemoveCustomers test now calling correct method for customer to assert - removed an assertion from testCompanyUpdateRemoveCustomers because assumption of the assertion was wrong 1e1cc66418 - CS Fixes - Updated Company controller test to test saving a company without customers assigned - Fixed Customer entity to allow the company to be empty - Added Company name and view link to Order view f71290b225 - CS fixes 672d5e8b31 Merge commit '11f7d8417a07b4a65cd787387c0e10cc56870352' into feature/MAR10001-692 383a5437d3 Merge commit '11f7d8417a07b4a65cd787387c0e10cc56870352' into feature/MAR10001-692 129d760efa Merge commit '11f7d8417a07b4a65cd787387c0e10cc56870352' into feature/MAR10001-692 cfac0ad041 Merge branch 'feature/init-application' into maintenance/2.1 ee5e2a1d2b Merge branch 'feature/init-application' into maintenance/2.1 4ed24a9507 Merge branch 'feature/init-application' into maintenance/2.1 deb31268b4 Merge branch 'feature/init-application' into develop ea14e032dd Merge branch 'feature/init-application' into develop 3048213b6c Merge branch 'feature/init-application' into develop 121c762d59 added phpstorm:init-application tool command b7466fec44 Merge branch 'feature/MAR10001-0-marello-demo-environment' into develop f52f9577e8 Merge branch 'feature/MAR10001-0-marello-demo-environment' into maintenance/2.1 dcad0b91cc - tmp disabled loading of OrderData because of incompletion 0c4d7af91f - removed suppliers from product grid - added missing taxcode to product grid 0ae002e73b Merge branch 'bugfix/MAR10001-711-images-load-slower-than-marello-20' into maintenance/2.1 e6c8c5a63c - added addditional migration to update product images with `acl_protected` false in Entity config to change the caching directory of images - updated installer to include the `acl_protected` entity config by default in Product Image attachments 6afdedd465 - added demo environment d603ca3c08 - updated OrderView datagrid layouts to resemble the 'original' style from Oro 08981d56ee - remove lock files 79de88d392 - remove lock files de02dd30ab - remove lock files e9add99b79 - remove lock files from master 143e1d9705 - remove lock files from master e63975816f - remove lock files from master 2e320d1863 Merge branch 'release/2.1' 8a509a9319 - update reference for subtree pushes and individual packages 56ca87506c - Release preparation 2.1 1e6328d6ef - Release preparation 2.1 45a6aa34f2 - Release preparation 2.1 8ef8047801 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 0b10735dff Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 c01908eda8 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 1a6e484232 - updated branch aliases bd52870624 - updated branch aliases 494159dbc6 Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 980c1ff750 Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 be1390fdfa Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 7b6de96466 - updated version number in upgrade notes 82ff6eed1d - updated version number in upgrade notes a9c177c93d - updated version number in upgrade notes 1e5f5f0fab - prepared composer.json files for release eeef2149d0 - prepared composer.json files for release 8c0452ddcb - prepared composer.json files for release a98eff79d3 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions cbcabb723e - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 172f0f0012 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 408e7914c6 - Added twig file extension to deal with image id being fetched as a result in the product grid and getting the correct image during PostgreSQL having issue with an object in the result - Fixed subscription controller test to include cancelBeforeDuration field since it is not nullable a8f5e24c81 - updated subscription type CancelBeforeDuration to change it to OroChoiceType 3e438fe1c9 - added currency to formatting in subscription items grid 744b5d721a - updated indentation in validation.yml 69c1aec0e7 - updated subscriptions with validation on billing / shipping address - fixed migration and installer to make sure billing / shipping are required for the subscriptions - added translation for validation messages c1dd6a41f3 - added back sorters in to two datagrids for invoices and packingslips a7948efd4c - updated translations - updated updated orderitem status Dropshipped to Dropshipping - updated datagrids with removal of exports and some sorters 42b566db2a - updated dev.lock files be1f5ccf64 - updated dev json and lock file to include oro 3.1.9 - small changes regarding docker environment files 093f55c9ff - removed todo comment 0691eaa1ee - Removed inventory check when subscription product is in the order and the OrderItem status is being updated b6bc0f16ce - removed check from WH listener in order to see the newly created external warehouses 42b77d6d1e - removed external warehouse inventory from AvailableInventoryProvider in order to not confuse users, external warehouse inventory should be taken into account in the inventory balancer 13c074bc59 - changed show form when empty boolean on inventorylevel collection in order to prevent confusion for users b50cf12a0a - updated code for checking bc breaks ddd3daed83 - Fixed some classes in order to keep BC for upcoming release - Added some comment in which we couldn't keep BC (OrmFilterExtension) 8bf702cd3b - fix constructor argument in order to keep BC for 2.1 release 6518cfe002 - fix constructor argument in order to keep BC for 2.1 release 3bbb699f47 - CS Fixes - updated the check for updating existing email templates migration 22e7e9eb2b Merge commit '5bb4981c46c7990c597fb4344a600bcb969981c5' into feature/MAR10001-676 3ac653016e Merge commit '5bb4981c46c7990c597fb4344a600bcb969981c5' into feature/MAR10001-676 134f7c19b8 Merge commit '5bb4981c46c7990c597fb4344a600bcb969981c5' into feature/MAR10001-676 9c67217406 - update translation on confirmation message when trying to delete an inventory level which still has inventory 96686acaf2 - merged bugfixes form MAR10001-680 with current code fc161bcddd Squashed 'package/marello-enterprise/' changes from 795a6a8fc..c61c7491a f936a56ef5 Merge commit 'fc161bcddd183c818ccdd11fc5e6934a84d6c566' into bugfix/MAR10001-680 24074341b4 - Updated translation for Order Item status report cef25b078c - fixed sorter of subscription datagrid to show the latest subscriptions first 6100734447 - Update InventoryItem view and update page for more consistency between the pages 1eb41a5a86 - Added check for Back/Pre-order quantities where the MaxInventoryQty is null - Updated test to check the new order count in DB after if the maxQty is set for back/pre-order 0897c07593 - Updated tests for checking whether more than 1 product type has been registered in the application 858ecb82f5 - Added tooltips for back/pre-order form fields - removed the 'relations' between purchase order and the backorder datetime field - updated translation labels for consistency - removed configuration for enabling / disabling usage of PO and datetime of backorder - added feature to set the pre-order allowed field to false and pre order datetime to null when PO has received items - added feature to set backorder datetime to null when PO has received items e81ee62bea Merge branch 'develop' into feature/MAR10001-485-subscriptions 92ecbebd0b Merge branch 'develop' into feature/MAR10001-485-subscriptions 65eb54e1f2 Merge branch 'develop' into feature/MAR10001-485-subscriptions 488b07fe23 - CS fixes - Updated dev.lock 7af5afd72d - CS fixes - Updated dev.lock 642c8bd172 - CS fixes - Updated dev.lock 28a6811453 - CS fix 80c97c997d Merge branch 'develop' into feature/MAR10001-485-subscriptions b2cfd723f8 Merge branch 'develop' into feature/MAR10001-485-subscriptions 1171bed2c5 Merge commit '5f12bd20893426c155ce26461eb08b0dc2da5297' into feature/MAR10001-670 d8a379295f Merge commit '5f12bd20893426c155ce26461eb08b0dc2da5297' into feature/MAR10001-670 44701866ab - removed unnecessary removal of modal during the disposal since it will be disposed by the parent view call fd9cb300da - Changed name of the placeholder data twig function for clarification - Added additional tests for checking the functions of the Additional data Placeholder Provider feature 958151fc8d - removed references of subscription bundle in Marello CE core - added the ability add additional placeholder data to render blocks - added additional placeholder data to orders, purcahse orders, suppliers, products and salesChannels ce283af3af - Updated send processor test to include coverage for sending correctly rendered emails b032174b37 - Added additional test for testing when the email template cannot be found - Changed the type, content and subject to be send to the emailNotificationSender in order to prevent sending notifications without proper rendering 0fdd327fec - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products be72a746b7 - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 2a72acdf7a - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products b4d614d5d2 Squashed 'package/marello-enterprise/' changes from fe0ae2835..795a6a8fc 638357fc9e Merge commit 'b4d614d5d259ac0085a2f1583612c1d4ad37139a' into feature/MAR10001-485-subscriptions c336fa2bc8 Merge commit 'b1ef79ca49e261313c5007056254a522cc673dee' into feature/MAR10001-485-subscriptions 1cf5ca18e3 Merge commit 'b1ef79ca49e261313c5007056254a522cc673dee' into feature/MAR10001-485-subscriptions 3c22ced3d5 Merge commit '4a99ea3f9aacb6c3ba458cd125c75fdb3d7a3f7e' into feature/MAR10001-485-subscriptions 4a99ea3f9a Squashed 'package/marello-subscriptions/' changes from 761e06555..572ecd4cf 9d4c87940d - added options to exclude subscription fields to be included in datagrid by default f5d918d8bf Squashed 'package/marello-enterprise/' changes from a2159f257..fe0ae2835 2c0b081c5d Merge commit 'f5d918d8bfff382f5e781e8224b6116c9c38a277' into feature/MAR10001-485-subscriptions 6929891c12 Merge commit 'e5280b59fd2f4e57a38bc08bb62f43344bae4ef0' into feature/MAR10001-485-subscriptions 5e0a964cd5 Merge commit 'e5280b59fd2f4e57a38bc08bb62f43344bae4ef0' into feature/MAR10001-485-subscriptions 08a75055d8 Merge commit '926481e3a768ead361e9599eb36593a346a635f7' into feature/MAR10001-485-subscriptions 926481e3a7 Squashed 'package/marello-subscriptions/' changes from 562240b44..761e06555 f0db9ec56f Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions b5b59f8611 Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions 6113000a9d Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions 78a94875a8 - added fixes for non escaped twig tags in replenishment and return emails ca67d75c32 - update migration namespace since it's not an oro migration but a Marello one; just clarification no bugfix 9cc3ce2b41 - fix email tags for Purhcase Order email templates 823a37b9ed - Added Migration to Order & Purchase Order bundles to update email template tags to make sure the custom tags are not being removed eff8d97015 - fixed subscription view translation keys - Changed ownership of product attributes to Custom to allow attribute sets be created without the subscription attributes in it (system attributes are required to be added to all attribute families) 8a9c38b7c5 Merge branch 'develop' into feature/MAR10001-485-subscriptions 3886fa1162 - fixed the waitinstall script which had the wrong configuration on checking the config - added container names to marello-ce docker environment yml 105da0004c - added documentation for registering product types - fixed some phpDocs in Subscription entity to include correct return types a377cbc4bd Merge branch 'feature/MAR10001-485-subscriptions' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-485-subscriptions 128e1556ef Merge branch 'develop' into feature/MAR10001-485-subscriptions a232ead9e2 Merge branch 'develop' into feature/MAR10001-485-subscriptions 7f622b8e9d Merge branch 'develop' into feature/MAR10001-485-subscriptions e43d1346e2 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 8c69e5ae60 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 2c3cf90314 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 5aae693eb7 Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into develop 3cc0f4afdb Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into develop 6bc26737d9 - Fix installing demo data with default product type 8b925c3e59 Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into feature/MAR10001-485-subscriptions 2f0f46a6e9 Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into feature/MAR10001-485-subscriptions b6811fb9cf - fixed issue with managedInventory interfering with updating inventoryLevels and or going from managed to unmanaged 73d3d395d2 - fixed issue with managedInventory interfering with updating inventoryLevels and or going from managed to unmanaged 5ed8876a3a - revert mark as skipped functional test of ProductController 7691f5e826 - CS fixes - Updated test-extended script in dev.json to test PSR in correct directory - Mark ProductCreate test as skipped because of failure with subscription extension enabled 68d48da97b - updated reference to js files which uses the bundle name as 'prefix' for dumping it into the bundles dir 097d4235d6 Squashed 'package/marello-enterprise/' changes from 800c8e916..a2159f257 f942197acf Merge commit '097d4235d69c0c86a7df735078efbdfa75437cbd' into feature/MAR10001-485-subscriptions 37ec4fbc18 Merge commit 'd616475ea6c833b33481537e80d73a114b76df94' into feature/MAR10001-485-subscriptions c2a8bf1a7a Merge commit 'd616475ea6c833b33481537e80d73a114b76df94' into feature/MAR10001-485-subscriptions 8d9a8d8a7e - updated PSR-4 autoloading for marello, marello-enterprise and subscriptions - updated dev lock for enterprise application with subscriptions extension enabled 098d606274 - change dev.lock 725919bd3d - change dev.lock e3406ab4b9 - update dev.lock d2958da255 - update dev.lock 1a33d34555 - subscription application docker-compose file added ff2c09bd30 Merge commit 'ec9171148008392dc265ef90998b13df9f655423' into feature/MAR10001-485-subscriptions ec91711480 Squashed 'package/marello-subscriptions/' changes from 981592058..562240b44 d0214eded1 - fixed typo in directory of subscriptions d078b53906 - updated paths for checking psr code style - added phpunit config to application root ad86e28dda - updated paths for checking psr code style - added phpunit config to application root 6507f09419 MAR10001-654: Add Business Unit selection to integration creation 36a7c6e12f - change repo configuration key in package - removed squash from cmd line in order to pull in from downstream c39eee37d4 - renamed commands to make them more unified in their usage - added remote sync command which will sync master branch from downstream remotes into monolith repo 41e64c3426 - added tool for initializing remotes of subtrees - added commands for adding and removing remotes 23660c7a9d - added section for PR's 1c35524c6a - Added images of flows on mono repo 207b4742f5 - added reference documentation for branching and releasing 2cf66506f2 - remove setting datetime for pre-orders when purchase order is created a91d0a1901 - PSR2 fixes - Remove unused constant from config - Unified translations for Backorders and Pre-orders b845ca9ad2 Squashed 'package/marello-enterprise/' changes from 84cf52f4a..800c8e916 745941fb85 Merge commit 'b845ca9ad29f3b591839c9943f6f2e288d12868b' into feature/MAR10001-377 8291db5777 Merge commit 'b55e936f3c6428ae97c2f440cd8df8e00e3a9127' into feature/MAR10001-377 94672eeff4 Merge commit 'b55e936f3c6428ae97c2f440cd8df8e00e3a9127' into feature/MAR10001-377 eb367669e7 Merge branch 'feature/MAR10001-604' into develop d3f4ec52c1 Merge branch 'feature/MAR10001-604' into develop a099b1929c - added php-semver-checker file for version checker df6321ac0c - added php-semver-checker to gitignore 99ebeaafb7 - update environment files for easier setup with docker - added phpunit.xml.dist to root dir on marello-ee application - updated psr testing test script in dev.json to look at the vendor directory instead of the src/ dir 2dbf586df5 - update environment files for easier setup with docker - added phpunit.xml.dist to root dir on marello-ee application - updated psr testing test script in dev.json to look at the vendor directory instead of the src/ dir 70d9c2d0b6 - Fix PSR2 cs fixes 04d6eecf52 Merge commit '4b5ec7e8d02e9b7e079e43d024f18dc3a92a9c7d' into development a6c66d1b94 Merge commit '4b5ec7e8d02e9b7e079e43d024f18dc3a92a9c7d' into development 524a373109 Squashed 'package/marello-enterprise/' changes from 58fa179aa..84cf52f4a b5dca21815 Merge commit '524a373109305ee69c29ade6f7eaa7bf0f34f6ac' into development 408c7794c6 Merge commit '40a4d43559a871bd237a9a91e61f6bb33f6db69e' into feature/MAR10001-604 1e9303caf6 Merge commit '40a4d43559a871bd237a9a91e61f6bb33f6db69e' into feature/MAR10001-604 8e21b533d1 - updated composer lock file for 'new application' with subscription 9a6a96eff0 Add 'package/marello-subscriptions/' from commit '9815920585b396456e88bd07aeecbdd6821506ca' 077fcc425c - add 'new application' directory for subscriptions based of the Marello Enterprise applicatio bacf022292 - added composer.lock to .gitignore - remove composer.lock files 13170fb10e - added composer.lock to .gitignore - remove composer.lock files 620cab4c83 - Added generated lock files - Updated composer.json & dev.json files with correct branch alias versions 58dbc6e3ed - Added generated lock files - Updated composer.json & dev.json files with correct branch alias versions 64f725e6e2 - added composer.lock - added dev.lock - updated branch alias in marello package composer.json f975f5283d Add 'applications/marello-application-ee/' from commit 'd13f2b41e079dff4eee99f8874928459658daaff' 0ce4a67f2b Add 'applications/marello-application-ee/' from commit 'd13f2b41e079dff4eee99f8874928459658daaff' 11ab45ce3c Squashed 'package/marello-enterprise/' content from commit 58fa179aa 941f18df46 Merge commit '11ab45ce3c32e2982aa62cb56e7336732d8baa04' as 'package/marello-enterprise' 9815920585 Adding .gitignore 4695ee4db9 fixing errors during synchronization of duplicated entities e3ec6e73b0 Added Taxes synchronization on integration create 014b1dfc87 Added solution for OroCommerce EE integration cb3af5b5c6 Added solution for OroCommerce EE integration 43eca8c5b8 Added solution for OroCommerce EE integration ad26f135be Added solution for OroCommerce EE integration e69246e7d7 Added solution for OroCommerce EE integration c5487d21fa Added solution for OroCommerce EE integration 8d47c25ace Added solution for OroCommerce EE integration 7fb8d30884 Added solution for OroCommerce EE integration f85bab4567 Added solution for OroCommerce EE integration 8844c2fc81 Added solution for OroCommerce EE integration 9c9bc14c60 Added solution for OroCommerce EE integration 2c8eea9b47 - Fixed bug on Product creation process - Fixed bug on Integration creation process 86ba691abc Fixed bug in Channel connectors form 4093954c75 Merge branch '1.0' of https://github.com/marellocommerce/marello-orocommerce-bridge into 1.0 93b893b572 Removed unused code 66578ae417 Merge branch '1.0' of https://github.com/marellocommerce/marello-orocommerce-bridge into 1.0 6d9662efad Merge branch 'gplanchat-patch-3' into 1.0 4e204bd537 Merge branch 'patch-3' of https://github.com/gplanchat/marello-orocommerce-bridge into gplanchat-patch-3 38e52b65f7 fixed bug with changeset 6e5aa89d2c MAR10001-591: fixed bug with changeset 167c0540e3 merged master into feature/MAR10001-591 eb8de44848 merged master into feature/MAR10001-591 619bf53091 merged master into feature/MAR10001-591 ced7d1fdfb merged master into feature/MAR10001-591 f39fd63909 merged master into feature/MAR10001-591 2a4193bf3e merged master into feature/MAR10001-591 63e85992aa Fixed bugs in reverse synchronization 72099d599d Merge branch 'bugfix/MAR10001-0-fix-order-normaliser-address-checks' into 1.0 7461d22f04 - Fix checks on addresses for customer and order before importing in order to make sure every property on Addresses exist before importing 2e2ec91a6e - added addtional check if order has relationship data before processing, this should stop the invalid foreach loops when importing orders into Marello from OroCommerce 031d9a5833 - cs fixes 4c5f7726ea Merge branch 'bugfix/MAR10001-0-update-export-readers-to-set-a-parameter-in-qb' 647546aaef - Update TaxRuleExportReader to make sure a QueryBuilder parameter is not an integer; problems arise when the 'old' solution was running on PostGreSQL, evaluating the parameters failed; 08abfcf10b - Update TaxExportReader to make sure a QueryBuilder parameter is not an integer; problems arise when the 'old' solution was running on PostGreSQL, evaluating the parameters failed; 0bb78afccc - Update ProductPriceExportReader to make sure a QueryBuilder parameter is not an integer; problems arise when the 'old' solution was running on PostGreSQL, evaluating the parameters failed; - Updated docblocks for export readers, deprecation for fields and method 717af1e5e5 - Update ProductImageExportCreateReader to make sure a QueryBuilder parameter is not an integer problems arise when the 'old' solution was running on PostGreSQL, evaluating the parameters failed 29bbfec889 - Update ProductExportUpdateReader with returning an empty array instead of an array with -1 integer daddaa0a84 - Update ProductExportCreateReader to make sure a QueryBuilder parameter is set even when a sku is not set; problems arise when the 'old' solution was running on PostGreSQL, evaluating the parameters failed 13a3f19f06 - Update InventoryLevelExportReader to make sure a QueryBuilder parameter is set even when a groupId or productId is not set problems arise when the 'old' solution was running on PostGreSQL, evaluating the parameters failed 1165e5db2c - Taxrate data was wrongly sent to OroCommerce as a whole number instead of the float the percentage actually represents; 17670ff177 MAR10001-591: Update OroCommerce Bridge for 3.1 versions e1c97dca67 MAR10001-591: Update OroCommerce Bridge for 3.1 versions 9eb94f4eb6 Merge branch '2.0-dev' into feature/MAR10001-591 8f23ad922f MAR10001-591: Update OroCommerce Bridge for 3.1 versions ecac365de4 Merge pull request #2 from marellocommerce/feature/MAR10001-591 e78011409f Updated OroCommerce version from 1.5.* to 3.1.* ca8bba864f Fix bug affecting all integrations but this one 91b03b552b MAR10001-496: Moving Marello to new Oro Platform 3.0 0580d9159d MAR10001-496: Moving Marello to new Oro Platform 3.0 fbd984b1df MAR10001-447: Create Shipping Methods - modifications for using same UPS Integration for Marello and for OroCommerce git-subtree-dir: package/marello-enterprise git-subtree-split: 15fbabcec149eaa8dc91570115cd558e9c53d505 --- composer.json | 4 +- .../Provider/OrderWarehousesProvider.php | 2 +- .../InventoryBundle/Resources/config/form.yml | 4 +- .../Resources/config/oro/search.yml | 4 ++ .../Resources/translations/messages.en.yml | 2 + .../Warehouse/Autocomplete/result.html.twig | 2 +- .../Resources/views/Warehouse/view.html.twig | 16 +++++ .../Provider/OrderWarehousesProviderTest.php | 4 +- .../OrderControllerDropshipmentTest.php | 30 ++++++++-- .../MarelloEnterpriseProductExtension.php | 25 ++++++++ .../ORM/OrganizationListener.php | 50 ++++++++++++++++ .../MarelloEnterpriseProductBundle.php | 9 +++ .../ORM/LoadDefaultProductFamiliesData.php | 58 +++++++++++++++++++ .../Resources/config/oro/bundles.yml | 2 + .../Resources/config/services.yml | 9 +++ .../PurchaseOrderFormViewListener.php | 8 +-- .../ReplenishmentOrderConfigRepository.php | 13 ----- 17 files changed, 213 insertions(+), 29 deletions(-) create mode 100644 src/MarelloEnterprise/Bundle/ProductBundle/DependencyInjection/MarelloEnterpriseProductExtension.php create mode 100644 src/MarelloEnterprise/Bundle/ProductBundle/EventListener/ORM/OrganizationListener.php create mode 100644 src/MarelloEnterprise/Bundle/ProductBundle/MarelloEnterpriseProductBundle.php create mode 100644 src/MarelloEnterprise/Bundle/ProductBundle/Migrations/Data/ORM/LoadDefaultProductFamiliesData.php create mode 100644 src/MarelloEnterprise/Bundle/ProductBundle/Resources/config/oro/bundles.yml create mode 100644 src/MarelloEnterprise/Bundle/ProductBundle/Resources/config/services.yml diff --git a/composer.json b/composer.json index 8bd5fdd10..b98a48192 100644 --- a/composer.json +++ b/composer.json @@ -28,13 +28,13 @@ }, "require": { "oro/platform-enterprise": "4.1.*", - "marellocommerce/marello": "~3.0.0" + "marellocommerce/marello": "~3.1.0" }, "minimum-stability": "dev", "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } } } \ No newline at end of file diff --git a/src/MarelloEnterprise/Bundle/InventoryBundle/Provider/OrderWarehousesProvider.php b/src/MarelloEnterprise/Bundle/InventoryBundle/Provider/OrderWarehousesProvider.php index 343cea365..66952fdc1 100644 --- a/src/MarelloEnterprise/Bundle/InventoryBundle/Provider/OrderWarehousesProvider.php +++ b/src/MarelloEnterprise/Bundle/InventoryBundle/Provider/OrderWarehousesProvider.php @@ -70,7 +70,7 @@ public function getWarehousesForOrder(Order $order) $results = $strategy->getWarehouseResults($order, $results); } - if (count($results) >= 0) { + if (count($results) >= 1) { return reset($results); } diff --git a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/config/form.yml b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/config/form.yml index f8eebd9f1..c4771a22a 100644 --- a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/config/form.yml +++ b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/config/form.yml @@ -14,7 +14,7 @@ services: parent: oro_form.autocomplete.search_handler arguments: - 'Marello\Bundle\InventoryBundle\Entity\Warehouse' - - ['label'] + - ['code', 'label'] tags: - { name: oro_form.autocomplete.search_handler, alias: warehouses, acl_resource: marello_inventory_inventory_view } @@ -23,7 +23,7 @@ services: parent: oro_form.autocomplete.search_handler arguments: - 'Marello\Bundle\InventoryBundle\Entity\Warehouse' - - ['label'] + - ['code', 'label'] tags: - { name: oro_form.autocomplete.search_handler, alias: system_group_global_warehouses, acl_resource: marello_inventory_inventory_view } diff --git a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/config/oro/search.yml b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/config/oro/search.yml index 16145f60a..a5582a618 100644 --- a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/config/oro/search.yml +++ b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/config/oro/search.yml @@ -12,6 +12,10 @@ search: name: label target_type: text target_fields: [label] + - + name: code + target_type: text + target_fields: [code] Marello\Bundle\InventoryBundle\Entity\WarehouseGroup: alias: marello_warehousegroups diff --git a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/translations/messages.en.yml b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/translations/messages.en.yml index 914254743..b459011b8 100644 --- a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/translations/messages.en.yml +++ b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/translations/messages.en.yml @@ -50,6 +50,8 @@ marelloenterprise: create_label: Create new WFA Rule warehouse: + datablock: + additional: Additional form: select_warehouse: Select Warehouse create_own_group: Create Warehouse Group diff --git a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/views/Warehouse/Autocomplete/result.html.twig b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/views/Warehouse/Autocomplete/result.html.twig index 167eefbc5..18c46eec6 100644 --- a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/views/Warehouse/Autocomplete/result.html.twig +++ b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/views/Warehouse/Autocomplete/result.html.twig @@ -1 +1 @@ -<%= highlight(_.escape(label)) %> +<%= highlight(_.escape(code)) %> - <%= highlight(_.escape(label)) %> diff --git a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/views/Warehouse/view.html.twig b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/views/Warehouse/view.html.twig index 60d1e5683..198eee80d 100755 --- a/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/views/Warehouse/view.html.twig +++ b/src/MarelloEnterprise/Bundle/InventoryBundle/Resources/views/Warehouse/view.html.twig @@ -1,6 +1,7 @@ {% extends 'OroUIBundle:actions:view.html.twig' %} {% import 'OroUIBundle::macros.html.twig' as UI %} {% import 'OroAddressBundle::macros.html.twig' as address %} +{% import 'OroEntityConfigBundle::macros.html.twig' as entityConfig %} {% if entity.id %} {% oro_title_set({params : {"%warehouse.label%": entity.label|default('N/A'|trans) } }) %} @@ -61,6 +62,21 @@ } ] %} + {% set additionalData %} + {{ entityConfig.renderDynamicFields(entity) }} + {% endset %} + + {% set dataBlocks = dataBlocks|merge([{ + 'title' : 'marelloenterprise.inventory.warehouse.datablock.additional'|trans, + 'subblocks': [{ + 'title' : null, + 'useSpan': false, + 'data' : [ + additionalData + ] + }] + }]) %} + {%- set additionalInfoPlaceholders = marello_get_additional_placeholder_data('warehouse') -%} {% for additionalInfo in additionalInfoPlaceholders %} {% set warehouseAdditionalInfoSection %} diff --git a/src/MarelloEnterprise/Bundle/InventoryBundle/Tests/Unit/Provider/OrderWarehousesProviderTest.php b/src/MarelloEnterprise/Bundle/InventoryBundle/Tests/Unit/Provider/OrderWarehousesProviderTest.php index 6a940aca8..1e4314ffb 100644 --- a/src/MarelloEnterprise/Bundle/InventoryBundle/Tests/Unit/Provider/OrderWarehousesProviderTest.php +++ b/src/MarelloEnterprise/Bundle/InventoryBundle/Tests/Unit/Provider/OrderWarehousesProviderTest.php @@ -109,8 +109,8 @@ public function getWarehousesForOrderDataProvider() [ 'firstStrategyResults' => [$result1], 'secondStrategyResults' => [$result2], - 'callStrategiesTimes' => 1, - 'expectedResult' => $result1 + 'callStrategiesTimes' => 2, + 'expectedResult' => $result2 ], [ 'firstStrategyResults' => [], diff --git a/src/MarelloEnterprise/Bundle/OrderBundle/Tests/Functional/Controller/OrderControllerDropshipmentTest.php b/src/MarelloEnterprise/Bundle/OrderBundle/Tests/Functional/Controller/OrderControllerDropshipmentTest.php index 7bcdaf3b6..7bc69db39 100644 --- a/src/MarelloEnterprise/Bundle/OrderBundle/Tests/Functional/Controller/OrderControllerDropshipmentTest.php +++ b/src/MarelloEnterprise/Bundle/OrderBundle/Tests/Functional/Controller/OrderControllerDropshipmentTest.php @@ -117,9 +117,20 @@ public function testCreateWithOwnWarehouse() */ public function testAssigningOwnWarehouse(Order $entity) { - $workflowItem = $this->workflowManager->getWorkflowItem($entity, 'marello_order_b2c_workflow_1'); - $this->workflowManager->transit($workflowItem, 'payment_received'); + $workflowItem = $this->workflowManager + ->getWorkflowItem($entity, 'marello_order_b2c_new_workflow_1'); + if (!$workflowItem) { + $workflowItem = $this->workflowManager + ->startWorkflow('marello_order_b2c_new_workflow_1', $entity, 'pending'); + } $this->workflowManager->transit($workflowItem, 'invoice'); + $data = $workflowItem->getData(); + $data + ->set('payment_reference', 'payment_reference') + ->set('payment_details', 'payment_details') + ->set('total_paid', 100); + $workflowItem->setData($data); + $this->workflowManager->transit($workflowItem, 'payment_received'); $this->workflowManager->transit($workflowItem, 'prepare_shipping'); /** @var PackingSlip $packingSlip */ @@ -221,9 +232,20 @@ public function testCreateWithOwnAndExternalWarehouse() */ public function testAssigningOwnAndExternalWarehouse(Order $entity) { - $workflowItem = $this->workflowManager->getWorkflowItem($entity, 'marello_order_b2c_workflow_1'); - $this->workflowManager->transit($workflowItem, 'payment_received'); + $workflowItem = $this->workflowManager + ->getWorkflowItem($entity, 'marello_order_b2c_new_workflow_1'); + if (!$workflowItem) { + $workflowItem = $this->workflowManager + ->startWorkflow('marello_order_b2c_new_workflow_1', $entity, 'pending'); + } $this->workflowManager->transit($workflowItem, 'invoice'); + $data = $workflowItem->getData(); + $data + ->set('payment_reference', 'payment_reference') + ->set('payment_details', 'payment_details') + ->set('total_paid', 100); + $workflowItem->setData($data); + $this->workflowManager->transit($workflowItem, 'payment_received'); $this->workflowManager->transit($workflowItem, 'prepare_shipping'); /** @var PackingSlip[] $packingSlips */ diff --git a/src/MarelloEnterprise/Bundle/ProductBundle/DependencyInjection/MarelloEnterpriseProductExtension.php b/src/MarelloEnterprise/Bundle/ProductBundle/DependencyInjection/MarelloEnterpriseProductExtension.php new file mode 100644 index 000000000..53c074762 --- /dev/null +++ b/src/MarelloEnterprise/Bundle/ProductBundle/DependencyInjection/MarelloEnterpriseProductExtension.php @@ -0,0 +1,25 @@ +load('services.yml'); + } +} diff --git a/src/MarelloEnterprise/Bundle/ProductBundle/EventListener/ORM/OrganizationListener.php b/src/MarelloEnterprise/Bundle/ProductBundle/EventListener/ORM/OrganizationListener.php new file mode 100644 index 000000000..27faffa5f --- /dev/null +++ b/src/MarelloEnterprise/Bundle/ProductBundle/EventListener/ORM/OrganizationListener.php @@ -0,0 +1,50 @@ +doctrineHelper = $doctrineHelper; + $this->productFamilyBuilder = $productFamilyBuilder; + } + + /** + * @param Organization $organization + */ + public function prePersist(Organization $organization): void + { + $defaultProductFamily = $this->productFamilyBuilder + ->createDefaultFamily($organization) + ->addDefaultAttributeGroups() + ->getFamily(); + + $manager = $this->doctrineHelper->getEntityManager(AttributeFamily::class); + $manager->persist($defaultProductFamily); + } +} diff --git a/src/MarelloEnterprise/Bundle/ProductBundle/MarelloEnterpriseProductBundle.php b/src/MarelloEnterprise/Bundle/ProductBundle/MarelloEnterpriseProductBundle.php new file mode 100644 index 000000000..28a0ec798 --- /dev/null +++ b/src/MarelloEnterprise/Bundle/ProductBundle/MarelloEnterpriseProductBundle.php @@ -0,0 +1,9 @@ +getOrganizations($manager); + + /** @var ProductFamilyBuilder $productFamilyBuilder */ + $productFamilyBuilder = $this->container->get('marello_product.entity.builder.product_family'); + /** @var Organization $organization */ + foreach ($organizations as $organization) { + $defaultProductFamily = $productFamilyBuilder + ->createDefaultFamily($organization) + ->addDefaultAttributeGroups() + ->getFamily(); + + $manager->persist($defaultProductFamily); + } + + $manager->flush(); + } + + /** + * @param ObjectManager $manager + * @return Organization[] + */ + protected function getOrganizations(ObjectManager $manager) + { + $queryBuilder = $manager->getRepository(Organization::class) + ->createQueryBuilder('org'); + + return $queryBuilder + ->leftJoin(AttributeFamily::class, 'family', Join::WITH, 'org.id = family.owner') + ->where($queryBuilder->expr()->isNull('family.owner')) + ->getQuery() + ->getResult(); + } +} diff --git a/src/MarelloEnterprise/Bundle/ProductBundle/Resources/config/oro/bundles.yml b/src/MarelloEnterprise/Bundle/ProductBundle/Resources/config/oro/bundles.yml new file mode 100644 index 000000000..36afa65d6 --- /dev/null +++ b/src/MarelloEnterprise/Bundle/ProductBundle/Resources/config/oro/bundles.yml @@ -0,0 +1,2 @@ +bundles: + - { name: MarelloEnterprise\Bundle\ProductBundle\MarelloEnterpriseProductBundle, priority: 20 } diff --git a/src/MarelloEnterprise/Bundle/ProductBundle/Resources/config/services.yml b/src/MarelloEnterprise/Bundle/ProductBundle/Resources/config/services.yml new file mode 100644 index 000000000..8eafcd9de --- /dev/null +++ b/src/MarelloEnterprise/Bundle/ProductBundle/Resources/config/services.yml @@ -0,0 +1,9 @@ +services: + marelloenterprise_product.event_listener.organization: + class: 'MarelloEnterprise\Bundle\ProductBundle\EventListener\ORM\OrganizationListener' + arguments: + - '@oro_entity.doctrine_helper' + - '@marello_product.entity.builder.product_family' + public: false + tags: + - { name: doctrine.orm.entity_listener, entity: 'Oro\Bundle\OrganizationBundle\Entity\Organization', event: prePersist } diff --git a/src/MarelloEnterprise/Bundle/PurchaseOrderBundle/Form/Listener/PurchaseOrderFormViewListener.php b/src/MarelloEnterprise/Bundle/PurchaseOrderBundle/Form/Listener/PurchaseOrderFormViewListener.php index ef81f4aa5..722e8e455 100755 --- a/src/MarelloEnterprise/Bundle/PurchaseOrderBundle/Form/Listener/PurchaseOrderFormViewListener.php +++ b/src/MarelloEnterprise/Bundle/PurchaseOrderBundle/Form/Listener/PurchaseOrderFormViewListener.php @@ -9,6 +9,7 @@ class PurchaseOrderFormViewListener { const WAREHOUSE_BLOCK_NAME = 'warehouse'; + const BILLING_SHIPPING_BLOCK_NAME = 'billing_shipping'; /** * @var TranslatorInterface @@ -41,9 +42,8 @@ public function onPurchaseOrderCreateStepTwo(BeforeListRenderEvent $event) */ protected function addWarehouseBlock(ScrollData $scrollData, $html) { - $blockLabel = $this->translator->trans('marelloenterprise.purchaseorder.warehouse.delivery_location.label'); - $scrollData->addNamedBlock(self::WAREHOUSE_BLOCK_NAME, $blockLabel, 10); - $subBlockId = $scrollData->addSubBlock(self::WAREHOUSE_BLOCK_NAME); - $scrollData->addSubBlockData(self::WAREHOUSE_BLOCK_NAME, $subBlockId, $html, 'warehouse'); + if ($scrollData->hasBlock(self::BILLING_SHIPPING_BLOCK_NAME)) { + $scrollData->addSubBlockData(self::BILLING_SHIPPING_BLOCK_NAME, 0, $html, 'warehouse'); + } } } diff --git a/src/MarelloEnterprise/Bundle/ReplenishmentBundle/Entity/Repository/ReplenishmentOrderConfigRepository.php b/src/MarelloEnterprise/Bundle/ReplenishmentBundle/Entity/Repository/ReplenishmentOrderConfigRepository.php index ded42ac5e..4b42486d9 100644 --- a/src/MarelloEnterprise/Bundle/ReplenishmentBundle/Entity/Repository/ReplenishmentOrderConfigRepository.php +++ b/src/MarelloEnterprise/Bundle/ReplenishmentBundle/Entity/Repository/ReplenishmentOrderConfigRepository.php @@ -3,7 +3,6 @@ namespace MarelloEnterprise\Bundle\ReplenishmentBundle\Entity\Repository; use Doctrine\ORM\EntityRepository; -use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper; /** * @deprecated @@ -12,16 +11,4 @@ */ class ReplenishmentOrderConfigRepository extends EntityRepository { - /** - * @var AclHelper - */ - private $aclHelper; - - /** - * @param AclHelper $aclHelper - */ - public function setAclHelper(AclHelper $aclHelper) - { - $this->aclHelper = $aclHelper; - } }