Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…7d46c2 37d46c202f Merge commit 'b2b512732b7b6cc96055dccd1c96286e7d038727' into maintenance/2.1 882ec963c5 - CS fix ce9c0ee6f1 Merge commit 'fe56927a100d6c3707201c28cc15b94d018cc561' into maintenance/2.1 84d6f55915 Merge commit 'fe56927a100d6c3707201c28cc15b94d018cc561' into maintenance/2.1 cecd7c27d2 Merge pull request #10 from brainOut/patch-2 5780d4caa0 - updated README's with updated versions of dependencies 6352ba7f54 - updated README's with updated versions of dependencies 89a487f6c2 Merge commit '00f2842c4059e15e701ce04345ab05c4a28a1cdc' into maintenance/2.1 00f2842c40 Squashed 'package/marello-enterprise/' changes from c61c7491a..68465c418 50ba31fcea Merge commit 'ef06c324bd0d46c1546a36c2a58cc38d9e7e96db' into maintenance/2.1 600b9529a3 - updated versions for release 594d6ee716 Update @var annotation to fit type of property REVERT: 71530acca5 Merge commit '5af3aae6bdb711c0d6537f67c359ab897877ef37' into maintenance/3.0 REVERT: 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 REVERT: 9f14bbc472 Merge commit '63f5e481b1b580ab73bcf6fd1d98fa0ba7595542' into maintenance/3.0 REVERT: 63f5e481b1 Squashed 'package/marello/' changes from e2134fdd6..0bc0152d4 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 90fd29c531 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices REVERT: 22060cd784 - fixed issue with not having a defaultPrice set when a RemoteProductCreatedEvent is fired of to update prices or to check to update prices REVERT: 90226e4e08 - applied CS fixes - added translations for origin ID label - removed debug comment REVERT: 3697940ee3 - applied CS fixes - added translations for origin ID label - removed debug comment REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 8bd128982e Merge commit '13f45b207c1508037c410ccd81df50a5133f518c' into maintenance/3.0 REVERT: 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 REVERT: 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 REVERT: 7d530c86aa Squashed 'package/marello/' changes from dac3d5304..e2134fdd6 REVERT: 929555b90f Merge commit '7d530c86aa0b89d4eb35d4c3572aa82061ee76fe' into maintenance/3.0 REVERT: 0c21c3cb7a Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 REVERT: 155117e1cc Merge commit '081641f09cf3308af11b3488a0784b307303b669' into maintenance/3.0 REVERT: 08a990bfc4 Merge commit 'e2e7875925ad96a42880ae7ac4ea9a9f3e46ba73' into maintenance/3.0 REVERT: e2e7875925 Squashed 'package/marello-enterprise/' changes from 3b4a07467..4cac7dff2 REVERT: d4d9d11e3e Merge commit 'e2af974edb72ae5923ecdf4dd34249e13ebf9f31' into maintenance/3.0 REVERT: e2af974edb Squashed 'package/marello/' changes from 8d9827b9d..dac3d5304 REVERT: 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 REVERT: 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 REVERT: 6f65cdd1fd Squashed 'package/marello-enterprise/' changes from f6c1dd20b..3b4a07467 REVERT: 4f5ffdf187 Merge commit '6f65cdd1fdc06ce135a697156bed456424742fda' into maintenance/3.0 REVERT: 0434749faa Squashed 'package/marello/' changes from bc1af2f1a..8d9827b9d REVERT: aa0e100189 Merge commit '0434749faa01bc372d0f6507d95e6c63b21d687a' into maintenance/3.0 REVERT: 2d726c233b Squashed 'package/marello/' changes from 0ac656700..bc1af2f1a REVERT: 4d23c9c468 Merge commit '2d726c233b9ee46e8df989abddab3e08d8d7a417' into maintenance/3.0 REVERT: 91faea637f Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 REVERT: 6cd29db996 Merge commit '146e80d70a0df2f8eabb897b7c693a1c978b9072' into maintenance/3.0 REVERT: 39d6009dcf Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 REVERT: 6772bf6984 Squashed 'package/marello-enterprise/' changes from eb20f6cd7..f6c1dd20b REVERT: 72ae77345d Merge commit '6772bf69848f25507e7ce17b2a01e39cad1c410d' into maintenance/3.0 REVERT: 82a165ef25 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 REVERT: e06e78f9a8 Merge commit 'b7401439b7d07eb5ae46c5ba2831fb42e3fde2b4' into maintenance/3.0 REVERT: d9ba1b92b3 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 REVERT: 7a0ae4460c Squashed 'package/marello-enterprise/' changes from cac71c327..eb20f6cd7 REVERT: c7451e8568 Merge commit '7a0ae4460c0cbbeb986aa176d153570ac5839ea6' into maintenance/3.0 REVERT: 171e747c96 Squashed 'package/marello/' changes from afe8e2fc2..0ac656700 REVERT: 72ab662cfa Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 REVERT: 3f6a63bb1f Merge commit '171e747c96d54e8f0821d6c20507350aafa607d3' into maintenance/3.0 REVERT: cb8b76af3b - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel REVERT: 01957c4a21 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel REVERT: 2e73947a00 - updated migration for UpdatingExistingAddresses in Orders to check if the SalesChannel is still available before trying to get data from the SalesChannel REVERT: 17cc6ff8eb Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 REVERT: 3238636436 Merge commit '8d2d3b7b58b87fe363f6849e62ca008fd26fb5b3' into maintenance/3.0 REVERT: eb90b8fcfa Squashed 'package/marello/' changes from b99730629..afe8e2fc2 REVERT: 6584594519 Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 REVERT: 94c08790ed Merge commit 'eb90b8fcfaedb948656084d945666cfebbe15532' into maintenance/3.0 REVERT: ad953d8323 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 REVERT: c36da8bf89 Merge commit '8c5aa63d9b59609801b3690ec63c08693eac5ab1' into maintenance/3.0 REVERT: c361088c4b Squashed 'package/marello-enterprise/' changes from d47723665..cac71c327 REVERT: 9fef034e17 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 REVERT: 3668449bc9 Merge commit 'c361088c4b57117c42811571c0dc3976f6a2f4cc' into maintenance/3.0 REVERT: c14e3ba9d0 - fixed cs issue with duplicated services compiler pass REVERT: 41691dd736 - fixed cs issue with duplicated services compiler pass REVERT: 89cb4cba3d - fixed cs issue with duplicated services compiler pass REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 26376dcdaf Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 REVERT: 54a378458a Merge commit '77a5de95137c258b736658cb2f396e4aad4ff544' into maintenance/3.0 REVERT: c3d7d6c1d4 Squashed 'package/marello/' changes from b1c499415..b99730629 REVERT: a1f978c474 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 REVERT: d59f099d54 Merge commit 'c3d7d6c1d492f690fe42956c139d0ead4c8a26cf' into maintenance/3.0 REVERT: a4350f087f Squashed 'package/marello-enterprise/' changes from 842772c4b..d47723665 REVERT: 2a87198fe2 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 REVERT: 9a81587737 Merge commit 'a4350f087f28246b1f6a05eb6ce695c35388be38' into maintenance/3.0 REVERT: b065d54997 Squashed 'package/marello/' changes from 558ee27c6..b1c499415 REVERT: d4875e03aa Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 REVERT: f894f13038 Merge commit 'b065d549972a67f4a7ee98e2774243a9e2b80092' into maintenance/3.0 REVERT: 31e6e6e4dc - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container REVERT: 9ea0d430db - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container REVERT: 875334e47e - updated compiler pass for duplicate services to check wether an OroCommerce instance is installed before removing services from the container REVERT: e40a901ca7 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 REVERT: 9238a5b1fa Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 REVERT: e4ac592b41 Merge commit 'a7e49facc389e81c425318b022985780ed725446' into maintenance/3.0 REVERT: 3464db8c6e Squashed 'package/marello-enterprise/' changes from 6772f6e0f..842772c4b REVERT: 461a1b16a9 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 REVERT: 3a20b07211 Merge commit '3464db8c6e987331f32f5f980e2a569620b0f14d' into maintenance/3.0 REVERT: 39e05989e5 Squashed 'package/marello/' changes from b7ac5c464..558ee27c6 REVERT: 913595fc37 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 REVERT: afc5368b70 Merge commit '39e05989e588eb7890665615fcc9b727f1c1f47e' into maintenance/3.0 REVERT: d6a7de8fe5 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 REVERT: 2ae99456ed Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 REVERT: eb17ecd805 Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into maintenance/3.0 REVERT: 15d749c9b6 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty REVERT: 8d44a4dad4 - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty REVERT: ce7ce99c3f - moved importexport services to own yml file for reabilty - moved eventlistener service definitions to own yml file for readabilty REVERT: dc97a9fc4e - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate REVERT: 98ee647e34 - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate REVERT: 4eb7f3a77a - added normalization for the OroCommerce Order's createdAt date to be in the Marello Order's purchaseDate REVERT: c2f7712f3d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company REVERT: 71f789072d - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company REVERT: a10e00d6ec - Updated logic to map Oro's Organization field on Addresses to Marello Address's Company REVERT: 6256f0dbf4 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 REVERT: 5afcdd80c9 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 REVERT: e2a0e14847 Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 REVERT: 0e72f4b21d Squashed 'package/marello-enterprise/' changes from ded77d2b1..6772f6e0f REVERT: 4312b20db7 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 REVERT: 3dbf8d7420 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 REVERT: 8a92cd82c3 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 REVERT: dc90038519 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 REVERT: 04ca95074b Squashed 'package/marello/' changes from 1999cc10e..b7ac5c464 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 68bd901249 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge REVERT: bcf5253da6 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge REVERT: e892dc0a67 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge REVERT: eb7399a08c - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings REVERT: 28712fcf66 - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings REVERT: c03fc2da12 - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings REVERT: ae6334aba3 - moved the order of some of the orocommerce settings for clarity REVERT: 12c4499df0 - moved the order of some of the orocommerce settings for clarity REVERT: 9c85201da9 - moved the order of some of the orocommerce settings for clarity REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 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 REVERT: d89262688c - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant REVERT: c546b47376 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant REVERT: d3cfa40240 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant REVERT: f9267bb6d5 - CS fix REVERT: 7e89ed28e3 - CS fix REVERT: dbc3194dd2 - CS fix REVERT: ce2d93d916 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed REVERT: 0a6076b111 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed REVERT: f9a0655fa3 - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed REVERT: f8038adc41 - updated validation for OroCommerce integration settings REVERT: 0c2aeaaa5e - updated validation for OroCommerce integration settings REVERT: 8314d7327e - updated validation for OroCommerce integration settings REVERT: 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 REVERT: 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 REVERT: 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 REVERT: 201fc5dfc3 - updated versions in the orocommerce bridge README REVERT: 930ab7eef1 - updated versions in the orocommerce bridge README REVERT: f8968197e7 - updated versions in the orocommerce bridge README REVERT: 67d6b6587d - updated versions in the orocommerce bridge README REVERT: 80428e27aa Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 REVERT: ae866d1d45 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 REVERT: fea3dea76b Squashed 'applications/marello-application-ee/' changes from a55ceb229..0ec7b8203 REVERT: 71601ac931 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 REVERT: a056889ea6 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 REVERT: bde1161731 Squashed 'applications/marello-application-ee/' changes from 1994f4f34..a55ceb229 REVERT: 63cef79bb3 - changed author name to correct company REVERT: e36deb83cc - changed author name to correct company REVERT: db6734954b - changed author name to correct company REVERT: b3bd4f727a - changed author name to correct company REVERT: 1ee395e3f2 - remove internal versions REVERT: 7df294bbb0 - remove internal versions REVERT: 62cc46645a - remove internal versions REVERT: a2c162db66 - remove internal versions REVERT: 6d302dc60e - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge REVERT: 26d6b44ff5 - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge REVERT: ec4af3fa94 - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge REVERT: a15cffae52 - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge REVERT: 2c338e8d85 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 REVERT: ac4d899ad3 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 REVERT: 921fe63141 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 REVERT: 69e04b3257 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 REVERT: bc72318236 MAR10001-879: Changes for correct selecting products by SKU and Organization REVERT: 8ec2cc1c04 MAR10001-879: Changes for correct selecting products by SKU and Organization REVERT: d9d4c04457 MAR10001-879: Changes for correct selecting products by SKU and Organization REVERT: 5dc9e2df1f MAR10001-879: Changes for correct selecting products by SKU and Organization REVERT: cec83bf310 - CS fix REVERT: b1b4c5f547 - CS fix REVERT: 5fc05ab999 - CS fix REVERT: 3c3193d817 - CS fix REVERT: 0f5e14d87d MAR10001-879: code optimization REVERT: 17d087d497 MAR10001-879: code optimization REVERT: 3a006b6a7a MAR10001-879: code optimization REVERT: 66eeb3713c MAR10001-879: code optimization REVERT: e98c29675c Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 REVERT: 1683a51f2f Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 REVERT: 8e74b04956 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 REVERT: 0e64bc67a9 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 REVERT: 59af438517 MAR10001-879: Made ProductImage sync conditional REVERT: 502cd3d14e MAR10001-879: Made ProductImage sync conditional REVERT: 53d1dbdc01 MAR10001-879: Made ProductImage sync conditional REVERT: 56dbca52a3 MAR10001-879: Made ProductImage sync conditional REVERT: 00221c7884 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL REVERT: 4f3dd1d8f4 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL REVERT: 54527f543f - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL REVERT: 84432f0d4f - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL REVERT: 81e5d37a00 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge REVERT: 9a43144606 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge REVERT: 1d117d3ebb MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge REVERT: c18c469bb4 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge REVERT: 78fb50571c Merge branch 'maintenance/3.0' into feature/MAR10001-870 REVERT: bc604f62ff Merge branch 'maintenance/3.0' into feature/MAR10001-870 REVERT: c8466a6cf4 Merge branch 'maintenance/3.0' into feature/MAR10001-870 REVERT: f9141663b1 Merge branch 'maintenance/3.0' into feature/MAR10001-870 REVERT: 3b208857bf MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce REVERT: 9557f9f9de MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce REVERT: 5ea3876e8d MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce REVERT: 2f77bc73b7 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce REVERT: 0d795fb0c8 Merge branch 'release/3.0.1' into maintenance/3.0 REVERT: c9ead58d33 Merge branch 'release/3.0.1' into maintenance/3.0 REVERT: ead8291918 Merge branch 'release/3.0.1' into maintenance/3.0 REVERT: 8d09dbd5a4 Merge branch 'release/3.0.1' into maintenance/3.0 REVERT: 6bf6b41682 Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 REVERT: a9ae475161 Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 REVERT: 34e755cead Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 REVERT: 4a989db21a Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 REVERT: 693300c5a2 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 REVERT: f8771ff591 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 REVERT: 23c2a362d4 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 REVERT: 215fcca0e8 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 REVERT: d5d6f5363b Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 REVERT: e425173a26 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 REVERT: 4d05495de5 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 REVERT: 12f55eaf19 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 REVERT: 611a7ee8f4 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 REVERT: 9e1d6599f8 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 REVERT: 4c11c1d62e - updated composer.json to internal versions REVERT: 02ba853038 - updated composer.json to internal versions REVERT: 5a85d153eb - updated composer.json to internal versions REVERT: 351787d22e - updated composer.json to internal versions REVERT: 1b93a365d5 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 REVERT: 5c0cdba991 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 REVERT: 4751ced650 Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 REVERT: c72676c95a Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 REVERT: 051c13f9a7 Squashed 'applications/marello-application-ee/' changes from a69ba4abb..1994f4f34 REVERT: c8ab65a29b Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 REVERT: 5f57185b4e Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 REVERT: 85f169e16c Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 REVERT: 9c356b21a4 Squashed 'applications/marello-application/' changes from 3a5a0ae59..95a24c22f REVERT: b4306b3230 - updated composer.lock files REVERT: 0cebbb868a -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 REVERT: a58b75669e -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 REVERT: 09151f0784 -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 REVERT: 9c0afd120e Squashed 'package/marello-enterprise/' changes from 37e37f3fd..ded77d2b1 REVERT: 9f8826c1ed Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 REVERT: f5b07591a6 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 REVERT: 30750447d3 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 REVERT: 9586a6de30 Squashed 'package/marello/' changes from 9051b1fde..1999cc10e REVERT: d96e7a8cea - removed internal versions REVERT: 67ffebf670 - removed internal versions REVERT: e00b588534 - removed internal versions REVERT: f149de71ae - removed internal versions REVERT: 65e3b323d1 - removed internal versions REVERT: 4e6eaea8c3 - added check to see if emails are already enabled by the user, otherwise the migration will fail because of it REVERT: a7a4b9ba54 - fixed issue with sending localized email notifications - fixed shipped order confirmation email template - fixed functional tests for sendProcessor REVERT: 09625222a3 fixed failed repository REVERT: 7d1884a38f - CS fix - Added fix for existing attributes to configure them correctly to show them in attribute groups and retain the original data REVERT: 0cceab441a - moved the image of the product view to separate template file in order try to control the divs better REVERT: 2d9793e856 - switch createdAt and tags columns in product grid using the buildAfter event REVERT: b3e042eb65 - added inline editing for product status in product grid REVERT: 9c38c292a3 - added inline edit for tags - added inline edit for sku - shuffled some columns around in the product grid - removed taxcode as default column REVERT: b8b24ad2fe - added Product tags in entity config - added migration to enable product tags for existing products REVERT: 524cf50a2a - Added email as activity to Marello Customer which allows to show emails being sent with the Customer as context in the customer view REVERT: 4dc1990ba1 - Added Additional data fields to Order entity - updated div's on the additional data of the product view REVERT: f5ed075cbb - updated migrations to deal with postgres update, works on mysql too REVERT: 9ef426b4ff - removed annotations from Customer entity to prevent issues with update schema, when creating fields on entities, when running postgresql REVERT: 31c5895c62 - Added save and new buttons to warehouse, warehouse group and warehouse channel group linking on the create and update views - changed selectAll to false in 'not-linked-saleschannelgroups-grid', SalesChannelGroup datagrid, as it was not possible to add a SCG to a WHG with postgres installed REVERT: 7d3a22b49e - Added save and new buttons to SalesChannel and SalesChannelGroup create and update views REVERT: dd216e596a - Added save and new buttons to Tax Jurisdictions, Tax Rates, Tax Rules and Tax Codes on both create and update views REVERT: 269f4299d4 Merge branch '3.0-test' into maintenance/3.0 REVERT: 165c1d492d Merge branch '3.0-test' into maintenance/3.0 REVERT: 267668e294 Merge branch '3.0-test' into maintenance/3.0 REVERT: b98065a61f Merge branch '3.0-test' into maintenance/3.0 REVERT: 5c83c9234f Merge branch '3.0-test' into maintenance/3.0 REVERT: 4239f09e3d merged maintenance/3.0 branch into 3.0-test REVERT: 4689652d9a merged maintenance/3.0 branch into 3.0-test REVERT: 06f39b07ca merged maintenance/3.0 branch into 3.0-test REVERT: 705c0aef72 merged maintenance/3.0 branch into 3.0-test REVERT: 17e7186a58 merged maintenance/3.0 branch into 3.0-test REVERT: d14cdd397e merged maintenance/3.0 branch into 3.0-test REVERT: 0e2d6aa340 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment REVERT: e8be4cc2b0 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment REVERT: a1339e555d - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment REVERT: 8289fb5f4a - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment REVERT: e68e88da3f - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment REVERT: a9c16235b3 fixed problem with schema update REVERT: bcc540e0a3 fixed problem with schema update REVERT: 31eb42e312 fixed problem with schema update REVERT: d543339c37 fixed problem with schema update REVERT: 5951dca681 fixed problem with schema update REVERT: 3d0287e56e fixed problem with schema update REVERT: b104424825 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 REVERT: 0addc6222d Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 REVERT: e78554d2ea Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 REVERT: 384c8dcff3 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 REVERT: 6886259a5b Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 REVERT: 541cda1129 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 REVERT: 0e8cf886db Merge branch 'feature/MAR10001-759' REVERT: d335f5ebb5 Merge branch 'feature/MAR10001-759' REVERT: ce2418bbca Merge branch 'feature/MAR10001-759' REVERT: 971c391b04 Merge branch 'feature/MAR10001-759' REVERT: e1bb79cec0 Merge branch 'feature/MAR10001-759' REVERT: 45feb75731 Merge branch 'feature/MAR10001-759' REVERT: ce45ee00e4 Merge branch 'feature/MAR10001-759' REVERT: 6402d99b8d - updated orocommerce docker environment - fixed change trigger in the settings in order to prevent infinite loading on the integration settings page REVERT: f96a520a08 - updated orocommerce docker environment - fixed change trigger in the settings in order to prevent infinite loading on the integration settings page REVERT: 86431222d8 made productName not audittable field REVERT: 0a3c65c191 made productName not audittable field REVERT: 5816c57094 - 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 REVERT: 41b3b04bd9 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched REVERT: f730fbf399 - fixed issue with results of the query being used when filtering products through the grid and trying to assign them to saleschannels - added ability to split the message for bigger chunks of data instead of having a single message with a lot of product ids - restructured the code in order to use the entity repository of the products instead of relying on the cached query from the querybuilder - Fixed the main issue of the bug where we couldn't mass-assign products to SalesChannels because the query for the products grid evolved in such a query, which made hard to reset parts of the query for counting and not having to deal with the query cache once the results where fetched REVERT: ce639334b7 - updated oro platform version to 3.1.15 - added script to enable / disable xdebug, can only be used when logged in as root in the container REVERT: 1994f4f348 - Added composer.lock files for 3.0 applications REVERT: 95a24c22f4 - Added composer.lock files for 3.0 applications REVERT: c635f38781 - Added composer.lock files for 3.0 applications REVERT: ded77d2b1c - 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 REVERT: 1999cc10e6 - 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 REVERT: 856a400198 - 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 REVERT: 78922543ab - 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 REVERT: 99411a99d8 - 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 REVERT: 8a5001a14c - 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 REVERT: b87c1b7c43 - 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 REVERT: 934520ffb3 Merge branch 'develop' into test REVERT: 67f866e696 Merge branch 'develop' into test REVERT: e64c5f450c Merge branch 'develop' into test REVERT: eed5ce92e0 Merge branch 'develop' into test REVERT: 7e9afaad32 Merge branch 'develop' into test REVERT: 0d89bd4e08 Merge branch 'develop' into test REVERT: 92727d17f1 Merge branch 'develop' into test REVERT: 6f261c0839 Merge branch 'develop' into test REVERT: 301e1dc8cf Merge branch 'develop' into test REVERT: c32162ac9d Merge branch 'develop' into test REVERT: 9e6eb4672b Merge branch '3.0' into test REVERT: b4ab3b4d43 Merge branch '3.0' into test REVERT: 1f5ae8a3e2 Merge branch '3.0' into test REVERT: bbad71a89f Merge branch '3.0' into test REVERT: 0019e8516d Merge branch '3.0' into test REVERT: d398d84ca8 Merge branch '3.0' into test REVERT: 728359f67d Merge branch '3.0' into test REVERT: 0bf7596358 Merge branch '3.0' into test REVERT: f8a01d3a39 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test REVERT: d8709e3f93 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test REVERT: 7088e36dfe Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test REVERT: a8790f512f Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test REVERT: 053da4351f Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test REVERT: cf4f9ca64e Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test REVERT: da31d37094 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test REVERT: 2e0404f7a6 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test REVERT: fa6c0c7845 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test REVERT: 9636ea8c2f Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test REVERT: ef8feb9cf4 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test REVERT: 20b013feb5 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test REVERT: 0675814fa4 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test REVERT: 9dc8519bab Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test REVERT: b40bb0337b Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test REVERT: 11bc636c28 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test REVERT: 58dfdb090d Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test REVERT: c649100e69 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test REVERT: 3d85fa014f Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test REVERT: f4c747cf95 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test REVERT: ed1f56b3c4 Merge branch '3.0' into develop REVERT: 114bdbfed1 Merge branch '3.0' into develop REVERT: a6b36c9151 Merge branch '3.0' into develop REVERT: 4a6e5ee5a7 Merge branch '3.0' into develop REVERT: 2137599641 Merge branch '3.0' into develop REVERT: e6c6ba1767 Merge branch '3.0' into develop REVERT: b1999b8200 Merge branch '3.0' into develop REVERT: 1297b37c7d Merge branch '3.0' into develop REVERT: 1de9afb11a Merge branch '3.0' into develop REVERT: 9fb648c3f9 Merge branch '3.0' into develop REVERT: 061774960d Merge branch '3.0' into develop REVERT: edd0d7daca - 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 REVERT: a2daff5bd9 - 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 REVERT: 2a921f8bcb - 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 REVERT: cc840cb7ee - 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 REVERT: b275cb5911 - 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 REVERT: 91aed6a26f - Added migration to include organization id on the purchase order item REVERT: 08a62c95c6 - Added migration to include organization id on the purchase order item REVERT: 4e7ad22a56 - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig REVERT: 7d80ea4503 - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig REVERT: fc63a64ea8 - removed .class parameters from service container and replaced it with the FQCNs REVERT: 92c57efbb3 - removed .class parameters from service container and replaced it with the FQCNs REVERT: 9017c02e86 - removed .class parameters from service container and replaced it with the FQCNs REVERT: e363aef874 - removed .class parameters from service container and replaced it with the FQCNs REVERT: 3863184ab5 - removed .class parameters from service container and replaced it with the FQCNs REVERT: 24506e1329 - removed .class parameters from service container and replaced it with the FQCNs REVERT: 7493d2d51a - removed .class parameters from service container and replaced it with the FQCNs REVERT: a4fd469e0a - removed .class parameters from service container and replaced it with the FQCNs REVERT: 7382a658ff - removed marello_product.entity.class parameter from service container and replaced it with the FQCN REVERT: 20635523b6 - removed marello_product.entity.class parameter from service container and replaced it with the FQCN REVERT: d679bd298b - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN REVERT: 8d2ffc0e0c - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN REVERT: d2e87f5a00 - 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 REVERT: 517384c8a8 - 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 REVERT: bbf61e1195 - PSR2 CS fixes in PDF/InvoiceBundle REVERT: c4531b0515 - PSR2 CS fixes in PDF/InvoiceBundle REVERT: 0f069d4c34 - fixing config for test environment on marello application ee REVERT: 3052d49b9a - fixing config for test environment on marello application ee REVERT: affcead8d9 - fixing config for test environment on marello application ee REVERT: c72351a604 merged branch 3.0 into feature/MAR10001-849 REVERT: 5dc613cf1b merged branch 3.0 into feature/MAR10001-849 REVERT: ac47232932 MAR10001-849: PDF Bundle improvements REVERT: 4832008359 MAR10001-849: PDF Bundle improvements REVERT: 9832815dd6 - 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 REVERT: 60eac8f04a - 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 REVERT: 84ddeebb25 - 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 REVERT: ee5a1b9401 - 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 REVERT: a4b158042d - 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 REVERT: 6cd52839b3 - 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 REVERT: 3b4f87c442 - Fixed issue with entity classes defined in the service container instead of using the FQCN REVERT: 6d209ff6a1 - Fixed issue with entity classes defined in the service container instead of using the FQCN REVERT: 27539a2edf - 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 REVERT: 92de4bd50a - 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 REVERT: 146333abe3 - Added missing translation labels REVERT: bca14808d7 - Added missing translation labels REVERT: 1d50767a46 - Added missing translation labels REVERT: da0ef8d509 - Added missing translation labels REVERT: 704e2f7bc5 - 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 REVERT: 4b87070d8d - 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 REVERT: 4d821e901c - Updated unit tests to use and test the new underlying structure of resizing images REVERT: 2a9d35c68b - Updated unit tests to use and test the new underlying structure of resizing images REVERT: f211744953 - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method REVERT: 147aab6fdd - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method REVERT: 976f6bd949 - 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 REVERT: c3b08d5c61 - 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 REVERT: ca4a8049c3 - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated REVERT: 647c67b7bb - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated REVERT: 03c2e3057b - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated REVERT: 08062c223f - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated REVERT: 67cfafd6f5 - Updated InventoryLevelLogGridListenerTest with the removal of the previous join, it will not check if it's being called - Updated phpunit.xml.dist of servicepoints application to remove deprecated attributes - Updated phpunit.xml.dist of marello-ee application with uncommenting the Oro TestFramework in order to check on DB and translation keys REVERT: 705acc0d64 - Updated InventoryLevelLogGridListenerTest with the removal of the previous join, it will not check if it's being called - Updated phpunit.xml.dist of servicepoints application to remove deprecated attributes - Updated phpunit.xml.dist of marello-ee application with uncommenting the Oro TestFramework in order to check on DB and translation keys REVERT: 78fc1c7578 - Updated InventoryLevelLogGridListenerTest with the removal of the previous join, it will not check if it's being called - Updated phpunit.xml.dist of servicepoints application to remove deprecated attributes - Updated phpunit.xml.dist of marello-ee application with uncommenting the Oro TestFramework in order to check on DB and translation keys REVERT: 62b641f492 - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints REVERT: b6e52aabbe - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints REVERT: 8e3244fa11 - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints REVERT: 84c45e2915 - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints REVERT: d733cf99f4 - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints REVERT: 259787bfca - 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 REVERT: 6cb3a25fc5 - 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 REVERT: ebdca1705d - 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 REVERT: 9c3770de40 - 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 REVERT: b4b1e20ff1 - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories REVERT: a183297bb4 - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories REVERT: 373f8fd9f2 - 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 .... REVERT: 9ea9ddfee3 - 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 .... REVERT: 65daa404e7 - 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 .... REVERT: 1d37e8108e - 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 .... REVERT: 72e67d4967 Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns REVERT: 082aa0564c Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns REVERT: c2d088017f - 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 REVERT: e81461d360 - 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 REVERT: 403f7d82fe Merge branch 'feature/MAR10001-837' into 3.0 REVERT: 8afc6fd73a Merge branch 'feature/MAR10001-837' into 3.0 REVERT: 139c38dfcd MAR10001-847: Fix prices in product datagrid REVERT: 2dce082c55 MAR10001-847: Fix prices in product datagrid REVERT: bb9731f590 - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications REVERT: ee895fc38b - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications REVERT: df960cce18 - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications REVERT: 6d8be00d08 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class' REVERT: d23be122f9 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class' REVERT: 734f9737ee Merge branch 'feature/MAR10001-845' into 3.0 REVERT: 5048005bde Merge branch 'feature/MAR10001-845' into 3.0 REVERT: 185d34b24d Merge branch 'feature/MAR10001-845' into 3.0 REVERT: ae99a18c1d Merge branch 'feature/MAR10001-845' into 3.0 REVERT: bcd1cac313 MAR10001-837: Inventory batch layout REVERT: c9506bd825 MAR10001-837: Inventory batch layout REVERT: 2c9235aeda - 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 R…
- Loading branch information
