ForbiddenException class doesn't exists #65
Comments
|
Hi @Peekmo, Thank you for reporting, we have implemented a fix by using the preferential exception instead of the removed class. The fix can be found in https://github.com/marellocommerce/marello/tree/3.0.8. Thanks again, Jaimy |
24198
pushed a commit
that referenced
this issue
Feb 4, 2021
- Fixed issue with "No logging in console on initial sync" - Fixed issue with "Sync start date doesn't set for new integration" - Fixed issue with "Proxy interface given instead of class manager"
24198
pushed a commit
that referenced
this issue
Feb 4, 2021
- Fixed issue with "No logging in console on initial sync" - Fixed issue with "Sync start date doesn't set for new integration" - Fixed issue with "Proxy interface given instead of class manager"
24198
added a commit
that referenced
this issue
Feb 4, 2021
0bc0152 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 633f259 MM-42: Test and fix functionality (#66) 6d656f8 MM-42: Test and fix functionality (#65) a62f4b7 MM-40: Test and fix import order functionality (#63) 49b6550 MM-38: Implement sync processors (#61) 1d6be06 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) d0d640d - 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 ad177b0 - 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 4ce14c7 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 0a23414 - 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 f230508 - 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 1f44fe2 - 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 224ba34 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation a287a3a - fixed renaming email templates for Order and Invoice notifications 361a765 - Updated email templates with new style 88337f5 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 87716bd - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 1f318b4 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 04a60f8 - 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 3d51851 - 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 8b9df75 - split the SalesBundle migrations as v1_3 was already released... 36e9e92 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 0442000 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9ac3f06 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) git-subtree-dir: package/marello git-subtree-split: 0bc0152
24198
pushed a commit
that referenced
this issue
Apr 22, 2021
- Fixed issue with "No logging in console on initial sync" - Fixed issue with "Sync start date doesn't set for new integration" - Fixed issue with "Proxy interface given instead of class manager"
24198
pushed a commit
that referenced
this issue
Apr 22, 2021
- Fixed issue with "No logging in console on initial sync" - Fixed issue with "Sync start date doesn't set for new integration" - Fixed issue with "Proxy interface given instead of class manager"
24198
pushed a commit
that referenced
this issue
Apr 22, 2021
- Fixed issue with "No logging in console on initial sync" - Fixed issue with "Sync start date doesn't set for new integration" - Fixed issue with "Proxy interface given instead of class manager"
24198
pushed a commit
that referenced
this issue
Jul 9, 2021
- Fixed issue with "No logging in console on initial sync" - Fixed issue with "Sync start date doesn't set for new integration" - Fixed issue with "Proxy interface given instead of class manager"
24198
added a commit
that referenced
this issue
Aug 4, 2021
…c69360 2c693602ba - remove locks from master eb9e7f1494 Merge branch 'release/3.1' 23f1e134f3 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 786d0ea03b - Preparing release changes ab64cf19b7 Merge branch 'release/3.1' 312e02f712 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 4008073cb3 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 3ddb40ec46 - preparing release 0952e4bcfc - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 55e28918e1 Merge branch 'bugfix/MAR10001-0-products-grid-not-displaying' into develop bdda30a02a - Added deployment type to parameters dist 72c8624d9e - updated oro platform daf631c001 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 d61cb2e294 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 c83358c425 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 56f8a41ae2 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 101d153b65 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 7568f464d4 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 2d285790fc Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily e08d90a30c Merge branch 'maintenance/3.0' 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 7b7407c525 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 957c32637c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field d20075c92a - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper 3e3951649c - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) db865d076d - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) ea450262e9 - added config to include M2 bundle - updated dev.json/dev.lock with M2 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right b6d7f1772b - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 1f2c18c580 - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 093dcc25e7 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection f26ffdd5e8 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order 066d775e84 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' c5697c673a Squashed 'applications/marello-application/' changes from 3a5a0ae59..ce3588041 f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3baf789b98 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 9ede319aa5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form e45d0240e1 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form b4e915f610 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form 0418a66a16 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) d719683eda MM-25: Add logic for product prices and inventory synchronization (#50) a0b0778d37 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 afe8e2fc25 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null bdf568e0c4 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null 33fc001a70 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39a687ee30 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information 4c54cd3881 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information 39efef0623 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 229daedc7d Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 96e7019bf1 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container b997306298 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension cd128f1c0a - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 c019a6c549 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 b1c499415d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 c4b1b9e202 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 02aab5af34 - added missing validator translations regarding shipping method rules and configs a61f403be2 - added missing validator translations regarding shipping method rules and configs bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 6ab3d583ca - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 357cc7021d - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 392920547f MM-13: Implement initial products export (#49) e3d1dbecce MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 558ee27c60 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 7478a591d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 3caff5cccc - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group e2a0f4859c - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 336ff49858 - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 701ced59d6 - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null c9bb1d065d - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null 1309973a1c - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null 84f6cdbe70 - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper ad17b0a0fc - Updated OrderWorkflowStart event listen…
24198
added a commit
that referenced
this issue
Jan 12, 2022
…b6e75 c4b6e750e8 - Preparing release changes ba0ce71e0b - preparing release 58deaedf82 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 01cf94a008 - Added deployment type to parameters dist b4ebc04473 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 11938e95b6 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 f1243cf07c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 0f2d344502 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 10e78edaac Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 fb872d35ea Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 873568bfac Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 7b7407c525 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 957c32637c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field d20075c92a - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper 3e3951649c - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) db865d076d - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right b6d7f1772b - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 1f2c18c580 - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 093dcc25e7 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection f26ffdd5e8 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false e353da748f Merge branch 'feature/magento2-integr' into testmerge-magentoint a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3baf789b98 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 9ede319aa5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form e45d0240e1 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form b4e915f610 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form 0418a66a16 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) d719683eda MM-25: Add logic for product prices and inventory synchronization (#50) a0b0778d37 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 afe8e2fc25 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null bdf568e0c4 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null 33fc001a70 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39a687ee30 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information 4c54cd3881 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information 39efef0623 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 229daedc7d Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 96e7019bf1 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container b997306298 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension cd128f1c0a - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 c019a6c549 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 b1c499415d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 c4b1b9e202 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 02aab5af34 - added missing validator translations regarding shipping method rules and configs a61f403be2 - added missing validator translations regarding shipping method rules and configs bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 6ab3d583ca - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 357cc7021d - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 392920547f MM-13: Implement initial products export (#49) e3d1dbecce MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 558ee27c60 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 7478a591d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 3caff5cccc - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group e2a0f4859c - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 336ff49858 - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 701ced59d6 - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null c9bb1d065d - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null 1309973a1c - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null 84f6cdbe70 - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper ad17b0a0fc - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper a2acb0843c - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 019f2cb11e - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager a2215e6341 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager 11ceb32ac8 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the even…
24198
added a commit
that referenced
this issue
Jan 12, 2022
…cf448 14cf448bca Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' 7b3b196d0d - remove locks from master c7cc25978e Merge branch 'release/3.1' 7620a00274 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' df48ae575b - Preparing release changes 3ac2782f9e Merge branch 'release/3.1' c4d74b57fa Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' dbcd9e8b59 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 582e4796b1 - preparing release c41c15110e - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 1d0c1d56c1 - Added deployment type to parameters dist eff2d014a6 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 0106f8a6af Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 f77b7fe9e9 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 6b79a0e49b Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 20aa67991d Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 f43a14f52c Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 03b2e7d2e1 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily a68a19e0fb Merge branch 'maintenance/3.0' 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello 0a97e336bb Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 142c71fb47 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 745cf53163 Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 7b7407c525 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 957c32637c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field d20075c92a - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper 3e3951649c - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) db865d076d - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right b6d7f1772b - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 1f2c18c580 - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 093dcc25e7 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection f26ffdd5e8 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order b2975e504c - removed composer.lock file from master d1962908d2 - removed composer.lock file from master 318b676f80 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' 184c988b5a Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 352786456e Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9551e1b315 Merge branch 'feature/magento2-integr' into testmerge-magentoint a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3baf789b98 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 9ede319aa5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 008b3d87cc Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 3591a99162 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form e45d0240e1 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form b4e915f610 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form 0418a66a16 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 8d3b8b802f Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) d719683eda MM-25: Add logic for product prices and inventory synchronization (#50) a0b0778d37 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 afe8e2fc25 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null bdf568e0c4 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null 33fc001a70 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39a687ee30 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information 4c54cd3881 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information 39efef0623 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 aac7ce894f Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 229daedc7d Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 0b13d63771 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 96e7019bf1 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container b997306298 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension cd128f1c0a - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 6f93c98ca0 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 c019a6c549 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 b1c499415d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 c4b1b9e202 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 02aab5af34 - added missing validator translations regarding shipping method rules and configs a61f403be2 - added missing validator translations regarding shipping method rules and configs bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 6ab3d583ca - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 357cc7021d - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 392920547f MM-13: Implement initial products export (#49) e3d1dbecce MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 09eab30cbe Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 558ee27c60 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 7478a591d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 3caff5cccc - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group e2a0f4859c - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 336ff49858 - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to ma…
24198
added a commit
that referenced
this issue
Jan 12, 2022
15fbabcec1 Merge branch 'release/3.1' 6b2714be79 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' c0d61547e5 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' ca47f3cca9 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 2e629b27fe - Added code to the search results of the autocomplete in the warehouse group edit page where warehouses can be selected that are not assigned to a warehousegroup 022ef1cf61 - Added small changes for batches; - added delivery date to batch form bc22c7b02f - reverted the change with adding the warehouse code in the select box of the warehouse selection field in the inventory update, it made a greater mess than it cleared things up 7698d64336 - Updated auto complete label in warehouse select result 1114b665ed Merge branch 'develop' into feature/MAR10001-894 30868b4c8b Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 667f4eb92a Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 d3783f294c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 455eddd360 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 158709d60e Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 18fa4e9a86 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 8758592c62 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid fff6c382ba Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 2c90732536 Merge branch 'task/MAR10001-0-layout-fixes' into develop 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 4ed8185f33 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 0339533106 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 76b9c1c270 Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 114b508780 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 7a56ff54b1 multiple fixes 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 23fe6937ec Merge branch 'maintenance/3.0' 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 5871e21a0d Merge branch 'task/MAR10001-0-update-strategy-results-provider' into develop 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 1000f2aef1 Merge branch 'task/MAR10001-0-cs-fix' into develop b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f5b4980ca7 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 7fb82d1f0e Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation b113472dee Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 7b7407c525 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 957c32637c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field d20075c92a - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper 3e3951649c - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) db865d076d - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right b6d7f1772b - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past aeadb25673 Merge branch 'task/MAR10001-905-add-managed-inventory-checkbox-external-wh' into develop efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 1c4da715f3 Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 1f2c18c580 - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 093dcc25e7 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection f26ffdd5e8 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection 7982aa00f0 Merge branch 'bugfix/MAR10001-0-fixed-wh-not-saved-on-group-after-edit' into develop d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 6fd92437f6 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f035dbfb24 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' c5697c673a Squashed 'applications/marello-application/' changes from 3a5a0ae59..ce3588041 f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3baf789b98 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 9ede319aa5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template ec1ee49ad9 Merge branch 'maintenance/3.0' into develop 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form e45d0240e1 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form b4e915f610 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form 0418a66a16 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file ac776c9713 Merge branch 'maintenance/3.0' into develop 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) d719683eda MM-25: Add logic for product prices and inventory synchronization (#50) a0b0778d37 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 afe8e2fc25 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null bdf568e0c4 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null 33fc001a70 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39a687ee30 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information 4c54cd3881 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information 39efef0623 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 76c7d3fa43 Merge branch 'maintenance/3.0' into develop 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 229daedc7d Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 96e7019bf1 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container b997306298 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension cd128f1c0a - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 c019a6c549 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 b1c499415d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 c4b1b9e202 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 02aab5af34 - added missing validator translations regarding shipping method rules and configs a61f403be2 - added missing validator translations regarding shipping method rules and configs bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 6ab3d583ca - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 357cc7021d - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 392920547f MM-13: Implement initial products export (#49) e3d1dbecce MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 558ee27c60 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 7478a591d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 f1a4f1df96 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 3caff5cccc - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group e2a0f4859c - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 336ff49858 - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 701ced59d6 - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null c9bb1d065d - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null 1309973a1c - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null 84f6cdbe70 - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper ad17b0a0fc - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper a2acb0843c - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 019f2cb11e - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager a2215e6341 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager 11ceb32ac8 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager 494f56e683 - fixed issue with product duplication error when the action group registry is not a public service anymore, created a provider that injects said service and retrieving it via the provider that has been created as a public service df0ac8930c - fixed issue with product duplication error when the action group registry is not a public service anymore, created a provider that injects said service and retrieving it via the provider that has been created as a public service 2ad444e881 - fixed issue with product duplication error when the action group registry is not a public service anymore, created a provider that injects said service and retrieving it via the provider that has been created as a public service 6cfe92ab4c MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 94ab6bc9f9 MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 592e2e78bd MM-23: Add logic to process changes in integration (#47) 024bee396f MM-23: Add logic to process changes in integration (#47) 05f765e4e2 MM-23: Add logic to process changes in integration (#47) fad55ac8bf MM-23: Add logic to process changes in integration (#47) d8b6058ee9 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG t…
24198
added a commit
that referenced
this issue
Jun 30, 2022
73c2e39ff5 - Added minor fixes to purchase orders view and form 7b00a7d73c - Added possibility to update cost via marello-supplier-product-grid c0e9f673c7 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 1591559098 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 9a16f4759c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 26a030ac69 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 cf8c669f62 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 dcc89ded95 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 746d1e3655 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 957c32637c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper e15f975b1f - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 093dcc25e7 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 9ede319aa5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme b4e915f610 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form 0418a66a16 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 61b2f271b5 - removed commit reference in validation file 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 13433d841b MAR10001-909: Add Company ID to Company db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 33fc001a70 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass 39efef0623 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 336ff49858 - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 1309973a1c - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null a2acb0843c - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 11ceb32ac8 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager 2ad444e881 - fixed issue with product duplication error when the action group registry is not a public service anymore, created a provider that injects said service and retrieving it via the provider that has been created as a public service 6cfe92ab4c MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 94ab6bc9f9 MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 05f765e4e2 MM-23: Add logic to process changes in integration (#47) fad55ac8bf MM-23: Add logic to process changes in integration (#47) d8b6058ee9 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 2aee6d3b49 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration c3bef1c448 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 4406e2a284 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 87dcfff50e - dropped unique index on integration ID on SalesChannel to allow a SalesChannelGroup with multiple SC's be connected to the integration - moved some fields around in the integration settings form - updated the OroCommerce integration event listener to take into account the integration is now linked to a SalesChannelGroup and not a single SalesChannel 083de421f6 - dropped unique index on integration ID on SalesChannel to allow a SalesChannelGroup with multiple SC's be connected to the integration - moved some fields around in the integration settings form - updated the OroCommerce integration event listener to take into account the integration is now linked to a SalesChannelGroup and not a single SalesChannel ab608edd2b - dropped unique index on integration ID on SalesChannel to allow a SalesChannelGroup with multiple SC's be connected to the integration - moved some fields around in the integration settings form - updated the OroCommerce integration event listener to take into account the integration is now linked to a SalesChannelGroup and not a single SalesChannel ad5384966f - dropped unique index on integration ID on SalesChannel to allow a SalesChannelGroup with multiple SC's be connected to the integration - moved some fields around in the integration settings form - updated the OroCommerce integration event listener to take into account the integration is now linked to a SalesChannelGroup and not a single SalesChannel 68bd901249 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge bcf5253da6 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge e892dc0a67 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge a1b93de21b - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge d15af99353 - removed required asterisk from Description on SalesChannel as this is not a required field a0222c768f - removed required asterisk from description as this is not required in the SCG eb7399a08c - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings 28712fcf66 - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings c03fc2da12 - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings 3fa5e8ec03 - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings ae6334aba3 - moved the order of some of the orocommerce settings for clarity 12c4499df0 - moved the order of some of the orocommerce settings for clarity 9c85201da9 - moved the order of some of the orocommerce settings for clarity 13e3f7d255 - moved the order of some of the orocommerce settings for clarity c25873ac3f - added SalesChannelGroup as OroCommerce integration settings - added migrations to update existing integrations with new SalesChannelGroup option - updated validation for OroCommerce integration settings to validate SalesChannelGroup - updated translations 24896b6986 - added SalesChannelGroup as OroCommerce integration settings - added migrations to update existing integrations with new SalesChannelGroup option - updated validation for OroCommerce integration settings to validate SalesChannelGroup - updated translations 67ffe45da0 - added SalesChannelGroup as OroCommerce integration settings - added migrations to update existing integrations with new SalesChannelGroup option - updated validation for OroCommerce integration settings to validate SalesChannelGroup - updated translations dd92a56b5c - added SalesChannelGroup as OroCommerce integration settings - added migrations to update existing integrations with new SalesChannelGroup option - updated validation for OroCommerce integration settings to validate SalesChannelGroup - updated translations ffcc7dc62d MM-22: Add logic to process changes in Sales Channel (#46) 9a5cdbd888 MM-22: Add logic to process changes in Sales Channel (#46) bf1e4788c4 - removed unused configuration settings like backOrder, inventoryThreshold and lowInventoryThreshold from OroCommerce integration and product syncs - Added additional logic to set the Product 'In Stock' when balancedInventoryLevels are updated - Added additional logic to set the Product 'backOrder' based on the related InventoryItem - Added migrations to 'reset' the existing settings on existing integrations - Updated installer to exclude the settings from installing in the first place - Updated OroCommerce entity to keep the methods used for the removed settings, but mark them as deprecated for BC 38fd895ab7 - removed unused configuration settings like backOrder, inventoryThreshold and lowInventoryThreshold from OroCommerce integration and product syncs - Added additional logic to set the Product 'In Stock' when balancedInventoryLevels are updated - Added additional logic to set the Product 'backOrder' based on the related InventoryItem - Added migrations to 'reset' the existing settings on existing integrations - Updated installer to exclude the settings from installing in the first place - Updated OroCommerce entity to keep the methods used for the removed settings, but mark them as deprecated for BC 2ba6ba1575 - removed unused configuration settings like backOrder, inventoryThreshold and lowInventoryThreshold from OroCommerce integration and product syncs - Added additional logic to set the Product 'In Stock' when balancedInventoryLevels are updated - Added additional logic to set the Product 'backOrder' based on the related InventoryItem - Added migrations to 'reset' the existing settings on existing integrations - Updated installer to exclude the settings from installing in the first place - Updated OroCommerce entity to keep the methods used for the removed settings, but mark them as deprecated for BC 2dceba6bad - removed unused configuration settings like backOrder, inventoryThreshold and lowInventoryThreshold from OroCommerce integration and product syncs - Added additional logic to set the Product 'In Stock' when balancedInventoryLevels are updated - Added additional logic to set the Product 'backOrder' based on the related InventoryItem - Added migrations to 'reset' the existing settings on existing integrations - Updated installer to exclude the settings from installing in the first place - Updated OroCommerce entity to keep the methods used for the removed settings, but mark them as deprecated for BC d89262688c - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant c546b47376 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant d3cfa40240 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant 6b150cb679 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant f9267bb6d5 - CS fix 7e89ed28e3 - CS fix dbc3194dd2 - CS fix 4e9e48a4ba - CS fix ce2d93d916 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed 0a6076b111 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed f9a0655fa3 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed 9829660eb0 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed e0bdf49899 - Updated validation on WarehouseGroup, remove required asterisk on description 31bdc5eda8 - Updated validation on WarehouseGroup, remove required asterisk on description e603454188 - Updated validation on WarehouseGroup, remove required asterisk on description f8038adc41 - updated validation for OroCommerce integration settings 0c2aeaaa5e - updated validation for OroCommerce integration settings 8314d7327e - updated validation for OroCommerce integration settings 701745ff58 - updated validation for OroCommerce integration settings 6a9d75ff94 - Updated clearing the entity manager just for the Company instead of all entities to prevent new found relations when trying to write a new batch to the DB f2288df414 - Updated clearing the entity manager just for the Company instead of all entities to prevent new found relations when trying to write a new batch to the DB d278e25e8c - Updated clearing the entity manager just for the Company instead of all entities to prevent new found relations when trying to write a new batch to the DB af76c9a68f - Updated clearing the entity manager just for the Company instead of all entities to prevent new found relations when trying to write a new batch to the DB 2050b367db MM-8: Add logic for tax class dictionary synchronization (#45) f4bb00dcb4 MM-8: Add logic for tax class dictionary synchronization (#45) 25661dabcd Removed asset-packagist from composer repositories - it's not used anymore in oro/platform:4.1+ - all the nodejs dependencies should be managed with npm, see https://doc.oroinc.com/frontend/javascript/composer-js-dependencies/ 30a0ff05db MM-11: Implement product export functionality (#44) 3c5155b8b5 MM-11: Implement product export functionality (#44) c65cb2ed99 - updated dev.json and dev.lock for demo environment 201fc5dfc3 - updated versions in the orocommerce bridge README 930ab7eef1 - updated versions in the orocommerce bridge README f8968197e7 - updated versions in the orocommerce bridge README 67d6b6587d - updated versions in the orocommerce bridge README 9fece1a81d - updated versions in the orocommerce bridge README 4a6266634b MM-6: Prepare logic for dictionary synchronization (#40) a1be2edf45 MM-6: Prepare logic for dictionary synchronization (#40) ffba2a1d74 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 7caed33836 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 c739b3fe03 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 80428e27aa Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 ae866d1d45 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 1030452d14 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 0ec7b8203d - removed white space ba236b5858 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 f2e5b1beb6 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 0398dad86e Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 71601ac931 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 a056889ea6 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 0ea53416a9 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 7786de3574 - updated composer.lock files fda4c69ffa - updated composer.lock files b5bbefb015 - updated composer.lock files 63cef79bb3 - changed author name to correct company e36deb83cc - changed author name to correct company db6734954b - changed author name to correct company b3bd4f727a - changed author name to correct company e1d2281bdf - changed author name to correct company 6772f6e0f7 - remove internal versions 423efea057 - remove internal versions 1ee395e3f2 - remove internal versions 7df294bbb0 - remove internal versions 62cc46645a - remove internal versions a2c162db66 - remove internal versions d80badafbc - remove internal versions bc77406765 - remov…
24198
added a commit
that referenced
this issue
Jun 30, 2022
f688b50538 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 22397d3dc9 - fixed layout on payment popup on Invoice/Creditmemo f17b373a72 - Added product unit as additional information to OrderItem on order create abdb830d3b - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 5612933352 - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 41316ec514 - added manage batches inventory link on inventory level grid on inventory item view e88e920f8e - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 58b9be4595 - Added taxIdentificationNumber below company number on invoice entity view d6301d05b7 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 2c93950ff7 - Added small changes for batches; - added delivery date to batch form e388935ab9 - Fixed issue with selecting organization when creating products and purchase order ac4434b31f - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip 01e83b08bc - Added organization to query for finding a specific sku for an organization b131e18705 - removed old query reference c4a592aeeb bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 7cef74f82f - Added different calculation for total due on order view dae0a29474 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 3cede794ad - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 468cb34678 Merge branch 'develop' into feature/MAR10001-930 89284c7368 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver c76ce7b2a3 - added hasColumn() checks on fields that might already be added in previous version d37fb2f87f - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 3896c6a4b2 - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 2094b8cf33 - Added fix for query on postgresql where customer tax identification is copied to company tax identification 09e90351ba Merge branch 'develop' into feature/MAR10001-894 9f3ab2f01a Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop c23d429fcd - Added minor fixes to purchase orders view and form 68a27031b9 - Added possibility to update cost via marello-supplier-product-grid a72855bef3 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 1c28c9ce6c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 9bf8fdef63 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 54c8d906fa Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 7ebf9da685 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 36d32c1249 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 2d021771e4 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 06235763a6 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop 3a6fd4c389 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty f24d48ed8c - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 747adb97af - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data eb19d4a8ad Merge branch 'develop' into feature/MAR10001-935 ea5c5088b5 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item a094c2634f - added additional check before loading the purchase price in the Purchase Order Item 15b4e6cb17 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop dee9b894a0 - Added support to display extended fields on SalesChannel view & grid 087ed4444a - Added support to display extended fields on SalesChannel view & grid bfa263ae83 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 20fde261ad - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 54f2d06e8e Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 01fbdd19db - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely 2759c63d9b Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number fd7bff72f7 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number bb2f91c41b Merge branch 'bugfix/MAR10001-966-product-categories' into develop 5b638da647 - updated product category grid on the category view to take the localized value of product name into account a61fefe603 - updated product category grid on the category view to take the localized value of product name into account dc38902182 Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 0d046ca00d - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 03e80ec3a6 Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 59a5feccdb - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 92c620677e Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop 4eebed688b - added default ACL config value for Tax Related entities 8ab3d7e3f8 - added default ACL config value for Tax Related entities dac4dc3188 Merge branch 'task/MAR10001-0-layout-fixes' into develop 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 8cd21c566f - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 2954aa3a72 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 3742532428 - fix issue with trying to display data based on an entity that isn't available f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order ea7a6f8020 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 2fc02ae6dc Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields 45c33db503 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields e6a0344817 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord e989f1fc2d - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 131e3b5d63 Merge branch 'task/MAR10001-0-validation-fixes' into develop 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message f298a72c0f - Updated validation groups for Order validation - Added SKU to the available inventory validation message a8827625f5 Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit e9202e08c1 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit f14ebf3682 Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 8ba3d9fc9e - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification a987a95dec Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d6e420f96b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... a6045d1519 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 490196e5c4 multiple fixes d062de0b81 multiple fixes 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 463b03d7b0 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 c9908e12ec - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 36185ab409 Merge branch 'maintenance/3.0' into develop 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0abc2d46e6 Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit a2792d890a Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity c7acf10796 Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 19aaa9bd4e Merge branch 'task/MAR10001-0-fix-shipping-context' into develop 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f52eb64642 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 66c6e9974d MAR10001-935: Payment updates 2 ecd633e008 - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment 05648340d7 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators cdbd1cbf21 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1b2884586a - added order status change for 'new' workflows in Marello cf01fd46ee Merge branch 'task/MAR10001-0-add-order-status' into develop e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation f7a39f6d2c Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 3015ccf731 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch a60a9fb91e Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 957c32637c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper e15f975b1f - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) 0217ff2fa4 Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8f5d044cb4 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 30fb36f650 Merge branch 'task/MAR10001-0-price-alignment' into develop 126c8037f3 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product 088c985264 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses 06529fa9d3 Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) e399a910b7 Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 37b9dbe178 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 702ee6d54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 093dcc25e7 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection b05d611cba - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned cf62473106 - fixed unique constraints format...again :') 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group f0e9db681f Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 9ede319aa5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 72b1da841c Merge branch 'feature/MAR10001-931' into develop 26b3ac14f9 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 6f7909c19c - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department 54ccd14fbf - fix OrderExtension test to include the new twig functions 1c40490752 Merge branch 'feature/MAR10001-920' into develop b7a8b98991 MAR10001-931: Update Order and OrderItem entities with additional fields 2fd9aa4727 Merge branch 'maintenance/3.0' into develop 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme a135353941 MAR10001-930: fixes for filtration on products grid b4e915f610 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form 0418a66a16 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel ebded99bbf Merge branch 'maintenance/3.0' into develop 61b2f271b5 - removed commit reference in validation file 44ac30aadf Merge branch 'maintenance/3.0' into develop 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 377f2a89cc Merge branch 'feature/MAR10001-909' into develop df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 13433d841b MAR10001-909: Add Company ID to Company dc85219029 - renamed Company code to Company number - added pdf translation - moved company number on the PDF db7dd5e612 MM-25: Add logic for product prices and inventory synchronization (#50) 02a7cd6679 MM-25: Add logic for product prices and inventory synchronization (#50) ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8a507d2ed1 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 8c5aa63d9b Squashed 'package/marello-orocommerce-bridge/' changes from e40a901ca..a1f978c47 c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 0145745747 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9e12b88764 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 9dafd0f20e Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 33fc001a70 - fixed issue with installing by updating the OrderBundle Installer by updating the migration version to the correct version - fixed issue with shipping_method_reference setter on the Order entity, the setter needed to accept that it can be null c14e3ba9d0 - fixed cs issue with duplicated services compiler pass 41691dd736 - fixed cs issue with duplicated services compiler pass 89cb4cba3d - fixed cs issue with duplicated services compiler pass 0b52894e3a - fixed cs issue with duplicated services compiler pass d4e4078d31 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 39efef0623 - Added Shippingmethod reference as new field to the Order entity - Removed shippingmethod validation from the commerce validation group on the Order entity - added translation for shipping method reference - updated Order view layout to have all the source references (order reference, invoice reference and shippingmethod reference) in the same block and below the customer information aed9bb9710 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses c2b112486b - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses f58ca7e2db - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 1ea84f7fe4 - updated Order address import logic to always create new billing & shipping addreses for the Order - Added mapping for shipping_method_reference which will allow us to store references about shipping methods we don't know in Marello - updated mapping for shipping_method and shipping_method_type to be in the correct columns of the Order - added migration to update existing order addresses that are identical to be cloned and saved as new addresses 42add63a2f MAR10001-909: Add Company ID to Company 3f68d97330 Merge branch 'maintenance/3.0' into develop bb988382ef MAR10001-909: Add Company ID to Company 77a5de9513 Squashed 'package/marello-orocommerce-bridge/' changes from 6256f0dbf..e40a901ca 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 7a94a7bcb0 Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 cac71c327c Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 0e4371c974 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 a8bdc128fc Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 fa7eee5696 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 4bc65d325e Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 a03344b947 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container e0f139c1c8 - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container 4b47e0c096 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 b79f041444 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 a7e49facc3 Squashed 'package/marello-orocommerce-bridge/' changes from 201fc5dfc..6256f0dbf 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b 5883038b1e Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 6a07bc9340 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 d477236658 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d5546ff8f6 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 e5edb02cd9 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty 5d1c9611e1 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty bd456e7ff1 - added missing validator translations regarding shipping method rules and configs dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate 9c5f51fe75 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 670424eaa2 - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company 88c4f9bda6 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 1e6678703f MM-13: Implement initial products export (#49) c7c231b005 MM-13: Implement initial products export (#49) 0bcb9bb847 Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 78f97e200c Merge commit 'f2f622a0501a000e61e11b9bcc6e74ddc36a540e' into maintenance/3.0 f2f622a050 Squashed 'package/marello-orocommerce-api-bridge/' changes from 9eb94f4eb..8eed856c0 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 3314ec5b83 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 826865e28a Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 5d6d9bb3b6 Squashed 'package/marello-orocommerce-bridge/' changes from 6507f0941..201fc5dfc 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f 842772c4b7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 8cb3dab607 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 2b3217338e Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 ca52781438 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 d413aab3d8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 94eae82d44 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 db5418534a Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 336ff49858 - updated email SendProcessor to do not send emails or try to send emails when the recipients array is empty - updated validation groups for the Order entity to be able to save Orders without a Customer for the commerce group 20eb6a17b2 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 02e4cef993 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 838a6de466 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 6ed5078119 - updated orocommerce integration where it's possible to choose the saleschannelgroup for it instead of having it created for you, including the associated saleschannel - fixed OrderImportStrategy to make sure the organization is being included in the Order before trying to find a product with said organization instead of null - updated OrderNormalizer to be able to create an Order without a Marello Customer and still be able to save the order for OroCommerce orders - updated tests to include the SalesChannelGroup as option in the integration settings 1309973a1c - updated data attribute of order to make sure when creating a new order via `new Order()` will have the data attribute as an array instead of null a2acb0843c - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 11ceb32ac8 - updated OrderWorkflowStart listener to use the doctrine helper from Oro to get the correct entity manager for the class instead of the event's entity manager aef5acf6f6 MAR10001-930: Cache seems to be invalidated quite frequently which results in pages being visited before increased loading times 2ad444e881 - fixed issue with product duplication error when the action group registry is not a public service anymore, created a provider that injects said service and retrieving it via the provider that has been created as a public service 6cfe92ab4c MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 94ab6bc9f9 MM-24: Implement encrypting of api token - Implemented encrypting of API Token - Added fix on product status 05f765e4e2 MM-23: Add logic to process changes in integration (#47) fad55ac8bf MM-23: Add logic to process changes in integration (#47) d8b6058ee9 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 2aee6d3b49 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration c3bef1c448 - added listener to prevent SCG from being deleted while it's still associated with an OroCommerce integration - added listener to update the integration channel of SalesChannels when adding/removing them from the SCG that is associated with an OroCommerce integration 4406e2a284 - ad…
24198
added a commit
that referenced
this issue
Jun 30, 2022
d80705c83c Merge branch 'release/3.1' b7df2ced63 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 9be5bc3877 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 0dcab9ced7 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 9465afdc47 - fixed layout on payment popup on Invoice/Creditmemo 968dfcf75c - Added product unit as additional information to OrderItem on order create 29cd362aac - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow e060f3794a - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 2d0aee8f24 - added manage batches inventory link on inventory level grid on inventory item view 9e68b871b3 - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 000dcf379c - Added taxIdentificationNumber below company number on invoice entity view 5a41136389 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 6e84022f8d - Added small changes for batches; - added delivery date to batch form e78d01e15f - Fixed issue with selecting organization when creating products and purchase order debbd9f0db - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip a8317801d2 - Added organization to query for finding a specific sku for an organization 5f4f0254d3 - removed old query reference 83badc9bf2 bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 2bd300f915 - Added different calculation for total due on order view 287750fecb - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 4c6a058db5 - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 1e1a5486e6 Merge branch 'develop' into feature/MAR10001-930 dbc8defaa3 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver ee01c68790 - added hasColumn() checks on fields that might already be added in previous version 1a3639e998 - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 31edb26d40 - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 01cf685ba1 - Added fix for query on postgresql where customer tax identification is copied to company tax identification 5ba6a0387a Merge branch 'develop' into feature/MAR10001-894 167914be40 Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 430ab3bb43 - Added minor fixes to purchase orders view and form dde294954d - Added possibility to update cost via marello-supplier-product-grid bd610c9fe6 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 dd1fc54c82 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 193d3fea6f Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 3baa45e432 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 668807adf4 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 9a5de91019 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 91d136e4c4 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 206a89b737 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop b383b8138d - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty 96d3c3da5f - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 497285847f - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data afe10013b2 Merge branch 'develop' into feature/MAR10001-935 b80a45a604 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop 2a9faf61cd - added additional check before loading the purchase price in the Purchase Order Item 2b1ffd9160 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop 40d84ffe1d - Added support to display extended fields on SalesChannel view & grid 3396437ff1 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop b943ecde6d - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 4272c01b92 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 8ea2cd21c2 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid f409304860 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' 42f96be742 Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop d4ffe67899 - 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 e9bdca05ad Merge branch 'bugfix/MAR10001-966-product-categories' into develop b80ea4d666 - updated product category grid on the category view to take the localized value of product name into account 52ea970fdc Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop 68a34c4f05 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid e997c2938b Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop 576d4b4f84 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) d455e77b8e Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop d47846ac55 - added default ACL config value for Tax Related entities 57e9233303 Merge branch 'task/MAR10001-0-layout-fixes' into develop 7f3d36c199 - 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 c59a474ba0 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 69df3b84b5 - fix issue with trying to display data based on an entity that isn't available 635b95d3bd Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 78bff7f0ce - Added shipping method details to store additional information regarding the shipping method on the Marello Order 6a1f95564c Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop cbc7d50021 - Added rendering for additional data block with dynamic entity fields 359e5f74ba Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop 3b49897071 - Added context option check for forceFlush in the inventorylevellogrecord b256f6567d Merge branch 'task/MAR10001-0-validation-fixes' into develop 6e8fc2bac8 - Updated validation groups for Order validation - Added SKU to the available inventory validation message d3b061686c Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop 10f5e5a917 - 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 298078c1fb Merge branch 'maintenance/3.0' 4d029e0a1d Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 9d33c6381c - 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 dd4f67f6c9 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop 76800e09e4 - 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 342c799e17 - 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... 1ba0c3e52a multiple fixes 5ccbb54a33 multiple fixes 6f34f88cbf Merge branch 'maintenance/3.0' b48c0cc790 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 e19f59023c Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 817c626ab9 - 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) 68db65f41d - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 00cc1f1002 Merge branch 'maintenance/3.0' into develop 4f65e8c8fb MM-42: Test and fix functionality (#66) 92bfd1afaa MM-42: Test and fix functionality (#65) a8bacc7078 MM-40: Test and fix import order functionality (#63) 4817829be9 MM-38: Implement sync processors (#61) 019a1bf6b1 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) e03adedeaa Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop d7558a553b - 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 8e3b617483 Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop c81490c68e - 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 172732b53d Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 314229d087 Merge branch 'task/MAR10001-0-fix-shipping-context' into develop 5396e6dc3d - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 3dedc0dcd4 - 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 d037f75e6c - 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 9ea3dafb87 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 7e8e448b99 - 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 38d1fc24f1 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 2421b27ff5 MAR10001-935: Payment updates 2 4e5e08104a - fixed renaming email templates for Order and Invoice notifications 737ea2f0be - Updated email templates with new style 5ec1a6a54e Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 21fea86fc7 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 3e8649c6a0 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 12028a44c2 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop ebd3a4ee2f - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly d4a4faec3e - added order status change for 'new' workflows in Marello 5f76351b57 Merge branch 'task/MAR10001-0-add-order-status' into develop a2edc86b63 - 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 afba749090 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop 1606b21a2f - 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 a032ac46b9 - split the SalesBundle migrations as v1_3 was already released... 8f45f4f4da Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 c55e72c5b9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2e3c05c2ab Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 42ab5e4e49 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop e79f8ea1bd - renamed migrations to take newer versions of migrations into account on the develop branch 466e26f915 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 616a370e64 - updated return notifications with ProductUnit on line items - added migration to update existing templates cd12386aa2 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 12edb4db24 - 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 e0560e386f - 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 ddba1708e0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved e1f528d5a2 - 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 c14755b41e - Added unitOfMeasurement to the InventoryItem view 67b17f04d3 - added unitOfMeasurement to InventoryItem grid with filters and sorters c1c8675b6d - 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) 3362d3e39b Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop 724c55a6a4 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b74710116b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8700025844 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 34f464d5e0 Merge branch 'task/MAR10001-0-price-alignment' into develop 95890e1169 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop fdc275034e Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 5a601552df Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 bd669d4e5c - Added the replenishment field to the variant grid for seeing continuation of the product d67deb0175 - 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 aaabab0bb2 - added validation message for DeliveryDate if date is not set in the future 8e7eaf7e1d - Added deliveryDate validation to make sure the date is set in the future and not in the past 3b22e634fa Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop cd34253b36 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) e4636cbefc Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 86acde5686 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop abb022df84 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 0bfbba2440 - 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 8af7a756af - 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 1e8ba0254c - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned 764ded7fb5 - fixed unique constraints format...again :') de1cf1ddcf Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop a120078366 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' c5697c673a Squashed 'applications/marello-application/' changes from 3a5a0ae59..ce3588041 9529d24ca5 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 d089cd443f - remove disabled code from SalesChannelType form type a4a6ba91b2 Merge branch 'feature/magento2-integr' into testmerge-magentoint b8e33d0c8f - removing BC break from order view regarding payments 2ab0e17cd5 - 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 c91a5a6ef2 MAR10001-931: Update Order and OrderItem entities with additional fields 49321bf5b1 Merge branch 'feature/MAR10001-931' into develop a598e0492f - 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 dae77eb2c2 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 adce2c73eb - fixed issue with checking companyNumber on null while trying to render the PDF template b4aaca2a15 - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department 05b90c397a - fix OrderExtension test to include the new twig functions 676420e632 Merge branch 'feature/MAR10001-920' into develop 7c21b23895 MAR10001-931: Update Order and OrderItem entities with additional fields 594e0cb6f4 Merge branch 'maintenance/3.0' into develop bde099601c - fixed issue with misquoting the columns on the unique constraint in the Company entity 9b975a725c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 498af6f3de MAR10001-930: fixes for filtration on products grid b1dac57f09 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 2b455f4c3e Merge branch 'maintenance/3.0' into develop 67af315d08 - removed commit reference in validation file 06abfd1d3f Merge branch 'maintenance/3.0' into develop 5bacf821b9 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 98738fb60e Merge branch 'feature/MAR10001-909' into develop f0c0ac9f5d - renamed Company code to Company number - added pdf translation - moved company number on the PDF 0d171513d8 MAR10001-909: Add Company ID to Company 2e94a890c3 - renamed Company code to Company number - added pdf translation - moved company number on the PDF c9ae8ff004 MM-25: Add logic for product prices and inventory synchronization (#50) c71fba9cfb Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 32f24758d1 - 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 e042a219a8 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop d2dec90d1e - 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 34bb0dd58f MAR10001-909: Add Company ID to Company e8489d2fb9 Merge branch 'maintenance/3.0' into develop 177f7c0781 MAR10001-909: Add Company ID to Company bf663180db Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 440aa90b1d Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 88e77d1529 - Removed replenishment enum field from InventoryItem form type as this has already been added through the DynamicFieldsExtension 9c8e8076ba Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 4ac8519a49 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 bc363a6d7c - added missing validator translations regarding shipping method rules and configs 739457eee9 - updated validation regarding Customer, Company and Address - moved the validation to the correct bundles instead of having it all in the OrderBundle validation file 511b6e95ed MM-13: Implement initial products export (#49) 99bce0c3bd Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 27b7d0ba76 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 0f282598df - 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 a24a263ce1 - 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 9be493eebb - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 05c200e5f6 - 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 e52f270e05 MAR10001-930: Cache seems to be invalidated quite frequently which results in pages being visited before increased loading times 29637429e6 - 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 dbd2f97b96 MM-23: Add logic to process changes in integration (#47) a9d817e4f2 - 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 a0cbca0bad - removed required asterisk from Description on SalesChannel as this is not a required field 3c1a361456 - removed required asterisk from description as this is not required in the SCG 821b86b812 MAR10001-920: Payments Update 3b20f616b5 MM-22: Add logic to process changes in Sales Channel (#46) 0444679822 MAR10001-920: Payments Update dcc2fabbd7 MM-8: Add logic for tax class dictionary synchronization (#45) 679b16e1b4 MAR10001-920: Payments updates 8f5ab0ba92 MAR10001-920: Payments updates 640b21f1b1 Merge branch 'feature/MAR10001-911' into develop 7e5614fad8 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail 73d2e6bb7f MM-6: Prepare logic for dictionary synchronization (#40) 0b932eced6 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 a1fceaada0 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 606a41d0a2 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail e52e0f3e41 - fixed issue with updating the application from 3.0.x to 3.1 during issues updating indexes on columns that don't exist 6e88347657 - CS fixes aeb67039fd MAR10001-911: Update Product with SKU and organization unique index 4437b85ee7 Merge branch 'feature/MAR10001-791' into release/3.1 faf4093a73 Merge branch 'task/MAR10001-0-add-grid-view-labels' into develop 669afa36a2 - added entity_grid_all_view_label to all relevant entities on CE 32b5734247 MAR10001-911: added migrations 9e3545bc8c - updated pricing js views in order to be able to disable channelpricing without errors in the console 3aa0841106 - updated pricing js views in order to be able to disable channelpricing without errors in the console 685674d73a - added invoice type to the invoice/creditmemo view for clarification 9d2ae719b9 MM-4: Create Magento2 integration form - Added missed constraints 8e21fd8af5 - 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 4bcba3217a - fixed functional of POcrons tests by updating the groupby clause in ProductRepository 80c43c3a94 MM-4: Create Magento2 integration form 5eb0c19071 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL 59c349e61e - fixed InvoiceDownload functional test, name of pdf changed during changes made for creditmemo 67409dbf06 Merge branch 'maintenance/3.0' into feature/MAR10001-870 ee18f241b3 - 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.. dff415a0b0 - added pdf template for creditmemo - added requesthandler for creditmemo pdf - updated translations for creditmemo pdf - added company to pdf's afc9de31d1 - added company to invoice view - moved company above the 'general' customer info on order view - added company to invoice pdf 1688dde2fc - removed `selectAll` from datagrids that were having issues with selecting rows only when having pgsql as db driver f656b27a94 Merge branch 'task/MAR10001-901-balanced-inventorylevels-disabled-products' into maintenance/3.0 2b1c222a8d - 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 7e3d730b3f - Fixed inventory levels on inventory item view when having PostgreSQL as db driver c697c71be1 Merge branch 'maintenance/3.0' into feature/MAR10001-870 9d776755be MAR10001-791: Marello Payments - fixed functional tests - fixed Invoice totalPaid, totalDue calculations c25ace73f3 Merge branch 'maintenance/3.0' into feature/MAR10001-791 1c252cd57f MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce e86e6ed294 - updated demo environment with oro 4.1.x - updated custom login page - removed deprecated ways of overriding templates f2f6e7a8d0 Merge branch 'release/3.0.1' into maintenance/3.0 973ae208d7 Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 49b655159b Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 eddf9768aa Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 f1e2b9c6dd Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 889dbf4c36 - Updated 'all time' query to include the start date and not only the date greater than the start date to include all orders 9e37a13263 - CS fixe 80cb2c6d70 Merge branch 'maintenance/3.0' into feature/MAR10001-867 8f9aba150e Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 a0c3ea4f15 Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 1d257e70a8 Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 b3e08131b2 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 2d66315948 - added check to see if emails are already enabled by the user, otherwise the migration will fail because of it 2c96360025 - fixed issue with sending localized email notifications - fixed shipped order confirmation email template - fixed functional tests for sendProcessor d9471fb432 fixed failed repository e0acbed29c - CS fix - Added fix for existing attributes to configure them correctly to show them in attribute groups and retain the original data 1cc8c922c8 - moved the image of the product view to separate template file in order try to control the divs better 7d5fa0dbcb - switch createdAt and tags columns in product grid using the buildAfter event 7010c4b2ab - added inline editing for product status in product grid 07a07d458a - added inline edit for tags - added inline edit for sku - shuffled some columns around in the product grid - removed taxcode as default column d4ec778e79 - added Product tags in entity config - added migration to enable product tags for existing products fb1e74458a - Added email as activity to Marello Customer which allows to show emails being sent with the Customer as context in the customer view d44ec5ee16 - Added Additional data fields to Order entity - updated div's on the additional data of the product view 20dc7304f9 - updated migrations to deal with postgres update, works on mysql too 1ce83a7bd8 - removed annotations from Customer entity to prevent issues with update schema, when creating fields on entities, when running postgresql a03739881c - Added save and new buttons to SalesChannel and SalesChannelGroup create and update views 13ec79d24a - Added save and new buttons to Tax Jurisdictions, Tax Rates, Tax Rules and Tax Codes on both create and update views 8f7a61c724 merged maintenance/3.0 branch into 3.0-test 16268f1b60 fixed problem with schema update e3a455ee6d Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 b2919ff4bc Merge branch 'feature/MAR10001-759' 02531ac825 made productName not audittable field 304eca194e MAR10001-867: Order statistics error when selecting 'All Time' as Date Range b61fefe5be Merge branch '3.0' into feature/MAR10001-791 f7d47e4683 MAR10001-791: Marello Payments a0a457bd4f - 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 062a9a134d - 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 d992deb85d Merge branch 'develop' into test ccf2ad8602 Merge branch '3.0' into test 68f42ed7fc Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test a9c51f6d9a Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 6c1b25d467 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test f41eaa1b3c Merge branch '3.0' into develop 501a3df713 - 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 6cc04c42c0 - Added migration to include organization id on the purchase order item 06e994633c - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig 3a6a510032 - removed .class parameters from service container and replaced it with the FQCNs 8109ecb47d - removed marello_product.entity.class parameter from service container and replaced it with the FQCN 7fc9dfaeda - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN d12c41ce2b - 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 d41e71cce2 - PSR2 CS fixes in PDF/InvoiceBundle 50df90b043 merged branch 3.0 into feature/MAR10001-849 d0e321148f MAR10001-849: PDF Bundle improvements 15034da774 - 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 33e8f5c219 - 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 bf0029c11e - Fixed issue with entity classes defined in the service container instead of using the FQCN b405a9a300 - 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 47ee1f552a - Added missing translation labels de3b70e663 - 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 5a1454fdd6 - Updated unit tests to use and test the new underlying structure of resizing images df22a03877 - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method 7e3e808a15 - 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 3164afffe3 - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated e7cb4250ae - 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 97642d73db - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories d6046389f1 - 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 .... a895e7a888 Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns 5cb399c081 - 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 82491d046c Merge branch 'feature/MAR10001-837' into 3.0 2b21958cfe MAR10001-847: Fix prices in product datagrid 4625f37bb6 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class' 63e0b0c0bb Merge branch 'feature/MAR10001-845' into 3.0 ce9d72a160 MAR10001-837: Inventory batch layout 43fc12dfba - 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 c88c25a6df MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener 6456a5a6f7 - 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 7f1cc1c91a Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0 3b5d64f244 - removed empty line from services.yml 643f192900 Merge branch 'feature/MAR10001-842' into 3.0 3d84eb8fca - removed deprecations from different classes, some inf favor of constructor dependency injection - fixed default user&password for initializing db's in the docker container 442821802f Merge branch 'feature/MAR10001-776' into 3.0 df69a307ff Merge branch 'feature/MAR10001-776' into 3.0 8e581df3cd MAR10001-776: Inventory Batches - fixed bug in replenishment 0d9ee3bfd2 - preparations for release 90afec03be Merge branch 'feature/MAR10001-776' into 3.0 3b96c1ab97 - 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 82c3f40ac9 MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled b6a01edcf0 - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to 98f43ba757 - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs 7c337e3746 MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders f85becbb06 [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 d9c7987cc6 - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid 6e852b56fc - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge f75dcb12fb - 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 0db88c5cbb - 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 341bcf112b - 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 ed4a9260de 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 b61114fe80 - 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 e13e8a23cf - 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 d3c9ffc21e MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid afde76c67b Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 ff58c510e8 - updated invoice email attachment template to match the subject of the invoice notification email 0c624a7fee Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3 2aea7fbc03 - 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 7930e5350f - 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 8d081b5df7 - updated customer update view to correctly display name in the tab of the browser c201b18b07 - removed old bundle of Servicepoints, Servicepoints are now a separate package e7bebd421b - added service points as new package - added docker-compose file for service points application cd27da7f56 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices 53bc5f4351 - fix controller - fix view d60ab65bd5 - fixed create return button on order view page after the status of items have been changed to enums instead of strings 99491f1076 - fixed order of import for multiple entity.js of purchase order 2fbe58179f - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone 3c199c7d4b - reworked the multiple entities setup for purchase orders regarding js components de33b40003 - fixed typo in item view of purchase orders 1d17473b18 CRH19001-18; Change date formtype 5bd5f585b8 CRH19001-18; Refactor form handler for business hours overrides 283224e715 - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle 93e0f7a301 CRH19001-18; Fix business hours overrides datagrid 05d3ee90cc - 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 358bc16eb8 - 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 cea6de24e2 - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form 603973a833 Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 10cbe2cf78 - updated emailtemplate action to comply with php 7.2.x 55f2f27915 - make service public in order to use the service within symfony 4.4.x framework on other places 58ae37ab3b Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 bf503d4350 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 0b2acad22c merged branch 3.0 into feature/MAR10001-776 61cb213344 MAR10001-776: InventoryBatches 068d74d3df Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 fe9ee212be Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3 e986b56fa9 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 9f96de829f CRH19001-18; Add business hours overrides 1442a7d762 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription e0d0dda2ac CRH19001-18; Manage collections of business hours in form handler 3f7c9317c5 CRH19001-18; Always show all days in form c6808d4d95 CRH19001-18; Fix validation c595b65716 - 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 7a03e31477 CRH19001-18; Rewrite business hours datastructure [WIP] 0ca22d1422 CRH19001-18; Rewrite business hours datastructure [WIP] 87cdbddbd1 CRH19001-18; Rewrite business hours datastructure [WIP] fa42383975 CRH19001-18; Update form view for business hours 500e23654d CRH1900-18; Fix validation 1a93d8f046 Merge branch 'feature/CRH19001-18_Service-points' of github.com:marellocommerce/development-mono-repository into feature/CRH19001-18_Service-points 403dedfa6c CRH19001-18; Updates to form theme 9b0fbd240f - updated all Marello CE bundles with the new format for webpack 08f29d3e82 CRH19001-18; Fix view page when no image selected 2ddc084de0 - 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 5dcaef4c7c - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 55389791d6 CRH19001-18; Add custom form theme for service point business hours 6c3e97f498 MAR10001-776: Inventory Batches - new comments fixed c55dd80ab4 CRH19001-18; Fix timezones of TimePeriod entities 915d6b6fc4 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 39215f2e6a MAR10001-742; Add ability to add attachments to notifications from workflow action 43d599a5e1 MAR10001-742; Add ability to add attachments to notifications via SendProcessor e08240baac MAR10001-742; Add attachments to Notification 6c73a2673d MAR10001-742; Add v1_0 migration for NotificationBundle b5df9841fd MAR10001-742; Fix typo db986fead1 - reverted to old sticky note icon dddea172b6 - changed the sticky note text - reverted commmented line in phpunit.xml beb726cda6 - fixed the sticky note description and logo - updated help link on the question icon on the top 5938f580aa MAR10001-13; Add white background color to PDF template 00461a3d81 MAR10001-13; Add configuration button on sales channel view 373fac5383 CRH19001-18; Validate timeperiod validity 185587f5f9 CRH19001-18; Allow multiple timeperiods per day 5c269df542 MAR10001-774: Remove increase / decrease external warehouses option eae9820367 - CS fix aff92ca9cc Merge branch 'feature/MAR10001-765' into 3.0 cc8284f5b0 Merge branch '3.0' into feature/MAR10001-776 5d90b4d8bb MAR10001-802: WFA rule index is not rendering 3298d7fcda MAR10001-765: Update InventoryRebalance Command e0f6532d50 MAR10001-776: Inventory Batches - bug fixed d016d877d3 MAR10001-776: Inventory Batches - bug fixed 5bae55cf31 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order 1fd2580e32 - 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 9c398bc65a - 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 dccd932a01 Merge branch 'feature/MAR10001-770' into 3.0 c5c22bd721 Merge branch 'feature/MAR10001-775' into maintenance/2.2 2fec41981a Merge branch 'feature/MAR10001-775' into 3.0 fdb762cc77 Merge branch 'feature/MAR10001-769' into 3.0 1d9beba640 - updated dev.lock with Oro Platform beta 4.1 db50f7cc3e MAR10001-776: Inventory Batches - removed temp code 7a945dbd59 MAR10001-776: Inventory Batches f112a14e5c - 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 cdb282c591 - 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 6578d01bc4 Merge branch '3.0' into feature/MAR10001-770 c0ab2de3d6 fixed bug on order create page bd9ca3692f MAR10001-770: Order statistics widget: filter by SalesChannel d686c8bf67 - Added migration to include organization id on the purchase order item 24898c61be - Added data column to PurchaseOrder a86b2a0ed6 MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first 4342e9cda5 MAR10001-766: OroCommerce Bridge 481d27f179 Merge branch 'develop' into feature/MAR10001-769 688913458a Merge branch 'feature/MAR10001-758' into develop d9e7dd5a18 Merge branch 'feature/MAR10001-758' into maintenance/2.2 3a6ceeebef - CS fixes 92cc9eafcb Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 3b0112bb93 Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 53a0e0fe76 - updated branch aliases 3069732a94 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 6bb210c740 MAR10001-759: Update OroCommerce bridge for Marello 2.2 b405650589 - CS fixes - Changed php version back to 7.1 bfa8d0a010 CRH19001-18; Add API ed9ceec43d CRH19001-18; Add map to service point view page 07cf5faeed CRH19001-18; Add service point image to view b996811d8c CRH19001-18; Add EntityConfig 2796bc42ad CRH19001-18; Add ACL 7253212610 CRH19001-18; Add controllers and views 1ab4140c16 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 85b581198e Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 75543a6404 MAR10001-759: Update OroCommerce bridge for Marello 2.2 0a34a36913 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels af59a86f6c Merge branch 'develop' into feature/MAR10001-758 15e7c2de73 MAR10001-769: Show 'Cost' currency on de Product edit page bfcfe51dc3 CRH19001-18; Add Forms 566a8047eb CRH19001-18; Add validation 8f81e069ab CRH19001-18; Add translations 4f0f4472c1 CRH19001-18; Add data model 181ba0b28b CRH19001-18; Add ServicePointBundle 36491f5d88 - Changed column source on invoice and creditmemo items product sku and name d56c29a1f5 Merge branch 'feature/MAR10001-674' into develop 902777e475 - Disabled OrderOnDemand widget in Inventory view / update in order to prevent the usage of the unfinished feauture cd96ad2fcd Merge branch 'feature/MAR10001-674' into develop cb7397a38e Merge branch 'bugfix/MAR10001-764-stop-override-orderitem-status-when-already-set' into develop e21f585dcb - Added check to prevent overriding OrderItemStatus when already set on creation 10cfcd0c26 Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop 71f17ce1d8 - Added additional check to verify there is a product to get the inventory item from when passed back to the import processor e9b8cb5546 - Added additional check to inventory level update strategy to check wether the product of the 'associated' inventory level exists before importing and throwing errors 075389df6a removed useless fields from oro_entity_config_field 968d3d9e36 fixed bug in Migrations versions ddab3fa39d fixed bug in Migrations versions f69acc4469 fixed bug in OrderBundle migration 703364dd86 merged branch develop into 3.0 f844a1ca2d Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop 61f30e140f Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1 4fd373a5b6 merge branch 3.0 into feature/MAR10001-730 92214326e6 merge branch 3.0 into feature/MAR10001-714 1b7c9737ca 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 f6ede87a76 Merge branch '3.0' into feature/MAR10001-725 01f560bbe7 Merge pull request #16 from marellocommerce/feature/MAR10001-751 89e25ec89b Merge branch '3.0' into feature/MAR10001-718 896f1bd97c Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop d1fd8a090d - updated PurchaseOrderBundle schema versions to take the 'next' version of Marello (2.2) into account 8ad671de85 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop 82e0205502 - CS fix ee2489e990 - 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 baf6ce615b - 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 4b2615016f - Added migration for updating existing InvoiceItems with Organization - Added migration for adding ownership to ReturnItems - Added migration for updating existing ReturnItems with Organization 30353c01c0 MAR10001-751: Rename columns to e81ccf1397 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bugs bbffc57fe2 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed CustomerBundle - fixed PaymentTermBundle e4d8f4973e merge develop branch into feature/MAR10001-717 ' 016a88d9de - Added migration to update current credit/invoice items with organization based on the parent entity's organization 44bb82a11b MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels 55caada862 - updated PackingSlipItem test to include organization - Added translation for PackingSlipItem organization e5abc43e6a - 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 c2e041aa3e - Added ownership field to Oro config d1b406c8d4 - Added organization ownership to InvoiceItems - Added translations for organization - Added migration to update schema with organization 19775441d0 - Added organization ownership to OrderItem for applying ACL when reports are created with the items e84fe56b4c - Added Organization ownership to Supplier entity - Added test to verify the organization is set when a new supplier is being created 8bc66364ae MAR10001-674: Order on demand - updated OOD validator - fixed bugs in order items statuses changing e7e7a14f35 - updated rendering of OrderNumber link and SalesChannel link on various views for quick navigation - added quick navigation link to customer on Invoice view 4859ab9d03 - Added product sku rendering link to RefundItem's datagrid for quick navigation 5d7eb3af80 - Added product SKU rendering link to ReturnItems grid for quick navigation 980ff3c964 - Added product sku rendering link to PackingSlip item grid for quick navigation 3090ea22fb - Added product sku link rendering to Invoice Item grid for quick navigation 4343ca21df - Added product sku link rendering to order item's product in order item datagrid 398f1459ec - 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 9fcb639852 - 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 e392127544 - Added quick navigation for customer on Order View - Updated quick navigation for SalesChannel link on Order View 37433d1ec4 MAR10001-714: Payment methods 97059a43a3 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 833db6fa4f MAR10001-742; Add tests 9c49ea3fcc MAR10001-742; Check if invoice workflow transition is set 391276bb71 MAR10001-742; Remove debug code a518151789 MAR10001-742; Add workflow actions to send invoice e-mail eb019896a8 MAR10001-742; Add translation 7a22819041 MAR10001-742; Add migration for invoice e-mail template 5197a78d51 MAR10001-742; Add IsSendEmailTransition workflow condition 95b51422f3 merged develop branch into feature/MAR10001-714 branch 45faee70c0 - 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 9ab72e4522 Merge branch 'develop' into feature/MAR10001-674 c08ff89542 - CS fix -> fixed docblock e9c1caf2c3 Merge branch 'feature/MAR10001-739_Payment-term-invoice' into develop a02adf01bf Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop caeebb8554 - Added Migrations to update entity_config tables and entity_config_field tables to set auditable to false for InventoryLevel && BalancedInventoryLevel f12d8b32db Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop ad1f8e1077 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 39649ac6d6 - 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 94dc6b9304 - 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 916fe29d7e MAR10001-742; Add e-mail settings about sending invoices 4c41e51514 MAR10001-739; Fix migration namespace 7663b85d5f - CS Fixes fb474fbb88 Merge branch 'feature/MAR10001-674' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-674 a80caf8af5 MAR10001-674: Order on Demand - fixed warehouses calculations for order 58caaf643d - remove unused code from validator cfc1569d0c - Removed unused code - Added CS fixes where necessary 1514d992ff MAR10001-674: Order on Demand 81eeb78342 MAR10001-674: Order on Demand c0e4dfa344 - Updated dev.lock files - Updated oro platform to version 3.1.13 dd509f05db backmerged develop branch into feature/MAR10001-730 branch 5f8bc9bf89 MAR10001-730: Update CustomerBundle with Customer 88b1265062 MAR10001-742; Add workflow action to send email with attachment 0396909dab MAR10001-739; Add payment term to invoice view 092e4dd6db MAR10001-739; Calculate invoice due date 34f4b459ae MAR10001-739; Add payment term during invoice generation 931854b73a MAR10001-739; Add getCustomerPaymentTerm to PaymentTermProvider 574b4b5f94 MAR10001-739; Add payment term to invoice model d804c235f4 MAR10001-13; Add demo data for invoice configuration 3c39998425 Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop 32a8e97f4a - Fixed typo in class name 63bcb3932d Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop 0c260a20c3 - Small CS fixes; new line on end of file, formatting ano function over multiple lines 624ca71682 MAR10001-730: Move Customer e89cc46bdb MAR10001-13; Add functional test e9ac295074 MAR10001-13; Update TableSizeProviderTest de8e3d26d4 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 7984fc3e82 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 c295d88b14 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop d8e50be874 Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements 1379ec2829 - Added test to verify correct registration of cron command - updated code to include correct registration of cron command 88ca77277d MAR10001-13; PdfBundle unit tests 08a0633b9f MAR10001-13; Fix PDF bugs 9cdb3c040a - 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 448f70228d Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification c154e4c36f - Added test to verify the working of the saving of the notification as activity target e62d2a80b7 - updated phpdocblock removing parameter that isn't there anymore c5299bf6c4 - updated query for including purchaseInventory when selecting purchaseOrderItemCandidates 243f6852cb - 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 a8ad8f7fc7 Merge branch 'develop' into feature/MAR10001-676-purchase-order-noti…
24198
added a commit
that referenced
this issue
Jun 30, 2022
9bdcb5f Merge commit '31e5dbd6a2b67a50f51ed8cd3c2e92b1d880bc20' into maintenance/3.1 934f722 Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.1 af75dcc task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand d598f64 Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.1 b16f33e - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 7317328 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into maintenance/3.1 38a655b - Fixed issue with schema update with updating table because of foreign key constraint a82942b Merge branch 'feature/MAR10001-988' into develop 4102983 Merge branch 'feature/MAR10001-988' into maintenance/3.1 a213c6b MAR10001-988: Minor fixed version of migration and create view changes 8e38e69 Merge branch 'feature/MAR10001-987' into maintenance/3.1 97521f4 Merge branch 'feature/MAR10001-987' into develop d40a92e MAR10001-968: Fixed unique name fields - unique on both: name, organization 715712f Add new reason for return items 80bbc82 Add additional fields to Return Entity, update views 9d50318 MAR10001-988: Add additional fields to Return Entity 4326c30 - fixed merged conflict 95385a3 Merge branch 'feature/MAR10001-984' into maintenance/3.1 84dd344 Merge branch 'feature/MAR10001-985' into maintenance/3.1 c77ae59 MAR10001-985: Rename Tabs/headings on the Return view page 8feec13 Add Customer information to Return view 5067315 Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 91ca20f - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages efd26db Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' into maintenance/3.1 588f418 Merge branch 'task/MAR10001-0-add-product-status-validation' into develop 6c4c4ea task/MAR10001-0-add-product-status-validation: - Added check for product status before balancing inventory for said product - Added validation + validation message for Product status 2912aec Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop ccd40f8 - added company number column, filter and sorter 4ba331e Merge branch 'merge-service-points-30' into maintenance/3.1 def0844 Merge branch 'feature/MAR10001-880' into merge-service-points-30 0e5e29c Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 e8749bd - fixed issue productUnit being submitted on order create, field should not be submitted at all ea5520e Merge commit '6dca2f914f41c1d50b12d89632b00f4c2bf4e2e3' into release/3.1 6dca2f9 Squashed 'applications/marello-application-ee/' changes from 0ec7b82..2c69360 42cb65b Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 9d60aab Merge branch 'release/3.1' 9844a91 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' cdcc150 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 564f132 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's cc33c5a - fixed layout on payment popup on Invoice/Creditmemo 9c0805f - Added product unit as additional information to OrderItem on order create 207ab18 - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 6cdba9e - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 280b221 - added manage batches inventory link on inventory level grid on inventory item view 5b1f26b - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name f9e6fa6 - Added taxIdentificationNumber below company number on invoice entity view ccbf129 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 60dc58e - Added small changes for batches; - added delivery date to batch form 1bae812 - Fixed issue with selecting organization when creating products and purchase order f8c7d7e - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip 3fdb8c7 - Added organization to query for finding a specific sku for an organization dd0b000 - removed old query reference 0f11915 bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction e076656 - Added different calculation for total due on order view e87a498 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid e3868bd - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 5161e0d Merge branch 'develop' into feature/MAR10001-930 94d467e - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver 3f4cce3 - added hasColumn() checks on fields that might already be added in previous version 774a0c7 - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 224dac7 - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button ea9e326 - Added fix for query on postgresql where customer tax identification is copied to company tax identification 96153fe Merge branch 'develop' into feature/MAR10001-894 9ca5b34 Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 0b1879a - Added minor fixes to purchase orders view and form 4cb837d - Added possibility to update cost via marello-supplier-product-grid 3069f27 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 2723bd7 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 bc32cb4 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 fcc9e1e Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 f7387ee Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 0846a6d Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 7ffe871 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 b75b6e3 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop d4218be - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty 7b5b79b - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider c705b2c - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data 08049b0 Merge branch 'develop' into feature/MAR10001-935 31fe089 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop d8cd80b - added additional check before loading the purchase price in the Purchase Order Item 16c1542 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop c5e866d - Added support to display extended fields on SalesChannel view & grid 8b2ba42 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop f1ae5c3 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 89ad052 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop ac086a6 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 0ef6266 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' 89929b2 Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop e4a5112 - 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 977d0c7 Merge branch 'bugfix/MAR10001-966-product-categories' into develop ff92270 - updated product category grid on the category view to take the localized value of product name into account ef929bb Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop fb27de8 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 0b0b2d9 Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop 1052506 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 7046914 Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop de4c45e - added default ACL config value for Tax Related entities 1cfd56b Merge branch 'task/MAR10001-0-layout-fixes' into develop e533e03 - 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 e2ec1d7 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 55eb3bf - fix issue with trying to display data based on an entity that isn't available ee8b561 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 69c3020 - Added shipping method details to store additional information regarding the shipping method on the Marello Order b30e6a2 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 640751d Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 2fe8c53 - Added rendering for additional data block with dynamic entity fields 09708ba Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop fb69b55 - Added context option check for forceFlush in the inventorylevellogrecord ca7f87a Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 17b1a75 Merge branch 'task/MAR10001-0-validation-fixes' into develop bbc7ca8 - Updated validation groups for Order validation - Added SKU to the available inventory validation message 3d8c66e Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop c139869 - 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 bd29a55 Merge branch 'maintenance/3.0' 5554263 Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 2e6dbe3 - 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 b2f0374 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop a523e45 - 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 2b47b38 - 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... 3f06d61 multiple fixes 5ecd69d multiple fixes f407c95 Merge branch 'maintenance/3.0' 5860ffb Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 3b86ae6 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 10d5b30 - 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) 5fd45f1 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer f7824f4 Merge branch 'maintenance/3.0' into develop 728e339 MM-42: Test and fix functionality (#66) 5675d75 MM-42: Test and fix functionality (#65) ea13d64 MM-40: Test and fix import order functionality (#63) 741e626 MM-38: Implement sync processors (#61) e704e9f MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) e2b15f0 Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop dedeb1b - 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 e124404 Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop 9d80633 - 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 82aab35 Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop fc84ac4 Merge branch 'task/MAR10001-0-fix-shipping-context' into develop f92a606 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 2c3af6f - 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 626ff0f - 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 f6cf066 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 659a93c - 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 7be50e1 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 6bf3870 MAR10001-935: Payment updates 2 e059902 - fixed renaming email templates for Order and Invoice notifications 937c296 - Updated email templates with new style d361e5f MAR10001-880: Service points updates(fixed conflicts) a1c7b24 MAR10001-880: Service points updates 4cf0ed2 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 8441271 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart bb33a03 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start fbf2ac9 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop 08f9f1d - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 42df0cb - added order status change for 'new' workflows in Marello a544ca4 Merge branch 'task/MAR10001-0-add-order-status' into develop ca16950 - 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 7669b9b Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop c973ae1 - 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 e170523 - split the SalesBundle migrations as v1_3 was already released... 510f97f Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 0ceb77a Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 33eba24 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 138d8bd Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 b59babd Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 7554189 Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 b70a3aa Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 7f802ec - renamed migrations to take newer versions of migrations into account on the develop branch fc3fef4 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 04df3e3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67e9557 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 908ee7f - 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 a9eb6a5 - 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 0b36166 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved eef4e67 - 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 f0c438a - Added unitOfMeasurement to the InventoryItem view f0f2ad3 - added unitOfMeasurement to InventoryItem grid with filters and sorters be907e3 - 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) 6a16bdb Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop c2b00f0 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 875b87a Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 3b5dabf Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 34d7283 Merge branch 'task/MAR10001-0-price-alignment' into develop 8e65bc5 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop 8dfe5fe Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 ee15adb Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 6788d78 - Added the replenishment field to the variant grid for seeing continuation of the product 0f366ad - 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 ebc8363 - added validation message for DeliveryDate if date is not set in the future a89e910 - Added deliveryDate validation to make sure the date is set in the future and not in the past c264f47 Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 1a40be8 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cc84bcd Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 38eba16 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop fec2210 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 413ab5a - 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 a2d4afd - 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 fd18d4d - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned 2732b90 - fixed unique constraints format...again :') 638cda5 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 0dfc151 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' c5697c6 Squashed 'applications/marello-application/' changes from 3a5a0ae..ce35880 bac1e39 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 2dab594 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 e8d7669 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' bbf94da MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 61a95f2 Merge branch 'feature/MAR10001-931' into develop 51055f0 - 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 7eca964 - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department e7c8029 - fix OrderExtension test to include the new twig functions 7377e59 Merge branch 'feature/MAR10001-920' into develop e388452 MAR10001-931: Update Order and OrderItem entities with additional fields 9b3d3fe Merge branch 'maintenance/3.0' into develop d3727d2 MAR10001-930: fixes for filtration on products grid 1af4a2e Merge branch 'maintenance/3.0' into develop 039ba0a Merge branch 'maintenance/3.0' into develop fe7ee95 Merge branch 'feature/MAR10001-909' into develop 58bb42c - renamed Company code to Company number - added pdf translation - moved company number on the PDF 9947664 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop f847771 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 132d4b0 MAR10001-909: Add Company ID to Company 2a68ce8 Merge branch 'maintenance/3.0' into develop 55048a6 MAR10001-909: Add Company ID to Company 965a577 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 8b64c08 MAR10001-930: Cache seems to be invalidated quite frequently which results in pages being visited before increased loading times 0c2fd4b MAR10001-920: Payments Update fc8330c MAR10001-920: Payments Update 90c3238 MAR10001-920: Payments updates f71c6cd MAR10001-920: Payments updates b62f79e Merge branch 'feature/MAR10001-911' into develop 365738d - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail 231dd56 - fixed issue with updating the application from 3.0.x to 3.1 during issues updating indexes on columns that don't exist 9f011dc - CS fixes 158a39f MAR10001-911: Update Product with SKU and organization unique index 2ef748b Merge branch 'feature/MAR10001-791' into release/3.1 00a75fb Merge branch 'task/MAR10001-0-add-grid-view-labels' into develop 7c5c499 MAR10001-911: added migrations 201a0e2 - updated pricing js views in order to be able to disable channelpricing without errors in the console d6ebf16 Merge branch 'task/MAR10001-895-add-invoice-type-to-creditmemo-invoice-view' into develop ebb51c2 Merge branch 'task/MAR10001-896-update-invoice-entity-config' into develop f35a522 Merge branch 'feature/MAR10001-870' into develop 353ec71 MAR10001-791: Marello Payments - fixed functional tests - fixed Invoice totalPaid, totalDue calculations 2dad104 Merge branch 'maintenance/3.0' into feature/MAR10001-791 c635fe5 Merge branch '3.0' into feature/MAR10001-791 cb16773 MAR10001-791: Marello Payments 9ace12f CRH19001-18; Update API for overrides e1d3bbf Merge commit '1971c71703ba24cf8d58f23ba53931d1dbd116a8' e0805d2 Update OroRequirements check to be compatible with Oro Platform 3.1.x f7cd198 - remove lock files from master 5c56333 - Release preparation 2.1 8ef8047 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 1a6e484 - updated branch aliases 980c1ff Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 a91b309 - updated version number in upgrade notes d953974 - prepared composer.json files for release 6fb68a8 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 37cceb1 Merge branch 'develop' into feature/MAR10001-485-subscriptions 22f054d - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 833d07d Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions efe95d2 Merge branch 'develop' into feature/MAR10001-485-subscriptions git-subtree-dir: package/marello git-subtree-split: 9bdcb5f
24198
added a commit
that referenced
this issue
Jun 30, 2022
0b2497e Merge branch 'MAR10001-PR70' 1ff9042 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 e4fba07 Merge branch 'MAR10001-PR68' fa3b3cd Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 769586a Merge branch 'maintenance/3.0' 36e1386 bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0: - Fixed issue with balanced inventory going below 0 if there is more reserved inventory on the balanced inventory than there is actual inventory to be balanced b428699 Merge branch 'maintenance/3.0' 013142e Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.0 4de2829 Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' 7d95094 Merge branch 'maintenance/3.0' 1208b22 bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid: - Fixed issue with search on orderReference and orderNumber in both Refund/Return grid d3ae655 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 1f76aac bugfix/MAR10001-998-patch-issue-with-refund-validation: - Moved validation for Refund to the complete Refund instead of items - Added currency symbol and formatting to the refund items price - Removed the exception from the subscriber that is interfering with the validation - Added validation to prevent negative refund amount on items 68555d9 specify full namespaces in Doctrine DiscriminatorMap a8760c8 task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled 080bcf6 task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled 9f3d932 - added hasColumn() checks on fields that might already be added in previous version a7a369c - added hasColumn() checks on fields that might already be added in previous version f7c3d90 Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 5785eec Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 ee0f8e5 task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand af75dcc task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand ba58809 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 eec7e33 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 5391c9c - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration b16f33e - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 32e9ef2 Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' 30cd7f3 - added company number column, filter and sorter ccd40f8 - added company number column, filter and sorter fdd1425 Merge branch 'feature/MAR10001-880' into merge-service-points-30 def0844 Merge branch 'feature/MAR10001-880' into merge-service-points-30 0e5e29c Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 292f519 Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' dab670b - fixed issue productUnit being submitted on order create, field should not be submitted at all acbb6d8 Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' fbe6998 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' ddc1152 Merge branch 'release/3.1' 9d7f1ff Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 7782fd9 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' f688b50 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 22397d3 - fixed layout on payment popup on Invoice/Creditmemo f17b373 - Added product unit as additional information to OrderItem on order create abdb830 - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 5612933 - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 41316ec - added manage batches inventory link on inventory level grid on inventory item view e88e920 - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 58b9be4 - Added taxIdentificationNumber below company number on invoice entity view d6301d0 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 2c93950 - Added small changes for batches; - added delivery date to batch form e388935 - Fixed issue with selecting organization when creating products and purchase order ac4434b - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip 01e83b0 - Added organization to query for finding a specific sku for an organization b131e18 - removed old query reference c4a592a bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 7cef74f - Added different calculation for total due on order view dae0a29 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 3cede79 - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 468cb34 Merge branch 'develop' into feature/MAR10001-930 89284c7 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver c76ce7b - added hasColumn() checks on fields that might already be added in previous version d37fb2f - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 3896c6a - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 2094b8c - Added fix for query on postgresql where customer tax identification is copied to company tax identification 09e9035 Merge branch 'develop' into feature/MAR10001-894 9f3ab2f Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 73c2e39 - Added minor fixes to purchase orders view and form c23d429 - Added minor fixes to purchase orders view and form 0b1879a - Added minor fixes to purchase orders view and form 7b00a7d - Added possibility to update cost via marello-supplier-product-grid 68a2703 - Added possibility to update cost via marello-supplier-product-grid 4cb837d - Added possibility to update cost via marello-supplier-product-grid c0e9f67 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 a72855b Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 3069f27 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 1591559 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 1c28c9c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 2723bd7 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 9a16f47 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 9bf8fde Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 bc32cb4 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 26a030a Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 54c8d90 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 fcc9e1e Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 cf8c669 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 7ebf9da Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 f7387ee Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 dcc89de Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 36d32c1 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 0846a6d Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 2d02177 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 7ffe871 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 0623576 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop 746d1e3 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty 3a6fd4c - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d4218be - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty f24d48e - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 747adb9 - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data eb19d4a Merge branch 'develop' into feature/MAR10001-935 ea5c508 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop a094c26 - added additional check before loading the purchase price in the Purchase Order Item d8cd80b - added additional check before loading the purchase price in the Purchase Order Item 15b4e6c Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop 087ed44 - Added support to display extended fields on SalesChannel view & grid c5e866d - Added support to display extended fields on SalesChannel view & grid bfa263a Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 20fde26 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration f1ae5c3 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 54f2d06 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 01fbdd1 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid ac086a6 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 7e67af6 Non expected return type (interface non-implemented) 2759c63 Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop fd7bff7 - 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 e4a5112 - 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 bb2f91c Merge branch 'bugfix/MAR10001-966-product-categories' into develop a61fefe - updated product category grid on the category view to take the localized value of product name into account ff92270 - updated product category grid on the category view to take the localized value of product name into account dc38902 Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop 0d046ca - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid fb27de8 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 03e80ec Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop 59a5fec - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 1052506 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 92c6206 Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop 8ab3d7e - added default ACL config value for Tax Related entities de4c45e - added default ACL config value for Tax Related entities dac4dc3 Merge branch 'task/MAR10001-0-layout-fixes' into develop 8cd21c5 - 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 e533e03 - 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 2954aa3 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 3742532 - fix issue with trying to display data based on an entity that isn't available ea7a6f8 - Added shipping method details to store additional information regarding the shipping method on the Marello Order 69c3020 - Added shipping method details to store additional information regarding the shipping method on the Marello Order b30e6a2 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 2fc02ae Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 45c33db - Added rendering for additional data block with dynamic entity fields 2fe8c53 - Added rendering for additional data block with dynamic entity fields e6a0344 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop e989f1f - Added context option check for forceFlush in the inventorylevellogrecord fb69b55 - Added context option check for forceFlush in the inventorylevellogrecord ca7f87a Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 131e3b5 Merge branch 'task/MAR10001-0-validation-fixes' into develop f298a72 - Updated validation groups for Order validation - Added SKU to the available inventory validation message bbc7ca8 - Updated validation groups for Order validation - Added SKU to the available inventory validation message a882762 Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop e9202e0 - 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 c139869 - 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 f14ebf3 Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 8ba3d9f - 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 2e6dbe3 - 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 a987a95 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop d6e420f - 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 a523e45 - 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 a6045d1 - 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... 2b47b38 - 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... 490196e multiple fixes d062de0 multiple fixes 5860ffb Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 463b03d Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 3b86ae6 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 c9908e1 - 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) 10d5b30 - 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) 5fd45f1 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 36185ab Merge branch 'maintenance/3.0' into develop 728e339 MM-42: Test and fix functionality (#66) 5675d75 MM-42: Test and fix functionality (#65) ea13d64 MM-40: Test and fix import order functionality (#63) 741e626 MM-38: Implement sync processors (#61) e704e9f MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 0abc2d4 Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop dedeb1b - 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 a2792d8 Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop 9d80633 - 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 c7acf10 Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 19aaa9b Merge branch 'task/MAR10001-0-fix-shipping-context' into develop f92a606 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 2c3af6f - 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 626ff0f - 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 f52eb64 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 659a93c - 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 7be50e1 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 66c6e99 MAR10001-935: Payment updates 2 e059902 - fixed renaming email templates for Order and Invoice notifications 937c296 - Updated email templates with new style d7bf5f8 MAR10001-880: Service points updates(fixed conflicts) d361e5f MAR10001-880: Service points updates(fixed conflicts) c2a6083 MAR10001-880: Service points updates a1c7b24 MAR10001-880: Service points updates 0564834 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 4cf0ed2 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 8441271 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart bb33a03 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start cdbd1cb Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop fbf2ac9 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop 08f9f1d - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1b28845 - added order status change for 'new' workflows in Marello 42df0cb - added order status change for 'new' workflows in Marello cf01fd4 Merge branch 'task/MAR10001-0-add-order-status' into develop a544ca4 Merge branch 'task/MAR10001-0-add-order-status' into develop ca16950 - 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 f7a39f6 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop 7669b9b Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop c973ae1 - 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 e170523 - split the SalesBundle migrations as v1_3 was already released... 510f97f Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 0ceb77a Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 33eba24 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 138d8bd Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 b59babd Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 7554189 Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 3015ccf Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop b70a3aa Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 7f802ec - renamed migrations to take newer versions of migrations into account on the develop branch a60a9fb Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop fc3fef4 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 04df3e3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67e9557 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 908ee7f - 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 a9eb6a5 - 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 0b36166 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved eef4e67 - 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 f0c438a - Added unitOfMeasurement to the InventoryItem view f0f2ad3 - added unitOfMeasurement to InventoryItem grid with filters and sorters be907e3 - 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) 0217ff2 Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop 6a16bdb Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop c2b00f0 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 875b87a Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8f5d044 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 3b5dabf Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 30fb36f Merge branch 'task/MAR10001-0-price-alignment' into develop 34d7283 Merge branch 'task/MAR10001-0-price-alignment' into develop 126c803 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop 8e65bc5 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop 8dfe5fe Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 ee15adb Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 6788d78 - Added the replenishment field to the variant grid for seeing continuation of the product 0f366ad - 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 ebc8363 - added validation message for DeliveryDate if date is not set in the future a89e910 - Added deliveryDate validation to make sure the date is set in the future and not in the past 06529fa Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop c264f47 Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 1a40be8 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) e399a91 Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop cc84bcd Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 37b9dbe Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop 38eba16 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop fec2210 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 413ab5a - 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 a2d4afd - 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 b05d611 - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned fd18d4d - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned cf62473 - fixed unique constraints format...again :') 2732b90 - fixed unique constraints format...again :') f0e9db6 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 638cda5 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop b2975e5 - removed composer.lock file from master 318b676 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' ce35880 Merge pull request #11 from clicktrend/patch-1 bac1e39 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 2dab594 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 e8d7669 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' bbf94da MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 72b1da8 Merge branch 'feature/MAR10001-931' into develop 61a95f2 Merge branch 'feature/MAR10001-931' into develop 26b3ac1 - 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 51055f0 - 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 6f7909c - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department 7eca964 - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department 54ccd14 - fix OrderExtension test to include the new twig functions e7c8029 - fix OrderExtension test to include the new twig functions 1c40490 Merge branch 'feature/MAR10001-920' into develop 7377e59 Merge branch 'feature/MAR10001-920' into develop b7a8b98 MAR10001-931: Update Order and OrderItem entities with additional fields e388452 MAR10001-931: Update Order and OrderItem entities with additional fields 2fd9aa4 Merge branch 'maintenance/3.0' into develop 9b3d3fe Merge branch 'maintenance/3.0' into develop a135353 MAR10001-930: fixes for filtration on products grid ebded99 Merge branch 'maintenance/3.0' into develop 1af4a2e Merge branch 'maintenance/3.0' into develop 44ac30a Merge branch 'maintenance/3.0' into develop 039ba0a Merge branch 'maintenance/3.0' into develop 377f2a8 Merge branch 'feature/MAR10001-909' into develop fe7ee95 Merge branch 'feature/MAR10001-909' into develop dc85219 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 58bb42c - renamed Company code to Company number - added pdf translation - moved company number on the PDF 9dafd0f Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 9947664 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop d4e4078 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop f847771 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 42add63 MAR10001-909: Add Company ID to Company 132d4b0 MAR10001-909: Add Company ID to Company 3f68d97 Merge branch 'maintenance/3.0' into develop 2a68ce8 Merge branch 'maintenance/3.0' into develop bb98838 MAR10001-909: Add Company ID to Company 55048a6 MAR10001-909: Add Company ID to Company db54185 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 965a577 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop aef5acf MAR10001-930: Cache seems to be invalidated quite frequently which results in pages being visited before increased loading times 87aa40d MAR10001-920: Payments Update 0c2fd4b MAR10001-920: Payments Update eadd863 MAR10001-920: Payments Update fc8330c MAR10001-920: Payments Update 8b62a6d MAR10001-920: Payments updates 90c3238 MAR10001-920: Payments updates aebeb94 MAR10001-920: Payments updates f71c6cd MAR10001-920: Payments updates b4db154 Merge branch 'feature/MAR10001-911' into develop b62f79e Merge branch 'feature/MAR10001-911' into develop a16bcb0 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail 365738d - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail 3a23037 - fixed issue with updating the application from 3.0.x to 3.1 during issues updating indexes on columns that don't exist 231dd56 - fixed issue with updating the application from 3.0.x to 3.1 during issues updating indexes on columns that don't exist 519a31e - CS fixes 9f011dc - CS fixes f6b5db1 MAR10001-911: Update Product with SKU and organization unique index 158a39f MAR10001-911: Update Product with SKU and organization unique index 6e2bea3 Merge branch 'feature/MAR10001-791' into release/3.1 2ef748b Merge branch 'feature/MAR10001-791' into release/3.1 8542992 Merge branch 'task/MAR10001-0-add-grid-view-labels' into develop 00a75fb Merge branch 'task/MAR10001-0-add-grid-view-labels' into develop 2255e48 MAR10001-911: added migrations 7c5c499 MAR10001-911: added migrations e5b3dd6 - updated pricing js views in order to be able to disable channelpricing without errors in the console 201a0e2 - updated pricing js views in order to be able to disable channelpricing without errors in the console d6ebf16 Merge branch 'task/MAR10001-895-add-invoice-type-to-creditmemo-invoice-view' into develop ebb51c2 Merge branch 'task/MAR10001-896-update-invoice-entity-config' into develop f35a522 Merge branch 'feature/MAR10001-870' into develop 941504a MAR10001-791: Marello Payments - fixed functional tests - fixed Invoice totalPaid, totalDue calculations 353ec71 MAR10001-791: Marello Payments - fixed functional tests - fixed Invoice totalPaid, totalDue calculations c1acf82 Merge branch 'maintenance/3.0' into feature/MAR10001-791 2dad104 Merge branch 'maintenance/3.0' into feature/MAR10001-791 3b8e727 Merge branch '3.0' into feature/MAR10001-791 c635fe5 Merge branch '3.0' into feature/MAR10001-791 097f418 MAR10001-791: Marello Payments cb16773 MAR10001-791: Marello Payments 89c1f39 Update routing.yml 9ace12f CRH19001-18; Update API for overrides e1d3bbf Merge commit '1971c71703ba24cf8d58f23ba53931d1dbd116a8' cd74db3 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 e0805d2 Update OroRequirements check to be compatible with Oro Platform 3.1.x fe3d83d Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements fd1a7eb - remove lock files f7cd198 - remove lock files from master 942b01e - remove lock files from master 08ed5eb - Release preparation 2.1 5c56333 - Release preparation 2.1 fcbd86d Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 d79c4f4 Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 a91b309 - updated version number in upgrade notes 680e701 - updated version number in upgrade notes d953974 - prepared composer.json files for release 61d89c6 - prepared composer.json files for release 6fb68a8 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 8033763 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 9552e48 - updated dev.lock files 98eb6c0 - updated dev json and lock file to include oro 3.1.9 - small changes regarding docker environment files 37cceb1 Merge branch 'develop' into feature/MAR10001-485-subscriptions 4c72f7d - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 22f054d - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 833d07d Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions efe95d2 Merge branch 'develop' into feature/MAR10001-485-subscriptions d3ed4d0 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 17383a0 - added composer.lock to .gitignore - remove composer.lock files 4ecfc51 - added composer.lock - added dev.lock - updated branch alias in marello package composer.json 05e1647 Add 'applications/marello-application-ee/' from commit 'd13f2b41e079dff4eee99f8874928459658daaff' a56511d Merge commit '44448293702551e588fff6fd5860d9d1e0db4a11' as 'package/marello' git-subtree-dir: package/marello git-subtree-split: 0b2497e
24198
added a commit
that referenced
this issue
Jun 30, 2022
279fe1bc86 feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 88ae7896c1 Merge branch 'bugfix/MAR10001-1032' into feature/MAR10001-1006-update-oro-platform-42 b05fc09c5b bugfix/MAR10001-1032: - Fixed bug with Global Access organization not being able to place orders, create payments or payment rules in non global access organization - Prevent Order workflow start when order is created from Global Access organization as this would result an error with permissions - Added changes for EE to make sure the correct organization parameters are available on templates to prevent Organization selector loop 4ec893642a MAR10001-1006: Update platform to Oro BAP 4.2 - fix functional tests - remove some deprecation code usages that causes warnings 41171a7623 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist 2e4a87e21f Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 2d3f89bd1b MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 7030ac3019 - Upgrade to Oro 4.2.7 - Fixes for PHP 8.0.x - Added fix for exposing fos js routes in marello enterprise application - Updated Dockerfile && docker-compose-ee.yml file for upgrade f4e4aeb338 Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 784764f06d Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform 0eabb98b00 Merge branch 'maintenance/3.1' into develop 8a08067fbf Merge branch 'MAR10001-PR70' into develop 00128c339b Merge branch 'MAR10001-PR70' into maintenance/3.1 9562cff113 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 b4bdb5ed61 Merge branch 'MAR10001-PR68' into develop bbe9eb391c Merge branch 'MAR10001-PR68' into maintenance/3.1 d0a1ce5231 Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 68555d9f81 specify full namespaces in Doctrine DiscriminatorMap 080bcf6957 task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled a7a369c052 - added hasColumn() checks on fields that might already be added in previous version 5785eec93c Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 af75dccc7d task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand eec7e33ad2 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 b16f33e432 - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 2931a51910 - Fixed namespaces and classes 6f788f4559 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform e77b664c43 - updated platform to 4.2.3 on all main applications and combinations 6ef2b5e27f Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 9dc9caef3d - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages 02f98f1a6b Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop ccd40f89e3 - added company number column, filter and sorter 6c7baa64a1 Merge branch 'merge-service-points-30' into maintenance/3.1 fb1d1de1ec Merge branch 'feature/MAR10001-880' into merge-service-points-30 def0844f51 Merge branch 'feature/MAR10001-880' into merge-service-points-30 7d75794fd8 - fixed dev lock 0e5e29cacc Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 0f47ce5a2f Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' c175c4d68a Merge branch 'release/3.1' cc1e89390b Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' a2ca4c4c0f Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 4759dcee01 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's f12e7445f2 - Added code to the search results of the autocomplete in the warehouse group edit page where warehouses can be selected that are not assigned to a warehousegroup 802c0c14c4 - Added small changes for batches; - added delivery date to batch form 544c17d676 - reverted the change with adding the warehouse code in the select box of the warehouse selection field in the inventory update, it made a greater mess than it cleared things up 432cf81a6c - Updated auto complete label in warehouse select result a94e79051b Merge branch 'develop' into feature/MAR10001-894 805d94991b Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 73c2e39ff5 - Added minor fixes to purchase orders view and form 0b1879a301 - Added minor fixes to purchase orders view and form 7b00a7d73c - Added possibility to update cost via marello-supplier-product-grid 4cb837d99e - Added possibility to update cost via marello-supplier-product-grid d988063513 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 c0e9f673c7 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 3069f275bb Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 38a10dfb15 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 1591559098 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 2723bd7afc Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 4755dd691f Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 9a16f4759c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 bc32cb42b7 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 b5c449bbc9 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 26a030ac69 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 fcc9e1e722 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 5c27b93bbc Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 cf8c669f62 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 f7387ee61e Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 576c87b1ca Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 dcc89ded95 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 0846a6df72 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 167302fd9a Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 7ffe8718dd Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 746d1e3655 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d4218be7f9 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item d8cd80b1f3 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid c5e866d484 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration f1ae5c3303 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid ac086a6ded - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 7e67af6717 Non expected return type (interface non-implemented) e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number e4a5112b28 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account ff92270199 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid fb27de8910 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 1052506523 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities de4c45eeee - added default ACL config value for Tax Related entities b5bf25335b Merge branch 'task/MAR10001-0-layout-fixes' into develop 77b3abb5b5 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done e533e03e10 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order 69c3020333 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 b30e6a2520 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 ecea175e47 Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 2bd389315c - Added rendering for additional data block with dynamic entity fields bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields 2fe8c53f8c - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord fb69b55c17 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 ca7f87a72f Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message bbc7ca82d4 - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit c139869cdd - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 2e6dbe33e4 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal a523e45f44 - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 2b47b38c52 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 90cf75975c multiple fixes 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 5860ffb378 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 3b86ae620f Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 10d5b30b15 - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 5fd45f1314 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer e74ce7c9da Merge branch 'task/MAR10001-0-update-strategy-results-provider' into develop 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 728e339bc4 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 5675d759f4 MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) ea13d6431f MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 741e626a94 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) e704e9f817 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 5da39e3540 Merge branch 'task/MAR10001-0-cs-fix' into develop b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit dedeb1b760 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 9d80633813 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates f92a60615c - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 2c3af6f865 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 626ff0f791 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 4508d883e0 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 659a93cd7f - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 7be50e1d62 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications e05990244d - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 937c296313 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment d361e5f802 MAR10001-880: Service points updates(fixed conflicts) a1c7b2417b MAR10001-880: Service points updates 4e22ff4ed0 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 4cf0ed2a9a Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 844127142c - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start bb33a03a95 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators fbf2ac9d63 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 08f9f1d274 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 42df0cbd63 - added order status change for 'new' workflows in Marello a544ca495f Merge branch 'task/MAR10001-0-add-order-status' into develop e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation ca16950dcb - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 3bec073565 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop 7669b9bc84 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid c973ae11de - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... e170523420 - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 510f97ff39 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 0ceb77aa0e Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 33eba24280 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 138d8bd39b Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 b59babdb5d Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 755418949b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 b70a3aafea Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch 7f802ec1a8 - renamed migrations to take newer versions of migrations into account on the develop branch fc3fef43e7 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 04df3e3b2b - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 67e95573e7 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 7b7407c525 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 908ee7f8c6 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 957c32637c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field d20075c92a - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field a9eb6a504e - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 0b36166c18 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper 3e3951649c - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper eef4e6752b - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view f0c438ae3e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters f0f2ad364e - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) db865d076d - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) be907e3fd3 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) 6a16bdb3be Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address c2b00f020f - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 875b87ad02 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 3b5dabf1b4 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 34d7283e7f Merge branch 'task/MAR10001-0-price-alignment' into develop 8e65bc594d Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 8dfe5fec90 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 ee15adbefb Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 6788d78ee1 - Added the replenishment field to the variant grid for seeing continuation of the product 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 0f366ad09f - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right 088c985264 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right b6d7f1772b - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right ebc8363e17 - added validation message for DeliveryDate if date is not set in the future 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future a89e9104aa - Added deliveryDate validation to make sure the date is set in the future and not in the past 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past eaf95dab0d Merge branch 'task/MAR10001-905-add-managed-inventory-checkbox-external-wh' into develop efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses c264f475bf Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 0954d2ec6a Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1a40be8e75 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cc84bcd04a Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 38eba16600 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop fec2210535 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 413ab5a54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 702ee6d54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 1f2c18c580 - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress a2d4afdd38 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection 093dcc25e7 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection f26ffdd5e8 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection fd18d4d126 - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned 2732b90f59 - fixed unique constraints format...again :') 30af93134c Merge branch 'bugfix/MAR10001-0-fixed-wh-not-saved-on-group-after-edit' into develop d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 638cda5e39 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 2bb72991d5 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 bac1e39cb9 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 2dab594b86 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree e8d76690cb Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false bbf94da23a MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3baf789b98 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 9ede319aa5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 61a95f2361 Merge branch 'feature/MAR10001-931' into develop 51055f06a5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 7eca964b6c - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department e7c8029bbf - fix OrderExtension test to include the new twig functions 7377e59bc1 Merge branch 'feature/MAR10001-920' into develop e388452303 MAR10001-931: Update Order and OrderItem entities with additional fields 51798aa66f Merge branch 'maintenance/3.0' into develop 9b3d3fe985 Merge branch 'maintenance/3.0' into develop 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form e45d0240e1 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form b4e915f610 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form 0418a66a16 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 1af4a2e4d5 Merge branch 'maintenance/3.0' into develop 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file a380ca34ba Merge branch 'maintenance/3.0' into develop 039ba0a816 Merge branch 'maintenance/3.0' into develop 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 fe7ee95d06 Merge branch 'feature/MAR10001-909' into develop 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR1…
24198
added a commit
that referenced
this issue
Jun 30, 2022
…7fddcc 27fddcc Merge branch 'maintenance/3.2' f8a6d8d Merge branch 'maintenance/3.1' b1db9cc Merge commit '811ef2206a24fab7eadc1ce79793e0824b0943ae' 811ef22 Squashed 'package/marello-orocommerce-api-bridge/' changes from 8eed856..e3bbb1b 9688ace Merge commit 'b276cc4f074d49d5ec6350c57d688bf166f97cec' b276cc4 Squashed 'package/marello-orocommerce-bridge/' changes from 71530ac..37d46c2 18b3745 Merge commit '9f67f7572cfc6d39b784e82db4bdd16f358fc84f' 9f67f75 Squashed 'package/marello-subscriptions/' changes from 572ecd4cf6..22e314a744 556e55f Merge commit '9536aace135ecd468733ef940ba39f116809abfe' 9536aac Squashed 'package/marello-enterprise/' changes from c0f33b1..15fbabc 97e5b46 Merge commit 'fcf4a0a7663c216168cff63872e45378c8f3195d' fcf4a0a Squashed 'package/marello/' changes from d80705c..0b2497e e8d1233 Merge commit '5d7b3b1e1789bb3bfe3604a4bc3bce6e082978a8' 5d7b3b1 Squashed 'applications/marello-application/' changes from ce35880..14cf448 79db88d - prepare release EE 94ff1fe feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 4f584c1 Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 e530eba MAR10001-1006: Update platform to Oro BAP 4.2 - update dev.lock with the latest version of oro 65e3d43 Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 02cafaa Merge commit 'd98be8ad7ddc91a7faab73f2a280bf82b8ca6666' into maintenance/3.1 d98be8a Squashed 'applications/marello-application/' changes from ce35880..c4b6e75 fb7d35a - remove version lock of laminas/laminas-diagnostics from root composer.json 36de34f - prepare release b7d3ec2 - updated oro platform to 4.1.17 93aa97a - Updated AppKernel.php in order to fix issue with loaded bundle that doesn't exist in dev environment d455b4c Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 776a466 MAR10001-1006: Update platform to Oro BAP 4.2 - fix functional tests - remove some deprecation code usages that causes warnings d5d625f feature/MAR10001-1006-update-oro-platform-42: - updated environments with build image of marello-application && marello-application-ee - removed old environment setup files - added dev.lock for marello-application ec79b63 Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 ccc1b20 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 0540bd9 - Upgrade to Oro 4.2.7 - Fixes for PHP 8.0.x - Added fix for exposing fos js routes in marello enterprise application - Updated Dockerfile && docker-compose-ee.yml file for upgrade 4df5323 Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 ce47419 Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform 87f783e Merge branch 'maintenance/3.1' into develop 58f38ae Merge commit 'a9026146d19fc6cd027e1046e302574c90caced3' into maintenance/3.1 a902614 Squashed 'package/marello/' changes from f688b50..9bdcb5f 07c5025 Merge branch 'MAR10001-PR70' 55cf385 Merge branch 'MAR10001-PR70' into develop e4d70db Merge branch 'MAR10001-PR70' into maintenance/3.1 106e58d Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 16c1310 Merge branch 'MAR10001-PR68' into develop 9473221 Merge branch 'MAR10001-PR68' 3dd9d2f Merge branch 'MAR10001-PR68' into maintenance/3.1 346e429 Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 6f2f35f Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' 3b7bdd1 Squashed 'package/marello/' changes from 73c2e39..d80705c 4936b2f Merge branch 'maintenance/3.0' 8df50a8 Merge branch 'maintenance/MAR10001-0-update-environments' into develop 2f12aeb Merge branch 'bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid' into maintenance/3.1 bded067 Merge commit 'ef28bce435a1bc54d56132a96267c092852fac1b' into maintenance/3.0 ef28bce Squashed 'package/marello-orocommerce-bridge/' changes from f0fabf9..71530ac ef67d52 Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.1 68555d9 specify full namespaces in Doctrine DiscriminatorMap 080bcf6 task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled a7a369c - added hasColumn() checks on fields that might already be added in previous version 1ac2059 Merge commit '31e5dbd6a2b67a50f51ed8cd3c2e92b1d880bc20' into maintenance/3.1 31e5dbd Squashed 'package/marello/' changes from 0bc0152..f688b50 5785eec Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 af75dcc task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand 094cb43 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 eec7e33 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 cacd84f Squashed 'package/marello/' changes from 0bc0152..73c2e39 b16f33e - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 3a931b8 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform 498ea7d - change environment on marello-reset composer script to prod 4397fde - updated platform to 4.2.3 on all main applications and combinations c3caf1f Merge branch 'feature/MAR10001-984' into maintenance/3.1 ed909d3 Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 de30b84 - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages 41ef790 Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' 39f038e Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop ccd40f8 - added company number column, filter and sorter 9d749c8 Merge branch 'merge-service-points-30' into maintenance/3.1 d6640f9 Merge branch 'feature/MAR10001-880' into merge-service-points-30 def0844 Merge branch 'feature/MAR10001-880' into merge-service-points-30 43204fa Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 0e5e29c Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 7b17852 Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' 7a2dcc2 - updated marello-enterprise tag 3533ff1 Merge commit '6dca2f914f41c1d50b12d89632b00f4c2bf4e2e3' into release/3.1 120ee79 Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' 3c16da7 - remove locks from master 7d1ea52 Merge branch 'release/3.1' e6cabdd Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' f0d3e3e - Preparing release changes ba21f16 Merge branch 'release/3.1' c5ed60b Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 7c3f91e Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 90ffddc - preparing release bc3fe5f - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 6c88c0b Merge branch 'bugfix/MAR10001-0-products-grid-not-displaying' into develop a05a891 Merge branch 'bugfix/MAR10001-0-deployment-type' into develop ab47126 - Added deployment type to parameters dist 48f56ea - updated oro platform 71751e1 Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 73c2e39 - Added minor fixes to purchase orders view and form 0b1879a - Added minor fixes to purchase orders view and form 7b00a7d - Added possibility to update cost via marello-supplier-product-grid 4cb837d - Added possibility to update cost via marello-supplier-product-grid b354709 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 c0e9f67 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 3069f27 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 341c242 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 1591559 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 2723bd7 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 ea89784 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 9a16f47 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 bc32cb4 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 df7312f Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 26a030a Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 fcc9e1e Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 78525a8 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 cf8c669 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 f7387ee Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 4691dc1 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 dcc89de Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 0846a6d Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 cded449 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 7ffe871 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 746d1e3 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d4218be - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d8cd80b - added additional check before loading the purchase price in the Purchase Order Item c5e866d - Added support to display extended fields on SalesChannel view & grid f1ae5c3 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration ac086a6 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 7e67af6 Non expected return type (interface non-implemented) e4a5112 - 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 ff92270 - updated product category grid on the category view to take the localized value of product name into account fb27de8 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 1052506 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) de4c45e - added default ACL config value for Tax Related entities e533e03 - 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 5df701d Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 96b2ea2 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 69c3020 - Added shipping method details to store additional information regarding the shipping method on the Marello Order 498798c Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 b30e6a2 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 2fe8c53 - Added rendering for additional data block with dynamic entity fields 528b4f3 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop fb69b55 - Added context option check for forceFlush in the inventorylevellogrecord fede6ba Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 ca7f87a Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 bbc7ca8 - Updated validation groups for Order validation - Added SKU to the available inventory validation message c139869 - 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 2e6dbe3 - 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 a470292 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop a523e45 - 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 2b47b38 - 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... 1689fa2 Merge branch 'maintenance/3.0' 47b2708 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 5860ffb Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 3b86ae6 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 10d5b30 - 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) 5fd45f1 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 728e339 MM-42: Test and fix functionality (#66) 5675d75 MM-42: Test and fix functionality (#65) ea13d64 MM-40: Test and fix import order functionality (#63) 741e626 MM-38: Implement sync processors (#61) e704e9f MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) dedeb1b - 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 9d80633 - 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 f92a606 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 2c3af6f - 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 626ff0f - 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 659a93c - 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 7be50e1 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation e059902 - fixed renaming email templates for Order and Invoice notifications 937c296 - Updated email templates with new style d361e5f MAR10001-880: Service points updates(fixed conflicts) a1c7b24 MAR10001-880: Service points updates 4cf0ed2 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 8441271 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart bb33a03 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start fbf2ac9 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop 08f9f1d - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 42df0cb - added order status change for 'new' workflows in Marello a544ca4 Merge branch 'task/MAR10001-0-add-order-status' into develop ca16950 - 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 0d0a1b3 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop 7669b9b Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop c973ae1 - 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 e170523 - split the SalesBundle migrations as v1_3 was already released... 2d7858a Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 510f97f Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 9c7a5b2 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 0ceb77a Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 d0e8d50 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 33eba24 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 7d06b51 Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 138d8bd Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 9cbeacd Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 b59babd Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 da8a1ff Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 7554189 Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 b70a3aa Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 7f802ec - renamed migrations to take newer versions of migrations into account on the develop branch fc3fef4 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 04df3e3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 67e9557 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 908ee7f - 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 a9eb6a5 - 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 0b36166 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved eef4e67 - 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 f0c438a - Added unitOfMeasurement to the InventoryItem view f0f2ad3 - added unitOfMeasurement to InventoryItem grid with filters and sorters be907e3 - 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) 6a16bdb Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop c2b00f0 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address c55bef7 - added config to include M2 bundle - updated dev.json/dev.lock with M2 875b87a Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 0021e8b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 3b5dabf Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 34d7283 Merge branch 'task/MAR10001-0-price-alignment' into develop 8e65bc5 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop 8dfe5fe Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 ee15adb Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 6788d78 - Added the replenishment field to the variant grid for seeing continuation of the product 0f366ad - 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 ebc8363 - added validation message for DeliveryDate if date is not set in the future a89e910 - Added deliveryDate validation to make sure the date is set in the future and not in the past c264f47 Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 1a40be8 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cc84bcd Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 38eba16 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop fec2210 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 413ab5a - 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 a2d4afd - 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 fd18d4d - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned 2732b90 - fixed unique constraints format...again :') f1a3892 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 638cda5 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop b2975e5 - removed composer.lock file from master 9fc64ba Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' 318b676 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' ce35880 Merge pull request #11 from clicktrend/patch-1 fb3ba63 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 bac1e39 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 bc9952c Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 2dab594 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 b7f4c0e Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' e8d7669 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d4540e9 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false bbf94da MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 61a95f2 Merge branch 'feature/MAR10001-931' into develop 51055f0 - 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 7eca964 - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department e7c8029 - fix OrderExtension test to include the new twig functions 7377e59 Merge branch 'feature/MAR10001-920' into develop e388452 MAR10001-931: Update Order and OrderItem entities with additional fields 0be11c4 Merge branch 'maintenance/3.0' into develop 9b3d3fe Merge branch 'maintenance/3.0' into develop 1af4a2e Merge branch 'maintenance/3.0' into develop 9dbcd1c Merge branch 'maintenance/3.0' into develop 039ba0a Merge branch 'maintenance/3.0' into develop 78a6e61 Merge branch 'maintenance/3.0' into develop fe7ee95 Merge branch 'feature/MAR10001-909' into develop 58bb42c - renamed Company code to Company number - added pdf translation - moved company number on the PDF 177b62d Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 9947664 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop a1466dd Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop f847771 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 132d4b0 MAR10001-909: Add Company ID to Company 3cff7d4 Merge branch 'maintenance/3.0' into develop 2a68ce8 Merge branch 'maintenance/3.0' into develop 55048a6 MAR10001-909: Add Company ID to Company b06cfde Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 965a577 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into develop 0c2fd4b MAR10001-920: Payments Update fc8330c MAR10001-920: Payments Update 90c3238 MAR10001-920: Payments updates f71c6cd MAR10001-920: Payments updates ff26f8a Merge branch 'feature/MAR10001-911' into develop b62f79e Merge branch 'feature/MAR10001-911' into develop 365738d - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail 231dd56 - fixed issue with updating the application from 3.0.x to 3.1 during issues updating indexes on columns that don't exist 9f011dc - CS fixes 158a39f MAR10001-911: Update Product with SKU and organization unique index 670ddcf Merge branch 'feature/MAR10001-791' into release/3.1 2ef748b Merge branch 'feature/MAR10001-791' into release/3.1 b51d7fd Merge branch 'task/MAR10001-0-add-grid-view-labels' into develop 00a75fb Merge branch 'task/MAR10001-0-add-grid-view-labels' into develop d09fdc4 MAR10001-911: added migrations 7c5c499 MAR10001-911: added migrations 201a0e2 - updated pricing js views in order to be able to disable channelpricing without errors in the console 5ba2572 Merge branch 'task/MAR10001-895-add-invoice-type-to-creditmemo-invoice-view' into develop d6ebf16 Merge branch 'task/MAR10001-895-add-invoice-type-to-creditmemo-invoice-view' into develop 4a72df4 Merge branch 'task/MAR10001-896-update-invoice-entity-config' into develop ebb51c2 Merge branch 'task/MAR10001-896-update-invoice-entity-config' into develop a84cd77 Merge branch 'feature/MAR10001-870' into develop f35a522 Merge branch 'feature/MAR10001-870' into develop 353ec71 MAR10001-791: Marello Payments - fixed functional tests - fixed Invoice totalPaid, totalDue calculations ae947db Merge branch 'maintenance/3.0' into feature/MAR10001-791 2dad104 Merge branch 'maintenance/3.0' into feature/MAR10001-791 096ffa2 Merge branch '3.0' into feature/MAR10001-791 c635fe5 Merge branch '3.0' into feature/MAR10001-791 d8f6246 MAR10001-791: Marello Payments cb16773 MAR10001-791: Marello Payments 89c1f39 Update routing.yml 8913643 CRH19001-18; Update API for overrides 9ace12f CRH19001-18; Update API for overrides cd74db3 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 fe3d83d Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements fd1a7eb - remove lock files 942b01e - remove lock files from master 08ed5eb - Release preparation 2.1 fcbd86d Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 d79c4f4 Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 680e701 - updated version number in upgrade notes 61d89c6 - prepared composer.json files for release 8033763 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 9552e48 - updated dev.lock files 98eb6c0 - updated dev json and lock file to include oro 3.1.9 - small changes regarding docker environment files 4c72f7d - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products d3ed4d0 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 17383a0 - added composer.lock to .gitignore - remove composer.lock files 4ecfc51 - added composer.lock - added dev.lock - updated branch alias in marello package composer.json 05e1647 Add 'applications/marello-application-ee/' from commit 'd13f2b41e079dff4eee99f8874928459658daaff' a56511d Merge commit '44448293702551e588fff6fd5860d9d1e0db4a11' as 'package/marello' git-subtree-dir: applications/marello-application-ee git-subtree-split: 27fddcc
24198
added a commit
that referenced
this issue
Sep 6, 2022
…8a1891 c8a1891f8a Merge branch 'release/4.0' 58e3ee8b38 Merge commit 'fab8d900274f2ab4822280f61f179b74307d349c' e12af400fe Merge commit '6e65bfbc703958cacaeaf25cef5fae6040e842eb' 6dcfbaf2e6 Merge commit 'e572be775f0196ad9931e8bf49c9e3e2d4f6d618' 3f7c16ae8f Merge commit 'e3bbb1bbdd8a07571e6d21cbc141d93ed353c1d4' 794bba4aa1 Merge commit '37d46c202ff627e635014c96936e95e09be7d833' 43e6c251a4 Merge branch 'feature/MAR10001-1039' into feature/MAR10001-0-order-allocation 1cae79f97a MAR10001-1039: Upgrade OroPlatform to 5.0.x - fixed normalizers - fixed community version - updated .lock files 5d6666fee6 Merge branch 'feature/MAR10001-1039' into demo-allocation-branch-50 a771001585 MAR10001-1039: Upgrade OroPlatform to 5.0.x - removed JMS - fixed functional tests that used _token parameter in the request - fixed skipped template path usage - made user fixtures compatible with oro 128e6afc12 Merge branch 'demo-allocation-branch' into test-branch 5f45e120b4 MAR10001-1039: Upgrade OroPlatform to 5.0.x - fixing api + extended entity collection methods for Product a9e3f431a6 MAR10001-1039: Upgrade OroPlatform to 5.0.x - fixed assets issue - fixed controllers usage - fixed twig templates usage and twig constructions - fixed repositories usage 750231dc0c Merge branch 'feature/MAR10001-0-order-allocation' into demo-allocation-branch 4348400b77 Merge branch 'develop' into feature/MAR10001-0-order-allocation 77b295d0fd Merge branch 'feature/MAR10001-0-order-allocation' into demo-allocation-branch 3435d65b55 feature/MAR10001-0-order-allocation: - Added transition eventlistener to create ReplenishmentOrders for allocations that are suballocations for a consolidation order 133851761c Merge branch 'feature/MAR10001-788-order-consolidation' into demo-allocation-branch 37bc4ea630 Merge branch 'feature/MAR10001-0-order-allocation' into demo-allocation-branch aca2182434 feature/MAR10001-1039: - Updated monolog config for production due to memory leak resulting in sigterm kills of process 4042c3c28d MAR10001-1039: Upgrade OroPlatform to 5.0.x - initial commit 15f1779987 Merge branch 'bugfix/MAR10001-0-fix-issue-with-missing-dependency' 243ed7fd3e Merge branch 'bugfix/MAR10001-0-fix-issue-with-missing-dependency' into develop 8047ff14a4 feature/MAR10001-788-order-consolidation: - Added consolidation enabled column to Order entity table 2836e51ec9 Merge branch 'develop' into feature/MAR10001-0-order-allocation 041b8881be MAR10001-1016: Simple Integration Status monitor - added MarelloHealthCheckBundle - created grid + dashboard widget 1fdc0778ab Merge commit '4861529cedd1765613434503bc084b74a5cffddf' into maintenance/3.2 fab8d90027 - remove locks 0e91fd6632 - remove locks 3f19c94a42 Merge branch 'maintenance/3.2' 0beb88cf2d Merge branch 'maintenance/3.2' 92c3f8d51d - prepare 3.2 CE release 756df9e8dd - prepare EE 3.2 release 321238a37c Merge commit '0e5c853ef17f503cf68829ceff886c53390327c3' into maintenance/3.2 24db399e7b Merge commit '0e5c853ef17f503cf68829ceff886c53390327c3' into maintenance/3.2 0e5c853ef1 Squashed 'package/marello-enterprise/' changes from c0f33b1479..279fe1bc86 6e65bfbc70 Merge branch 'maintenance/3.2' e572be775f Merge branch 'maintenance/3.2' d90f7b075b Merge branch 'maintenance/3.2' 42385d5ea3 Merge branch 'maintenance/3.1' 9ecf753543 Merge branch 'maintenance/3.1' fbc2f39d78 Merge branch 'maintenance/3.1' ba6baff5da Merge commit '811ef2206a24fab7eadc1ce79793e0824b0943ae' a649a8de66 Merge commit '811ef2206a24fab7eadc1ce79793e0824b0943ae' a6319f4c9d Merge commit '811ef2206a24fab7eadc1ce79793e0824b0943ae' deeaefcbe0 Merge commit 'b276cc4f074d49d5ec6350c57d688bf166f97cec' b383d53b5d Merge commit 'b276cc4f074d49d5ec6350c57d688bf166f97cec' 1dc7d12c9e Merge commit 'b276cc4f074d49d5ec6350c57d688bf166f97cec' 8e1cf7a777 Merge commit '9f67f7572cfc6d39b784e82db4bdd16f358fc84f' 7ef749a1b0 Merge commit '9f67f7572cfc6d39b784e82db4bdd16f358fc84f' 2958e409c4 Merge commit '9f67f7572cfc6d39b784e82db4bdd16f358fc84f' eec4645631 Merge commit '9536aace135ecd468733ef940ba39f116809abfe' 3164365192 Merge commit '9536aace135ecd468733ef940ba39f116809abfe' 2bd702044d Merge commit '9536aace135ecd468733ef940ba39f116809abfe' f2fad9d4b0 Merge commit 'fcf4a0a7663c216168cff63872e45378c8f3195d' b2d94e7a75 Merge commit 'fcf4a0a7663c216168cff63872e45378c8f3195d' 927bf14733 Merge commit 'fcf4a0a7663c216168cff63872e45378c8f3195d' 0006463c5d Merge commit '5d7b3b1e1789bb3bfe3604a4bc3bce6e082978a8' dcfd5af0c4 Merge commit '5d7b3b1e1789bb3bfe3604a4bc3bce6e082978a8' 4a070560cc Merge commit '5d7b3b1e1789bb3bfe3604a4bc3bce6e082978a8' f3f8fe434d - prepare release CE c8f39ac2eb feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 5162fafb9f feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 6c8b6e7791 feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() 8d09a3ff82 MAR10001-1006: Update platform to Oro BAP 4.2 - update dev.lock with the latest version of oro d1838f8b87 Merge branch 'bugfix/MAR10001-1032' into feature/MAR10001-1006-update-oro-platform-42 ba2ce17fa2 Merge branch 'bugfix/MAR10001-1032' into feature/MAR10001-1006-update-oro-platform-42 87e7c9fe11 Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 48debe89d0 Merge commit 'd98be8ad7ddc91a7faab73f2a280bf82b8ca6666' into maintenance/3.1 0d7637824d Merge commit 'd98be8ad7ddc91a7faab73f2a280bf82b8ca6666' into maintenance/3.1 dfd8683201 Merge commit 'd98be8ad7ddc91a7faab73f2a280bf82b8ca6666' into maintenance/3.1 050f0fba37 - prepare 3.1.1 application release 3901f5f6e4 Merge commit 'a2e75c0a0b4c46f407bebbb4e69238466adc6382' into maintenance/3.1 a923e94d19 Merge commit 'a2e75c0a0b4c46f407bebbb4e69238466adc6382' into maintenance/3.1 9184f9637b Merge commit 'a2e75c0a0b4c46f407bebbb4e69238466adc6382' into maintenance/3.1 a2e75c0a0b Squashed 'applications/marello-application-ee/' changes from 2c693602ba..7a2dcc27c6 1d99ac4c33 bugfix/MAR10001-1032: - Fixed bug with Global Access organization not being able to place orders, create payments or payment rules in non global access organization - Prevent Order workflow start when order is created from Global Access organization as this would result an error with permissions - Added changes for EE to make sure the correct organization parameters are available on templates to prevent Organization selector loop 5718cfeca1 bugfix/MAR10001-1032: - Fixed bug with Global Access organization not being able to place orders, create payments or payment rules in non global access organization - Prevent Order workflow start when order is created from Global Access organization as this would result an error with permissions - Added changes for EE to make sure the correct organization parameters are available on templates to prevent Organization selector loop b93b92856e - removed debug lines from refund totals view dbcaf49a1a MAR10001-1006: Update platform to Oro BAP 4.2 - fix the last functional test 3dd23fba70 MAR10001-1006: Update platform to Oro BAP 4.2 - fix failed yaml file after merging 88489d2bbd Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 7ca034fbde MAR10001-1006: Update platform to Oro BAP 4.2 - fix functional tests - remove some deprecation code usages that causes warnings 8e751249c5 MAR10001-1006: Update platform to Oro BAP 4.2 - fix functional tests - remove some deprecation code usages that causes warnings 94084e540a feature/MAR10001-1006-update-oro-platform-42: - PSR2 fixes 03bd945c9a feature/MAR10001-1006-update-oro-platform-42: - Fixed issues with data fixtures for Refund functional tests - Updated missing translations for Refund related entities 9cd0eed406 feature/MAR10001-1006-update-oro-platform-42: - updated environments with build image of marello-application && marello-application-ee - removed old environment setup files - added dev.lock for marello-application 8f588d58e7 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist d5fe1a4813 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist 891b5dfd74 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist 6c3587a315 Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 6d4a55c76c Merge branch 'feature/MAR10001-1006-update-oro-platform-42' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-1006-update-oro-platform-42 407dbe1c5e MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 45467025a6 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 1e6e257078 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 4fbc19b1a8 - Upgrade to Oro 4.2.7 - Fixes for PHP 8.0.x - Added fix for exposing fos js routes in marello enterprise application - Updated Dockerfile && docker-compose-ee.yml file for upgrade 5eab4fee73 - Upgrade to Oro 4.2.7 - Fixes for PHP 8.0.x - Added fix for exposing fos js routes in marello enterprise application - Updated Dockerfile && docker-compose-ee.yml file for upgrade ef7346a22a Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 6cc750fff1 Merge branch 'feature/MAR10001-827' into develop cc63a0cdbe Merge branch 'feature/MAR10001-1002' into feature/MAR10001-1006-update-oro-platform-42 e0feed709f feature/MAR10001-1002: - Changed translation to be workflow related instead of Sales channel assignment 5198241bb3 feature/MAR10001-827: - fixed minor issues with tax calculations - updated views to reflect new tax calculations - added additional fields for refunds and refund items to store the taxes and subtotals 26427b38a6 MAR10001-1002: Transit workflow Mass action(s) - created new workflowtransit mass action with sync/async processing - added email report after async or failed processing - added documentation 45e89a01bf Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 8e22013a3c Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 18c52b4911 Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 7a9bdd7d3c feature/MAR10001-827: - Fixed minor issues with refund totals - Split totals and balance on refund create - Added totals and balance update based on input e682e2a6db Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform c2c2f012f6 Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform 840b0d158f Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform 19dae8dfcd feature/MAR10001-827: - Renamed old view(s) from totals to balance as this will now represent the balance of all refunds for this particular order eb9698bda4 feature/MAR10001-827: - Changed calculations for showing refunds total (all refunds combined) - Added header for view specifically for totals - Removed unnecessary code from RefundTotalsProvider - Updated keys from amount to refundtotals / refund_totals - Updated translations 341e887bfd [WIP] feature/MAR10001-827: - Removed updated/created at from create/edit and view page - Changed OrderItem:price in refund item to OrderItem:purchasePriceIncl - Added tax and tax code fields in item grid on refund create page - Added tax totals and subtotals to Refund entity 905c5a3579 Merge branch 'bugfix/MAR10001-868' into merge-branch a2266f3891 Merge branch 'maintenance/3.1' into develop ed49174f54 Merge branch 'maintenance/3.1' into develop 768a6b1019 Merge branch 'maintenance/3.1' into develop 627fe5a327 feature/MAR10001-981: - Removed receivedAt from Return create as it is illogical to set a received date without being received - Added receivedAt as option for default workflow transition from pending to received - Made receivedAt and trackAndTrace code fields nullable in DB 5e6d03821e Merge branch 'bugfix/MAR10001-986' into feature/MAR10001-981 69f3f20939 bugfix/MAR10001-986: - Fixed translation key for company on return view - Removed created/updated at from return view general information - Moved saleschannel form field rendering to generalInformation block in create ad97adbc58 Merge branch 'bugfix/MAR10001-986' into maintenance/3.1 6e03b6aa55 Merge commit 'a9026146d19fc6cd027e1046e302574c90caced3' into maintenance/3.1 3c6b67188b Merge commit 'a9026146d19fc6cd027e1046e302574c90caced3' into maintenance/3.1 0b2497e159 Merge branch 'MAR10001-PR70' 13989822b6 Merge branch 'MAR10001-PR70' bd746f0280 Merge branch 'MAR10001-PR70' 42436f4710 Merge branch 'MAR10001-PR70' ec10461562 Merge branch 'MAR10001-PR70' into develop 1a43b16deb Merge branch 'MAR10001-PR70' into develop 3055661082 Merge branch 'MAR10001-PR70' into develop 2aa0d9f0d4 Merge branch 'MAR10001-PR70' into maintenance/3.1 bcd98a0be7 Merge branch 'MAR10001-PR70' into maintenance/3.1 908ac83456 Merge branch 'MAR10001-PR70' into maintenance/3.1 1ff9042bd3 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 ad4654ec92 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 a813b5b8c3 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 5140659352 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 35960e7bce Merge branch 'MAR10001-PR68' into develop c4232edea6 Merge branch 'MAR10001-PR68' into develop fff2f46db3 Merge branch 'MAR10001-PR68' into develop e4fba070df Merge branch 'MAR10001-PR68' d72fe657cf Merge branch 'MAR10001-PR68' b0b7b70c63 Merge branch 'MAR10001-PR68' e753e8bc15 Merge branch 'MAR10001-PR68' d16c3e62fd Merge branch 'MAR10001-PR68' into maintenance/3.1 36336dbb0e Merge branch 'MAR10001-PR68' into maintenance/3.1 38587d94ec Merge branch 'MAR10001-PR68' into maintenance/3.1 fa3b3cd14f Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 836040fe45 Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 a0dcec31f2 Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 5b5679adcb Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 769586ae5b Merge branch 'maintenance/3.0' 3a07f03a22 Merge branch 'maintenance/3.0' d7b6e5f98a Merge branch 'bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0' into develop e86d3471f6 Merge branch 'bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0' into maintenance/3.1 36e1386f17 bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0: - Fixed issue with balanced inventory going below 0 if there is more reserved inventory on the balanced inventory than there is actual inventory to be balanced af7eb4e77b bugfix/MAR10001-0-prevent-balanced-inventory-going-below-0: - Fixed issue with balanced inventory going below 0 if there is more reserved inventory on the balanced inventory than there is actual inventory to be balanced b428699cb2 Merge branch 'maintenance/3.0' dca60fbd40 Merge branch 'maintenance/3.0' 013142ed07 Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.0 ef0e7f32ff Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.0 7be23d91b0 Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' 4f39aec27a Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' 4de282982b Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' 74765447dd Merge commit '3b7bdd1d14f56c555caf234e8d8f0607013a8fc3' f29ea6b158 Merge branch 'maintenance/3.0' db62206ca7 Merge branch 'maintenance/3.0' 7d95094290 Merge branch 'maintenance/3.0' 5b4e945802 Merge branch 'maintenance/3.0' 07cf508d4e Merge branch 'maintenance/MAR10001-0-update-environments' into develop d82104c52c Merge branch 'maintenance/MAR10001-0-update-environments' into develop 059ac10aca Merge branch 'maintenance/MAR10001-0-update-environments' into develop 42ec3a7e5d Merge branch 'bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid' into maintenance/3.1 5a1266be86 Merge branch 'bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid' into maintenance/3.1 fd736159a0 Merge branch 'bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid' into maintenance/3.1 1208b2253a bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid: - Fixed issue with search on orderReference and orderNumber in both Refund/Return grid bead7030f6 bugfix/MAR10001-1001-ordernumber-orderreference-search-in-refund-grid: - Fixed issue with search on orderReference and orderNumber in both Refund/Return grid d3ae6556e8 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 17d433d8c7 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 3fbba45e19 Merge commit 'ef28bce435a1bc54d56132a96267c092852fac1b' into maintenance/3.0 5c1bb3f682 Merge commit 'ef28bce435a1bc54d56132a96267c092852fac1b' into maintenance/3.0 dafaf5bd96 Merge commit 'ef28bce435a1bc54d56132a96267c092852fac1b' into maintenance/3.0 46f3992a80 Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.1 602d2a2f8f Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.1 eda6f25968 Merge branch 'bugfix/MAR10001-998-fix-refund-validation' into maintenance/3.1 1f76aac3fc bugfix/MAR10001-998-patch-issue-with-refund-validation: - Moved validation for Refund to the complete Refund instead of items - Added currency symbol and formatting to the refund items price - Removed the exception from the subscriber that is interfering with the validation - Added validation to prevent negative refund amount on items 900b675c47 bugfix/MAR10001-998-patch-issue-with-refund-validation: - Moved validation for Refund to the complete Refund instead of items - Added currency symbol and formatting to the refund items price - Removed the exception from the subscriber that is interfering with the validation - Added validation to prevent negative refund amount on items d343b84e48 - Prototype part 2 a8760c87fd task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled 9f3d932ed1 - added hasColumn() checks on fields that might already be added in previous version 06c6a2948f Merge branch 'task/MAR10001-0-order-on-demand' into develop b381c6c6c7 Merge commit '31e5dbd6a2b67a50f51ed8cd3c2e92b1d880bc20' into maintenance/3.1 a0a831bac7 Merge commit '31e5dbd6a2b67a50f51ed8cd3c2e92b1d880bc20' into maintenance/3.1 9bdcb5f234 Merge commit '31e5dbd6a2b67a50f51ed8cd3c2e92b1d880bc20' into maintenance/3.1 934f72267e Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.1 f7c3d90fe2 Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 ee0f8e577a task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand 427da51dcf Merge branch 'task/MAR10001-0-order-on-demand' into develop 817c6c2e76 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 2f01383a05 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 ba58809f0b Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 d598f64be0 Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.1 5391c9c9d9 - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 3584af6c21 - fixed refunds fa48a77166 - Fixed namespaces and classes f3ba5aab60 - Fixed namespaces and classes 9faf259599 - Fixed namespaces and classes Registry/ObjectManager - Switched fields expiration date and purchase price on inventory batch view/edit 7eda473193 - Updated namespaces && classes for ManagerRegistry and ObjectManager - Removed deprecated workflows - Added additional error message for when consumers aren't running and return flow cannot be completed because of that 5166a9f947 MAR10001-868: Fixed new created refund. Removed unused code 6b7de7d08b Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform c86263b7b3 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform 2b702d3604 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform 731732811e Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into maintenance/3.1 38a655ba62 - Fixed issue with schema update with updating table because of foreign key constraint a82942bfca Merge branch 'feature/MAR10001-988' into develop 4102983adf Merge branch 'feature/MAR10001-988' into maintenance/3.1 a213c6b018 MAR10001-988: Minor fixed version of migration and create view changes 8e38e69f5f Merge branch 'feature/MAR10001-987' into maintenance/3.1 97521f48ed Merge branch 'feature/MAR10001-987' into develop 47ec7b1059 - updated platform to 4.2.3 on all main applications and combinations bd3b906e03 - updated platform to 4.2.3 on all main applications and combinations b5d883c0d9 - updated platform to 4.2.3 on all main applications and combinations d40a92e17a MAR10001-968: Fixed unique name fields - unique on both: name, organization 715712fb0b Add new reason for return items 80bbc82223 Add additional fields to Return Entity, update views 9d50318ee6 MAR10001-988: Add additional fields to Return Entity 9b9fe64697 Disable refund if refund submitted in order total amount 6a1c2b223f Merge branch 'develop' of github.com:marellocommerce/development-mono-repository into develop 16ecea2e1b Fixed when change a refund - calculate refund totals values 4326c3006b - fixed merged conflict 95385a3b2b Merge branch 'feature/MAR10001-984' into maintenance/3.1 84dd344f9b Merge branch 'feature/MAR10001-985' into maintenance/3.1 c77ae590bd MAR10001-985: Rename Tabs/headings on the Return view page 8feec132e3 Add Customer information to Return view f53907f968 Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 1bae8cd5e9 Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 5067315595 Merge branch 'feature/MAR10001-0-update-oro-platform' into maintenance/3.1 48e2baf432 - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages abbc3fd12a - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages 91ca20ff2c - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages 62086c9202 Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' 72b788b8f6 Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' 32e9ef2e3d Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' dca587186e Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' efd26dbcac Merge branch 'bugfix/MAR10001-0-fix-invalid-yaml-magento2-bundle' into maintenance/3.1 588f418158 Merge branch 'task/MAR10001-0-add-product-status-validation' into develop 6c4c4ea40d task/MAR10001-0-add-product-status-validation: - Added check for product status before balancing inventory for said product - Added validation + validation message for Product status 73268264aa Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop e661a0f571 Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop 2912aec318 Merge branch 'task/MAR10001-982-0-add-company-number-to-grid-and-filter' into develop 30cd7f3c3a - added company number column, filter and sorter 7249fe2ae2 Merge branch 'merge-service-points-30' into maintenance/3.1 60a0845d56 Merge branch 'merge-service-points-30' into maintenance/3.1 4ba331e35d Merge branch 'merge-service-points-30' into maintenance/3.1 b78ac3d7cf Merge branch 'feature/MAR10001-880' into merge-service-points-30 29e31b652b Merge branch 'feature/MAR10001-880' into merge-service-points-30 fdd1425667 Merge branch 'feature/MAR10001-880' into merge-service-points-30 ff5840ed1b - fixed dev lock 4918dbf7bc Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 9a97c2574f Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 935e9ee0da Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' d52c2ca5e4 Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' 292f519425 Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' ac4e8b8367 Merge branch 'bugfix/MAR10001-product-unit-wrong-type-order-create' e8749bd057 - fixed issue productUnit being submitted on order create, field should not be submitted at all dab670b110 - fixed issue productUnit being submitted on order create, field should not be submitted at all f0d2e6a1aa Merge commit '6dca2f914f41c1d50b12d89632b00f4c2bf4e2e3' into release/3.1 b0ba383194 Merge commit '6dca2f914f41c1d50b12d89632b00f4c2bf4e2e3' into release/3.1 ea5520ec11 Merge commit '6dca2f914f41c1d50b12d89632b00f4c2bf4e2e3' into release/3.1 6dca2f914f Squashed 'applications/marello-application-ee/' changes from 0ec7b8203d..2c693602ba 14cf448bca Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' da5e33361f Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' 1429434b97 Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' acbb6d81e3 Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' bee45cf84f Merge commit 'b2975e504ce49313f160f637df271153bdad6f03' 7b3b196d0d - remove locks from master c673edf9c9 - remove locks from master 000b968307 Merge branch 'release/3.1' c7cc25978e Merge branch 'release/3.1' fbe6998113 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' e5bfe2b65a Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 42cb65b63e Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 466aa72d80 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' 7620a00274 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' c4b6e750e8 - Preparing release changes 8fc7898ce3 - Preparing release changes df48ae575b - Preparing release changes 15fbabcec1 Merge branch 'release/3.1' d80705c83c Merge branch 'release/3.1' ddc115289d Merge branch 'release/3.1' 2be610485d Merge branch 'release/3.1' 9d60aab739 Merge branch 'release/3.1' c9c2c5bf8a Merge branch 'release/3.1' 3ac2782f9e Merge branch 'release/3.1' 6b2714be79 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' b7df2ced63 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 9d7f1ffcfd Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 646c2a7d45 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 9844a91ea5 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' c9dd9a7e5d Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' c4d74b57fa Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' c0d61547e5 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 9be5bc3877 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 7782fd9c24 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 28a8259a61 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' cdcc1506d6 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' 3ee7e48a6d Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' dbcd9e8b59 Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' ba0ce71e0b - preparing release b110da6fbd - preparing release 582e4796b1 - preparing release f688b50538 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's ca47f3cca9 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 0dcab9ced7 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's dc85fb40f5 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 564f132669 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 58deaedf82 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 443cc8b60f - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's c41c15110e - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 22397d3dc9 - fixed layout on payment popup on Invoice/Creditmemo 9465afdc47 - fixed layout on payment popup on Invoice/Creditmemo cc33c5ac63 - fixed layout on payment popup on Invoice/Creditmemo f17b373a72 - Added product unit as additional information to OrderItem on order create 968dfcf75c - Added product unit as additional information to OrderItem on order create 9c0805f1e5 - Added product unit as additional information to OrderItem on order create abdb830d3b - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 29cd362aac - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 207ab18c76 - Uncommented previously commented for no obvious reason on the OrderItemType - Fixed translation on workflow 5612933352 - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages e060f3794a - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 6cdba9e07e - Added view page for inventory batches - added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages 41316ec514 - added manage batches inventory link on inventory level grid on inventory item view 2d0aee8f24 - added manage batches inventory link on inventory level grid on inventory item view 280b221a2e - added manage batches inventory link on inventory level grid on inventory item view e88e920f8e - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 9e68b871b3 - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 5b1f26b6ae - Fixed product name in datagrid for inventory item / balanced inventory level grid not being updated after changing the product's name 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 5adca2d841 - 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 58b9be4595 - Added taxIdentificationNumber below company number on invoice entity view 000dcf379c - Added taxIdentificationNumber below company number on invoice entity view f9e6fa63b1 - Added taxIdentificationNumber below company number on invoice entity view d6301d05b7 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 5a41136389 Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop ccbf12911a Merge branch 'bugfix/MAR10001-970-batch-allocation' into develop 022ef1cf61 - Added small changes for batches; - added delivery date to batch form 1e179b6f07 - Added small changes for batches; - added delivery date to batch form 2c93950ff7 - Added small changes for batches; - added delivery date to batch form 6e84022f8d - Added small changes for batches; - added delivery date to batch form 60dc58e38e - Added small changes for batches; - added delivery date to batch form e388935ab9 - Fixed issue with selecting organization when creating products and purchase order e78d01e15f - Fixed issue with selecting organization when creating products and purchase order 1bae8129db - Fixed issue with selecting organization when creating products and purchase order ac4434b31f - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip debbd9f0db - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip f8c7d7e4dd - fixed inventory batch condition that didn't add the correct amount for a batch to a packingslip 01e83b08bc - Added organization to query for finding a specific sku for an organization a8317801d2 - Added organization to query for finding a specific sku for an organization 3fdb8c7b5c - Added organization to query for finding a specific sku for an organization b131e18705 - removed old query reference 5f4f0254d3 - removed old query reference dd0b0002e9 - removed old query reference c4a592aeeb bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 83badc9bf2 bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 0f1191592f bugfix/MAR10001-888-reports-per-organisation: - updated queries to cover organisation restriction 7cef74f82f - Added different calculation for total due on order view 2bd300f915 - Added different calculation for total due on order view e07665620e - Added different calculation for total due on order view 93fae97198 Merge branch 'bugfix/MAR10001-0-deployment-type' into develop dfdf03c807 - Added deployment type to parameters dist 01cf94a008 - Added deployment type to parameters dist 1d0c1d56c1 - Added deployment type to parameters dist dae0a29474 - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 287750fecb - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid e87a4988bb - Fixed issue with loading images during demo install - Fixed groupBy issues with products grid 3cede794ad - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 4c6a058db5 - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname e3868bd6d7 - Changed to Autocomplete for Customers to FullNameSearchHandler instead of the default searchhandler to include fullname 468cb34678 Merge branch 'develop' into feature/MAR10001-930 1e1a5486e6 Merge branch 'develop' into feature/MAR10001-930 5161e0dc29 Merge branch 'develop' into feature/MAR10001-930 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 62ea4952b4 - 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 89284c7368 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver dbc8defaa3 - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver 94d467e20e - Added additional check to see which query needs to be running for updating tax_identification_number based on db driver c76ce7b2a3 - added hasColumn() checks on fields that might already be added in previous version ee01c68790 - added hasColumn() checks on fields that might already be added in previous version 3f4cce348d - added hasColumn() checks on fields that might already be added in previous version d37fb2f87f - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 1a3639e998 - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 774a0c7490 - changed conditional statement in checking wether the width needs to be applied to the logo of the pdf 3896c6a4b2 - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 31edb26d40 - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 224dac710b - Fixed idententation to match all others for actions.yml file - added additional css classes to make sure there is space between buttons of pdf and payment - added is_granted to pdf download button 2094b8cf33 - Added fix for query on postgresql where customer tax identification is copied to company tax identification 01cf685ba1 - Added fix for query on postgresql where customer tax identification is copied to company tax identification ea9e32633b - Added fix for query on postgresql where customer tax identification is copied to company tax identification 7698d64336 - Updated auto complete label in warehouse select result a1bc0e6149 - Updated auto complete label in warehouse select result 09e90351ba Merge branch 'develop' into feature/MAR10001-894 5ba6a0387a Merge branch 'develop' into feature/MAR10001-894 96153fe160 Merge branch 'develop' into feature/MAR10001-894 1114b665ed Merge branch 'develop' into feature/MAR10001-894 f97ed63adc Merge branch 'develop' into feature/MAR10001-894 9ff7020eaf Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 9f3ab2f01a Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 167914be40 Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 9ca5b342fe Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 30868b4c8b Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop 7e74c1e45d Merge branch 'bugfix/MAR10001-0-apply-fixes' into develop c23d429fcd - Added minor fixes to purchase orders view and form 430ab3bb43 - Added minor fixes to purchase orders view and form 68a27031b9 - Added possibility to update cost via marello-supplier-product-grid dde294954d - Added possibility to update cost via marello-supplier-product-grid e2803cd7fc Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 cafa75d2db Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 b4ebc04473 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 eff2d014a6 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 667f4eb92a Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 a72855bef3 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 bd610c9fe6 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 4f6daa0fd1 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 bfcacc7924 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 11938e95b6 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 0106f8a6af Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 d3783f294c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 1c28c9ce6c Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 dd1fc54c82 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 2f2c637e5f Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 ef545d71ea Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 f1243cf07c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 f77b7fe9e9 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 455eddd360 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 9bf8fdef63 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 193d3fea6f Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 dbf681173f Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 32c5da7959 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 0f2d344502 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 6b79a0e49b Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 158709d60e Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 54c8d906fa Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 3baa45e432 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 4fe0a27217 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 77f4e7d52a Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 10e78edaac Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 20aa67991d Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 18fa4e9a86 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 7ebf9da685 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 668807adf4 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 c773624c19 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 fa8c7365e9 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 fb872d35ea Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 f43a14f52c Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 36d32c1249 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 9a5de91019 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 8758592c62 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 28dba967a0 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 5582224fde Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 873568bfac Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 03b2e7d2e1 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 2d021771e4 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 91d136e4c4 Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 06235763a6 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop 206a89b737 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop b75b6e3c74 Merge branch 'bugfix/MAR10001-0-add-additional-check-customer-address-in-order-create' into develop 3a6fd4c389 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty b383b8138d - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty f24d48ed8c - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 96d3c3da5f - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 7b5b79b442 - Removed redundant variable provider, functionality is already included in Marello\Bundle\ProductBundle\Twig\Provider\ProductUnitVariablesProvider 747adb97af - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data 497285847f - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data c705b2c200 - Added translations to Payments datagrid on Order and Invoice views that reflect the datagrid data eb19d4a8ad Merge branch 'develop' into feature/MAR10001-935 afe10013b2 Merge branch 'develop' into feature/MAR10001-935 08049b002c Merge branch 'develop' into feature/MAR10001-935 ea5c5088b5 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop b80a45a604 Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop 31fe08959d Merge branch 'bugfix/MAR10001-0-purchaseorder-item-api' into develop a094c2634f - added additional check before loading the purchase price in the Purchase Order Item 2a9faf61cd - added additional check before loading the purchase price in the Purchase Order Item 15b4e6cb17 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop 2b1ffd9160 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop 16c15423a2 Merge branch 'task/MAR10001-0-added-extended-view-support-for-saleschannel' into develop 087ed4444a - Added support to display extended fields on SalesChannel view & grid 40d84ffe1d - Added support to display extended fields on SalesChannel view & grid bfa263ae83 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 3396437ff1 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 8b2ba42502 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 20fde261ad - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration b943ecde6d - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 54f2d06e8e Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 4272c01b92 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 89ad052cf2 Merge branch 'bugfix/MAR10001-0-add-extended-entity-names-to-datagrids' into develop 01fbdd19db - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 8ea2cd21c2 - 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' f409304860 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' 2f38d38d89 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' 0ef6266f40 Merge branch 'feature/MAR10001-0-add-option-to-remove-product-from-website-only' 2759c63d9b Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop 42f96be742 Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop 89929b2130 Merge branch 'bugfix/MAR10001-957-Company-validation-fails-on-update' into develop fd7bff72f7 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number d4ffe67899 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number bb2f91c41b Merge branch 'bugfix/MAR10001-966-product-categories' into develop e9bdca05ad Merge branch 'bugfix/MAR10001-966-product-categories' into develop 977d0c78e7 Merge branch 'bugfix/MAR10001-966-product-categories' into develop a61fefe603 - updated product category grid on the category view to take the localized value of product name into account b80ea4d666 - updated product category grid on the category view to take the localized value of product name into account dc38902182 Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop 52ea970fdc Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop ef929bbabe Merge branch 'bugfix/MAR10001-499-Filtering-SalesChannel' into develop 0d046ca00d - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 68a34c4f05 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid 03e80ec3a6 Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop e997c2938b Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop 0b0b2d94c0 Merge branch 'bugfix/MAR10001-0-fix-order-reference-filter' into develop 59a5feccdb - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 576d4b4f84 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 92c620677e Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop d455e77b8e Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop 70469141f3 Merge branch 'task/MAR10001-0-add-acl-config-to-tax-related-entities' into develop 8ab3d7e3f8 - added default ACL config value for Tax Related entities d47846ac55 - added default ACL config value for Tax Related entities 2c90732536 Merge branch 'task/MAR10001-0-layout-fixes' into develop b594eab854 Merge branch 'task/MAR10001-0-layout-fixes' into develop dac4dc3188 Merge branch 'task/MAR10001-0-layout-fixes' into develop 57e9233303 Merge branch 'task/MAR10001-0-layout-fixes' into develop 1cfd56bd38 Merge branch 'task/MAR10001-0-layout-fixes' into develop be9bc2fa78 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 8cd21c566f - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done 7f3d36c199 - 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 1cac787f14 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 4ed8185f33 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 523ae78a3e Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 2954aa3a72 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop c59a474ba0 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop e2ec1d775e Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' into develop 3742532428 - fix issue with trying to display data based on an entity that isn't available 69df3b84b5 - fix issue with trying to display data based on an entity that isn't available 55eb3bfdb1 - fix issue with trying to display data based on an entity that isn't available 6ac00f0649 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 0339533106 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 635b95d3bd Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' 1d01d7ee8b Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' ee8b561249 Merge branch 'task/MAR10001-0-skip-configurables-magento-integration' ea7a6f8020 - Added shipping method details to store additional information regarding the shipping method on the Marello Order 78bff7f0ce - Added shipping method details to store additional information regarding the shipping method on the Marello Order 118a760896 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 277b7b6c9f Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 76b9c1c270 Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 867815803e Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 2fc02ae6dc Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 6a1f95564c Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 640751dc64 Merge branch 'task/MAR10001-0-add-additional-dynamic-entity-fields' into develop 45c33db503 - Added rendering for additional data block with dynamic entity fields cbc7d50021 - Added rendering for additional data block with dynamic entity fields 14058eedef - Added rendering for additional data block with dynamic entity fields cad063bee1 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop e0d3f5d967 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop e6a0344817 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop 359e5f74ba Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop 09708ba6a8 Merge branch 'task/MAR10001-0-add-force-flush-option-to-inventory-level-record' into develop e989f1fc2d - Added context option check for forceFlush in the inventorylevellogrecord 3b49897071 - Added context option check for forceFlush in the inventorylevellogrecord c185fb1e44 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 9943c2241a Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 131e3b5d63 Merge branch 'task/MAR10001-0-validation-fixes' into develop b256f6567d Merge branch 'task/MAR10001-0-validation-fixes' into develop 17b1a7558c Merge branch 'task/MAR10001-0-validation-fixes' into develop f298a72c0f - Updated validation groups for Order validation - Added SKU to the available inventory validation message 6e8fc2bac8 - Updated validation groups for Order validation - Added SKU to the available inventory validation message a8827625f5 Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop d3b061686c Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop 3d8c66ee62 Merge branch 'bugfix/MAR10001-0-calculation-packingslipitem-weight' into develop e9202e08c1 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 10f5e5a917 - 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 298078c1fb Merge branch 'maintenance/3.0' bd29a55f96 Merge branch 'maintenance/3.0' f14ebf3682 Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 4d029e0a1d Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 555426370c Merge branch 'bugfix/MAR10001-0-change-forbidden-exception' into develop 8ba3d9fc9e - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d33c6381c - 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 e973eb8ba0 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop 35883ca734 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop a987a95dec Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop dd4f67f6c9 Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop b2f03748ce Merge branch 'task/MAR10001-0-url-encode-magento-sku' into develop d6e420f96b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal 76800e09e4 - 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 a6045d1519 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 342c799e17 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 490196e5c4 multiple fixes 1ba0c3e52a multiple fixes 3f06d614a7 multiple fixes 7a56ff54b1 multiple fixes c5c10e837e multiple fixes d062de0b81 multiple fixes 5ccbb54a33 multiple fixes 5ecd69d938 multiple fixes a68a19e0fb Merge branch 'maintenance/3.0' 310d9d3771 Merge branch 'maintenance/3.0' 23fe6937ec Merge branch 'maintenance/3.0' d979b1fc14 Merge branch 'maintenance/3.0' 6f34f88cbf Merge branch 'maintenance/3.0' f407c95271 Merge branch 'maintenance/3.0' 0a97e336bb Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 994018b6b9 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 dde3fa2bb0 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 b48c0cc790 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 463b03d7b0 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 e19f59023c Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 c9908e12ec - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 817c626ab9 - 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) 68db65f41d - 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 5e319bcb99 Merge branch 'task/MAR10001-0-update-strategy-results-provider' into develop 5ffa1a8910 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 36185ab409 Merge branch 'maintenance/3.0' into develop 00cc1f1002 Merge branch 'maintenance/3.0' into develop f7824f46b1 Merge branch 'maintenance/3.0' into develop 4f65e8c8fb MM-42: Test and fix functionality (#66) 92bfd1afaa MM-42: Test and fix functionality (#65) a8bacc7078 MM-40: Test and fix import order functionality (#63) 4817829be9 MM-38: Implement sync processors (#61) 019a1bf6b1 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1000f2aef1 Merge branch 'task/MAR10001-0-cs-fix' into develop 266b6801d7 Merge branch 'task/MAR10001-0-cs-fix' into develop 0abc2d46e6 Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop e03adedeaa Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop e2b15f0dc8 Merge branch 'task/MAR10001-0-fix-productUnit-issue-email-template' into develop 9337f24e86 - fix indentation of the if statement in the strategy for clarification on where the if statement ends d7558a553b - 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 a2792d890a Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop 8e3b617483 Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop e124404ab5 Merge branch 'task/MAR10001-0-fix-default-value-for-data-property-on-entities' into develop c81490c68e - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity c7acf10796 Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 172732b53d Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 82aab359be Merge branch 'task/MAR10001-0-added-product-unit-twig-variable-provider' into develop 19aaa9bd4e Merge branch 'task/MAR10001-0-fix-shipping-context' into develop 314229d087 Merge branch 'task/MAR10001-0-fix-shipping-context' into develop fc84ac4ce0 Merge branch 'task/MAR10001-0-fix-shipping-context' into develop 5396e6dc3d - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 3dedc0dcd4 - 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 d037f75e6c - 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 65c85aa0df Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop f52eb64642 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 9ea3dafb87 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop f6cf066a29 Merge branch 'task/MAR10001-0-fix-checking-wrong-field-for-available-inventory' into develop 7e8e448b99 - 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 38d1fc24f1 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 66c6e9974d MAR10001-935: Payment updates 2 2421b27ff5 MAR10001-935: Payment updates 2 6bf387077a MAR10001-935: Payment updates 2 4e5e08104a - fixed renaming email templates for Order and Invoice notifications 619205b750 - Updated email templates with new style 737ea2f0be - Updated email templates with new style d7bf5f8068 MAR10001-880: Service points updates(fixed conflicts) c2a6083397 MAR10001-880: Service points updates 8ac4572927 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 7fb82d1f0e Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 05648340d7 Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 5ec1a6a54e Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 21fea86fc7 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart a7dc47feeb - fixed identation in service definition of wfa rule registry 3e8649c6a0 - Fixed issue with WorkflowStartListener where only the last order id (whi…
24198
added a commit
that referenced
this issue
Jan 20, 2023
…f7c2f 82f7c2f39b - prepare 3.2 CE release cb0ecc1dec - prepare release CE 7ca7b24465 feature/MAR10001-1006-update-oro-platform-42: - Updated application structure - Added changelog - Upated package/package-lock json files - Added fix for global access organization on Refunds - Added fix for ProductSupplierRelationRepository with incorrect sort order in impode() be34ba534a MAR10001-1006: Update platform to Oro BAP 4.2 - update dev.lock with the latest version of oro d05cff4186 feature/MAR10001-1006-update-oro-platform-42: - updated environments with build image of marello-application && marello-application-ee - removed old environment setup files - added dev.lock for marello-application 6d2ce90a42 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version - revert TestListener to a phpunit.xml.dist 0155416f70 MAR10001-1006: Update platform to Oro BAP 4.2 - fix unit tests according to new phpunit version 278244ab91 Merge branch 'develop' into feature/MAR10001-1006-update-oro-platform-42 a6b49570bf Merge branch 'maintenance/3.1' into feature/MAR10001-0-update-oro-platform acaeb255f3 Merge branch 'maintenance/3.1' into develop fd8e94e121 Merge branch 'MAR10001-PR70' into develop c4fa8afd68 Merge branch 'MAR10001-PR70' into maintenance/3.1 987ef4a549 Merge commit '68555d9f81f680a62989f8110a509e701ae86de8' into MAR10001-PR70 1cb4b73b8c Merge branch 'MAR10001-PR68' into develop 39a51636f5 Merge branch 'MAR10001-PR68' into maintenance/3.1 e258dab41e Merge commit '7e67af671722a1ced9fc332f3361ab8a5503d2bc' into MAR10001-PR68 68555d9f81 specify full namespaces in Doctrine DiscriminatorMap 080bcf6957 task/MAR10001-0-fix-po-logic: - fix issue with PO still being created while config was disabled a7a369c052 - added hasColumn() checks on fields that might already be added in previous version 5785eec93c Merge branch 'task/MAR10001-0-order-on-demand' into maintenance/3.0 af75dccc7d task/MAR10001-0-order-on-demand: - Added additional option to explictly enable inventory on demand eec7e33ad2 Merge commit 'cacd84fdc25bfba6449f9fae6efb80c9682cc406' into maintenance/3.0 b16f33e432 - Reinstated the order on demand feature, with additional setting to turn it on and off via the system configuration 994a321cb6 Merge branch 'bugfix/MAR10001-0-fix-issue-with-schema-update' into feature/MAR10001-0-update-oro-platform 8ef70d1ce8 - updated platform to 4.2.3 on all main applications and combinations f631fb1553 - Changed Marello CE/EE to include Oro Platform 4.1.14 - Updated applications to be able to run 7.4 normally - Updated branch aliases for packages ccd40f89e3 - added company number column, filter and sorter def0844f51 Merge branch 'feature/MAR10001-880' into merge-service-points-30 0e5e29cacc Merge branch 'feature/CRH19001-18_Service-points' into merge-service-points-30 d73c76042b Merge branch 'release/3.1' 729b4de506 Merge commit 'e1d3bbf462667e07cca89196389fdfd925f4cd73' c4b6e750e8 - Preparing release changes d525fa02e7 Merge branch 'release/3.1' 506b740301 Merge commit '8ef804780109269a9d0078c99b98f46751d8b922' 75a95e0cad Merge commit '1a6e4842329a1d135e43cd5092e0a40660ddb3fd' ba0ce71e0b - preparing release 58deaedf82 - updated dev.json/dev.locks - added missing translations - psr fixes - updated package-json's 01cf94a008 - Added deployment type to parameters dist 73c2e39ff5 - Added minor fixes to purchase orders view and form 0b1879a301 - Added minor fixes to purchase orders view and form 7b00a7d73c - Added possibility to update cost via marello-supplier-product-grid 4cb837d99e - Added possibility to update cost via marello-supplier-product-grid b4ebc04473 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 c0e9f673c7 Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 3069f275bb Merge commit 'ffba2a1d74fe5713fd615d1fb3b6980a41cb9f31' into maintenance/3.0 11938e95b6 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 1591559098 Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 2723bd7afc Merge commit 'f497f93ca471ade418553eea3289318a7c4bca23' into maintenance/3.0 f1243cf07c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 9a16f4759c Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 bc32cb42b7 Merge commit '71530acca5abd305f2c328d3f74bb414c1b89844' into maintenance/3.0 0f2d344502 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 26a030ac69 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 fcc9e1e722 Merge commit '0bcb9bb847396efc745579839904136a8252ed58' into maintenance/3.0 10e78edaac Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 cf8c669f62 Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 f7387ee61e Merge commit 'e779b8a1796d417078e3a9dfe89b0474e462caac' into maintenance/3.0 fb872d35ea Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 dcc89ded95 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 0846a6df72 Merge commit '4f68dc37da2773e1c4f6cee4e165f7a441154a90' into maintenance/3.0 873568bfac Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 7ffe8718dd Merge commit 'd34d82be891e77a23fd995c71dbfd92b8542ca00' into maintenance/3.0 746d1e3655 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d4218be7f9 - Added additional info on runtime exception for Product create/update if no default name is given - Added additional check on loading customer address when creating an order and the primary address is empty d34d82be89 - added additional check before loading the purchase price in the Purchase Order Item d8cd80b1f3 - added additional check before loading the purchase price in the Purchase Order Item dee9b894a0 - Added support to display extended fields on SalesChannel view & grid c5e866d484 - Added support to display extended fields on SalesChannel view & grid a2dd95d706 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration f1ae5c3303 - fixed issue with extended_entity_name in datagrid on the wrong spot in the configuration 44fc9f87c8 - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid ac086a6ded - added extended entity names to datagrids - added additional filters to balanced inventory level datagrid 7e67af6717 Non expected return type (interface non-implemented) e779b8a179 - Add option to remove a product from websites only without deleting the Product remotely eec168eee6 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number e4a5112b28 - Updated validation for company number as it was wrongly failing the validation when updating the company itself and not having another company using this number 5b638da647 - updated product category grid on the category view to take the localized value of product name into account ff92270199 - updated product category grid on the category view to take the localized value of product name into account 230d919cbd - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid fb27de8910 - Fixed issue with SalesChannels in colomn not being rendered in the Product grid - Fixed issue with SalesChannel filter in the Product grid b7a3e5d042 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 1052506523 - changed type of OrderReference filter to string in order data grid to filter correctly (changed filter type from number to string) 4eebed688b - added default ACL config value for Tax Related entities de4c45eeee - added default ACL config value for Tax Related entities 4f68dc37da - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done d7c162d420 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done e533e03e10 - fixed issue with rendering customer view where brackets where missing - added block identifiers in purchase order view to target blocks easier with event listeners - renamed duedate label to expected delivery date, due date field only has renamed labels for this - updated PO form view listener to add the WH delivery to the billing and shipping info block on the form - added general and additional ui section label translations in core bundle - updated validation for due date as it did get stuck when due date was in the past and validation for the whole PO was done f9a0bff8dd - Added clarification on the validation errors seen in the jobs list on which order the error occurs (order id / reference from the 3rd party application) - Added modifications to the Converters to add additional mapping and change & fix some of the mapping from Magento data to Marello data 477e91a6a7 - Added shipping method details to store additional information regarding the shipping method on the Marello Order 69c3020333 - Added shipping method details to store additional information regarding the shipping method on the Marello Order f65e7a78eb Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 315bc9c29b Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 b30e6a2520 Merge commit '3bc4ba916ecf196dfea78f68e553d7358f415336' into maintenance/3.0 3bc4ba916e Squashed 'package/marello-enterprise/' changes from 4cac7dff2..c0f33b147 bc15ecf2b8 - Added rendering for additional data block with dynamic entity fields cdef83caba - Added rendering for additional data block with dynamic entity fields 2fe8c53f8c - Added rendering for additional data block with dynamic entity fields eff4832729 - Added context option check for forceFlush in the inventorylevellogrecord fb69b55c17 - Added context option check for forceFlush in the inventorylevellogrecord 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 51b8c2200e Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 ca7f87a72f Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 5af3aae6bd Squashed 'package/marello-orocommerce-bridge/' changes from 0c21c3cb7..f0fabf995 838307e076 - Added validation for the Commerce group - Updated validation error messages with an error prefix to show which order is invalid - Fixed setting PoNumber and customerNotes correctly as they were setting a boolean instead of the actual value - set delivery date in the order normalizer based on the shipUntil from OroCommerce 2643d8a6dd - Updated validation groups for Order validation - Added SKU to the available inventory validation message bbc7ca82d4 - Updated validation groups for Order validation - Added SKU to the available inventory validation message 07bee4ae50 - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit c139869cdd - added additional data block on PackingSlip view - Updated weight calculation by multiplying it with the orderItem quantity in order to show the total weight for the row instead of the individual unit 815800f027 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 2e6dbe33e4 - Added Symfony\Component\Security\Core\Exception\AccessDeniedException instead of Oro\Bundle\SecurityBundle\Exception\ForbiddenException in the ReturnController as this class has been removed - Added translation for exception for clarification 9d29ba1f5b - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal a523e45f44 - remove enum field with OWNER_CUSTOM from form type in ReturnItem form as this will be managed by the platform itself - fix small issue with upgrade to 1_3_x versions for SalesBundle as it might already have a foreinkey relation which doesn't allow for the unique index removal d26acf85d9 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 0670b227d8 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 2b47b38c52 - added url encoding for SKU in requests to Magento as it might have slashes in the sku - removed validation from items in Marello order as it seems like the Count validation is not properly going of or validating the data correctly for some reason... 3303e506eb Merge branch 'task/MAR10001-0-update-magento-bundle' into maintenance/3.0 fd27696d5c - added conversion for 'Default' attribute set name to Marello's default attributeFamily 6ad0f70854 Merge branch 'maintenance/3.0' 91489e78cc Merge commit '5d879df6e7dfdbd3e56702cce28eaf825383865f' into maintenance/3.0 ace7feb8ba - Updated Sync process for products to be able to have multiple consumers process messages instead of relying on a single consumer ca8baca8e8 - updated mapping for attribute_set_name to attributeFamily, instead of using the id, we're using the attribute family code to map it in Marello c1770bd09b Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 37f473692d Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 5860ffb378 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 76c60a1bb8 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 aff0ad0f06 Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 3b86ae620f Merge branch 'maintenance/3.0' of https://github.com/marellocommerce/development-mono-repository into maintenance/3.0 64fce2d28c - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) 10d5b30b15 - added default weight to products to prevent issues with assigning WH's in Packingslips and issues with shipment creation for UPS - Added migration that will update the default weight for products that don't have a weight yet (null) f0fabf9951 - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 17842ff99c - updated message context in ProductExportWriters that will not run out of memory :') - updated OroCommerceRestTransport to be less checking for the status code as it turns out, a unique constraint validation fail also returns a 400 status code - updated OroCommerceRestTransport so it will not endlessly try to update the product and will return an empty array instead, the writer will notice the result is empty and write a message about it 0bc0152d40 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 745fe8c862 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer 5fd45f1314 - added additional check on order view to make sure a customer exists on the order before trying to render properties of the customer c0f33b1479 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 7513c7a273 - Removed the limitation of when there is only one result after a rule has been processed it would immediately return that result instead of looking further. Now it will process all rules that are applicable and return a result as filtered after running through all of them (based on certain conditions for the rules), if the result turns out to be empty, it will return an empty array still 02ef25f7f8 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 18595ffeb9 MM-17: Cover functionality with unit and functional tests - Added test to cover TrackedSalesChannelProvider 2a52c3b43d MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 4cf00fdb57 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchValueNormalizer 3cdbf534c0 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria bcaf49f791 MM-17: Cover functionality with unit and functional tests - Added test to cover SearchCriteria d4f52ecd17 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings c091546991 MM-17: Cover functionality with unit and functional tests - Added test to cover Magento2TransportSettings 35e90b3155 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem f76b4b1221 MM-17: Cover functionality with unit and functional tests - Added new validator to validate WebsiteToSalesChannelMapItem 4942bfaf3f MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 71484984eb MM-17: Cover functionality with unit and functional tests - Removed DTO and introduced model of WebsiteToSalesChannelMapItem - Renamed OriginWebsiteId to WebsiteOriginId and OriginStoreId to StoreOriginId - Fixed issue with website autocomplete 38bd5e1f2e MM-17: Cover functionality with unit and functional tests - Added small changes 492f77b9c9 MM-17: Cover functionality with unit and functional tests - Added small changes 8e9e5ec22a MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 17ae6f8325 MM-17: Cover functionality with unit and functional tests - Removed unneeded logic with reset store 515037faad MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator a7a1f1c585 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in StoreIterator - Refactored logic in StoreIterator 4a96a3fff4 MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 12933d1f6f MM-17: Cover functionality with unit and functional tests - Implemented test to cover functionality in WebsiteIterator - Refactored logic in WebsiteIterator 6fced3d76f MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 5b630f920b MM-17: Cover functionality with unit and functional tests - Fixed issue with missed validation 80ed03e3c3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 976ea30b68 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 7da913ef64 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information a0c5add3d3 MM-17: Cover functionality with unit and functional tests - Updated logger context data, to have more useful information 81f2fe49b6 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties a7cd503c68 MM-17: Cover functionality with unit and functional tests - Covered with unit tests ShiftedItemsSearchRequestFactory - Small refactoring to have more clear naming of methods and properties 366ab7e2c6 MM-42: Test and fix functionality (#66) 728e339bc4 MM-42: Test and fix functionality (#66) 633f259137 MM-42: Test and fix functionality (#66) 0530503033 MM-42: Test and fix functionality (#66) 95dbe7b45e MM-42: Test and fix functionality (#66) d525b2ab4d MM-42: Test and fix functionality (#65) 5675d759f4 MM-42: Test and fix functionality (#65) 6d656f8381 MM-42: Test and fix functionality (#65) c9525af331 MM-42: Test and fix functionality (#65) 411a2335a7 MM-42: Test and fix functionality (#65) f7156688e4 - Fixed issue with incorrect purchase date e0dc0bc8f3 - Fixed issue with incorrect purchase date d3189bfdbf MM-41: Implement export order status functionality (#64) d37f43c2b8 MM-41: Implement export order status functionality (#64) 2ffeb7066d MM-40: Test and fix import order functionality (#63) ea13d6431f MM-40: Test and fix import order functionality (#63) a62f4b7f93 MM-40: Test and fix import order functionality (#63) 77f9c97bbc MM-40: Test and fix import order functionality (#63) a17ff035b4 MM-40: Test and fix import order functionality (#63) 24af64d1e1 MM-38: Implement sync processors (#61) 741e626a94 MM-38: Implement sync processors (#61) 49b65509c1 MM-38: Implement sync processors (#61) 169c2b9d6a MM-38: Implement sync processors (#61) 35d43ef328 MM-38: Implement sync processors (#61) 4d57bb2c98 Fixed issue with incorrect services declarations 2213f50450 Fixed issue with incorrect services declarations d90e7b9392 MM-36: Implement functionality of pre-processing order job import (#60) f2779753cf MM-36: Implement functionality of pre-processing order job import (#60) d55f92a9a4 MM-37: Refactor exception logic (#59) 2369262a82 MM-37: Refactor exception logic (#59) 895b91dde3 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) e704e9f817 MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 1d6be06cbb MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) 33161f46ee MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) f29f33902a MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58) eddf031992 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) 0ca749ac80 MM-34: Fix issue with 'Option "Use Default Value" unchecked on attribute that was used to create product' (#57) e83245de88 - fix indentation of the if statement in the strategy for clarification on where the if statement ends b08579b526 - fix indentation of the if statement in the strategy for clarification on where the if statement ends c973005e01 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 201d8f31f7 - A lot of processedEntities in the ProductReverseSyncListener causes a memory allocation issue, in order to prevent this we use just the SKU in the processedEntities array instead of the whole entity 5a53f3553d - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit dedeb1b760 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit d0d640da11 - added non proxy class of the Marello Product Unit as without this it can cause issues when the 'normal' class is used to send templates instead of the Proxy class of the product unit 55aa4dd75e - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit f3804d977f - Added checks for empty data that is being sent to the api - Added page size limit's to certain get requests - Added product unit data from inventory item if the method is available otherwise it will use the transport's productunit 3f1c2fde31 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 9d80633813 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity ad177b07e4 - Added default value for $data property as in most cases it will expect an array even if the data is not set on an Entity 2038bbffed - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates f92a60615c - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 4ce14c7564 - updated email templates with name variable for ProductUnit - updated migration version for the application to load the new templates 536043b033 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 2c3af6f865 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 0a23414cc0 - added ProductUnit variable provider for rendering the product unit in the email templates as this is an enum field which is behaving as an extended entity with a proxy class that wasn't allowed in the email templates 1644ee50d3 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 626ff0f791 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation f230508154 - Added the shipping origin based on WFA rules back for shipping methods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation 37e0104218 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 659a93cd7f - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 1f44fe29e6 - updated field to check for available inventory, it used the balanced inventory instead of the inventory qty which is the qty that is left from the balanced inventory 2006d0ecf4 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 7be50e1d62 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 224ba34581 - removed check that was going through the WFA rules that wasn't necessary for either Payment methods and Shipping methods on the Order creation 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices ecd633e008 - fixed renaming email templates for Order and Invoice notifications e05990244d - fixed renaming email templates for Order and Invoice notifications a287a3ae9c - fixed renaming email templates for Order and Invoice notifications 048e68e74e - Updated email templates with new style d1b8e631cf - Updated email templates with new style bd99e38500 - Updated email templates with new style 937c296313 - Updated email templates with new style 361a7651a1 - Updated email templates with new style 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment d361e5f802 MAR10001-880: Service points updates(fixed conflicts) a1c7b2417b MAR10001-880: Service points updates 4cf0ed2a9a Merge branch 'task/MAR10001-0-fix-orocommerce-integration-with-updated-filter' into develop 541dff7679 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 844127142c - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 88337f5514 - updated WorkflowstartListener test to check new behaviour of the OrderWorkflowStart 7c4063defb - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 4a582dbf03 - Added BC for certain methods on Orders as the combination of the new version of the bridge might not have been installed with correct Marello version 0eb4942dab - fixed identation in service definition of wfa rule registry 1c53a3d96a - fixed identation in service definition of wfa rule registry c205bebcd5 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start bb33a03a95 - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 87716bd00a - Fixed issue with WorkflowStartListener where only the last order id (which came in batches) was getting a workflow start 357dfbfaf0 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators 706a83c552 - fixed issue with switching SCG's in integration where the SC's were not being updated - Added origin ids to Customer, Company and OrderItem for easier lookup and identification - Updated Request factory to take pagenumbers and page size into account - Updated strategies to take the new introduced 'identifier' into account - updated the RestTransport with a temporary solution for Pagination without iterators fbf2ac9d63 Merge branch 'task/MAR10001-0-fix-orderitemstatus-dashboard-widget' into develop d374bf34ea - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 08f9f1d274 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 1f318b4a07 - Removed statuses that are NULL from the OrderItemStatus dashboard widget as they cannot be displayed correctly 42df0cbd63 - added order status change for 'new' workflows in Marello a544ca495f Merge branch 'task/MAR10001-0-add-order-status' into develop e2c59898a8 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation ca16950dcb - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 04a60f8507 - added Order status to Order which will serve as preparation for the next step in the Order Management - currently no critical parts are relying on the new Order status as of yet, it's also not visibile in the current implementation 7669b9bc84 Merge branch 'bugfix/MAR10001-0-fix-inventory-item-grid' into develop d8538e7c38 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid c973ae11de - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 3d518511d7 - renamed table alias as the datagrid was confused which one was the actual table and which one was the column of the ProductUnit in the InventoryItem grid 1ffea3f7aa - split the SalesBundle migrations as v1_3 was already released... e170523420 - split the SalesBundle migrations as v1_3 was already released... 8b9df75162 - split the SalesBundle migrations as v1_3 was already released... 13f45b207c Squashed 'package/marello-orocommerce-bridge/' changes from 39d6009dc..0c21c3cb7 c8a09010b1 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 510f97ff39 Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 7451566442 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 397a7c9614 - updated OrderNormalizer to take the ProductUnitCode from OroCommerce into account and set it on the OrderItem if the enum exists and is found through the code 8a35fff619 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 dfcf994040 - updated AttributeSetConnector with the new implemented AbstractConnector 89fca9ef48 - updated AttributeSetConnector with the new implemented AbstractConnector 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 7079390a50 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 57022e5aa3 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 0ceb77aa0e Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 43e7913713 Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 a762f3828b Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 9e87b057aa Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 378d68d233 MM-32: Implement getOrder transport endpoint with iterator (#56) 0a512d574e MM-32: Implement getOrder transport endpoint with iterator (#56) 36e9e92abb Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 2f4659f335 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 33eba24280 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 6ca07ed0e9 Merge branch 'task/ZON20001-0-update-m2-bundle' into maintenance/3.0 1991969214 - updated Magento 2 bundle with attribute set connector to import existing attribute families 0f0459adc4 - updated Magento 2 bundle with attribute set connector to import existing attribute families ecf2d7a2ab Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 8320e64eb7 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 081641f09c Squashed 'package/marello-orocommerce-bridge/' changes from d9ba1b92b..39d6009dc 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 138d8bd39b Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 a34d03d18c Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 4b2c9746c1 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 b59babdb5d Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 477dd4fbc7 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 573bb2696b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2134fdd6c Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 755418949b Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 132968090e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 b70a3aafea Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop 125f2134a1 - renamed migrations to take newer versions of migrations into account on the develop branch 324cba8a79 - renamed migrations to take newer versions of migrations into account on the develop branch 7f802ec1a8 - renamed migrations to take newer versions of migrations into account on the develop branch fc3fef43e7 Merge branch 'feature/MAR10001-0-add-quantity-of-unit-inventory-item' into develop a85c12d6b3 - updated return notifications with ProductUnit on line items - added migration to update existing templates 7fc60c73c5 - updated return notifications with ProductUnit on line items - added migration to update existing templates 04df3e3b2b - updated return notifications with ProductUnit on line items - added migration to update existing templates 67b1af5ee9 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 4e717791cb - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations 67e95573e7 - updated email templates with Product Unit on the line items - Added migration to update email templates in existing installations e6776cae27 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 7b7407c525 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 908ee7f8c6 - updated grids to include productUnit - updated PDF providers to include ProductUnit in PDF's - updated mappers either get the unit from the OrderItem or null 957c32637c - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field d20075c92a - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field a9eb6a504e - renamed unitOfMeasurement in InventoryItem to use the ProducUnit to keep it consistent in all entities having this relation - added ProductUnit to PackingSlipItem and InvoiceItem, InvoiceItem uses a different approach because it has a inheritance table and the EntityExtendBundle didn't really like this setup by adding an Extended field b7ab4dba8e - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 544f7738a0 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved 0b36166c18 - updated test to check for the Unit Of Measurement being set on the OrderItem after the Order is saved b9df8eb0dd - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper 3e3951649c - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper eef4e6752b - Updated OrderItemProductUnitListener to first check the InventoryItem for a UnitOfMeasurement before going straight to the default, the previous logic for checking it's empty before assigning is still in place - Updated service definition of the OrderItemProductUnitListener to use the InventoryItemManager and get the necessary data from there instead of only using the DoctrineHelper e15f975b1f - Added unitOfMeasurement to the InventoryItem view 34cb16015e - Added unitOfMeasurement to the InventoryItem view f0c438ae3e - Added unitOfMeasurement to the InventoryItem view 6bd940835e - added unitOfMeasurement to InventoryItem grid with filters and sorters b5ab255822 - added unitOfMeasurement to InventoryItem grid with filters and sorters f0f2ad364e - added unitOfMeasurement to InventoryItem grid with filters and sorters 199b726b72 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) db865d076d - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) be907e3fd3 - Added unitOfMeasurement to InventoryItem - Updated tests for UoM - Added translations for inventory item UoM - Added default UoM when product is created (which is followed by creating and attaching the InventoryItem) 6a16bdb3be Merge branch 'task/MAR10001-0-fix-unique-indexes-customer-addresses' into develop 6de6d32c48 - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 978b03af6b - updated logic for addresses that 'don't' exist for existing/new customers, by creating new Addresses to mitigate the posibility that they already exist based on the searchcriteria being used to look up Addresses 5a17070652 - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address 3cc166c3ea - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address c2b00f020f - removed unique index on Customer primary/shipping address as it is a theoretical posibility that they are exactly the same address b4341f16e9 MM-30: Prepare migrations for order sync functionality (#55) 40d492e9d8 MM-30: Prepare migrations for order sync functionality (#55) 044200010e Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 72bd506426 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 875b87ad02 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 6807169915 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle caa1181006 Merge branch 'feature/magento2-integr' into task/ZON20001-0-update-m2-bundle 3b5dabf1b4 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into develop 34d7283e7f Merge branch 'task/MAR10001-0-price-alignment' into develop 8e65bc594d Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into develop f63ce643b7 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 584f8661ed Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 8dfe5fec90 Merge branch 'task/MAR10001-0-add-replenishment-field-to-variant-grid' into maintenance/3.0 7a83a2a0f0 Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 f0b0ccd05f Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 ee15adbefb Merge branch 'task/MAR10001-932-add-validation-to-Order-delivery-date' into maintenance/3.0 6788d78ee1 - Added the replenishment field to the variant grid for seeing continuation of the product 1e50d0fe8d - Added the replenishment field to the variant grid for seeing continuation of the product e170548272 - Added the replenishment field to the variant grid for seeing continuation of the product 0f366ad09f - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right 088c985264 - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right b6d7f1772b - fixed some price alignment, not specifically to the right, but at least in line with each others TH; - even though Oro's right aligment did work, it only worked with a 'crowed' table, as soon as only a few columns are in the grid, the whole things 'falls apart' and are not actually aligned to the right ebc8363e17 - added validation message for DeliveryDate if date is not set in the future 33d43a82c2 - added validation message for DeliveryDate if date is not set in the future b150ac8f94 - added validation message for DeliveryDate if date is not set in the future a89e9104aa - Added deliveryDate validation to make sure the date is set in the future and not in the past 800e8854d7 - Added deliveryDate validation to make sure the date is set in the future and not in the past 5b6426fd86 - Added deliveryDate validation to make sure the date is set in the future and not in the past a9f4cb55ef - re-instated the checkbox for managing inventory on External Warehouses efe630fc3a - re-instated the checkbox for managing inventory on External Warehouses c264f475bf Merge branch 'bugfix/MAR10001-938-ghost-warehouse-after-switching-type' into develop 768d425120 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) d1f6656c74 - fixed issue with ghost warehouse after switching from one warehouse type to another, especially the swithing from Fixed to another (global for instance) c44c198658 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) c9a5ad9df0 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 9ac3f06418 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1be35ba721 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) 1a40be8e75 MM-29: Add functionality to map relation between website and sales_channel on the integration form (#54) cc84bcd04a Merge branch 'bugfix/MAR10001-0-update-taxes-when-shipping-address-does-not-have-region-in-customer-address' into develop 38eba16600 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into develop fec2210535 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 cf0959f2a4 Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 32f7b4c2ad Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' into maintenance/3.0 413ab5a54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 702ee6d54d - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress 1f2c18c580 - updated condition to trigger the tax calculations for Order rows when creating an Order through the GUI - previously the calculation wouldn't trigger because the region was not set in the customer's shippingAddress a2d4afdd38 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection 093dcc25e7 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection f26ffdd5e8 - fixed issue with recalculation not being triggered when items in the advised grid are either updated with an amount or quantity - added additional trigger / listener to trigger the recalculation in this collection fd18d4d126 - updated explictly assigning of status for payments that have a source selected - fixed filtering related entities when updating a payment without a source assigned 2732b90f59 - fixed unique constraints format...again :') 9d2a5a386b - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group d72ece42f6 - fixed issue where WarehouseGroups would be empty after saving, specifically the WarehouseGroups for fixed wh's, this was caused by using the 'disabled' attribute instead of 'readonly' in order to restrict the removal of the Fixed Wh's for this group 638cda5e39 Merge branch 'bugfix/MAR10001-939-cannot-complete-replenishment-order' into develop 8575cec478 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order c703e83d57 - implemented a fix where inventory batches are being saved correctly and the replenishment order can be completed when multiple items are in the replenishment order and have batches enabled --> fix includes an additional call to the flush operation as this is not being triggered (correctly) when having multiple items with batches on completing the replenishment order b2975e504c - removed composer.lock file from master 318b676f80 Merge commit 'c5697c673a4193f88c63e21e067f6b4142305400' f497f93ca4 Merge pull request #12 from anyt/3.0 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 204a8b83eb Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 bac1e39cb9 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 e0667ea502 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 4cac7dff29 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d 64909371ec Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 5a54fac7c9 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 2dab594b86 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 954a0a1e4d - renamed again for adding subtree e8d76690cb Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' 5599056342 Merge commit '6f2927f4e544aaabbcbc424c47e238e257b99cb5' as 'package/marello-magento2-bundle' d7f9e3b039 - rename caee165da2 - initial commit 282e0d6a43 - updated translations messages for the All %entity_plural_label% grid view - added hardcoded mapping of Marello SC's to ZB websites for demo purposes dac3d5304d - remove disabled code from SalesChannelType form type a913e8d32a - remove disabled code from SalesChannelType form type 32a99ad25b - remove disabled code from SalesChannelType form type fe27b16166 MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false 9c7657632f MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false bbf94da23a MM-27: Add missed functionality and bugfix - Fixed issue when first item from collection can return false e353da748f Merge branch 'feature/magento2-integr' into testmerge-magentoint a8352a6851 Merge branch 'feature/magento2-integr' into testmerge-magentoint af094b9d65 Merge branch 'feature/magento2-integr' into testmerge-magentoint 3e8df42b80 Merge branch 'feature/magento2-integr' into testmerge-magentoint b9016f8bdc - removing BC break from order view regarding payments 0a5c725aee - removing BC break from order view regarding payments 7dd9d89685 - removing BC break from order view regarding payments f8ea638b10 MM-27: Add missed functionality and bugfix (#53) 7c497a3019 MM-27: Add missed functionality and bugfix (#53) 466b4a1ce0 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3baf789b98 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 9ede319aa5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3b6764234d MAR10001-931: Update Order and OrderItem entities with additional fields 4a509e5dee MAR10001-931: Update Order and OrderItem entities with additional fields 0bc0d4d604 MAR10001-931: Update Order and OrderItem entities with additional fields 61a95f2361 Merge branch 'feature/MAR10001-931' into develop 51055f06a5 - fixed issue with Migration where it was trying to create the order table on updating the application while it already exists - fixed issue with association name in the Enum field being inconsistent between the installer and the migration - Added additional enum options such as Box and Pallet 3b4a074675 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 ba7bed32a6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 d0281d2dc6 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 8d9827b9db - fixed issue with checking companyNumber on null while trying to render the PDF template 27b70076a9 - fixed issue with checking companyNumber on null while trying to render the PDF template a5951be050 - fixed issue with checking companyNumber on null while trying to render the PDF template 7eca964b6c - fixed issue with check on Payment term when rendering the pdf once downloaded - Some cs fixes in the payment bundle department e7c8029bbf - fix OrderExtension test to include the new twig functions 7377e59bc1 Merge branch 'feature/MAR10001-920' into develop e388452303 MAR10001-931: Update Order and OrderItem entities with additional fields 9b3d3fe985 Merge branch 'maintenance/3.0' into develop 146e80d70a Squashed 'package/marello-orocommerce-bridge/' changes from 01957c4a2..d9ba1b92b 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 2d7ae1b56c Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b 11c6cb274a Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 65b287cfbd Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 bc1af2f1ad - fixed issue with misquoting the columns on the unique constraint in the Company entity f16cfe6b16 - fixed issue with misquoting the columns on the unique constraint in the Company entity 882c2020e2 - fixed issue with misquoting the columns on the unique constraint in the Company entity f6c1dd20bf - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository 1d04138017 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository c73501f9f1 - removed the service definition additional call (setAclHelper) that is not necessary in the current ReplenishmentOrderRepository b7401439b7 Squashed 'package/marello-orocommerce-bridge/' changes from 9fef034e1..01957c4a2 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 41c4b734ef Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 1bbf904548 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 3d3642ae98 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 f5ed9adc71 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 df95062d26 Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 30d3d8092c Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 940845ce3e Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 53d0ef688b Merge branch 'task/MAR10001-0-add-info-tooltips' into feature/magento2-integr 9559cb3dc8 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 80624d1a17 - Added additional tooltips on the Integration settings form for clarification regarding integration configuration - Added basic readme 7bd2784086 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form e45d0240e1 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form b4e915f610 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form 0418a66a16 MM-26: Test and stabilize product sync feature - Fixed issue with check connection on existing integration - Fixed issue with invalid transformations of pricing value triggers update prices on every save of product form cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel eeeabf64fd - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel 1af4a2e4d5 Merge branch 'maintenance/3.0' into develop 0ac656700f - removed commit reference in validation file 125bbe8f23 - removed commit reference in validation file 61b2f271b5 - removed commit reference in validation file 039ba0a816 Merge branch 'maintenance/3.0' into develop 8d2d3b7b58 Squashed 'package/marello-orocommerce-bridge/' changes from a1f978c47..9fef034e1 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 9b1d3db3f4 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 eb20f6cd71 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 1c0060e13d Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 8503e29cfc Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 fe7ee95d06 Merge branch 'feature/MAR10001-909' into develop 0a4bb46ccb - renamed Company code to Company number - added pdf translation - moved company number on the PDF 34dbdfec0c - renamed Company code to Company number - added pdf translation - moved company number on the PDF df09ed6832 - renamed Company code to Company number - added pdf translation - moved company number on the PDF 259c9d70c0 MAR10001-909: Add Company ID to Company 68d20ae17e MAR10001-909: Add Company ID to Company 13433d841b MAR10001-909: Add Company ID to Company 58bb42c0bd - renamed Company code to Company number - added pdf translation - moved company number on the PDF db7dd5e612 MM-25: Add…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Hello,
It seems that in Marello 3.0.1, in
Marello\Bundle\ReturnBundle\Controller\ReturnControllerif you try to create a return from a non shipped order, you throw aOro\Bundle\SecurityBundle\Exception\ForbiddenException, but it seems that this class doesn't exists.The text was updated successfully, but these errors were encountered: