let the user choose it's "--url-application" param value #2

brainOut · 2018-12-19T12:22:58Z

remove --url-application param from composer.json's script part, to let the user define its own url application.

remove `--url-application` param from composer.json's script part, to let the user define its own url application.

Fixed fatal error on product save

….446668aac 446668aac - remove composer.lock file from marello application ee for branch 07ca88d21 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 e21e37842 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 e0805d258 Update OroRequirements check to be compatible with Oro Platform 3.1.x 67a71b6af - remove lock files f7cd198b0 - remove lock files from master 5c5633301 - Release preparation 2.1 a91b309d7 - updated version number in upgrade notes d95397463 - prepared composer.json files for release 6fb68a83e - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 37cceb12a Merge branch 'develop' into feature/MAR10001-485-subscriptions 488b07fe2 - CS fixes - Updated dev.lock 22f054ddc - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 833d07d19 Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions efe95d211 Merge branch 'develop' into feature/MAR10001-485-subscriptions e43d1346e - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 22a02abd2 MAR10001-499: Filtering SalesChannel(s) on product edit page's SalesChannel selection grid a752f44f0 - remove setting datetime for pre-orders when purchase order is created a5d97d127 - PSR2 fixes - Remove unused constant from config - Unified translations for Backorders and Pre-orders c6d627992 Merge commit 'b55e936f3c6428ae97c2f440cd8df8e00e3a9127' into feature/MAR10001-377 a684040d6 Merge branch 'feature/MAR10001-604' into develop 985929421 - Fix PSR2 cs fixes d31fc550c Merge commit '4b5ec7e8d02e9b7e079e43d024f18dc3a92a9c7d' into development 87da451f8 Merge commit '40a4d43559a871bd237a9a91e61f6bb33f6db69e' into feature/MAR10001-604 a2560bfe9 - added composer.lock - added dev.lock - updated branch alias in marello package composer.json 16a13cf1f Merge commit '44448293702551e588fff6fd5860d9d1e0db4a11' as 'package/marello' de51c0982 Merge commit '07371b34fa35e74b969b9d7f160d601853a300b6' as 'applications/marello-application' 07371b34f Squashed 'applications/marello-application/' content from commit 3d023f800 8d1b0acc5 - removed test packages and applications ff563494f Merge branch 'master' of https://github.com/marellocommerce/development-mono-repository a364f4c8b - removed all packages and application in preparation for setting up subtrees 'correctly' ce5cb30e9 Merge commit '58fa179aa805e5f3117264671cf1998803b46eb7' into maintenance/2.0 cf767cd1d Merge commit '836c77f1c5eeb7490a5734bb5fefc4e68f5c1e3c' into maintenance/2.0 a7e69027e - Adding composer json to package bad4a42a9 Merge branch 'master' into bugfix/MAR10001-0-patchmelater 5a8a336f5 Merge commit '2aa4713bdd35a63c782f0b9881ab36bad31aa000' 2aa4713bd Squashed 'applications/test-app/' changes from 4fc55ec77..721a946a7 52ec12c67 - Testing the double push a654d687e - test line subree split 7936f0c50 - add another line e9b3ef3f7 - added a line 559dc3888 - added test-me for patching me later 2530c8df5 Merge commit '22d91eb8e1ba1e86cccb13bd7e54d278e06dcac7' as 'package/test-package' 22d91eb8e Squashed 'package/test-package/' content from commit 76854dbee c4871a500 Squashed 'applications/test-app/' content from commit 4fc55ec77 bfeec6f9b Merge commit 'c4871a500fcddb91eb4fa65e1bdbeea5b441d93d' as 'applications/test-app' bc1953383 MAR10001-377: Backorders / Pre-orders - Back- Pre-orders Datetime field 22cfacdb1 MAR10001-604: Update Locale / Localisation fields for LocaleAwareInterface entities - kept BC 3d023f800 - removed composer.lock 88f61a917 - Update Oro Platform to 3.1.6 which includes the update of twig version to 1.38.x e5f928e02 MAR10001-377: Backorders / Pre-orders - Add 'maxQtyToPreorder' field to InventoryItem - Back- Pre-orders Datetime field - Purchase Order's dueDate as Backorder expected delivery time - Add system setting for using the dueDate of Purchase Order on InventoryItem's backorder field acaa60ce0 - Update readme with reference to community chat ea5a25e71 - tmp removed navigation to attribute families and attribute creation 54c12f0ea MAR10001-604: Update Locale / Localisation fields for LocaleAwareInterface entities - Update inheritance chain of getting correct email template for localisation - Test chain inheritance of email template 24d310372 Merge branch '2.0-dev' into feature/MAR10001-604 015917f4e - Added creation of the Attribute group when loading the default attribute family data in order to save the attribute family inmediately instead of having to add a label to the group first 0a0c45901 - Updated css for having same look and feel on attribute family page as it does in OroCommerce 63288e8d7 - added fieldName to array to check unique values per field which will prevent issues when multiple validations of the UniqueCollection validation are used in the same request 10c57fb30 Merge branch '2.0-dev' into feature/MAR10001-621 9b1374a08 - Fixed tests to include new contraint introduced in the transport settings form - CS Fix in product repo 63d38246b Merge branch '2.0-dev' into feature/MAR10001-604 02d4826c8 Merge branch '2.0-dev' into feature/MAR10001-591 a762d0239 - Added some additional tests for Product attributes and families a937a62ab Merge branch 'feature/MAR10001-54-product-attributes' into 2.0-dev 5f2c953c4 - added tests for checking the attribute routes if they are available for the MarelloProductBundle:Product entity 2931383fd - Updated check for checking if the schema has a table to prevent exceptions being thrown the function hasTable now is being used instead of getTable f203c24f4 MAR10001-597: Order dropshipping 120eb4ca0 Merge branch 'feature/MAR10001-54-product-attributes' into 2.0-dev 53ab3d2c1 - added translations for product families and attributes pages 4def4c6b8 Merge branch 'feature/MAR10001-54-product-attributes' into 2.0-dev 54d87a31f - fixed issue with wrongly updated config value for has_attributes data 6a2bb584b Merge branch 'feature/MAR10001-54-product-attributes' into 2.0-dev f8b4f032e - Added event listener to assign default attribute family on product creation - Updated tests to verify the family is in fact assigned 7175ec64b - Added migration to update existing products with an attribute family to prevent errors on editing existing products a43a58a44 - Updated translation labels to use a key on navigation items for product attributes routes - Updated demo data to load default attribute family - Added migration to create a default attribute family fe19b56f5 - Added listeners for showing Product attributes for the specific Product family 764a6f65c - Added query for updating entity config in db with has_attributes=true to include change in annotation in db for existing installs - Added routes for easily navigating to creating product families and product attributes 6468cabc5 - Enable attributes to be shown in the Product update view 890ae4d29 - Added schema updates for Product to include attribute family - Added the config notation to make the Product Class available for adding attributes via it's own attribute management - Added test to ensure the product has the config notation - Updated test to include new $attributeFamily in property testing 89c912d38 MAR10001-591: Update OroCommerce Bridge for 3.1 versions - fix for using LIKE operator on json column for pg_sql database driver 7c8828c98 MAR10001-621: Issue with assigning orders to external Warehouses in the Marello Community Edition ab6b2d84b - Updated translation for section of Back/Pre-order - Moved fields of Backorder/Pre-order to widget in order to keep data together in InventoryItem view - Moved fields of Backorder/Pre-order to separate section in InventoryItem update view c1f74c631 - CS fix 829e130db Merge branch '2.0-dev' into feature/MAR10001-377 c0b85c23e - Updated migration version for OrderBundle installer 766d7bc49 Merge branch '2.0-dev' into feature/MAR10001-596-adding-context-to-note 8a02aeb5b - small bugfix in showing the correct items for the inventory db246f4e5 Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev 186fd5c27 MAR10001-377: Backorders / Pre-orders 30f449cfa - Added check for existing product supplier relations in demo data before creating new ones which fail because unique constraints 264e35327 - Added 'allow_delete' parameter to inventory level form view in order to disable deletion for InventoryLevels on External Warehouses 05b9214df - fix issue with disabling / enabling the managed inventory e599843bc MAR10001-377: Backorders / Pre-orders 1918136a6 Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev 04faf1a5e Merge branch '2.0' into 2.0-dev a8058e600 Merge branch '2.0' into 2.0-dev 836c77f1c - Update various files to make 2.0 branch php 7.2 compliant 8fe23b670 Merge branch 'brainOut-patch-2' into 2.0 3243563e6 - updated product supplier demo data to include inventory levels for external warehouse 076a5998c Merge branch 'feature/MAR10001-597' into 2.0-dev 30156ddfd - updated form type for CE version to include External Warehouses - Moved migration for updating inventory levels to be 'managed' to CE, otherwise it will be not manageable baa1d4360 Merge branch 'feature/MAR10001-597' into 2.0-dev 01ceab8f8 - Added dependency on external warehouse data migration before updating suppliers with inventory levels and an external warehouse 489df6313 Merge branch 'feature/MAR10001-597' into 2.0-dev 9be204819 - Added migration for existing installations to update the suppliers marked for dropshipping and related product marked as dropshippable to create an external warehouse and related inventory levels e851febdb MAR10001-591: Update OroCommerce Bridge for 3.1 versions - Fixed entity aliases - Fixed Integration Forms validation 6c020257f - Split supplier data into two separate fixtures for loading ProductSupplierRelations and Suppliers to separate responsibilities of loading data which is dependent on each other 9a61316d4 - updated demo data to set the managed inventory on demo data inventory levels for editting in EE version 8a7ee948d - Added check for disabling fields on inventory level when it's managed or not 5d2aedbd3 merge 2.0-dev into feature/MAR10001-591 b0b6e79bd MAR10001-597: Add Dropshipment functionalities within Marello - Modified logic in orderItem and packingSlipItem status assigning a37ee7051 MAR10001-597: Add Dropshipment functionalities within Marello - Show OrderItem status in OrderItem line on Order view page; - Show PackingSlipItem status in PackingSlipItem line on PackingSlip view page; - Added external inventory to AvailableInventoryProvider; 3e031a9ba Merge branch 'feature/MAR10001-597' into 2.0-dev f91dc37d2 - updated files with PSR2 CS fixes d70d4fec2 MAR10001-597: Add Dropshipment functionalities within Marello - fixed functional tests cdd9f82c5 MAR10001-597: Add Dropshipment functionalities within Marello - unit and functional tests fixes 640763743 Merge branch 'task/MAR10001-609-update-button-label-in-po-workflow' into 2.0-dev 8e7d7a224 - update label on worflow button from 'Receive partially' to 'Receive items' in the Purchase Order wf 12e444486 MAR10001-604: Update Locale / Localisation fields for LocaleAwareInterface entities 2ded8637b - Updated the navigation and index translation for Warehouse Channel Group Links to Linking Sales Channels for clarification dee02154b MAR10001-597: Add Dropshipment functionalities within Marello 28c539326 MAR10001-596: Adding context to an existing note 6374b270f Merge branch 'feature/MAR10001-595' into 2.0-dev 2c215cf65 Merge branch '2.0-dev' into feature/MAR10001-594 03b2033c5 MAR10001-595: Fix inventory management link 51b65992e Merge branch 'feature/MAR10001-592' into 2.0-dev c6f1127d0 - Updated tests for refund extension test to include new twig function - CS fix in RefundBalanceCalculator 94657c82f Modifying entity aliases 6e86bf7db Make Marello2 installation 7.2 complient 899d4aa3d Merge branch '2.0' f78c14242 - added import export .gitignore file 47d3dc480 MAR10001-592: Refund balance doesn't take other refunds into account - added validation based on Refund Balance 04ac4fc7e MAR10001-594: Modifying entity aliases ef46237b7 - added support for validating duplicate sku's in a single order against the available inventory in the balancer 23cecb4c6 - Removed unsused join 049491f21 Merge branch 'MAR10001-0-fix-readme-and-application-var-dir' 469e9d596 Merge branch 'MAR10001-0-fix-readme-and-application-var-dir' into 2.0 34ed913b9 - Removed PostgreSQL notes from README since PostGreSQL is not supported by community edition - Updated .gitignore file so it wouldn't ignore the necessary var directory again - Added the var/ directory to the application structure in order to install the dependencies correctly via composer 42383d5f4 MAR10001-592: Refund balance doesn't take other refunds into account 9cff0dded Merge branch '2.0-dev' into feature/MAR10001-591 504a89ec5 MAR10001-591: Update OroCommerce Bridge for 3.1 versions c40558421 - added formatting-code and language parameters for install 106d7c8ef - updated translation 58fa179aa - updated dependencies 51e1974d5 - Updated description for login screen b1f1ead62 - added dev.json - remove old changelog file 66919afa4 - typo fix in dependency requirement b21e89944 - attempt number 2 for getting the correct dependency 5510d7c25 - update branch alias 1abf9a702 - update branch alias - update dependency for correct oro 'branch alias' 1ea317dda - Fixed Typo in repository url 5adf2a41d - Fixed typo in repo url bde7b535b - updated composer.json, removing development script 9ed1d0ce9 - update readme 3856e1d79 Merge branch '2.0-dev' into release/2.0 ee21aa999 Merge branch '2.0-dev' into release/2.0 fd14a313c - Update application structure to Oro 3.1.x 73560f85d - fixed configuration field constraints in order to comply with platform 3.1.2 validation of system configuration fields 2294b3759 Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev 8822f476a - updated license copyright year 7662f017a Merge branch '2.0-dev' into bugfix/MAR10001-0-3-1-fixes 0114d51b5 Merge branch 'feature/MAR10001-0-add-option-for-using-balanced-inventory-in-cancel-action' into 2.0-dev 9401d6bda - fixed invoice type by 'duplicating' the discrimiator field into a normal property of AbstractInvoice 85d38276d - fix import export validation button icon 6f8081ab2 - renamed assets structure in order to build assets with Oro's webpack implementation 45a3cd2ac - Added additional API test responses for getting creditmemo's 16a79db65 - Add creditmemo API repsonse 027f69f2b - adding new way for abstract item mapping - added additional check if order item does exist on refund item before getting all data through the PropertyAccessor 921a79fb8 - moving around some of the code ba01b9c51 - updated tests for api responses of getting invoices - added the type from the discriminator column into the Invoice data model where Creditmemo and Invoice have their own value - Removed the InvoiceType entity from the code base since it has been replaced by a simple 'string' value defined by the discriminator value 935700eb0 - First attempt on splitting the Invoice entity into Creditmemo and Invoice 4b2ee551c - removed unused code 106c45048 - Added InvoiceJsonApi Test - Added API resource for invoice, shipment and packingslips 00c46d668 - removed empty line 09b019fd9 - Updated Customer entity to be extendable - Added rendering of fields to views ae657bba8 - CS fix for translation being longer than 128 characters f1ef37984 MAR10001-589: Remove REST API Routing, Controllers and related Forms d7ab0baff MAR10001-589: Remove REST API Routing, Controllers and related Forms 6b73ba0b4 - Updated Product grids to sort on the same columns 14d3154c8 - Added additional inventory balancer event - removed credit step/transition from workflow cac767536 Merge branch 'feature/MAR10001-590' into 2.0-dev 03a67b596 - Removed unused code ffc60303b - Added additional check for getting WarehouseChannelGroupLink's warehouse group which if not checked would result in a error when selected in an Order b2cb99e22 - Added translation for bottom "All rights reserved" 4a583356e MAR10001-590: Rest JSON API is missing Workflow routes 43ed760cb - more cs fixes b34c17635 - renamed file for CS fix 408f498cf - renaming class for cs fix 525bc6a3c - CS fixes e4c283eac - css fix for destiantions in the shipping method config rule c15280b4d - formatting update.html.twig with correct indentation - Changed from ChoiceType to OroChoiceType in order to get correct classes for select 2ab07f07e - CS fix 56e2fee93 Merge branch '2.0-dev' into feature/MAR10001-421 b20af3629 Merge branch 'feature/MAR10001-545' into 2.0-dev eb39834b3 - changed translation 7d008151f Merge branch 'feature/MAR10001-587' into 2.0-dev 911d972bf Merge branch 'feature/MAR10001-587' into 2.0-dev 0563fbc65 - updated validation for productsupplierrelation field to show the error message on a field which does exist on the productsupplierrelation entity - updated translation key for uniqueness error on productsupplierrelation in order to show the translated message aa3072a97 Merge branch 'brainOut-patch-1' into release/1.5.2 3b57a1652 - Updated composer lock for 1.5.2 version ab3ed91de - Added fix for logging inventory movement while nothing has changed. Now no InventoryLogRecord is created when both quantities (inventoryAlteration and allocatedInventoryAlteration) are 0 5981c6588 - Added additional validation to OrderLineItem that 'fixes' the issue of a quantity value below 1 d09043638 Merge branch 'brainOut-patch-1' into 1.5 dd266fbda Merge branch 'patch-1' of https://github.com/brainOut/marello into brainOut-patch-1 a82bbf9ef Merge branch 'Djamy-patch-1' into 1.5 7152813a4 MAR10001-545: Add a warning when removing an inventory level 9be718199 Merge branch 'feature/MAR10001-588' into 2.0-dev e938c2bea Merge branch 'feature/MAR10001-548' into 2.0-dev f0c94f24b - cs fix fecf206c6 MAR10001-587: A couple of custom Validators have stopped working with Symfony 3.4 version cef2a7031 MAR10001-587: A couple of custom Validators have stopped working with Symfony 3.4 version 200054732 MAR10001-588: Alignment inventory balancer e622d8477 MAR10001-548: Align prices in grid to the right - fixed prices on products-grid fde2c1d16 - CS fix - Updated Test for WarehouseDeleteHandler for taking into account the translator that's being injected 9378c4528 Merge branch '2.0-dev' into feature/MAR10001-536 167b27e8b Merge branch '2.0-dev' into feature/MAR10001-536 a8b7b03bf MAR10001-536: Add additional inventory balance events 7840db0d6 MAR10001-536: Add additional inventory balance events d739eb5d3 MAR10001-536: Add additional inventory balance events 9fb10e306 - Changed name of Domain for InventoryLevelLog triggers translation 52dc73b7d - Changed the way labels of workflow triggers are being translated - Removed unused dependency in WorkflowActions - Updated inventory replenishment route identifiers and acls - CSS fix for add products button on Replenishment Order create f06733e03 Merge branch 'feature/MAR10001-416' of https://github.com/marellocommerce/marello-dev into feature/MAR10001-416 20f0b1a92 Merge branch '2.0-dev' into feature/MAR10001-416 a0eed54d3 Merge branch '2.0-dev' into feature/MAR10001-537 61bee513f Merge branch '2.0-dev' into feature/MAR10001-552 ede95d802 Merge branch '2.0-dev' into feature/MAR10001-548 92542b89c MAR10001-581: Hero widget (layout issues) f468479d2 MAR10001-581: Hero widget (layout issues) cddbfa08f Merge branch '2.0-dev' into feature/MAR10001-579 c9f7b941d - fix deleting of products via API 7bee3804d - css fix 3138d3838 - CS fixes 728faf1ab Merge branch '2.0-dev' into feature/MAR10001-574 6338477c6 - Removed unused import from listener 3ff5b0122 Merge branch '2.0-dev' into bugfix/MAR10001-0-miscellaneous-fixes 79b317d7c - Fixed layout issue hero widget on dashboard - Removed DELETE route from MarelloAddress api during foreign key constraint issues - Fixed 'no data' message when adding products for purchase advice and no data is shown ed50ddab7 MAR10001-579: Modifying categorie product assignments c2faada45 MAR10001-416: Inventory Replenishment 3306fb71a MAR10001-416: Inventory Replenishment 68ab8ebfc - added css fix for region-text field d419f2136 - Fix css for Order totals in order view 2e2246ccc - Fixed layout issue with Primary & Shipping addresses on Customer view b56e38d9a - Swapped cost and priority in product supplier grid on product view and edit e9f0f67c2 - Fixed add button on Purchase Order create by using the same class as other add buttons in grid forms - Fixed remove button on Tax Jurisdiction zip-codes by using the same class as other remove buttons in grid forms - Fixed css for remove button in order to remove the margins around the 'X' in grid forms 94cf731b1 - Updated CSS for inventory level adjustment input fields to get them unstuck from each other and in line with the rest of items - Added "layout=separate" to form fields - Added additional divs for getting the adjustment fields unstuck 766cbcb84 - Added fix for adjustment input fields which where stuck together by adding additional divs 4b7f64ba1 - updated 'algorithm' for showing inventory chart timeline correctly 5b34fb29c - updated query for getting total of inventory quantities for inventory levels instead of sum of alterations 8e6418d79 - Updated InventoryLevelGridlistener tests - Added InventoryLevelLogGrid listener to add Warehouse to inventory level log grids 3a1edfee6 - Removed unused controller - Added additional fields for 'real' quantities on InventoryLevelLog 3cff108b4 - Added check if both inventoryAlt and allocatedInventoryAlt are 0, if so don't log the 'change' because nothing changed 5feea5942 - Updated method of updating the inventory through the workflow of Replenishment. - Split a single update into two actions to have correct display of inventory 50972cc49 Make the interface compatible with the modified Trait 4f39919e0 Add possibility to reset shipment d662b9add MAR10001-552: Add shipping costs to return and refund Order summary c6f76c67d MAR10001-548: Align prices in grid to the right 1806b8a98 - updated Replenishment workflow label e7d795f0e - Fixed layout issue of order statistics widget. d7092b21d Merge branch '2.0-dev' into feature/MAR10001-551 9eb2d9928 MAR10001-574: Query time product grid optimization 54f44595f - Fixed minimum quantity WFA rule test to take into account the new WarehouseChannelLinkRepository - CS fixes 803c33dd3 - Removed unused test datafixture - Added SalesChannelGroup references to default WarehouseChannelLink e806dbd74 Merge branch '2.0-dev' into feature/MAR10001-523 40496d6eb Merge branch '2.0-dev' into feature/MAR10001-523 4746b0807 Merge branch 'feature/MAR10001-416' into 2.0-dev 02dfcf3b7 - Updated workflow to display replenishment items on page instead of popup - Updated translation messages - removed created at column from multiple entity template 176671283 Merge branch 'feature/MAR10001-416' into 2.0-dev a65ac2a0e - updated filters for Popup in Replenishment Order product Selection fa97b58a3 Merge branch 'feature/MAR10001-416' into 2.0-dev 4d69ed864 - Updated messages - Added updated/created at to Repl. Order - Removed Repl.Order.Items from datagrid - CS fixes e3d51b764 MAR10001-523: Splitting order over multiple warehouses went wrong c7dada236 MAR10001-523: Splitting order over multiple warehouses went wrong 6a0e4c631 Merge branch '2.0-dev' into feature/MAR10001-416 64122d89a - Added tests for return reports to verify they will not return errors when checking the reports - Fixed Report title for `returned_qty` report - Fixed issue with query where db name was still in the query and wasn't available - CS fix 6128e8119 Merge branch '2.0-dev' into feature/MAR10001-538 19ac73ddf - Added additional shipping rule and shipping rule config for GBP currency f4a1b8df1 MAR10001-416: Inventory Replenishment e9a32f923 MAR10001-416: Inventory Replenishment 2492f164e MAR10001-416: Inventory Replenishment 868358750 Merge branch '2.0-dev' into feature/MAR10001-538 5bcf5a5ca - added option to add note from workflow as Activity Note, only applies when note is being submitted and not empty 990ab85b3 - removed saleschannel column and filter from the default product grid (it's still configurable via datagrid options in GUI) 771710703 - Added inventory for surfboards in different warehouses 1753b3b4c - Added prices for surfboards - Added inventory for surfboards 7d2448b4c - Added support for refund creation from Order in the workflow action - Fixed case sensitive issue for TextareaType instead of TextAreaType which will allow textarea types to be displayed properly during the workflow transitions d34cd76a7 - Changed steps Invoiced->Paid to Paid->Invoiced ffcedd61a - Removed unused translations 87a168930 - Cleanup 4e4a8dc77 - CS fixes 266d8d41a - fixed schema tests 6a6338cf6 - updated InvoiceBundle by squashing the datagrids into a single one instead of both creditmemo and invoice edc05c95b - Added option to have the ability to use or not use the balanced inventory manager when cancelling an Order through the workflow 312891a0f Merge branch '2.0-dev' into feature/MAR10001-549 c239b1f83 let the user choose it's `--url-application` param fd31485cd add a data-layout to prevent backnone error 37ceec273 - Fixed with using the same class twice in a single class - Updated data for testing Order requests where shippingmethod and shipping method type are required b19b644f0 Merge branch '2.0-dev' into feature/MAR10001-343 c5be92891 Merge branch '2.0-dev' into feature/MAR10001-416 fd6dbd274 MAR10001-416 Inventory Replenishment - added description field 991d7a0fe MAR10001-551: Error when trying to duplicate a product a2b350d4c MAR10001-416:Inventory Replenishment - fixes for schema test - fixes for entity fiealds translation test 54658eb98 MAR10001-416:Inventory Replenishment - fixes for schema test 56767cbf4 - fixed missing constructor argument in ProductExtensionTest - Added additional Test for getting category ids via the ProductExtension 62a4f6855 Merge branch 'feature/MAR10001-416' into 2.0-dev b3fbfbe38 Merge branch 'feature/MAR10001-416' into merge/MAR10001-416 5360bc695 - CS fixes ca055712e MAR10001-538: return report f7a15be51 MAR10001-537: Discount is missing in the transactional emails order totals sum c79063752 Merge branch 'feature/MAR10001-549' into feature/MAR10001-537 6eaf90f5d MAR10001-550: Fix parameter binding in product-categories grid on product view page 5a487c9c7 Merge branch 'feature/MAR10001-416' into merge/MAR10001-416 6b423b572 MAR10001-421: Refund calculation 6559cb4b0 MAR10001-549: Update Notification bundle to comply with Oro Platform 3.1.x e6675dccf Merge branch 'feature/MAR10001-543' into 2.0-dev 515f82a1c - Added diagram for inventory/balancedinventory 6757254f4 - Added fix for float comparison on Refundtotal vs Order grandtotal ce0263e3a Merge branch 'feature/MAR10001-542' into 2.0-dev 0159c583e Merge branch 'feature/MAR10001-505' into 2.0-dev 7074bac70 - removed 'Export grid' from SalesChannel Aware grid when selecting products for an order in the popup 08261be14 Merge branch '2.0-dev' into feature/MAR10001-542 da089da56 MAR10001-542: Improve Marello search 09fc8e54a - updated ACL for datagrid ffe73ce9b - changed warehouse address country code to the correct iso_2 code for the UK ddc7a1822 - Updated SalesChannelTax Demo Data - Added additional channels to products c4f6c0770 Merge branch '1.3' into dist-master 820126dae Merge branch 'bugfix/MAR10001-0-UPS-channel-identifier-conflict' into 1.5 73beed807 - fixed UPS shipping method with marello as prefix for transport and channel to prevent conflicts with the OroCommerce one b472e7d31 Merge branch 'brainOut-master' into 1.5 b04bb3d4c Merge branch 'master' of https://github.com/brainOut/marello into brainOut-master 1a54f70bb - fixed json api responses for Orders, Prices and Returns dfd71b448 - CS fixes - Fixed PO & Order controller tests - Added setProductSku() as function in OrderItem 443ef298f - CS fixes aae53da32 - Updated some customer lastnames to easily identify users from certain countries - Updated address logic by not always randomly assign numbers for addresses b810ddc9c - Added additional shipping method Rule and Config - Updated JS to comply with new 3.1.x version - Updated default shipping method integration price 2a4a688c3 - Added additional warehouses and warehouse group - saleschannel group links fc5dfda5c - Added Demo data for additional SalesChannel groups and SalesChannels dff55d73c MAR10001-543: Refunds mixed currency f698fc186 - Updated Tax demo data with new jurisdictions, rates and rules - Moved references around for clarification 5f89e5c87 MAR10001-343: Invoices & Creditmemo's - merged and conflicts fixed 07ec0cac2 MAR10001-343: Invoices & Creditmemo's 196d81486 - tmp disabled notifications during hefty changes in 3.1.x 9f24dc44e - fixed filter to comply with version 3.1.x 641b73446 - Added labels for default wfa rules 300fb80a0 - Updated InstoreAssistantBundle to comply with oro version 3.1.x - Removed all unused code from InstoreAssistantBundle d702b50d7 - Fixed JSONApi responses for product functional tests ef58bc032 - updates OrderJsonAPI responses for functional tests 189c500ef - CS fixes in test files 8c7c36d02 - Removed Product Status from Inventory datagrid 85576ca9a - Fixed page title on WFA rule create cc2d45069 - Fix API User loading test by using the new Authorization checker and fetch the UserToken from the TokenStorage 1fd6770b8 - CS fix c7514694e - updated unit tests with authorizationcheckerinterface for testing - removed useless unit tests 1502b1694 - updated unit tests with authorizationcheckerinterface for testing - removed useless unit tests 7442fc96b - updated \PHPUnit_Framework_TestCase to a use with 'new' namespace for all unit tests classes which extend the 'old' version of PHPUnit 60e7e1700 - updated \PHPUnit_Framework_TestCase to a use with 'new' namespace for all unit tests classes which extend the 'old' version of PHPUnit a98fb601c - remove mass action from Product grid in the selection popup on Orders beb3a1075 - cs fix 2bc1bc03d - moved suppliers to separate file for demo data - removed columns from main 'products' demo data csv file - Added references for prices to make them available when calculating costs for supplier based of default price a5da554d4 - Added new product prices demo data - Moved logic for adding prices and channel prices to separate files - Removed old data from dictionaries caa89468d Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev 08bd58f4c - fix issue with weird js behaviour for duplicate items in order creation b2e68e80a Merge branch 'bugfix/MAR10001-0-fix-refund-and-return' into 2.0-dev bdfaace2a - first version of totals validation for Refund f79b900df - added additional tests for creating refunds - added flash message on refund creation 6301721c0 - updated translation - fixed issue with 'deleted' Refund items when saved on edit - added 'data-layout="separate"' to the additionalItems of Refunds to load PageComponent correctly - Fixed issue with display workflow status on updating the Refund e447c0ef6 - replaced Select2ChoiceType with SalesChannelSelectType in the Return Form Type e90ca81de Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev c4d14b5a2 - update quantity of unit in demo data to 1 419b44ea6 MAR10001-505: Optimisation of Image rendering in Product Grid 05373d740 - removed createdAt from OrderView c4f4c43ec - added migration for removing the virtual inventory level and adding the balanced inventory level table 774200982 MAR10001-524: Add additional step on default order workflow 08b63c661 - Added diagram for clarification with relations of Inventory and Balanced Inventory (and other related entities) 286cadeb3 - Renaming files to BalancedInventory* like names for consistency 60980838f MAR10001-416: Inventory Replenishment 4b9f572ee MAR10001-416: Inventory Replenishment 1e317b77d - starting renaming of VirtualInventoryLevel to BalancedInventoryLevel 0dc996970 - fixed duplicate products in order line items having trouble calculating row totals 9fcc1a80e Merge branch 'feature/MAR10001-500' of https://github.com/marellocommerce/marello-dev into feature/MAR10001-500 9f2307630 - cs fix 2ed7b7f20 - CS fixes 829edeec4 - fixed SKU as identifier in product API a766d7d66 Merge branch '2.0-dev' into feature/MAR10001-500 3fc327973 Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-ee-dev into 2.0-dev 7725269a6 - fixed exception in unknown form types in GoogleApi configuration by using the FQCN instead of aliases ba92be34c Merge branch '2.0-dev' into feature/MAR10001-500 bd55eb69f Merge branch '2.0-dev' into feature/MAR10001-507 4c5e46617 - Fixed layout issue on shipping rules by renaming the sheets to .scss and include all relevant .scss files into a main file 836db5bb1 Merge branch '2.0-dev' into feature/MAR10001-505 4b1699c3d - Remove `methodConfigs` from marello-shipping-methods-configs-rule-grid - Reverted changes in BasicShippingMethodChoicesProvider & EnabledShippingMethodChoicesProviderDecorator in order to make the identifier of the shipping rule the key and the label the value in the array - Add condition to check if a method is actually returned from the shippingMethodProvider in the EnabledShippingMethodChoicesProviderDecorator in line 39-40 - Replaced non-existent option `empty_value` with `placeholder` in Symfony 3.4.x in the Marello\Bundle\ShippingBundle\Form\Type\ShippingMethodsConfigsRuleType.php - Replaced non-existent option `options` with `constraints` in Symfony 3.4.x in the Marello\Bundle\ManualShippingBundle\Form\Type\ManualShippingSettingsType.php 881481c7d enhanced phpDoc comments 200fd94e7 MAR10001-507: Rename ExtendWorkflowBundle to WorkflowBundle 3f6908c4b MAR10001-505: Optimisation of Image rendering in Product Grid c076e9c6a - fixed form types in system_configuration files 00d0d3882 - fixed form types in system_configuration files 9adfeb99a MAR10001-500: Create Sales Channel Assignment Mass-Action on Product Grid 453187239 - CS fix 730cf802d - fixed assembled channel pricelists API responses 58e92fc16 - fixed prices and assembledpricelist responses for API 27c0d6247 - fixed products api responses 9de919074 Merge branch 'bugfix/MAR10001-fix-functional-api-tests-variables' into 2.0-dev 6730da3b1 - fixed responses for returns - removed yaml dumps for responses in api 7cbe557bc - fixed customer api responses d631c0844 - fixed responses for Order Json API cc0a32a52 Merge branch 'feature/MAR10001-498' into 2.0-dev e1fc78cba - CS fixes eff1ac53e Merge branch 'feature/MAR10001-499' into 2.0-dev a6d660ab6 - CS fixes - Removed unnecessary code - Fixed typo in entity class in form.yml parameters 647154676 Merge branch 'feature/MAR10001-496' of https://github.com/marellocommerce/marello-dev into feature/MAR10001-496 4da36cb32 MAR10001-496: Moving Marello to new Oro Platform 3.0 - fixed issue with Product Index Page 7ea85e24e - reverted color change in left nav of admin panel 7756b5a36 MAR10001-499: Filtering SalesChannel(s) on product edit page's SalesChannel selection grid d55775457 - fix 'typo' on form - tmp added css - add svg image 42778f4d4 - run forrest run... 2cf479eb4 - ffs 084b2359f - ... 4a0eca475 - force recreate... :/ fbb21233a -... d6d528e1e ... b04816746 - testing with pre-creating vendor directory 4ea24f1a6 - testing timeout && retry for installing dependencies before going into testing 5481eecf9 - setup testing d4a04b125 ... f31a9859b - testing setup df9e092a0 - added composer-map-env.php 0a21da3aa - fix composer-map-env.php call in container 9ebeffd9b - bare....: 781309c41 - ..:/ 9bfeb56e5 - ... 60ed75344 - tmp remove the cleanup for debug f1bd44c1f .... darn 6fa05adfc MAR10001-498: Add Columns, Filters and Sorters to Products grid 02c180e9b - fix syntax issue c523f8753 Update jenkins file 2da081755 - fixing mkdir recursive 2d0223119 - testing... bd1cf96b1 - testing.... 82065676b - remove vendor dir creation from run.sh on docker-build - add creation of vendor dir for www-data user in jenkins file 3cdb5910a - trying different setup for 'building' stage c23ee8aa5 - trying to fix composer install in container when there is no vendor directory created yet bf8e2c57c - adding another volume which should have an ownership fix - trying to execute composer installs with specific user e59303172 - removed one of the post commands to 'remove' all files within the container - added docker-compose down with specific file in order to close and remove the containers 6b3904db9 - updated parameters to map into parameters.yml - added composer environment parameter mapper in order to create the parameters.yml 7ff881b46 - updated command to exectute phpunit 066764a75 - Updated the way composer install is initialized and added variables for which of the json files should be used to do a composer install 7378a5ad2 - Added some variables to be able to control the build of a certain environment 37a82587b - changed APP_ROOT for cleaning up the 'correct' directories when shutting down during issues with 'root' as owner on some directories 5daff49e2 - fixed composer install command line execution during missing whitespace between two options f961c409d - fixed quotes on phpunit & phplint executing commands in docker container f9c5a3848 - trying different syntax for ENV in Dockerfile abe9b4116 - added jenkins file d3a737aa4 - removed composer.lock files as they will only be available for specific tags in the future - added dev.json for the orocommerce application b69f12bf1 - cs fixes b5ed9f62b MAR10001-490: Add missing icons d2afb852d Merge branch 'feature/MAR10001-496' of https://github.com/marellocommerce/marello-dev into feature/MAR10001-496 1c6542549 MAR10001-490: Add missing icons 464b4ac04 Merge branch 'bugfix/add_monorepobuilder_yml' into release/1.0.x 959997074 - add monorepo-builder.yml abc07f6d4 - fixed cs dc041308c MAR10001-496: Moving Marello to new Oro Platform 3.0 fd28b25f5 MAR10001-496: Moving Marello to new Oro Platform 3.0 277e77451 MAR10001-496: Moving Marello to new Oro Platform 3.0 - changed icom, logo and description from Oro Plarform to Marello 3525ae73c - added dev.lock files 64189d6ab - Added dev.json & dev.locks to Marello CE & EE application ed481cc99 - Added docker environment - Added .gitignore 9738bd9ed Merging marello-orocommerce-bridge to master d0e4c8dd2 Merging marello-orocommerce-api-bridge to master e6573f427 Merging marello-orocrm-bridge to master ab122d579 Merging marello-magento-bundle to master 1be669c12 Merging marello-orocommerce-ee-application to master 4c4c591fe Merging marello to master 5de9a3134 Merging marello-enterprise to master 855ff164d Merging marello-application to master c3cac8169 Merging marello-application-ee to master 49e4c9940 Root commit for master branch 78eb273b9 - changed branch alias to match minor version scheme f37162629 - changed branch alias to match minor version scheme 227db193a - changed branch alias to match minor version scheme 15184e142 - changed branch alias to match minor version scheme fb55d6808 MAR10001-496: Moving Marello to new Oro Platform 3.0 a98d10fab MAR10001-496: Moving Marello to new Oro Platform 3.0 e9f969139 Merge branch 'release/1.5.0' 4bab95f8b - updated composer.lock with oro/platform version 2.6.29 7b8bf8b20 Merge branch 'release/1.5.0' 62c0aff73 - updated composer.json & composer.lock fa94e843b Merge branch 'release/1.3.0' into dist-master 1a14b152a - cs fix 0c7180199 - updated composer json - removed ymldumps from test files 0758cdf7b - updated composer.json 5b7877677 Merge branch 'release/1.3.0' into dist-master d29b7ee83 Merge branch 'bug/MAR10001-inventory-validation-on-order-create' into release/1.3.0 bfc36f024 Merge branch 'feature/MAR10001-379' into release/1.3.0 2fc95e9a9 Merge branch 'feature/MAR10001-494' into release/1.5.0 c66c73f79 - Remove markAsSkipped from tests - CS fixes for processors f6f3ebca9 Merge branch 'dev' into feature/MAR10001-345-api bef1af945 Merge branch 'dev' into feature/MAR10001-345-instore-assistant 8c31f3c64 Revert "- [WIP] Remove unnecessary files for custom authentication and CORS options request" 74812237f - cs fix 85ca61b1a merged dev branch into feature/MAR10001-494 964e7e8ca MAR10001-494: Current (JSON) Api doesn't support Workflow processing 67978d1c9 Merge branch 'brainOut-fix_marello_returns' into dev be40693a1 Merge branch 'fix_marello_returns' of https://github.com/brainOut/marello into brainOut-fix_marello_returns 3ec27242a - Added css for consistency in the layout of the remove button on collections in edit modus 008007947 - Added css for consistency in the layout of the remove button on collections in edit modus 9b9cb6674 - added new translation for delivery location on purchase order warehouse selection block 334eab071 Merge branch 'feature/MAR10001-495' into dev a6d6e66e1 Merge branch 'feature/MAR10001-418' into dev a683a9a14 Merge branch 'feature/MAR10001-418' into dev 08404a693 - cs fixes c6753f482 - CS fix 55685aeee Merge branch 'feature/MAR10001-460' into dev 74bd4ff44 - Fix issue with Return notifications not being sent even if it's configured to do so - CS fixes 8146137dd Merge branch 'feature/MAR10001-486' into dev 90eed74f6 - updated purchaseDate setting via prepersist lifecycle callback - added purchaseDate to relevant order-grids bb13341ee - Updated error confirmation popup title to a more generic title, thanks @brainOut - Updated popup opening when changing saleschannels and deleting order items which are not salable in a specific saleschannel 2dea32d10 - Updated error confirmation popup title to a more generic title, thanks @brainOut - Updated popup opening when changing saleschannels and deleting order items which are not salable in a specific saleschannel 2cf127c2a Merge branch 'feature/MAR10001-486' into dev 608bb0a2a add control on shipment existence before render form f7c2b7714 MAR10001-495: Current (JSON) Api doesn't support Workflow related entities 31fad2ab3 Merge branch 'feature/MAR10001-352' into dev 8956c4546 - CS fix 710ce4c02 MAR10001-486: Add purchase date to Order entity 77f1cfb84 MAR10001-352: Remove telephone number on Order address 7f9cacd23 MAR10001-460: Review Order notification being sent when Order is created 49e7e271f MAR10001-351: Add image column to gridview 9c2f50064 MAR10001-418: Orders cannot be processed if coordinates for an address have not been found/stored 2ccb6c2e6 MAR10001-418: Orders cannot be processed if coordinates for an address have not been found/stored d1c4e1fdf - Fixed form validation for ChannelPrices collection in API and GUI - Fixed DEFAULT_PRICE, SPECIAL_PRICE references in Migrations and FormSubscribers - Updated pricing api to use 'saleschannel' as key for 'channel' attribute in order to improve consistency in API resource keys 84bb82132 - updated API tests for channel priceslists - updated api's with consistent field names - updated fixtures and tests to adhere to updated fieldnames - added resource docs for pricingbundle entities cee5b4f95 MAR10001-493;Update docs e5c379b36 - Add support for AssembledPriceList in API aec413829 MAR10001-493;dep changes to stay 49b100ce7 MAR10001-493;Adding support for special and msrp prices 9849a7502 - added AssembledPriceList and AssembledChannelPriceList to API 358f5346f - update api doc c9a2fc39f - updated api doc for virtualinventorylevel 890ff59a5 - removed unused test ec5b285d4 Merge branch 'feature/MAR10001-488' 2d4d39256 MAR10001-488;rm todos 2b5d8f7c3 Merge branch 'dev' into feature/MAR10001-345-api 06e8d3cd0 Merge branch 'feature/MAR10001-46' into dev b46091219 - Changed hero widget icon for hero products widget 84d92c014 - repsonses adf804275 Merge branch 'feature/MAR10001-345-instore-assistant' of https://github.com/marellocommerce/marello-ee-dev into feature/MAR10001-345-instore-assistant 66d69b0fb MAR10001-46: Hero Products Widget - added dateRange option - fixed layout design issues 2689fe82c - api responses 54951165c Merge branch 'dev' into feature/MAR10001-345-api 9fc6d03a7 - fixed functional tests which were using demo data fixtures instead of test fixtures be962d170 Merge branch 'dev' into feature/MAR10001-345-instore-assistant 93d24c5ac Merge branch 'dev' into feature/MAR10001-345-api 0b27733f9 Merge branch 'feature/MAR10001-46' into dev 76c7cc7ff - CS fixes 3fd6cd9e9 - updated icon for hero widget in widget selection popup on Dashboard 973889a60 MAR10001-46: Hero Products Widget - applied new layout design ad3533a6c - Added docs for SalesChannel JSON API - updated saleschannel api definition with excluded fields and actions - updated return item api definition with excluded action(s) 75c2f5bcf - Updated validation for Return Item by moving constraint to validation.yml instead of the FormType itself - Updated documentation resource for Return JSON API 1d9175b3f - Fixed Merge conflict in LoadProductData - CS fixes aa1ce1f32 Merge branch 'dev' into feature/MAR10001-345-api f1b6f4a99 - CS fixes df642b222 Merge branch 'feature/MAR10001-378' into merge/PR40-MAR10001-378 2528c7593 - updated return json api test - added doc resource for return api b9b316402 backmerged dev branch 5be36987b MAR10001-378: Additional product pricing information - backmerged with dev branch cbad1d0ea MAR10001-378: Additional product pricing information - merged with remote branch 644d54ef6 MAR10001-378: Additional product pricing information - Update Order's get prices/channelprices - Fixed Functional tests - Fixed Unit tests 1d896b76a - Fixed support on return api 91054f92e Merge branch 'feature/MAR10001-378' into merge/PR22-MAR10001-378 21e332756 Merge branch 'dev' into feature/MAR10001-345-instore-assistant efcc5b63e - CS Fixes in inventory bundle 3eaf2d968 - Updated indexes for complying with the schema test 2d3599336 - adding Annotations for correcting the difference between the schema installer and the doctrine annotations 854dfe5e4 - CS fixes 7ca88f725 - Fixed preserving prices on install when updating to AssembledPriceList and AssembledChannelPriceList a3be0e2d6 - Fixed Product Unit Tests in order to comply with newly created AssembledPriceList and AssembledChannelPriceList d8ad61dba MAR10001-488;Fixing few code smells (psr) a24861d9e - Fixed issues with running platform update in combination with new tables 7548d29be - [WIP] Add API support for Returns 4eca761ec MAR10001-488;Fixing few code smells (psr) e8f696b15 MAR10001-488;Fixing tests ffec331dd MAR10001-488;Fixing tests, adding missing messages a5b53f1fd Merge branch 'dev' into feature/MAR10001-345-api c7a0e63c9 Merge branch 'bugfix/MAR10001-487' into dev 83f92c426 - fix customer select issue from customer grid on order creation e1c487fb3 MAR10001-488;Fixing unit tests a68815bbf - Reverted disabling of AvailableInventory validator - Added validation groups for specifically validating on API calls without validating the AvailableInventory e4ea14f2d MAR10001-378: Additional product pricing information 3151e86ae - tmp disable test 1680a3fa2 - [WIP] Add workflow item config to related entities in JSON API 3af6565b4 - Removed InventoryLevel API support because of issues regarding non-mapped fields in Form 5f3878730 - [WIP] adding inventory level api support b48c518e4 - Added API support for virtual inventory levels (balanced inventory) 057201ba3 - updated order json responses for api 3a44b3cd6 - Added tests for category api 0a46f8b5b - Updated responses after false positives of functional test results with corrupt database tables on auto increment ids - Added product update api test - Added tax code api document resource - Added product api document resource b33c0042b - updated API with create for Orders - updated tests with requests and responses for orders with and without new customers - added taxcodes to api - tmp disabled available inventory validator because of issues with api calls 7dd23b22e - updated responses for order api tests f3a4f72f8 - update product responses for tests 0b56c8ced - TMP Disabled services 8ca9fa207 - Added OrderCreation test via JSON api - Added order_create request data 1d4817443 - update order API responses for functional tests e3857c0db - [WIP] CS fixes 67a4f8b98 - [WIP] Remove unnecessary files for custom authentication and CORS options request 2c00cfdfa Merge branch 'dev' into feature/MAR10001-345-instore-assistant 011ad4155 - CS fixes 8058cd7f0 Merge branch 'dev' into feature/MAR10001-345-order-api bfb219e89 - CS fix bab641184 - replace oro_shipping reference with marello_shipping 2c5524e62 Merge branch 'dev' into feature/MAR10001-345-order-api f1e8fa965 Merge branch 'dev' into feature/MAR10001-345-instore-assistant f114f4943 - fix constructor of ShippingMethodFactory on creation in test be76ab275 Merge branch 'feature/MAR10001-449' into merge/PR38-MAR10001-449 65b440ee2 - Removed skipped tests file of UPSShippingIntegration - Updated doc block for ManualShippingServiceIntegration 57b9c99bc MAR10001-447: CresteShipping Methods - modifications for using same UPS integration for Marello and OroCommerce in single instance installation 2c3c85d47 Merge branch 'feature/MAR10001-449' into merge/PR15-MAR10001-449 39b0efd93 - Updated tests which previously relied on the FeatureChecker - Updated constructors in tests which didn't have the LoggerInterface injected - Updated check for Geocodedaddresses after fetching them, either one of them should not be available before continuing 3c4376d31 Merge branch 'feature/MAR10001-449' into merge/PR15-MAR10001-449 6725546f0 MAR10001-447: Create Shipping Methods - added new chain for distance calculation AddressBased - added new system WFA Rule with Min Distance strategy - Min Distance strategy now is not dependent on Google Address Geocoding Feature 0483533c3 - CS fixes 4ff100793 Merge branch 'feature/MAR10001-449' into merge/PR15-MAR10001-449 3e495eab4 - CS fixes - Fixed PO & Order controller tests 2ea841587 Merge branch 'feature/MAR10001-449' into merge/PR38-MAR10001-449 a5c2c9dba Merge branch 'dev' into feature/MAR10001-449 66cf4a496 MAR10001-447: Create Shipping Methods - modifications necessary for selecting correct shipping origin eaa44db64 MAR10001-447: Create Shipping Methods - fixed few unit tests - added functional tests - modifications necessary for selecting correct shipping origin b06ba7011 - applied CS fixed ec8c44fca Merge branch 'bug/MAR10001-fix-cs-psr2' into dev 71297bd95 - CS fixes f8df662c8 Merge branch 'dev' into merge/PR38-MAR10001-449 b3f353f19 Merge branch 'bug/MAR10001-fix-cs-psr2' into dev b52a4c540 - CS fixes b030aef15 - Updated composer.json and added install instructions to README b6a29d02f - Updated composer.json and added install instructions to README 8736647bb - Added translations; - Removed reference to OroShippingBundle b23c996e9 Merge branch 'feature/MAR10001-449' into merge/PR38-MAR10001-449 7a38b1abd MAR10001-459: UPS Shipping Method - removed unnecessary files b245eef83 MAR10001-459: UPS Shipping Method - unit tests dda03ea22 Merge branch 'dev' into feature/MAR10001-449 0da16def1 - Added prices, channelprices and saleschannels to API and give them appropriate entity aliases a0a393ee3 - Apply new patch for updating AvailableInventoryValidator to be less biased and defensive b34808775 MAR10001-459: UPS Shipping Method - fixed conflicts 1674d5a1c MAR10001-459: UPS Shipping Method 14ee40d07 - applied patches for inventory validation, address validation and inventory display in order creation page fd770b2be Merge branch 'release/0.9.2' a94544990 MAR10001-389;doc update 134e07067 Revert "MAR10001-389;revert php version" e3d68b8ba Merge branch 'release/0.9.2v' f18845d7d Merge branch 'feature/MAR10001-389-1' into develop 84cb66475 MAR10001-389;Strict marello dependency 46b697b5e Rename DOCS 09752294c Merge branch 'release/0.9.1v' 4fd8df461 Merge branch 'feature/MAR10001-389' into develop 19f841f69 MAR10001-389;Adding backward compatible iterators (deprecated) e0dfe975d MAR10001-389;Adding category link skip on exist + un-assign unwanted links 600f741f0 MAR10001-389;update deps ecdbb8b64 MAR10001-389;revert php version 11189bc45 MAR10001-389;Fixing dep 071404898 MAR10001-389;Fixing dep 6df176976 MAR10001-389;Fixing dep 4354783d5 MAR10001-389;cleanup 38a102818 MAR10001-389;Move README to the bundle itself 0b0761d5f MAR10001-389;REVERT -> updating docs 85fe3aefb Merge branch 'feature/MAR10001-389' of https://github.com/marellocommerce/marello-magento-bundle into feature/MAR10001-389 05274da55 Merge branch 'feature/MAR10001-10' into feature/MAR10001-389 65ca9b597 MAR10001-389;updating docs 601c954c0 MAR10001-389;updating docs 0709367a2 - Corrected 'Security' use statement alias in order to fix issues with ACL not working correctly 85992d54e - updated composer.json for 1.4.2 e33447ea9 Merge branch 'bug/MAR10001-463-fix-acl-annotation-bug' into dist-master 58fe4f5e3 Merge branch 'dev' into bug/MAR10001-463-fix-acl-annotation-bug 121ec82d7 - Corrected 'Security' use statement alias in order to fix issues with ACL not working correctly 03de4eb74 - Corrected 'Security' use statement alias in order to fix issues with ACL not working correctly 3c7db857a - first adaption of ACL annotation fixes 6d79f8f38 MAR10001-449: Create Shipping Rules - fixed conflicts ed01710c8 MAR10001-449: Create Shipping Rules - shipping rules skeleton - shipping methods skeleton - manual shipping method - integrated new shipping methods in order workflow 84367c3c0 - Added additional tests and API endpoints c20266bb4 - updated functional tests to succeed after adding OrderItems in the mix and moving the identifier of the Product to the SKU 9dba19e29 Merge branch 'dev' into feature/MAR10001-345-order-api 838d0f323 - Added composer.json and additional files for meta info aab64821e - Initial Commit fa2908d87 Add .gitignore d8e959780 - Fixed primary & shipping address id columns on order_customer table 4d62a94cf - Fixed FK change on the organization of Order, PackingSlip, PurchaseOrder and Refund table a2300366e - updated doc block c330791ea - Fixed broken test of checking the report; Test contained old naming of the datagrid af2ff9a95 - Fixed broken tests for testing the deletion of SalesChannels and SalesChannelGroups a4ee0cfa8 - Added required fields to form data in order to fix broken tests regarding updating Taxcodes and suppliers e591620ed - Added docblocks and fixed comparison of DateTime values a6aba9fd9 - Fix broken Datafixture of OrderData efd3a83c3 - Fix broken inventory update test c750eced3 - Fix broken category view test bbf106f89 - added filter on order items to get them all for a single order 6ec12b8e8 - updated data check for whether there is no data available for the metric item b45080b8d Merge branch 'dev' into feature/MAR10001-345-instore-assistant a530fabed Merge branch 'dev' into feature/MAR10001-345-order-api 70d6b7a21 - enabled OrderItems in api, with link to Orders 917e97a3a MAR10001-10;Adding support for product remove/delete ba12d1e3f MAR10001-10;batch size is always 1 9035e34dd MAR10001-10;Refactor the product event ec2cb49c8 MAR10001-10;Adding product create/update sync action from the admin gui ff25ff7a3 MAR10001-10;Adding message-que upon product ui modifications e27e0b2f2 - Updated composer.lock for 1.4.1 41fa4118d Merge branch 'release/1.4.1' into dist-master 42770c925 - Fixed unit test to test getting the customer shipping address - added bc for getting primary address of customer from addressprovider 930cb8abf MAR10001-10;Fixing lastsync date 05ba026a9 - fixed rendering datagrid issue when 'selectAll' option is abscent 8c174af1b Merge branch 'dev' into feature/MAR10001-127-small-fixes 946e21ba7 MAR10001-10;Fixing product filter dae3cea32 MAR10001-10;Move job name into constants 72802752a MAR10001-10;Enable initial connectors 7b5329037 MAR10001-10;docs a00d08849 MAR10001-10;Adding store_code retrieval 005642b64 Merge branch 'release/1.4.0' into feature/MAR10001-127-small-fixes ea2d3f56e - Updated Marello Customer datagrid and remove id as column and added the createdAt and updatedAt fe1354e4f MAR10001-10;Adding more tests 0686572bc MAR10001-10;Adding entity unit tests 9af0eca5c MAR10001-10;Fixing wsdl_url check error 51b158e10 MAR10001-10;Addint soap-transport unit test d34411a62 MAR10001-10;Adding support for price per website e6e9f8e14 MAR10001-10;Code cleanup 4fcdf97fd MAR10001-10;cleanup cbfd8d8c3 MAR10001-10;Adding saleschannel filter on product connector/reader d34857f3a MAR10001-10;Adding channel prices support b4d172b0a MAR10001-10;cleanup e172e5741 MAR10001-10;Fixing inventorylevel export reader 05e3eb137 MAR10001-10;Adding integration channel filter on inventorylevel reader da68bf935 MAR10001-10;Implimeting Mage twoway sync 604aa461d MAR10001-10;Order connector incl.update c69bd88ce MAR10001-10;Order connector incl.update d530ffc3b MAR10001-10;Order connector incl.update 4f4d513a2 MAR10001-46: Hero Products Widget -fixed conflict with deb branch 1b00ddd1e MAR10001-46: Hero Products Widget aad56f1fa Merge branch 'release/1.4.0' ccada9f04 - Updated dependencies 72677a8d5 Merge branch 'release/1.4.0' into dist-master b119bb265 - updated depedencies of Marello CE 079114079 - updated marello version d91b2f221 - updated version of dependencies in composer.json 536931a2c Merge branch 'release/1.4.0' into dev a10643dbc Merge branch 'release/1.4.0' into dist-master 5bd33fd35 Merge branch 'release/1.2.0' into dist-master c5b021f52 - Changed method signature of creating a Customer by allowing the shippingAddress to be null - Fixed LoadOrderData test fixture 97ef35903 Merge branch 'feature/MAR10001-276' into dev b78d87d40 Merge branch 'feature/MAR10001-276' into release/1.4.0 09feb151a - Updated return entity font-awesome icon to 'undo' in grid and dashboard a6462e6e6 - Updated grid to use the new 'select-all' feature 664373c93 - fixed issue with grid of SalesChannels selection in product create/update - updated grids to use the new 'select-all' feature 6308039a6 MAR10001-10;Adding ground work for order connector 3686d89b2 MAR10001-10;Change sync filter to 1 day / 24hrs 07d705219 MAR10001-10;grouping 27a693c9c MAR10001-10;Adding website_ids into the product data package 5ae0fd3fc MAR10001-10;Attempt to add channel in the exports for filtering 1a14be8d6 MAR10001-10;Process only known categories in magento 0fe7e2c0e MAR10001-10;Adding product category assignment 8f43b2da0 MAR10001-10;Migrate message path 6bdbe6155 MAR10001-10;category code nullable f934c87fc MAR10001-10;category connector - iterator ac9ece0c7 MAR10001-10;Adding transport support for the category listing 1064c3ab9 MAR10001-10;Fixing entity classes 26cd99de7 MAR10001-10;Adding rough category connectory 9955daca3 MAR10001-10;Adding category connector 548e6a399 MAR10001-10;Enable other calls in migration setup fc98a315c MAR10001-10;Adding category migration && entity 8ea781e2a MAR10001-10;cleanup 0d337fe4b Merge pull request #2 from gplanchat/patch-1 d0deb1e6c Fixed fatal error on product save bcf8a590d MAR10001-10;Fixing doc be16de695 MAR10001-10;Adding real price value f79a76f03 MAR10001-10;Price entity class abceefdd3 MAR10001-10;Adding price connector 443df7275 MAR10001-10;Rename stock level connector d3a58df31 Merge branch 'bug/MAR10001-428-layout-and-load-issue-of-order-address' into dev 443473063 - Added correct widget rendering blocks for Shipping- and BillingAddress in Order create - Removed 'shipping' from the abstract order address type name cf0e1df64 MAR10001-10;Adding stock level export to M1 fdee84873 inventory - connector f61997de6 MAR10001-276: Small changes - fixed conflicts after merge a392ca6a7 MAR10001-276: Small changes 169c04d30 MAR10001-276: Small changes 6a46e1812 MAR10001-10;Process connector export process via sync processor 03f0f1a5c MAR10001-10;Adding inventory level support f59396690 Merge branch 'feature/MAR10001-428_Customer-shipping-address' into dev 788ab1104 - changed layout for addressblock in general because of the rendering of minimap in the customer view ae3896527 MAR10001-10;#? df1d319dd MAR10001-10;Adding stock level connector - rough 4d62cbb11 Merge branch 'feature/MAR10001-428_Customer-shipping-address' into dev e226df8f4 Merge branch 'bugfix/MAR10001-000-fix-supplier-datafixture' into dev 5eb597eea - fixed Supplier fixture in functional tests 92ce4f6de MAR10001-10;Minor refactor bb252d407 - Add fix for creating Customer with demo data including a shipping address c53fee9df MAR10001-10;Save workspace 6b59e0289 - Added migration to update existing customers to clone their primaryAddress into their shippingAddress 601197608 - CS fix 8eaa86893 - Added small modification in layout when editting the Customer addresses f2c361929 MAR10001-10;cleanup 7e8ed8f22 Merge branch 'dev' into feature/MAR10001-428_Customer-shipping-address a032e3277 MAR10001-10;Adding currency on the integration + auto channel/group create 9477be246 Merge branch 'feature/MAR10001-379' into dev ad2e65aa6 Merge branch 'dev' into feature/MAR10001-379 e4ae9f8c9 MAR10001-379: Purchase advice should only be added once 80d3fa2cd MAR10001-379: Purchase advice should only be added once 2f1bcc853 MAR10001-379: Purchase advice should only be added once c8d4ade9c MAR10001-10;Adding product update support 9bafe1f21 - Added missing CS fixes b2cb34fab - added method of sending the purchase order to the view - Small cs fixes afd6d6984 MAR10001-10;Adding product export f78cd4700 MAR10001-10;Enable dictionary connectors 8723fd32f Merge branch 'dev' into feature/MAR10001-310 7e92088a1 - updated oro/platform version - updated php version to 7.1, drop support for 7.0 002a147ff - Split address select for order create 00ed67043 MAR10001-310: Sent purchase order by feature bf618da30 MAR10001-10;Adding product export to Magento instance 40363d9a4 Revert "Merge branch 'gplanchat-set-workflow-application' into dev" 40bae0afd - Add shipping address to API db0baf731 - Add shipping address to form and view a0a511d83 - Add shipping address to customer 0f341a9c2 MAR10001-10;Enable dictionaly processor 2956f438c MAR10001-10;Adding product connector - import only for now 531b6aef3 Merge branch 'gplanchat-set-workflow-application' into dev 80b064b33 Merge branch 'set-workflow-application' of https://github.com/gplanchat/marello-dev into gplanchat-set-workflow-application 167052f95 Merge branch 'feature/MAR10001-404' into dev ab667b185 Merge branch 'feature/MAR10001-404' into dev e5a41fa20 MAR10001-404: Marello Procurement updates - fixed latest comments fe42ecbb5 MAR10001-404: Marello Procurement updates - fixed latest comments 217c47c01 MAR10001-10;Adding product connector - rough fe794176e Added application identifier to Marello workflows 9ef321536 update composer.json 05455eacd Merge branch 'feature/MAR10001-413' into dev 24486d749 - CS fix a4d0eeb40 MAR10001-10;Adding product connector - rough 925248a6f MAR10001-10;created, updated at 8de082714 Initial commit 1fee7875c Adding product connector 637992ab5 #? f8ae66afb webiste && store connector 7f56a0d17 Merge branch 'release/1.0.1' a189dbd54 - added allow_array option to PaymentStatus entityIdentifier field to filter correctly a single id or incoming string with multiple ids - added allow_array option to TaxValue entityId to filter correctly a single id or incoming string with multiple ids e58738cdb - CS fixes 75d0e2c88 Merge branch 'feature/MAR10001-353' b9aca80e5 - added null check on getting current workflow item from entity before verifying if a transition is allowed 4b519888b MAR10001-426: Select All and None only selects first page d82940eaf Re-run based regular oro magento bridge - foundation e84b15ee9 Adding website && store connectors 4e25624cc Adding product, store && website 735b384e1 Remove price on product process 419360b62 Merge branch 'bug/MAR1001-392-Explicitly-define-route-keys-for-individual-controllers' into dev b28afb8f5 Merge branch 'kiboko-labs-dev' into dev b13cbca2d Merge branch 'dev' of https://github.com/kiboko-labs/marello-ee-dev into kiboko-labs-dev b1d274d58 Merge branch 'feature/MAR10001-404' into dev 66dea21a5 Merge branch 'ticket/MAR10001-380' into feature/MAR10001-404 596e87c27 Fixed installation issues on existing projects b80b4b4ef Adding config provider 6211bc2a1 Merge branch 'feature/MAR10001-404' into dev 7a3b4ee19 - fixed issue of incorrect mapping of currency attribute on Supplier entity; - fixed issue of incorrect mapping of order_total attribute on PurchaseOrder entity; - fixed issue of incorrect mapping of row_total attribtue on PurchaseOrderItem entity; 9123b50fc Adding rough-website-sales-channel relation -TODO: Fix gui issues 4d4dde3de Merge branch 'bug/MAR10001-tax-unique-index-fix' into dev eb27215b8 Merge branch 'dev' of https://github.com/marellocommerce/marello-dev into dev 967042403 Merge branch 'ticket/MAR10001-380' into dev f7b05c0a5 Merge branch 'feature/MAR10001-404' into dev 5a96a40d2 Merge branch 'bug/MAR10001-update-form-with-data-layout-attribute' into dev 039349f30 - Fixed data-attribute in form fields in Inventory level form ea635ea99 - Fixed broken tests in PurchaseOrderController; - Updated Datafixture for Tests with row totals and order total for PO & POI - Fixed issue with data-layout attribute in fields for PurchaseOrder creation 8deb1c71f -…

…rder workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default

…5a0ae 3a5a0ae59 Update OroRequirements check to be compatible with Oro Platform 3.1.x b53f12c7b - remove lock files from master 3637f5469 - Release preparation 2.1 00235777d - updated version number in upgrade notes 66943d23c - prepared composer.json files for release 45b8ab62c - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 962e68cf9 - updated dev.lock files 7fa927ad5 - updated dev json and lock file to include oro 3.1.9 - small changes regarding docker environment files fb74794b2 - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 5175feb86 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 22a02abd2 MAR10001-499: Filtering SalesChannel(s) on product edit page's SalesChannel selection grid a752f44f0 - remove setting datetime for pre-orders when purchase order is created a5d97d127 - PSR2 fixes - Remove unused constant from config - Unified translations for Backorders and Pre-orders c6d627992 Merge commit 'b55e936f3c6428ae97c2f440cd8df8e00e3a9127' into feature/MAR10001-377 a684040d6 Merge branch 'feature/MAR10001-604' into develop 985929421 - Fix PSR2 cs fixes d31fc550c Merge commit '4b5ec7e8d02e9b7e079e43d024f18dc3a92a9c7d' into development 87da451f8 Merge commit '40a4d43559a871bd237a9a91e61f6bb33f6db69e' into feature/MAR10001-604 f02add10d - added composer.lock to .gitignore - remove composer.lock files a2560bfe9 - added composer.lock - added dev.lock - updated branch alias in marello package composer.json 372aaeb4a - added composer.lock - added dev.lock - updated branch alias in marello package composer.json 16a13cf1f Merge commit '44448293702551e588fff6fd5860d9d1e0db4a11' as 'package/marello' 91291d7b8 Merge commit '07371b34fa35e74b969b9d7f160d601853a300b6' as 'applications/marello-application' de51c0982 Merge commit '07371b34fa35e74b969b9d7f160d601853a300b6' as 'applications/marello-application' 07371b34f Squashed 'applications/marello-application/' content from commit 3d023f800 8d1b0acc5 - removed test packages and applications ff563494f Merge branch 'master' of https://github.com/marellocommerce/development-mono-repository a364f4c8b - removed all packages and application in preparation for setting up subtrees 'correctly' ce5cb30e9 Merge commit '58fa179aa805e5f3117264671cf1998803b46eb7' into maintenance/2.0 cf767cd1d Merge commit '836c77f1c5eeb7490a5734bb5fefc4e68f5c1e3c' into maintenance/2.0 a7e69027e - Adding composer json to package bad4a42a9 Merge branch 'master' into bugfix/MAR10001-0-patchmelater 5a8a336f5 Merge commit '2aa4713bdd35a63c782f0b9881ab36bad31aa000' 2aa4713bd Squashed 'applications/test-app/' changes from 4fc55ec77..721a946a7 52ec12c67 - Testing the double push a654d687e - test line subree split 7936f0c50 - add another line e9b3ef3f7 - added a line 559dc3888 - added test-me for patching me later 2530c8df5 Merge commit '22d91eb8e1ba1e86cccb13bd7e54d278e06dcac7' as 'package/test-package' 22d91eb8e Squashed 'package/test-package/' content from commit 76854dbee c4871a500 Squashed 'applications/test-app/' content from commit 4fc55ec77 bfeec6f9b Merge commit 'c4871a500fcddb91eb4fa65e1bdbeea5b441d93d' as 'applications/test-app' bc1953383 MAR10001-377: Backorders / Pre-orders - Back- Pre-orders Datetime field 22cfacdb1 MAR10001-604: Update Locale / Localisation fields for LocaleAwareInterface entities - kept BC e5f928e02 MAR10001-377: Backorders / Pre-orders - Add 'maxQtyToPreorder' field to InventoryItem - Back- Pre-orders Datetime field - Purchase Order's dueDate as Backorder expected delivery time - Add system setting for using the dueDate of Purchase Order on InventoryItem's backorder field ea5a25e71 - tmp removed navigation to attribute families and attribute creation 54c12f0ea MAR10001-604: Update Locale / Localisation fields for LocaleAwareInterface entities - Update inheritance chain of getting correct email template for localisation - Test chain inheritance of email template 24d310372 Merge branch '2.0-dev' into feature/MAR10001-604 015917f4e - Added creation of the Attribute group when loading the default attribute family data in order to save the attribute family inmediately instead of having to add a label to the group first 0a0c45901 - Updated css for having same look and feel on attribute family page as it does in OroCommerce 63288e8d7 - added fieldName to array to check unique values per field which will prevent issues when multiple validations of the UniqueCollection validation are used in the same request 10c57fb30 Merge branch '2.0-dev' into feature/MAR10001-621 9b1374a08 - Fixed tests to include new contraint introduced in the transport settings form - CS Fix in product repo 63d38246b Merge branch '2.0-dev' into feature/MAR10001-604 02d4826c8 Merge branch '2.0-dev' into feature/MAR10001-591 a762d0239 - Added some additional tests for Product attributes and families a937a62ab Merge branch 'feature/MAR10001-54-product-attributes' into 2.0-dev 5f2c953c4 - added tests for checking the attribute routes if they are available for the MarelloProductBundle:Product entity 2931383fd - Updated check for checking if the schema has a table to prevent exceptions being thrown the function hasTable now is being used instead of getTable f203c24f4 MAR10001-597: Order dropshipping 120eb4ca0 Merge branch 'feature/MAR10001-54-product-attributes' into 2.0-dev 53ab3d2c1 - added translations for product families and attributes pages 4def4c6b8 Merge branch 'feature/MAR10001-54-product-attributes' into 2.0-dev 54d87a31f - fixed issue with wrongly updated config value for has_attributes data 6a2bb584b Merge branch 'feature/MAR10001-54-product-attributes' into 2.0-dev f8b4f032e - Added event listener to assign default attribute family on product creation - Updated tests to verify the family is in fact assigned 7175ec64b - Added migration to update existing products with an attribute family to prevent errors on editing existing products a43a58a44 - Updated translation labels to use a key on navigation items for product attributes routes - Updated demo data to load default attribute family - Added migration to create a default attribute family fe19b56f5 - Added listeners for showing Product attributes for the specific Product family 764a6f65c - Added query for updating entity config in db with has_attributes=true to include change in annotation in db for existing installs - Added routes for easily navigating to creating product families and product attributes 6468cabc5 - Enable attributes to be shown in the Product update view 890ae4d29 - Added schema updates for Product to include attribute family - Added the config notation to make the Product Class available for adding attributes via it's own attribute management - Added test to ensure the product has the config notation - Updated test to include new $attributeFamily in property testing 89c912d38 MAR10001-591: Update OroCommerce Bridge for 3.1 versions - fix for using LIKE operator on json column for pg_sql database driver 7c8828c98 MAR10001-621: Issue with assigning orders to external Warehouses in the Marello Community Edition ab6b2d84b - Updated translation for section of Back/Pre-order - Moved fields of Backorder/Pre-order to widget in order to keep data together in InventoryItem view - Moved fields of Backorder/Pre-order to separate section in InventoryItem update view c1f74c631 - CS fix 829e130db Merge branch '2.0-dev' into feature/MAR10001-377 c0b85c23e - Updated migration version for OrderBundle installer 766d7bc49 Merge branch '2.0-dev' into feature/MAR10001-596-adding-context-to-note 8a02aeb5b - small bugfix in showing the correct items for the inventory db246f4e5 Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev 186fd5c27 MAR10001-377: Backorders / Pre-orders 30f449cfa - Added check for existing product supplier relations in demo data before creating new ones which fail because unique constraints 264e35327 - Added 'allow_delete' parameter to inventory level form view in order to disable deletion for InventoryLevels on External Warehouses 05b9214df - fix issue with disabling / enabling the managed inventory e599843bc MAR10001-377: Backorders / Pre-orders 1918136a6 Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev 04faf1a5e Merge branch '2.0' into 2.0-dev a8058e600 Merge branch '2.0' into 2.0-dev 836c77f1c - Update various files to make 2.0 branch php 7.2 compliant 8fe23b670 Merge branch 'brainOut-patch-2' into 2.0 3243563e6 - updated product supplier demo data to include inventory levels for external warehouse 076a5998c Merge branch 'feature/MAR10001-597' into 2.0-dev 30156ddfd - updated form type for CE version to include External Warehouses - Moved migration for updating inventory levels to be 'managed' to CE, otherwise it will be not manageable baa1d4360 Merge branch 'feature/MAR10001-597' into 2.0-dev 01ceab8f8 - Added dependency on external warehouse data migration before updating suppliers with inventory levels and an external warehouse 489df6313 Merge branch 'feature/MAR10001-597' into 2.0-dev 9be204819 - Added migration for existing installations to update the suppliers marked for dropshipping and related product marked as dropshippable to create an external warehouse and related inventory levels e851febdb MAR10001-591: Update OroCommerce Bridge for 3.1 versions - Fixed entity aliases - Fixed Integration Forms validation 6c020257f - Split supplier data into two separate fixtures for loading ProductSupplierRelations and Suppliers to separate responsibilities of loading data which is dependent on each other 9a61316d4 - updated demo data to set the managed inventory on demo data inventory levels for editting in EE version 8a7ee948d - Added check for disabling fields on inventory level when it's managed or not 5d2aedbd3 merge 2.0-dev into feature/MAR10001-591 b0b6e79bd MAR10001-597: Add Dropshipment functionalities within Marello - Modified logic in orderItem and packingSlipItem status assigning a37ee7051 MAR10001-597: Add Dropshipment functionalities within Marello - Show OrderItem status in OrderItem line on Order view page; - Show PackingSlipItem status in PackingSlipItem line on PackingSlip view page; - Added external inventory to AvailableInventoryProvider; 3e031a9ba Merge branch 'feature/MAR10001-597' into 2.0-dev f91dc37d2 - updated files with PSR2 CS fixes d70d4fec2 MAR10001-597: Add Dropshipment functionalities within Marello - fixed functional tests cdd9f82c5 MAR10001-597: Add Dropshipment functionalities within Marello - unit and functional tests fixes 640763743 Merge branch 'task/MAR10001-609-update-button-label-in-po-workflow' into 2.0-dev 8e7d7a224 - update label on worflow button from 'Receive partially' to 'Receive items' in the Purchase Order wf 12e444486 MAR10001-604: Update Locale / Localisation fields for LocaleAwareInterface entities 2ded8637b - Updated the navigation and index translation for Warehouse Channel Group Links to Linking Sales Channels for clarification dee02154b MAR10001-597: Add Dropshipment functionalities within Marello 28c539326 MAR10001-596: Adding context to an existing note 6374b270f Merge branch 'feature/MAR10001-595' into 2.0-dev 2c215cf65 Merge branch '2.0-dev' into feature/MAR10001-594 03b2033c5 MAR10001-595: Fix inventory management link 51b65992e Merge branch 'feature/MAR10001-592' into 2.0-dev c6f1127d0 - Updated tests for refund extension test to include new twig function - CS fix in RefundBalanceCalculator 94657c82f Modifying entity aliases 6e86bf7db Make Marello2 installation 7.2 complient 47d3dc480 MAR10001-592: Refund balance doesn't take other refunds into account - added validation based on Refund Balance 04ac4fc7e MAR10001-594: Modifying entity aliases ef46237b7 - added support for validating duplicate sku's in a single order against the available inventory in the balancer 23cecb4c6 - Removed unsused join 42383d5f4 MAR10001-592: Refund balance doesn't take other refunds into account 9cff0dded Merge branch '2.0-dev' into feature/MAR10001-591 504a89ec5 MAR10001-591: Update OroCommerce Bridge for 3.1 versions 106d7c8ef - updated translation 58fa179aa - updated dependencies 51e1974d5 - Updated description for login screen 66919afa4 - typo fix in dependency requirement b21e89944 - attempt number 2 for getting the correct dependency 5510d7c25 - update branch alias 1abf9a702 - update branch alias - update dependency for correct oro 'branch alias' 1ea317dda - Fixed Typo in repository url 5adf2a41d - Fixed typo in repo url 9ed1d0ce9 - update readme 3856e1d79 Merge branch '2.0-dev' into release/2.0 ee21aa999 Merge branch '2.0-dev' into release/2.0 73560f85d - fixed configuration field constraints in order to comply with platform 3.1.2 validation of system configuration fields 2294b3759 Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev 8822f476a - updated license copyright year 7662f017a Merge branch '2.0-dev' into bugfix/MAR10001-0-3-1-fixes 0114d51b5 Merge branch 'feature/MAR10001-0-add-option-for-using-balanced-inventory-in-cancel-action' into 2.0-dev 9401d6bda - fixed invoice type by 'duplicating' the discrimiator field into a normal property of AbstractInvoice 85d38276d - fix import export validation button icon 6f8081ab2 - renamed assets structure in order to build assets with Oro's webpack implementation 45a3cd2ac - Added additional API test responses for getting creditmemo's 16a79db65 - Add creditmemo API repsonse 027f69f2b - adding new way for abstract item mapping - added additional check if order item does exist on refund item before getting all data through the PropertyAccessor 921a79fb8 - moving around some of the code ba01b9c51 - updated tests for api responses of getting invoices - added the type from the discriminator column into the Invoice data model where Creditmemo and Invoice have their own value - Removed the InvoiceType entity from the code base since it has been replaced by a simple 'string' value defined by the discriminator value 935700eb0 - First attempt on splitting the Invoice entity into Creditmemo and Invoice 4b2ee551c - removed unused code 106c45048 - Added InvoiceJsonApi Test - Added API resource for invoice, shipment and packingslips 00c46d668 - removed empty line 09b019fd9 - Updated Customer entity to be extendable - Added rendering of fields to views ae657bba8 - CS fix for translation being longer than 128 characters f1ef37984 MAR10001-589: Remove REST API Routing, Controllers and related Forms d7ab0baff MAR10001-589: Remove REST API Routing, Controllers and related Forms 6b73ba0b4 - Updated Product grids to sort on the same columns 14d3154c8 - Added additional inventory balancer event - removed credit step/transition from workflow cac767536 Merge branch 'feature/MAR10001-590' into 2.0-dev 03a67b596 - Removed unused code ffc60303b - Added additional check for getting WarehouseChannelGroupLink's warehouse group which if not checked would result in a error when selected in an Order b2cb99e22 - Added translation for bottom "All rights reserved" 4a583356e MAR10001-590: Rest JSON API is missing Workflow routes 43ed760cb - more cs fixes b34c17635 - renamed file for CS fix 408f498cf - renaming class for cs fix 525bc6a3c - CS fixes e4c283eac - css fix for destiantions in the shipping method config rule c15280b4d - formatting update.html.twig with correct indentation - Changed from ChoiceType to OroChoiceType in order to get correct classes for select 2ab07f07e - CS fix 56e2fee93 Merge branch '2.0-dev' into feature/MAR10001-421 b20af3629 Merge branch 'feature/MAR10001-545' into 2.0-dev eb39834b3 - changed translation 7d008151f Merge branch 'feature/MAR10001-587' into 2.0-dev 911d972bf Merge branch 'feature/MAR10001-587' into 2.0-dev 0563fbc65 - updated validation for productsupplierrelation field to show the error message on a field which does exist on the productsupplierrelation entity - updated translation key for uniqueness error on productsupplierrelation in order to show the translated message ab3ed91de - Added fix for logging inventory movement while nothing has changed. Now no InventoryLogRecord is created when both quantities (inventoryAlteration and allocatedInventoryAlteration) are 0 5981c6588 - Added additional validation to OrderLineItem that 'fixes' the issue of a quantity value below 1 d09043638 Merge branch 'brainOut-patch-1' into 1.5 dd266fbda Merge branch 'patch-1' of https://github.com/brainOut/marello into brainOut-patch-1 a82bbf9ef Merge branch 'Djamy-patch-1' into 1.5 7152813a4 MAR10001-545: Add a warning when removing an inventory level 9be718199 Merge branch 'feature/MAR10001-588' into 2.0-dev e938c2bea Merge branch 'feature/MAR10001-548' into 2.0-dev f0c94f24b - cs fix fecf206c6 MAR10001-587: A couple of custom Validators have stopped working with Symfony 3.4 version cef2a7031 MAR10001-587: A couple of custom Validators have stopped working with Symfony 3.4 version 200054732 MAR10001-588: Alignment inventory balancer e622d8477 MAR10001-548: Align prices in grid to the right - fixed prices on products-grid fde2c1d16 - CS fix - Updated Test for WarehouseDeleteHandler for taking into account the translator that's being injected 9378c4528 Merge branch '2.0-dev' into feature/MAR10001-536 167b27e8b Merge branch '2.0-dev' into feature/MAR10001-536 a8b7b03bf MAR10001-536: Add additional inventory balance events 7840db0d6 MAR10001-536: Add additional inventory balance events d739eb5d3 MAR10001-536: Add additional inventory balance events 9fb10e306 - Changed name of Domain for InventoryLevelLog triggers translation 52dc73b7d - Changed the way labels of workflow triggers are being translated - Removed unused dependency in WorkflowActions - Updated inventory replenishment route identifiers and acls - CSS fix for add products button on Replenishment Order create f06733e03 Merge branch 'feature/MAR10001-416' of https://github.com/marellocommerce/marello-dev into feature/MAR10001-416 20f0b1a92 Merge branch '2.0-dev' into feature/MAR10001-416 a0eed54d3 Merge branch '2.0-dev' into feature/MAR10001-537 61bee513f Merge branch '2.0-dev' into feature/MAR10001-552 ede95d802 Merge branch '2.0-dev' into feature/MAR10001-548 92542b89c MAR10001-581: Hero widget (layout issues) f468479d2 MAR10001-581: Hero widget (layout issues) cddbfa08f Merge branch '2.0-dev' into feature/MAR10001-579 c9f7b941d - fix deleting of products via API 7bee3804d - css fix 3138d3838 - CS fixes 728faf1ab Merge branch '2.0-dev' into feature/MAR10001-574 6338477c6 - Removed unused import from listener 3ff5b0122 Merge branch '2.0-dev' into bugfix/MAR10001-0-miscellaneous-fixes 79b317d7c - Fixed layout issue hero widget on dashboard - Removed DELETE route from MarelloAddress api during foreign key constraint issues - Fixed 'no data' message when adding products for purchase advice and no data is shown ed50ddab7 MAR10001-579: Modifying categorie product assignments c2faada45 MAR10001-416: Inventory Replenishment 3306fb71a MAR10001-416: Inventory Replenishment 68ab8ebfc - added css fix for region-text field d419f2136 - Fix css for Order totals in order view 2e2246ccc - Fixed layout issue with Primary & Shipping addresses on Customer view b56e38d9a - Swapped cost and priority in product supplier grid on product view and edit e9f0f67c2 - Fixed add button on Purchase Order create by using the same class as other add buttons in grid forms - Fixed remove button on Tax Jurisdiction zip-codes by using the same class as other remove buttons in grid forms - Fixed css for remove button in order to remove the margins around the 'X' in grid forms 94cf731b1 - Updated CSS for inventory level adjustment input fields to get them unstuck from each other and in line with the rest of items - Added "layout=separate" to form fields - Added additional divs for getting the adjustment fields unstuck 766cbcb84 - Added fix for adjustment input fields which where stuck together by adding additional divs 4b7f64ba1 - updated 'algorithm' for showing inventory chart timeline correctly 5b34fb29c - updated query for getting total of inventory quantities for inventory levels instead of sum of alterations 8e6418d79 - Updated InventoryLevelGridlistener tests - Added InventoryLevelLogGrid listener to add Warehouse to inventory level log grids 3a1edfee6 - Removed unused controller - Added additional fields for 'real' quantities on InventoryLevelLog 3cff108b4 - Added check if both inventoryAlt and allocatedInventoryAlt are 0, if so don't log the 'change' because nothing changed 5feea5942 - Updated method of updating the inventory through the workflow of Replenishment. - Split a single update into two actions to have correct display of inventory 50972cc49 Make the interface compatible with the modified Trait 4f39919e0 Add possibility to reset shipment d662b9add MAR10001-552: Add shipping costs to return and refund Order summary c6f76c67d MAR10001-548: Align prices in grid to the right 1806b8a98 - updated Replenishment workflow label e7d795f0e - Fixed layout issue of order statistics widget. d7092b21d Merge branch '2.0-dev' into feature/MAR10001-551 9eb2d9928 MAR10001-574: Query time product grid optimization 54f44595f - Fixed minimum quantity WFA rule test to take into account the new WarehouseChannelLinkRepository - CS fixes 803c33dd3 - Removed unused test datafixture - Added SalesChannelGroup references to default WarehouseChannelLink e806dbd74 Merge branch '2.0-dev' into feature/MAR10001-523 40496d6eb Merge branch '2.0-dev' into feature/MAR10001-523 4746b0807 Merge branch 'feature/MAR10001-416' into 2.0-dev 02dfcf3b7 - Updated workflow to display replenishment items on page instead of popup - Updated translation messages - removed created at column from multiple entity template 176671283 Merge branch 'feature/MAR10001-416' into 2.0-dev a65ac2a0e - updated filters for Popup in Replenishment Order product Selection fa97b58a3 Merge branch 'feature/MAR10001-416' into 2.0-dev 4d69ed864 - Updated messages - Added updated/created at to Repl. Order - Removed Repl.Order.Items from datagrid - CS fixes e3d51b764 MAR10001-523: Splitting order over multiple warehouses went wrong c7dada236 MAR10001-523: Splitting order over multiple warehouses went wrong 6a0e4c631 Merge branch '2.0-dev' into feature/MAR10001-416 64122d89a - Added tests for return reports to verify they will not return errors when checking the reports - Fixed Report title for `returned_qty` report - Fixed issue with query where db name was still in the query and wasn't available - CS fix 6128e8119 Merge branch '2.0-dev' into feature/MAR10001-538 19ac73ddf - Added additional shipping rule and shipping rule config for GBP currency f4a1b8df1 MAR10001-416: Inventory Replenishment e9a32f923 MAR10001-416: Inventory Replenishment 2492f164e MAR10001-416: Inventory Replenishment 868358750 Merge branch '2.0-dev' into feature/MAR10001-538 5bcf5a5ca - added option to add note from workflow as Activity Note, only applies when note is being submitted and not empty 990ab85b3 - removed saleschannel column and filter from the default product grid (it's still configurable via datagrid options in GUI) 771710703 - Added inventory for surfboards in different warehouses 1753b3b4c - Added prices for surfboards - Added inventory for surfboards 7d2448b4c - Added support for refund creation from Order in the workflow action - Fixed case sensitive issue for TextareaType instead of TextAreaType which will allow textarea types to be displayed properly during the workflow transitions d34cd76a7 - Changed steps Invoiced->Paid to Paid->Invoiced ffcedd61a - Removed unused translations 87a168930 - Cleanup 4e4a8dc77 - CS fixes 266d8d41a - fixed schema tests 6a6338cf6 - updated InvoiceBundle by squashing the datagrids into a single one instead of both creditmemo and invoice edc05c95b - Added option to have the ability to use or not use the balanced inventory manager when cancelling an Order through the workflow 312891a0f Merge branch '2.0-dev' into feature/MAR10001-549 fd31485cd add a data-layout to prevent backnone error 37ceec273 - Fixed with using the same class twice in a single class - Updated data for testing Order requests where shippingmethod and shipping method type are required b19b644f0 Merge branch '2.0-dev' into feature/MAR10001-343 c5be92891 Merge branch '2.0-dev' into feature/MAR10001-416 fd6dbd274 MAR10001-416 Inventory Replenishment - added description field 991d7a0fe MAR10001-551: Error when trying to duplicate a product a2b350d4c MAR10001-416:Inventory Replenishment - fixes for schema test - fixes for entity fiealds translation test 54658eb98 MAR10001-416:Inventory Replenishment - fixes for schema test 56767cbf4 - fixed missing constructor argument in ProductExtensionTest - Added additional Test for getting category ids via the ProductExtension 62a4f6855 Merge branch 'feature/MAR10001-416' into 2.0-dev b3fbfbe38 Merge branch 'feature/MAR10001-416' into merge/MAR10001-416 5360bc695 - CS fixes ca055712e MAR10001-538: return report f7a15be51 MAR10001-537: Discount is missing in the transactional emails order totals sum c79063752 Merge branch 'feature/MAR10001-549' into feature/MAR10001-537 6eaf90f5d MAR10001-550: Fix parameter binding in product-categories grid on product view page 5a487c9c7 Merge branch 'feature/MAR10001-416' into merge/MAR10001-416 6b423b572 MAR10001-421: Refund calculation 6559cb4b0 MAR10001-549: Update Notification bundle to comply with Oro Platform 3.1.x e6675dccf Merge branch 'feature/MAR10001-543' into 2.0-dev 515f82a1c - Added diagram for inventory/balancedinventory 6757254f4 - Added fix for float comparison on Refundtotal vs Order grandtotal ce0263e3a Merge branch 'feature/MAR10001-542' into 2.0-dev 0159c583e Merge branch 'feature/MAR10001-505' into 2.0-dev 7074bac70 - removed 'Export grid' from SalesChannel Aware grid when selecting products for an order in the popup 08261be14 Merge branch '2.0-dev' into feature/MAR10001-542 da089da56 MAR10001-542: Improve Marello search 09fc8e54a - updated ACL for datagrid ffe73ce9b - changed warehouse address country code to the correct iso_2 code for the UK ddc7a1822 - Updated SalesChannelTax Demo Data - Added additional channels to products c4f6c0770 Merge branch '1.3' into dist-master 820126dae Merge branch 'bugfix/MAR10001-0-UPS-channel-identifier-conflict' into 1.5 73beed807 - fixed UPS shipping method with marello as prefix for transport and channel to prevent conflicts with the OroCommerce one b472e7d31 Merge branch 'brainOut-master' into 1.5 b04bb3d4c Merge branch 'master' of https://github.com/brainOut/marello into brainOut-master 1a54f70bb - fixed json api responses for Orders, Prices and Returns dfd71b448 - CS fixes - Fixed PO & Order controller tests - Added setProductSku() as function in OrderItem 443ef298f - CS fixes aae53da32 - Updated some customer lastnames to easily identify users from certain countries - Updated address logic by not always randomly assign numbers for addresses b810ddc9c - Added additional shipping method Rule and Config - Updated JS to comply with new 3.1.x version - Updated default shipping method integration price 2a4a688c3 - Added additional warehouses and warehouse group - saleschannel group links fc5dfda5c - Added Demo data for additional SalesChannel groups and SalesChannels dff55d73c MAR10001-543: Refunds mixed currency f698fc186 - Updated Tax demo data with new jurisdictions, rates and rules - Moved references around for clarification 5f89e5c87 MAR10001-343: Invoices & Creditmemo's - merged and conflicts fixed 07ec0cac2 MAR10001-343: Invoices & Creditmemo's 196d81486 - tmp disabled notifications during hefty changes in 3.1.x 9f24dc44e - fixed filter to comply with version 3.1.x 641b73446 - Added labels for default wfa rules 300fb80a0 - Updated InstoreAssistantBundle to comply with oro version 3.1.x - Removed all unused code from InstoreAssistantBundle d702b50d7 - Fixed JSONApi responses for product functional tests ef58bc032 - updates OrderJsonAPI responses for functional tests 189c500ef - CS fixes in test files 8c7c36d02 - Removed Product Status from Inventory datagrid 85576ca9a - Fixed page title on WFA rule create cc2d45069 - Fix API User loading test by using the new Authorization checker and fetch the UserToken from the TokenStorage 1fd6770b8 - CS fix c7514694e - updated unit tests with authorizationcheckerinterface for testing - removed useless unit tests 1502b1694 - updated unit tests with authorizationcheckerinterface for testing - removed useless unit tests 7442fc96b - updated \PHPUnit_Framework_TestCase to a use with 'new' namespace for all unit tests classes which extend the 'old' version of PHPUnit 60e7e1700 - updated \PHPUnit_Framework_TestCase to a use with 'new' namespace for all unit tests classes which extend the 'old' version of PHPUnit a98fb601c - remove mass action from Product grid in the selection popup on Orders beb3a1075 - cs fix 2bc1bc03d - moved suppliers to separate file for demo data - removed columns from main 'products' demo data csv file - Added references for prices to make them available when calculating costs for supplier based of default price a5da554d4 - Added new product prices demo data - Moved logic for adding prices and channel prices to separate files - Removed old data from dictionaries caa89468d Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev 08bd58f4c - fix issue with weird js behaviour for duplicate items in order creation b2e68e80a Merge branch 'bugfix/MAR10001-0-fix-refund-and-return' into 2.0-dev bdfaace2a - first version of totals validation for Refund f79b900df - added additional tests for creating refunds - added flash message on refund creation 6301721c0 - updated translation - fixed issue with 'deleted' Refund items when saved on edit - added 'data-layout="separate"' to the additionalItems of Refunds to load PageComponent correctly - Fixed issue with display workflow status on updating the Refund e447c0ef6 - replaced Select2ChoiceType with SalesChannelSelectType in the Return Form Type e90ca81de Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-dev into 2.0-dev c4d14b5a2 - update quantity of unit in demo data to 1 419b44ea6 MAR10001-505: Optimisation of Image rendering in Product Grid 05373d740 - removed createdAt from OrderView c4f4c43ec - added migration for removing the virtual inventory level and adding the balanced inventory level table 774200982 MAR10001-524: Add additional step on default order workflow 08b63c661 - Added diagram for clarification with relations of Inventory and Balanced Inventory (and other related entities) 286cadeb3 - Renaming files to BalancedInventory* like names for consistency 60980838f MAR10001-416: Inventory Replenishment 4b9f572ee MAR10001-416: Inventory Replenishment 1e317b77d - starting renaming of VirtualInventoryLevel to BalancedInventoryLevel 0dc996970 - fixed duplicate products in order line items having trouble calculating row totals 9fcc1a80e Merge branch 'feature/MAR10001-500' of https://github.com/marellocommerce/marello-dev into feature/MAR10001-500 9f2307630 - cs fix 2ed7b7f20 - CS fixes 829edeec4 - fixed SKU as identifier in product API a766d7d66 Merge branch '2.0-dev' into feature/MAR10001-500 3fc327973 Merge branch '2.0-dev' of https://github.com/marellocommerce/marello-ee-dev into 2.0-dev 7725269a6 - fixed exception in unknown form types in GoogleApi configuration by using the FQCN instead of aliases ba92be34c Merge branch '2.0-dev' into feature/MAR10001-500 bd55eb69f Merge branch '2.0-dev' into feature/MAR10001-507 4c5e46617 - Fixed layout issue on shipping rules by renaming the sheets to .scss and include all relevant .scss files into a main file 836db5bb1 Merge branch '2.0-dev' into feature/MAR10001-505 4b1699c3d - Remove `methodConfigs` from marello-shipping-methods-configs-rule-grid - Reverted changes in BasicShippingMethodChoicesProvider & EnabledShippingMethodChoicesProviderDecorator in order to make the identifier of the shipping rule the key and the label the value in the array - Add condition to check if a method is actually returned from the shippingMethodProvider in the EnabledShippingMethodChoicesProviderDecorator in line 39-40 - Replaced non-existent option `empty_value` with `placeholder` in Symfony 3.4.x in the Marello\Bundle\ShippingBundle\Form\Type\ShippingMethodsConfigsRuleType.php - Replaced non-existent option `options` with `constraints` in Symfony 3.4.x in the Marello\Bundle\ManualShippingBundle\Form\Type\ManualShippingSettingsType.php 881481c7d enhanced phpDoc comments 200fd94e7 MAR10001-507: Rename ExtendWorkflowBundle to WorkflowBundle 3f6908c4b MAR10001-505: Optimisation of Image rendering in Product Grid c076e9c6a - fixed form types in system_configuration files 00d0d3882 - fixed form types in system_configuration files 9adfeb99a MAR10001-500: Create Sales Channel Assignment Mass-Action on Product Grid 453187239 - CS fix 730cf802d - fixed assembled channel pricelists API responses 58e92fc16 - fixed prices and assembledpricelist responses for API 27c0d6247 - fixed products api responses 9de919074 Merge branch 'bugfix/MAR10001-fix-functional-api-tests-variables' into 2.0-dev 6730da3b1 - fixed responses for returns - removed yaml dumps for responses in api 7cbe557bc - fixed customer api responses d631c0844 - fixed responses for Order Json API cc0a32a52 Merge branch 'feature/MAR10001-498' into 2.0-dev e1fc78cba - CS fixes eff1ac53e Merge branch 'feature/MAR10001-499' into 2.0-dev a6d660ab6 - CS fixes - Removed unnecessary code - Fixed typo in entity class in form.yml parameters 647154676 Merge branch 'feature/MAR10001-496' of https://github.com/marellocommerce/marello-dev into feature/MAR10001-496 4da36cb32 MAR10001-496: Moving Marello to new Oro Platform 3.0 - fixed issue with Product Index Page 7ea85e24e - reverted color change in left nav of admin panel 7756b5a36 MAR10001-499: Filtering SalesChannel(s) on product edit page's SalesChannel selection grid d55775457 - fix 'typo' on form - tmp added css - add svg image 42778f4d4 - run forrest run... 2cf479eb4 - ffs 084b2359f - ... 4a0eca475 - force recreate... :/ fbb21233a -... d6d528e1e ... b04816746 - testing with pre-creating vendor directory 4ea24f1a6 - testing timeout && retry for installing dependencies before going into testing 5481eecf9 - setup testing d4a04b125 ... f31a9859b - testing setup df9e092a0 - added composer-map-env.php 0a21da3aa - fix composer-map-env.php call in container 9ebeffd9b - bare....: 781309c41 - ..:/ 9bfeb56e5 - ... 60ed75344 - tmp remove the cleanup for debug f1bd44c1f .... darn 6fa05adfc MAR10001-498: Add Columns, Filters and Sorters to Products grid 02c180e9b - fix syntax issue c523f8753 Update jenkins file 2da081755 - fixing mkdir recursive 2d0223119 - testing... bd1cf96b1 - testing.... 82065676b - remove vendor dir creation from run.sh on docker-build - add creation of vendor dir for www-data user in jenkins file 3cdb5910a - trying different setup for 'building' stage c23ee8aa5 - trying to fix composer install in container when there is no vendor directory created yet bf8e2c57c - adding another volume which should have an ownership fix - trying to execute composer installs with specific user e59303172 - removed one of the post commands to 'remove' all files within the container - added docker-compose down with specific file in order to close and remove the containers 6b3904db9 - updated parameters to map into parameters.yml - added composer environment parameter mapper in order to create the parameters.yml 7ff881b46 - updated command to exectute phpunit 066764a75 - Updated the way composer install is initialized and added variables for which of the json files should be used to do a composer install 7378a5ad2 - Added some variables to be able to control the build of a certain environment 37a82587b - changed APP_ROOT for cleaning up the 'correct' directories when shutting down during issues with 'root' as owner on some directories 5daff49e2 - fixed composer install command line execution during missing whitespace between two options f961c409d - fixed quotes on phpunit & phplint executing commands in docker container f9c5a3848 - trying different syntax for ENV in Dockerfile abe9b4116 - added jenkins file d3a737aa4 - removed composer.lock files as they will only be available for specific tags in the future - added dev.json for the orocommerce application b69f12bf1 - cs fixes b5ed9f62b MAR10001-490: Add missing icons d2afb852d Merge branch 'feature/MAR10001-496' of https://github.com/marellocommerce/marello-dev into feature/MAR10001-496 1c6542549 MAR10001-490: Add missing icons 464b4ac04 Merge branch 'bugfix/add_monorepobuilder_yml' into release/1.0.x 959997074 - add monorepo-builder.yml abc07f6d4 - fixed cs dc041308c MAR10001-496: Moving Marello to new Oro Platform 3.0 fd28b25f5 MAR10001-496: Moving Marello to new Oro Platform 3.0 277e77451 MAR10001-496: Moving Marello to new Oro Platform 3.0 - changed icom, logo and description from Oro Plarform to Marello 3525ae73c - added dev.lock files 64189d6ab - Added dev.json & dev.locks to Marello CE & EE application ed481cc99 - Added docker environment - Added .gitignore 9738bd9ed Merging marello-orocommerce-bridge to master d0e4c8dd2 Merging marello-orocommerce-api-bridge to master e6573f427 Merging marello-orocrm-bridge to master ab122d579 Merging marello-magento-bundle to master 1be669c12 Merging marello-orocommerce-ee-application to master 4c4c591fe Merging marello to master 5de9a3134 Merging marello-enterprise to master 855ff164d Merging marello-application to master c3cac8169 Merging marello-application-ee to master 49e4c9940 Root commit for master branch 78eb273b9 - changed branch alias to match minor version scheme f37162629 - changed branch alias to match minor version scheme 227db193a - changed branch alias to match minor version scheme 15184e142 - changed branch alias to match minor version scheme fb55d6808 MAR10001-496: Moving Marello to new Oro Platform 3.0 a98d10fab MAR10001-496: Moving Marello to new Oro Platform 3.0 5ae645aa9 - updated composer lock 07dcf8107 Merge branch 'release/1.3.0' e68daf1ea - Updated composer.json & composer.lock fa94e843b Merge branch 'release/1.3.0' into dist-master 1a14b152a - cs fix 0c7180199 - updated composer json - removed ymldumps from test files 0758cdf7b - updated composer.json 5b7877677 Merge branch 'release/1.3.0' into dist-master d29b7ee83 Merge branch 'bug/MAR10001-inventory-validation-on-order-create' into release/1.3.0 bfc36f024 Merge branch 'feature/MAR10001-379' into release/1.3.0 2fc95e9a9 Merge branch 'feature/MAR10001-494' into release/1.5.0 c66c73f79 - Remove markAsSkipped from tests - CS fixes for processors f6f3ebca9 Merge branch 'dev' into feature/MAR10001-345-api bef1af945 Merge branch 'dev' into feature/MAR10001-345-instore-assistant 8c31f3c64 Revert "- [WIP] Remove unnecessary files for custom authentication and CORS options request" 74812237f - cs fix 85ca61b1a merged dev branch into feature/MAR10001-494 964e7e8ca MAR10001-494: Current (JSON) Api doesn't support Workflow processing 67978d1c9 Merge branch 'brainOut-fix_marello_returns' into dev be40693a1 Merge branch 'fix_marello_returns' of https://github.com/brainOut/marello into brainOut-fix_marello_returns 3ec27242a - Added css for consistency in the layout of the remove button on collections in edit modus 008007947 - Added css for consistency in the layout of the remove button on collections in edit modus 9b9cb6674 - added new translation for delivery location on purchase order warehouse selection block 334eab071 Merge branch 'feature/MAR10001-495' into dev a6d6e66e1 Merge branch 'feature/MAR10001-418' into dev a683a9a14 Merge branch 'feature/MAR10001-418' into dev 08404a693 - cs fixes c6753f482 - CS fix 55685aeee Merge branch 'feature/MAR10001-460' into dev 74bd4ff44 - Fix issue with Return notifications not being sent even if it's configured to do so - CS fixes 8146137dd Merge branch 'feature/MAR10001-486' into dev 90eed74f6 - updated purchaseDate setting via prepersist lifecycle callback - added purchaseDate to relevant order-grids 1400c2529 - updated composer.lock - updated parameters.yml.dists to add database_driver_options as part of the dist parameters bb13341ee - Updated error confirmation popup title to a more generic title, thanks @brainOut - Updated popup opening when changing saleschannels and deleting order items which are not salable in a specific saleschannel 2dea32d10 - Updated error confirmation popup title to a more generic title, thanks @brainOut - Updated popup opening when changing saleschannels and deleting order items which are not salable in a specific saleschannel 2cf127c2a Merge branch 'feature/MAR10001-486' into dev 608bb0a2a add control on shipment existence before render form f7c2b7714 MAR10001-495: Current (JSON) Api doesn't support Workflow related entities 31fad2ab3 Merge branch 'feature/MAR10001-352' into dev 8956c4546 - CS fix 710ce4c02 MAR10001-486: Add purchase date to Order entity 77f1cfb84 MAR10001-352: Remove telephone number on Order address 7f9cacd23 MAR10001-460: Review Order notification being sent when Order is created 49e7e271f MAR10001-351: Add image column to gridview 9c2f50064 MAR10001-418: Orders cannot be processed if coordinates for an address have not been found/stored 2ccb6c2e6 MAR10001-418: Orders cannot be processed if coordinates for an address have not been found/stored d1c4e1fdf - Fixed form validation for ChannelPrices collection in API and GUI - Fixed DEFAULT_PRICE, SPECIAL_PRICE references in Migrations and FormSubscribers - Updated pricing api to use 'saleschannel' as key for 'channel' attribute in order to improve consistency in API resource keys 84bb82132 - updated API tests for channel priceslists - updated api's with consistent field names - updated fixtures and tests to adhere to updated fieldnames - added resource docs for pricingbundle entities cee5b4f95 MAR10001-493;Update docs e5c379b36 - Add support for AssembledPriceList in API aec413829 MAR10001-493;dep changes to stay 49b100ce7 MAR10001-493;Adding support for special and msrp prices 9849a7502 - added AssembledPriceList and AssembledChannelPriceList to API 358f5346f - update api doc c9a2fc39f - updated api doc for virtualinventorylevel 890ff59a5 - removed unused test ec5b285d4 Merge branch 'feature/MAR10001-488' 2d4d39256 MAR10001-488;rm todos 2b5d8f7c3 Merge branch 'dev' into feature/MAR10001-345-api 06e8d3cd0 Merge branch 'feature/MAR10001-46' into dev b46091219 - Changed hero widget icon for hero products widget 84d92c014 - repsonses adf804275 Merge branch 'feature/MAR10001-345-instore-assistant' of https://github.com/marellocommerce/marello-ee-dev into feature/MAR10001-345-instore-assistant 66d69b0fb MAR10001-46: Hero Products Widget - added dateRange option - fixed layout design issues 2689fe82c - api responses 54951165c Merge branch 'dev' into feature/MAR10001-345-api 9fc6d03a7 - fixed functional tests which were using demo data fixtures instead of test fixtures be962d170 Merge branch 'dev' into feature/MAR10001-345-instore-assistant 93d24c5ac Merge branch 'dev' into feature/MAR10001-345-api 0b27733f9 Merge branch 'feature/MAR10001-46' into dev 76c7cc7ff - CS fixes 3fd6cd9e9 - updated icon for hero widget in widget selection popup on Dashboard 973889a60 MAR10001-46: Hero Products Widget - applied new layout design ad3533a6c - Added docs for SalesChannel JSON API - updated saleschannel api definition with excluded fields and actions - updated return item api definition with excluded action(s) 75c2f5bcf - Updated validation for Return Item by moving constraint to validation.yml instead of the FormType itself - Updated documentation resource for Return JSON API 1d9175b3f - Fixed Merge conflict in LoadProductData - CS fixes aa1ce1f32 Merge branch 'dev' into feature/MAR10001-345-api f1b6f4a99 - CS fixes df642b222 Merge branch 'feature/MAR10001-378' into merge/PR40-MAR10001-378 2528c7593 - updated return json api test - added doc resource for return api b9b316402 backmerged dev branch 5be36987b MAR10001-378: Additional product pricing information - backmerged with dev branch cbad1d0ea MAR10001-378: Additional product pricing information - merged with remote branch 644d54ef6 MAR10001-378: Additional product pricing information - Update Order's get prices/channelprices - Fixed Functional tests - Fixed Unit tests 1d896b76a - Fixed support on return api 91054f92e Merge branch 'feature/MAR10001-378' into merge/PR22-MAR10001-378 21e332756 Merge branch 'dev' into feature/MAR10001-345-instore-assistant efcc5b63e - CS Fixes in inventory bundle 3eaf2d968 - Updated indexes for complying with the schema test 2d3599336 - adding Annotations for correcting the difference between the schema installer and the doctrine annotations 854dfe5e4 - CS fixes 7ca88f725 - Fixed preserving prices on install when updating to AssembledPriceList and AssembledChannelPriceList a3be0e2d6 - Fixed Product Unit Tests in order to comply with newly created AssembledPriceList and AssembledChannelPriceList d8ad61dba MAR10001-488;Fixing few code smells (psr) a24861d9e - Fixed issues with running platform update in combination with new tables 7548d29be - [WIP] Add API support for Returns 4eca761ec MAR10001-488;Fixing few code smells (psr) e8f696b15 MAR10001-488;Fixing tests ffec331dd MAR10001-488;Fixing tests, adding missing messages a5b53f1fd Merge branch 'dev' into feature/MAR10001-345-api c7a0e63c9 Merge branch 'bugfix/MAR10001-487' into dev 83f92c426 - fix customer select issue from customer grid on order creation e1c487fb3 MAR10001-488;Fixing unit tests a68815bbf - Reverted disabling of AvailableInventory validator - Added validation groups for specifically validating on API calls without validating the AvailableInventory e4ea14f2d MAR10001-378: Additional product pricing information 3151e86ae - tmp disable test 1680a3fa2 - [WIP] Add workflow item config to related entities in JSON API 3af6565b4 - Removed InventoryLevel API support because of issues regarding non-mapped fields in Form 5f3878730 - [WIP] adding inventory level api support b48c518e4 - Added API support for virtual inventory levels (balanced inventory) 057201ba3 - updated order json responses for api 3a44b3cd6 - Added tests for category api 0a46f8b5b - Updated responses after false positives of functional test results with corrupt database tables on auto increment ids - Added product update api test - Added tax code api document resource - Added product api document resource b33c0042b - updated API with create for Orders - updated tests with requests and responses for orders with and without new customers - added taxcodes to api - tmp disabled available inventory validator because of issues with api calls 7dd23b22e - updated responses for order api tests f3a4f72f8 - update product responses for tests 0b56c8ced - TMP Disabled services 8ca9fa207 - Added OrderCreation test via JSON api - Added order_create request data 1d4817443 - update order API responses for functional tests e3857c0db - [WIP] CS fixes 67a4f8b98 - [WIP] Remove unnecessary files for custom authentication and CORS options request 2c00cfdfa Merge branch 'dev' into feature/MAR10001-345-instore-assistant 011ad4155 - CS fixes 8058cd7f0 Merge branch 'dev' into feature/MAR10001-345-order-api bfb219e89 - CS fix bab641184 - replace oro_shipping reference with marello_shipping 2c5524e62 Merge branch 'dev' into feature/MAR10001-345-order-api f1e8fa965 Merge branch 'dev' into feature/MAR10001-345-instore-assistant f114f4943 - fix constructor of ShippingMethodFactory on creation in test be76ab275 Merge branch 'feature/MAR10001-449' into merge/PR38-MAR10001-449 65b440ee2 - Removed skipped tests file of UPSShippingIntegration - Updated doc block for ManualShippingServiceIntegration 57b9c99bc MAR10001-447: CresteShipping Methods - modifications for using same UPS integration for Marello and OroCommerce in single instance installation 2c3c85d47 Merge branch 'feature/MAR10001-449' into merge/PR15-MAR10001-449 39b0efd93 - Updated tests which previously relied on the FeatureChecker - Updated constructors in tests which didn't have the LoggerInterface injected - Updated check for Geocodedaddresses after fetching them, either one of them should not be available before continuing 3c4376d31 Merge branch 'feature/MAR10001-449' into merge/PR15-MAR10001-449 6725546f0 MAR10001-447: Create Shipping Methods - added new chain for distance calculation AddressBased - added new system WFA Rule with Min Distance strategy - Min Distance strategy now is not dependent on Google Address Geocoding Feature 0483533c3 - CS fixes 4ff100793 Merge branch 'feature/MAR10001-449' into merge/PR15-MAR10001-449 3e495eab4 - CS fixes - Fixed PO & Order controller tests 2ea841587 Merge branch 'feature/MAR10001-449' into merge/PR38-MAR10001-449 a5c2c9dba Merge branch 'dev' into feature/MAR10001-449 66cf4a496 MAR10001-447: Create Shipping Methods - modifications necessary for selecting correct shipping origin eaa44db64 MAR10001-447: Create Shipping Methods - fixed few unit tests - added functional tests - modifications necessary for selecting correct shipping origin b06ba7011 - applied CS fixed ec8c44fca Merge branch 'bug/MAR10001-fix-cs-psr2' into dev 71297bd95 - CS fixes f8df662c8 Merge branch 'dev' into merge/PR38-MAR10001-449 b3f353f19 Merge branch 'bug/MAR10001-fix-cs-psr2' into dev b52a4c540 - CS fixes b030aef15 - Updated composer.json and added install instructions to README b6a29d02f - Updated composer.json and added install instructions to README 8736647bb - Added translations; - Removed reference to OroShippingBundle b23c996e9 Merge branch 'feature/MAR10001-449' into merge/PR38-MAR10001-449 7a38b1abd MAR10001-459: UPS Shipping Method - removed unnecessary files b245eef83 MAR10001-459: UPS Shipping Method - unit tests dda03ea22 Merge branch 'dev' into feature/MAR10001-449 0da16def1 - Added prices, channelprices and saleschannels to API and give them appropriate entity aliases a0a393ee3 - Apply new patch for updating AvailableInventoryValidator to be less biased and defensive b34808775 MAR10001-459: UPS Shipping Method - fixed conflicts 1674d5a1c MAR10001-459: UPS Shipping Method 14ee40d07 - applied patches for inventory validation, address validation and inventory display in order creation page fd770b2be Merge branch 'release/0.9.2' a94544990 MAR10001-389;doc update 134e07067 Revert "MAR10001-389;revert php version" e3d68b8ba Merge branch 'release/0.9.2v' f18845d7d Merge branch 'feature/MAR10001-389-1' into develop 84cb66475 MAR10001-389;Strict marello dependency 46b697b5e Rename DOCS 09752294c Merge branch 'release/0.9.1v' 4fd8df461 Merge branch 'feature/MAR10001-389' into develop 19f841f69 MAR10001-389;Adding backward compatible iterators (deprecated) e0dfe975d MAR10001-389;Adding category link skip on exist + un-assign unwanted links 600f741f0 MAR10001-389;update deps ecdbb8b64 MAR10001-389;revert php version 11189bc45 MAR10001-389;Fixing dep 071404898 MAR10001-389;Fixing dep 6df176976 MAR10001-389;Fixing dep 4354783d5 MAR10001-389;cleanup 38a102818 MAR10001-389;Move README to the bundle itself 0b0761d5f MAR10001-389;REVERT -> updating docs 85fe3aefb Merge branch 'feature/MAR10001-389' of https://github.com/marellocommerce/marello-magento-bundle into feature/MAR10001-389 05274da55 Merge branch 'feature/MAR10001-10' into feature/MAR10001-389 65ca9b597 MAR10001-389;updating docs 601c954c0 MAR10001-389;updating docs 0709367a2 - Corrected 'Security' use statement alias in order to fix issues with ACL not working correctly e6d60db2b - updated composer.lock e33447ea9 Merge branch 'bug/MAR10001-463-fix-acl-annotation-bug' into dist-master 58fe4f5e3 Merge branch 'dev' into bug/MAR10001-463-fix-acl-annotation-bug 121ec82d7 - Corrected 'Security' use statement alias in order to fix issues with ACL not working correctly 03de4eb74 - Corrected 'Security' use statement alias in order to fix issues with ACL not working correctly 3c7db857a - first adaption of ACL annotation fixes 6d79f8f38 MAR10001-449: Create Shipping Rules - fixed conflicts ed01710c8 MAR10001-449: Create Shipping Rules - shipping rules skeleton - shipping methods skeleton - manual shipping method - integrated new shipping methods in order workflow 84367c3c0 - Added additional tests and API endpoints c20266bb4 - updated functional tests to succeed after adding OrderItems in the mix and moving the identifier of the Product to the SKU 9dba19e29 Merge branch 'dev' into feature/MAR10001-345-order-api 838d0f323 - Added composer.json and additional files for meta info aab64821e - Initial Commit fa2908d87 Add .gitignore d8e959780 - Fixed primary & shipping address id columns on order_customer table 4d62a94cf - Fixed FK change on the organization of Order, PackingSlip, PurchaseOrder and Refund table a2300366e - updated doc block c330791ea - Fixed broken test of checking the report; Test contained old naming of the datagrid af2ff9a95 - Fixed broken tests for testing the deletion of SalesChannels and SalesChannelGroups a4ee0cfa8 - Added required fields to form data in order to fix broken tests regarding updating Taxcodes and suppliers e591620ed - Added docblocks and fixed comparison of DateTime values a6aba9fd9 - Fix broken Datafixture of OrderData efd3a83c3 - Fix broken inventory update test c750eced3 - Fix broken category view test bbf106f89 - added filter on order items to get them all for a single order 6ec12b8e8 - updated data check for whether there is no data available for the metric item b45080b8d Merge branch 'dev' into feature/MAR10001-345-instore-assistant a530fabed Merge branch 'dev' into feature/MAR10001-345-order-api 70d6b7a21 - enabled OrderItems in api, with link to Orders 917e97a3a MAR10001-10;Adding support for product remove/delete ba12d1e3f MAR10001-10;batch size is always 1 9035e34dd MAR10001-10;Refactor the product event ec2cb49c8 MAR10001-10;Adding product create/update sync action from the admin gui ff25ff7a3 MAR10001-10;Adding message-que upon product ui modifications 3fdddfe24 - updated readme 8a0193e0f - updated composer.lock to include marello 1.4.1 41fa4118d Merge branch 'release/1.4.1' into dist-master 42770c925 - Fixed unit test to test getting the customer shipping address - added bc for getting primary address of customer from addressprovider 930cb8abf MAR10001-10;Fixing lastsync date 05ba026a9 - fixed rendering datagrid issue when 'selectAll' option is abscent 8c174af1b Merge branch 'dev' into feature/MAR10001-127-small-fixes 946e21ba7 MAR10001-10;Fixing product filter dae3cea32 MAR10001-10;Move job name into constants 72802752a MAR10001-10;Enable initial connectors 7b5329037 MAR10001-10;docs a00d08849 MAR10001-10;Adding store_code retrieval 005642b64 Merge branch 'release/1.4.0' into feature/MAR10001-127-small-fixes ea2d3f56e - Updated Marello Customer datagrid and remove id as column and added the createdAt and updatedAt fe1354e4f MAR10001-10;Adding more tests 0686572bc MAR10001-10;Adding entity unit tests 9af0eca5c MAR10001-10;Fixing wsdl_url check error 51b158e10 MAR10001-10;Addint soap-transport unit test d34411a62 MAR10001-10;Adding support for price per website e6e9f8e14 MAR10001-10;Code cleanup 4fcdf97fd MAR10001-10;cleanup cbfd8d8c3 MAR10001-10;Adding saleschannel filter on product connector/reader d34857f3a MAR10001-10;Adding channel prices support b4d172b0a MAR10001-10;cleanup e172e5741 MAR10001-10;Fixing inventorylevel export reader 05e3eb137 MAR10001-10;Adding integration channel filter on inventorylevel reader da68bf935 MAR10001-10;Implimeting Mage twoway sync 604aa461d MAR10001-10;Order connector incl.update c69bd88ce MAR10001-10;Order connector incl.update d530ffc3b MAR10001-10;Order connector incl.update 4f4d513a2 MAR10001-46: Hero Products Widget -fixed conflict with deb branch 1b00ddd1e MAR10001-46: Hero Products Widget 415148909 Merge branch 'release/1.2.0' eedc2c43e - removed .gitmodules - updated dependencies 72677a8d5 Merge branch 'release/1.4.0' into dist-master b119bb265 - updated depedencies of Marello CE 079114079 - updated marello version d91b2f221 - updated version of dependencies in composer.json 536931a2c Merge branch 'release/1.4.0' into dev a10643dbc Merge branch 'release/1.4.0' into dist-master 5bd33fd35 Merge branch 'release/1.2.0' into dist-master c5b021f52 - Changed method signature of creating a Customer by allowing the shippingAddress to be null - Fixed LoadOrderData test fixture 97ef35903 Merge branch 'feature/MAR10001-276' into dev b78d87d40 Merge branch 'feature/MAR10001-276' into release/1.4.0 09feb151a - Updated return entity font-awesome icon to 'undo' in grid and dashboard a6462e6e6 - Updated grid to use the new 'select-all' feature 664373c93 - fixed issue with grid of SalesChannels selection in product create/update - updated grids to use the new 'select-all' feature 6308039a6 MAR10001-10;Adding ground work for order connector 3686d89b2 MAR10001-10;Change sync filter to 1 day / 24hrs 07d705219 MAR10001-10;grouping 27a693c9c MAR10001-10;Adding website_ids into the product data package 5ae0fd3fc MAR10001-10;Attempt to add channel in the exports for filtering 1a14be8d6 MAR10001-10;Process only known categories in magento 0fe7e2c0e MAR10001-10;Adding product category assignment 8f43b2da0 MAR10001-10;Migrate message path 6bdbe6155 MAR10001-10;category code nullable f934c87fc MAR10001-10;category connector - iterator ac9ece0c7 MAR10001-10;Adding transport support for the category listing 1064c3ab9 MAR10001-10;Fixing entity classes 26cd99de7 MAR10001-10;Adding rough category connectory 9955daca3 MAR10001-10;Adding category connector 548e6a399 MAR10001-10;Enable other calls in migration setup fc98a315c MAR10001-10;Adding category migration && entity 8ea781e2a MAR10001-10;cleanup 0d337fe4b Merge pull request #2 from gplanchat/patch-1 d0deb1e6c Fixed fatal error on product save bcf8a590d MAR10001-10;Fixing doc be16de695 MAR10001-10;Adding real price value f79a76f03 MAR10001-10;Price entity class abceefdd3 MAR10001-10;Adding price connector 443df7275 MAR10001-10;Rename stock level connector d3a58df31 Merge branch 'bug/MAR10001-428-layout-and-load-issue-of-order-address' into dev 443473063 - Added correct widget rendering blocks for Shipping- and BillingAddress in Order create - Removed 'shipping' from the abstract order address type name cf0e1df64 MAR10001-10;Adding stock level export to M1 fdee84873 inventory - connector f61997de6 MAR10001-276: Small changes - fixed conflicts after merge a392ca6a7 MAR10001-276: Small changes 169c04d30 MAR10001-276: Small changes 6a46e1812 MAR10001-10;Process connector export process via sync processor 03f0f1a5c MAR10001-10;Adding inventory level support f59396690 Merge branch 'feature/MAR10001-428_Customer-shipping-address' into dev 788ab1104 - changed layout for addressblock in general because of the rendering of minimap in the customer view ae3896527 MAR10001-10;#? df1d319dd MAR10001-10;Adding stock level connector - rough 4d62cbb11 Merge branch 'feature/MAR10001-428_Customer-shipping-address' into dev e226df8f4 Merge branch 'bugfix/MAR10001-000-fix-supplier-datafixture' into dev 5eb597eea - fixed Supplier fixture in functional tests 92ce4f6de MAR10001-10;Minor refactor bb252d407 - Add fix for creating Customer with demo data including a shipping address c53fee9df MAR10001-10;Save workspace 6b59e0289 - Added migration to update existing customers to clone their primaryAddress into their shippingAddress 601197608 - CS fix 8eaa86893 - Added small modification in layout when editting the Customer addresses f2c361929 MAR10001-10;cleanup 7e8ed8f22 Merge branch 'dev' into feature/MAR10001-428_Customer-shipping-address a032e3277 MAR10001-10;Adding currency on the integration + auto channel/group create 9477be246 Merge branch 'feature/MAR10001-379' into dev ad2e65aa6 Merge branch 'dev' into feature/MAR10001-379 e4ae9f8c9 MAR10001-379: Purchase advice should only be added once 80d3fa2cd MAR10001-379: Purchase advice should only be added once 2f1bcc853 MAR10001-379: Purchase advice should only be added once c8d4ade9c MAR10001-10;Adding product update support 9bafe1f21 - Added missing CS fixes b2cb34fab - added method of sending the purchase order to the view - Small cs fixes afd6d6984 MAR10001-10;Adding product export f78cd4700 MAR10001-10;Enable dictionary connectors 8723fd32f Merge branch 'dev' into feature/MAR10001-310 7e92088a1 - updated oro/platform version - updated php version to 7.1, drop support for 7.0 002a147ff - Split address select for order create 00ed67043 MAR10001-310: Sent purchase order by feature bf618da30 MAR10001-10;Adding product export to Magento instance 40363d9a4 Revert "Merge branch 'gplanchat-set-workflow-application' into dev" 40bae0afd - Add shipping address to API db0baf731 - Add shipping address to form and view a0a511d83 - Add shipping address to customer 0f341a9c2 MAR10001-10;Enable dictionaly processor 2956f438c MAR10001-10;Adding product connector - import only for now 531b6aef3 Merge branch 'gplanchat-set-workflow-application' into dev 80b064b33 Merge branch 'set-workflow-application' of https://github.com/gplanchat/marello-dev into gplanchat-set-workflow-application 167052f95 Merge branch 'feature/MAR10001-404' into dev ab667b185 Merge branch 'feature/MAR10001-404' into dev e5a41fa20 MAR10001-404: Marello Procurement updates - fixed latest comments fe42ecbb5 MAR10001-404: Marello Procurement updates - fixed latest comments 217c47c01 MAR10001-10;Adding product connector - rough fe794176e Added application identifier to Marello workflows 9ef321536 update composer.json 05455eacd Merge branch 'feature/MAR10001-413' into dev 24486d749 - CS fix a4d0eeb40 MAR10001-10;Adding product connector - rough 925248a6f MAR10001-10;created, updated at 8de082714 Initial commit 1fee7875c Adding product connector 637992ab5 #? f8ae66afb webiste && store connector 7f56a0d17 Merge branch 'release/1.0.1' a189dbd54 - added allow_array option to PaymentStatus entityIdentifier field to filter correctly a single id or incoming string with multiple ids - added allow_array option to TaxValue entityId to filter correctly a single id or incoming string with multiple ids e58738cdb - CS fixes 75d0e2c88 Merge branch 'feature/MAR10001-353' b9aca80e5 - added null check on getting current workflow item from entity before verifying if a transition is allowed 4b519888b MAR10001-426: Select All and None only selects first page d82940eaf Re-run based regular oro magento bridge - foundation e84b15ee9 Adding website && store connectors 4e25624cc Adding product, store && website 735b384e1 Remove price on product process 419360b62 Merge branch 'bug/MAR1001-392-Explicitly-define-route-keys-for-individual-controllers' into dev b28afb8f5 Merge branch 'kiboko-labs-dev' into dev b13cbca2d Merge branch 'dev' of https://github.com/kiboko-labs/marello-ee-dev into kiboko-labs-dev b1d274d58 Merge branch 'feature/MAR10001-404' into dev 66dea21a5 Merge branch 'ticket/MAR10001-380' into feature/MAR10001-404 596e87c27 Fixed installation issues on existing projects b80b4b4ef Adding config provider 6211bc2a1 Merge branch 'feature/MAR10001-404' into dev 7a3b4ee19 - fixed issue of incorrect mapping of currency attribute on Supplier entity; - fixed issue of incorrect mapping of order_total attribute on PurchaseOrder entity; - fixed issue of incorrect mapping of row_total attribtue on PurchaseOrderItem entity; 9123b50fc Adding rough-website-sales-channel relation -TODO: Fix gui issues 4d4dde3de Merge branch 'bug/MAR10001-tax-unique-index-fix' into dev eb27215b8 Merge branch 'dev' of https://github.com/marellocommerce/marello-dev into dev 967042403 Merge branch 'ticket/MAR10001-380' into dev f7b05c0a5 Merge branch 'feature/MAR10001-404' into dev 5a96a40d2 Merge branch 'bug/MAR10001-update-form-with-data-layout-attribute' into dev 039349f30 - Fixed data-attribute in form fields in Inventory level form ea635ea99 - Fixed broken tests in PurchaseOrderController; - Updated Datafixture for Tests with row totals and order total for PO & POI - Fixed issue with data-layout attribute in fields for PurchaseOrder creation 8deb1c71f - Fixed issue with upgrading the purchase order table in migration bf4a26f68 - remove necessary script 3a114a453 - fixed composer.json autoloader key 8c4fcd4c2 MAR10001-353: Integration OroCommerce - CRM - Marello - added functional tests - fixed bugs 8196e2940 Adding configuration support 32194029b - Added migrations for updating the unique index names on Category, TaxCode, TaxRate and TaxJurisdiction entities 953ebde38 - Updated unique constraints on `code` columns of the Category, TaxCode, TaxJurisdiction & TaxRate entities - Updated unique indexes to have their 'own' code instead of generated codes based on column names 6783bddcc - Updated category schema in order to pass `Oro\Bundle\TestFrameworkBundle\Tests\Functional\SchemaTest::testSchema` - Updated Category ORM annotation to add unique constraint to code column 5977da4c3 - added missing translations 19b332e47 - added new migration for description; platform update didn't add the column when the version is already installed a5c039e10 Add these in ignore ee0afa697 Add these in ignore 3a3b468d7 Adding inventory resource 2709e3f72 - added some category demo data 9b32ef2a6 - Fixed Category View test afte…

1999cc10e - 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 7e9afaad3 Merge branch 'develop' into test 0019e8516 Merge branch '3.0' into test 053da4351 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test 20b013feb Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test e6c6ba176 Merge branch '3.0' into develop 2a921f8bc - 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 91aed6a26 - Added migration to include organization id on the purchase order item 4e7ad22a5 - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig 7493d2d51 - removed .class parameters from service container and replaced it with the FQCNs 7382a658f - removed marello_product.entity.class parameter from service container and replaced it with the FQCN d679bd298 - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN d2e87f5a0 - 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 bbf61e119 - PSR2 CS fixes in PDF/InvoiceBundle c72351a60 merged branch 3.0 into feature/MAR10001-849 ac4723293 MAR10001-849: PDF Bundle improvements 84ddeebb2 - 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 a4b158042 - 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 3b4f87c44 - Fixed issue with entity classes defined in the service container instead of using the FQCN 27539a2ed - 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 1d50767a4 - Added missing translation labels 704e2f7bc - 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 4d821e901 - Updated unit tests to use and test the new underlying structure of resizing images f21174495 - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method 976f6bd94 - 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 03c2e3057 - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated 259787bfc - 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 b4b1e20ff - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories 65daa404e - 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 .... 72e67d496 Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns c2d088017 - 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 403f7d82f Merge branch 'feature/MAR10001-837' into 3.0 139c38dfc MAR10001-847: Fix prices in product datagrid 6d8be00d0 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class' 185d34b24 Merge branch 'feature/MAR10001-845' into 3.0 bcd1cac31 MAR10001-837: Inventory batch layout 2c9235aed - 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 c834a8ab7 MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener b6cd772dd - 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 2595ee11e Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0 7ae8042af - removed empty line from services.yml ce975e1e4 Merge branch 'feature/MAR10001-842' into 3.0 cb30cc441 - removed deprecations from different classes, some inf favor of constructor dependency injection - fixed default user&password for initializing db's in the docker container 97faf3a6a Merge branch 'feature/MAR10001-776' into 3.0 026b5ed30 Merge branch 'feature/MAR10001-776' into 3.0 c21d40af7 MAR10001-776: Inventory Batches - fixed bug in replenishment 4531bc1f6 - added composer.lock 4487e16f3 - preparations for release 9c7ebb089 - preparations for release 1f7345af5 - preparations for release 2819c3c30 Merge branch 'feature/MAR10001-776' into 3.0 9c4bb6a27 Merge branch 'feature/MAR10001-776' into 3.0 49cb95939 Merge branch 'feature/MAR10001-776' into 3.0 928594e30 - 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 37cd32a84 - 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 e191aafb4 MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled 4db583582 - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to 93bc2e239 - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to 1fee5e261 - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs 7956cf253 - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs ca6f502a5 MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 13612475f MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 8a50d6ae6 MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 9967a85a7 [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 df1cb7464 [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 4ea003c01 [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 5be051dd3 - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid 0bb927d39 - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid 9d20701b2 - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge ce37a6112 - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge 94e6f5587 - 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 944a0499c - 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 12b60eba1 - 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 666ab51f6 - 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 8ccaba9f6 - 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 5d6d3844a - 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 5b31fe9a8 - 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 7f77e9197 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 d52df0655 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 cf018838d - 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 c42a3a418 - 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 cc3cbaebc - 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 178037210 - 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 82bee64d5 - 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 078492453 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid fc8c4387e MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid a56959684 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid 3ee315d59 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 02918fd66 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 eadf26e02 - updated invoice email attachment template to match the subject of the invoice notification email 653dd6fd1 - updated invoice email attachment template to match the subject of the invoice notification email f7fd44771 Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3 cc78cdad3 Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3 be4c9f2ae - 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 bae24cb56 - 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 6392d133a - 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 66c0f54c9 - 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 02ebfdd35 - updated customer update view to correctly display name in the tab of the browser 3c50453ed - updated customer update view to correctly display name in the tab of the browser 3ea3e88c1 - removed old bundle of Servicepoints, Servicepoints are now a separate package a727ae292 - removed old bundle of Servicepoints, Servicepoints are now a separate package 44f4cf6e3 - added service points as new package - added docker-compose file for service points application a79cd78f4 - added service points as new package - added docker-compose file for service points application dade4f5e3 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle 4412c5601 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices cb5eb34f3 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices 2eb5b91dc - fixed js component for purchase orders - fixed issue with showing currency symbol and prices a0a9af782 - fix controller - fix view 284cff7f4 - fix controller - fix view b02106eb7 - fixed create return button on order view page after the status of items have been changed to enums instead of strings e349ca4ee - fixed create return button on order view page after the status of items have been changed to enums instead of strings 576071659 - fixed order of import for multiple entity.js of purchase order d0b13e21b - fixed order of import for multiple entity.js of purchase order 7a5a1caa0 - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone 2cc838df3 - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone 1d523cffc - reworked the multiple entities setup for purchase orders regarding js components deeb6eb62 - reworked the multiple entities setup for purchase orders regarding js components 7286d3fd8 - fixed typo in item view of purchase orders 4cba9e4ab - fixed typo in item view of purchase orders cdd73bc3a CRH19001-18; Change date formtype 5d2a982b6 CRH19001-18; Change date formtype 6b3b24e03 CRH19001-18; Refactor form handler for business hours overrides 23f871f7b CRH19001-18; Refactor form handler for business hours overrides 59e718e52 - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle 3bd28bf9e - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle 03059ddff CRH19001-18; Fix business hours overrides datagrid 4e7b92b28 CRH19001-18; Fix business hours overrides datagrid 2f04f513b - 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 bb9c7a7c8 - 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 5f4973652 - 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 b37f81d7a - 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 dc05e390f - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form 6041ea2c0 - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form 5e3ed72c5 Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 59dfd625a Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 66777f0da - updated emailtemplate action to comply with php 7.2.x 316f99b67 - updated emailtemplate action to comply with php 7.2.x 2365984dc - make service public in order to use the service within symfony 4.4.x framework on other places ebc1ae9ef - make service public in order to use the service within symfony 4.4.x framework on other places 310222f69 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 192df4cb8 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 a88d455e1 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 a8659a27c Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 99b600615 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 7c0f196f7 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 8d4dee8de merged branch 3.0 into feature/MAR10001-776 9bd950cc3 merged branch 3.0 into feature/MAR10001-776 a1a938d99 merged branch 3.0 into feature/MAR10001-776 595bc3a20 MAR10001-776: InventoryBatches b27a9ae8c MAR10001-776: InventoryBatches 19b0a4aa8 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 6e60193a9 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 5733ea805 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 7b5245e71 Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3 20233da2c Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3 eb894e455 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 9b442c953 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 905110932 - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 efee8011c CRH19001-18; Add business hours overrides 923142625 CRH19001-18; Add business hours overrides e94354bbc - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription b7db90238 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription 9620c2ec6 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription bfa5931f9 CRH19001-18; Manage collections of business hours in form handler 231bb0e94 CRH19001-18; Manage collections of business hours in form handler e6b9a080c CRH19001-18; Always show all days in form b380c5ad4 CRH19001-18; Always show all days in form 1f3e58698 CRH19001-18; Fix validation 506badde8 CRH19001-18; Fix validation 23ad02620 - 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 9d6bad5c8 - 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 438cd4074 - 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 6051c0692 CRH19001-18; Rewrite business hours datastructure [WIP] 9c20c1588 CRH19001-18; Rewrite business hours datastructure [WIP] 9be307c6c CRH19001-18; Rewrite business hours datastructure [WIP] 1fabb3439 CRH19001-18; Rewrite business hours datastructure [WIP] 0fde8de36 CRH19001-18; Rewrite business hours datastructure [WIP] 6f40bb129 CRH19001-18; Rewrite business hours datastructure [WIP] 4bb000f02 - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings f0fd1db5e CRH19001-18; Update form view for business hours c8b5fe623 CRH19001-18; Update form view for business hours 38575d13d CRH1900-18; Fix validation 2da004692 CRH1900-18; Fix validation f25a67557 Merge branch 'feature/CRH19001-18_Service-points' of github.com:marellocommerce/development-mono-repository into feature/CRH19001-18_Service-points 3bac8acd8 Merge branch 'feature/CRH19001-18_Service-points' of github.com:marellocommerce/development-mono-repository into feature/CRH19001-18_Service-points 682c99c9d CRH19001-18; Updates to form theme 95c9fdc18 CRH19001-18; Updates to form theme 4b9c8c683 - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation b53c39a0a - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 28daddedd - updated dev.lock file fe90bbaa2 - updated all Marello CE bundles with the new format for webpack 5193d734f - updated all Marello CE bundles with the new format for webpack 604d4d97b CRH19001-18; Fix view page when no image selected 5cd88e9dd CRH19001-18; Fix view page when no image selected f6da13472 - 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 c252f838e - 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 31156333b - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 227d2865f - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 3fa848d95 - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 83969e824 - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc 669d346e0 CRH19001-18; Add custom form theme for service point business hours 75290c1b1 CRH19001-18; Add custom form theme for service point business hours d6bb3b9b1 MAR10001-776: Inventory Batches - new comments fixed 6200983d2 MAR10001-776: Inventory Batches - new comments fixed 924d920e1 MAR10001-776: Inventory Batches - new comments fixed 4f8d33afc CRH19001-18; Fix timezones of TimePeriod entities 0cbb51dec CRH19001-18; Fix timezones of TimePeriod entities 1e5841ce9 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 b6c984d5d 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 b5d0795ce MAR10001-742; Add ability to add attachments to notifications from workflow action 6eb9d1569 MAR10001-742; Add ability to add attachments to notifications from workflow action 737fc682d MAR10001-742; Add ability to add attachments to notifications via SendProcessor 3c9be9991 MAR10001-742; Add ability to add attachments to notifications via SendProcessor 10b411531 MAR10001-742; Add attachments to Notification 6bc8305a6 MAR10001-742; Add attachments to Notification e4479f701 MAR10001-742; Add v1_0 migration for NotificationBundle a5dff3ee3 MAR10001-742; Add v1_0 migration for NotificationBundle 0ec555db6 MAR10001-742; Fix typo 8fa0f8f00 MAR10001-742; Fix typo 78454b743 - reverted to old sticky note icon 6525fe1e0 - reverted to old sticky note icon 9c7cff9d3 - changed the sticky note text - reverted commmented line in phpunit.xml 25ed67191 - changed the sticky note text - reverted commmented line in phpunit.xml a5d99b495 - fixed the sticky note description and logo - updated help link on the question icon on the top 106395942 - fixed the sticky note description and logo - updated help link on the question icon on the top 87cc5f9b7 MAR10001-13; Add white background color to PDF template c5ddc1a7e MAR10001-13; Add white background color to PDF template 895b6a11c MAR10001-13; Add configuration button on sales channel view f4f6289f4 MAR10001-13; Add configuration button on sales channel view 27c15c12d CRH19001-18; Validate timeperiod validity 598944c8e CRH19001-18; Validate timeperiod validity 8dc19290d CRH19001-18; Allow multiple timeperiods per day df4565703 CRH19001-18; Allow multiple timeperiods per day 7bdd0349d - remove instore assistant bundle as we are going to move the code to a separate repo and introduce it as an extension 985343a46 MAR10001-774: Remove increase / decrease external warehouses option 8c74043b3 MAR10001-774: Remove increase / decrease external warehouses option 740c4e7a1 MAR10001-774: Remove increase / decrease external warehouses option c4b99caec - CS fix 3c68ee563 - CS fix 58962e2b5 Merge branch 'feature/MAR10001-765' into 3.0 05cd663b2 Merge branch 'feature/MAR10001-765' into 3.0 1294fd60d Merge branch 'feature/MAR10001-765' into 3.0 83a15435f Merge branch '3.0' into feature/MAR10001-776 32dd31b4b Merge branch '3.0' into feature/MAR10001-776 3164fd5e1 Merge branch '3.0' into feature/MAR10001-776 b0a779dde MAR10001-802: WFA rule index is not rendering 0991d23c1 MAR10001-802: WFA rule index is not rendering 4766df7ec MAR10001-802: WFA rule index is not rendering 763b003ce MAR10001-765: Update InventoryRebalance Command e88a5d820 MAR10001-765: Update InventoryRebalance Command e9ec53480 MAR10001-765: Update InventoryRebalance Command 26a7c3c84 - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 235ebf9e9 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ ae3bb88eb - updated to 4.1-beta on marello-ce b6326501a MAR10001-776: Inventory Batches - bug fixed a8b947cfa MAR10001-776: Inventory Batches - bug fixed a21503972 MAR10001-776: Inventory Batches - bug fixed 2a7b9beb8 MAR10001-776: Inventory Batches - bug fixed 690e5d913 MAR10001-776: Inventory Batches - bug fixed 76518c5c6 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order fe1066805 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order 05feb9490 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order 46c7b18ce - 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 dd2603baf - 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 c51753d46 - 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 cae7edad7 - 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 7f394a308 Merge branch 'feature/MAR10001-770' into 3.0 d1b98eb90 Merge branch 'feature/MAR10001-770' into 3.0 dcb7aa4a4 Merge branch 'feature/MAR10001-775' into maintenance/2.2 9fe1a4e14 Merge branch 'feature/MAR10001-775' into 3.0 cd9313e3c Merge branch 'feature/MAR10001-775' into 3.0 619e6fd78 Merge branch 'feature/MAR10001-769' into 3.0 d4a649819 Merge branch 'feature/MAR10001-769' into 3.0 02a53141e Merge branch 'feature/MAR10001-769' into 3.0 d14bcb338 - updated dev.lock with Oro Platform beta 4.1 217d280ea - updated dev.lock with Oro Platform beta 4.1 30ef262ad - updated dev.lock with Oro Platform beta 4.1 6fa5a778a MAR10001-776: Inventory Batches - removed temp code 917cdc829 MAR10001-776: Inventory Batches - removed temp code b95c8380c MAR10001-776: Inventory Batches 40019aaf9 MAR10001-776: Inventory Batches e6e150fc7 MAR10001-776: Inventory Batches 0647a3566 - 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 a484d5598 - 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 86e648a01 - 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 c22d03f9a - 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 63a48116c - 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 13dcc1f9d - 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 0fb3f43b4 - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer 467677402 Merge branch '3.0' into feature/MAR10001-770 6fccd993c Merge branch '3.0' into feature/MAR10001-770 f421f1d23 fixed bug on order create page 21589a0bd fixed bug on order create page 90dc5f64c MAR10001-770: Order statistics widget: filter by SalesChannel 1ff5a6164 MAR10001-770: Order statistics widget: filter by SalesChannel cf4217608 - Added migration to include organization id on the purchase order item 68f88547c - Added data column to PurchaseOrder f543a3824 MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first 10cafed1c MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first 098bc5146 Merge branch 'develop' into feature/MAR10001-769 a34c4d6af Merge branch 'develop' into feature/MAR10001-769 41e354923 Merge branch 'feature/MAR10001-758' into develop ae693ab4c Merge branch 'feature/MAR10001-758' into develop d60f3a7f3 Merge branch 'feature/MAR10001-758' into maintenance/2.2 9f2cf4c54 - CS fixes 2ab467421 - CS fixes 0ef03ef55 - updated branch aliases f8049b093 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 5f1757ce5 - CS fixes - Changed php version back to 7.1 face93ac8 CRH19001-18; Add API 92722bccf CRH19001-18; Add API b832b1717 CRH19001-18; Add map to service point view page 02939ef0b CRH19001-18; Add map to service point view page 23e5e4e6c CRH19001-18; Add service point image to view 4eadfa473 CRH19001-18; Add service point image to view 8416988bc CRH19001-18; Add EntityConfig 9c1030a21 CRH19001-18; Add EntityConfig 5033f1ccd CRH19001-18; Add ACL 3ca3135f4 CRH19001-18; Add ACL 6d9054f9a CRH19001-18; Add controllers and views 0cfb53c59 CRH19001-18; Add controllers and views a34157713 - 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 c0cb485b9 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels ceaf461e2 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels 4aa5ba4b5 Merge branch 'develop' into feature/MAR10001-758 4e9b55324 Merge branch 'develop' into feature/MAR10001-758 afa0bbcfc MAR10001-769: Show 'Cost' currency on de Product edit page 62c11fd93 MAR10001-769: Show 'Cost' currency on de Product edit page 79ae658dc CRH19001-18; Add Forms 3e78149c1 CRH19001-18; Add Forms b9c3c3257 CRH19001-18; Add validation b630b8cd7 CRH19001-18; Add validation 2d4e1ff7a CRH19001-18; Add translations 07a769e0f CRH19001-18; Add translations 7e32b8dfb CRH19001-18; Add data model 292a8e349 CRH19001-18; Add data model 763fa3517 CRH19001-18; Add ServicePointBundle 15a36f12b CRH19001-18; Add ServicePointBundle 01a0d5ae6 - removed self.version from package composer.json files 50883c5da - Changed column source on invoice and creditmemo items product sku and name d337d0963 Merge branch 'feature/MAR10001-674' into develop e7dae6c0e - Disabled OrderOnDemand widget in Inventory view / update in order to prevent the usage of the unfinished feauture 6b78c8848 Merge branch 'feature/MAR10001-674' into develop eab1858f1 Merge branch 'bugfix/MAR10001-764-stop-override-orderitem-status-when-already-set' into develop 104c43817 - Added check to prevent overriding OrderItemStatus when already set on creation fe8bb42ba Merge branch 'bugfix/MAR10001-763-fix-inventory-level-import' into develop 1c6d80544 - Added additional check to verify there is a product to get the inventory item from when passed back to the import processor 97c9b2fcc - Added additional check to inventory level update strategy to check wether the product of the 'associated' inventory level exists before importing and throwing errors e48fc472c removed useless fields from oro_entity_config_field 465492e30 removed useless fields from oro_entity_config_field 9a7010469 fixed bug in Migrations versions 813bbd944 fixed bug in Migrations versions 53ebeb0e7 fixed bug in Migrations versions 3eb689333 fixed bug in Migrations versions 3affb539f fixed bug in OrderBundle migration 5812d0894 fixed bug in OrderBundle migration 24fdddaa0 merged branch develop into 3.0 e043d4722 merged branch develop into 3.0 f84c3c90c merged branch develop into 3.0 fe06756a9 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into develop 154bd1592 Merge branch 'task/MAR10001-0-add-quick-navigation-in-views' into maintenance/2.1 4c66dac97 Merge branch 'task/MAR10001-add-orocommerce' into develop add2b43cc merge branch 3.0 into feature/MAR10001-730 05e8bf957 merge branch 3.0 into feature/MAR10001-730 17b92a3dc merge branch 3.0 into feature/MAR10001-730 864b93968 merge branch 3.0 into feature/MAR10001-730 1cce30b4a merge branch 3.0 into feature/MAR10001-714 0b8bdb496 merge branch 3.0 into feature/MAR10001-714 5b9024db8 merge branch 3.0 into feature/MAR10001-714 b75c1ed00 merge branch 3.0 into feature/MAR10001-714 c462f187e 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 4c9b5b4bc 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 ca97bfc4e Merge branch '3.0' into feature/MAR10001-725 09421c85e Merge branch '3.0' into feature/MAR10001-725 ceeafb61f Merge branch '3.0' into feature/MAR10001-725 931f1932c Merge pull request #16 from marellocommerce/feature/MAR10001-751 989b3f2c9 Merge pull request #16 from marellocommerce/feature/MAR10001-751 56e5d5d61 Merge branch '3.0' into feature/MAR10001-718 8a15bf5a1 Merge branch '3.0' into feature/MAR10001-718 c790edaa0 - finetuned composer json files for oro commerce 4ddc0c617 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop 6f402e9ca - updated PurchaseOrderBundle schema versions to take the 'next' version of Marello (2.2) into account 6c6ae2d34 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop df0124130 Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop 52a78660f - Added Organization ownership to ReplenishmentOrderItem - Added migration to update current ReplenishmentOrderItems - Added translation for Organization label - Updated installer migration to include Organization column 7c1ba3419 - CS fix dd6a7b011 - 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 e53eefe14 - 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 0fb228023 - Added migration for updating existing InvoiceItems with Organization - Added migration for adding ownership to ReturnItems - Added migration for updating existing ReturnItems with Organization 92e27ecf5 MAR10001-751: Rename columns to bbdd49b9e MAR10001-751: Rename columns to 893c103da MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bugs a50481065 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed bugs 1491c5475 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed CustomerBundle - fixed PaymentTermBundle f439b84c9 MAR10001-717: Update applications with Oro platform 4.0.0 - fixed CustomerBundle - fixed PaymentTermBundle 8612c07ae merge develop branch into feature/MAR10001-717 ' a885563af merge develop branch into feature/MAR10001-717 ' eb6dc9d3e merge develop branch into feature/MAR10001-717 ' 84443da43 merge develop branch into feature/MAR10001-717 ' 4fabaabf6 - Added migration to update current credit/invoice items with organization based on the parent entity's organization 7a30b978e MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels 2c93997a1 MAR10001-758: ProductSupplierRelation deletion is not updating InventoryLevels fd600cf5e - updated PackingSlipItem test to include organization - Added translation for PackingSlipItem organization 86a679149 - 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 c45b7e495 - Added ownership field to Oro config 938fcb2e5 - Added organization ownership to InvoiceItems - Added translations for organization - Added migration to update schema with organization 2e7dcce2f - Added organization ownership to OrderItem for applying ACL when reports are created with the items 03055ef1f - Added Organization ownership to Supplier entity - Added test to verify the organization is set when a new supplier is being created cd439fbfd MAR10001-674: Order on demand - updated OOD validator - fixed bugs in order items statuses changing eccc3fc5c - updated rendering of OrderNumber link and SalesChannel link on various views for quick navigation - added quick navigation link to customer on Invoice view ee1c715a1 - Added product sku rendering link to RefundItem's datagrid for quick navigation 9b77d2459 - Added product SKU rendering link to ReturnItems grid for quick navigation b8a832823 - Added product sku rendering link to PackingSlip item grid for quick navigation ace617480 - Added product sku link rendering to Invoice Item grid for quick navigation a327b1fdb - Added product sku link rendering to order item's product in order item datagrid 2d2303bf7 - 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 0e2cbe4f4 - 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 048587cf3 - Added quick navigation for customer on Order View - Updated quick navigation for SalesChannel link on Order View 4ba6fd268 MAR10001-714: Payment methods 54f3f9f07 MAR10001-714: Payment methods 38f1adb17 MAR10001-714: Payment methods 6c1fc09a5 merge develop branch into feature/MAR10001-714 54fe24b3f Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 7c2e68e36 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 9c966430d Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 4b750e19c Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 9c172db5e - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 0f8d89e19 MAR10001-742; Add tests 40c061fa7 MAR10001-742; Add tests f8d1a0d3f MAR10001-742; Check if invoice workflow transition is set e455f1228 MAR10001-742; Check if invoice workflow transition is set 8ea852060 MAR10001-742; Remove debug code 30fd7e03c MAR10001-742; Remove debug code 9e774ebfe MAR10001-742; Add workflow actions to send invoice e-mail 503189527 MAR10001-742; Add workflow actions to send invoice e-mail df25693a0 MAR10001-742; Add translation e953097f1 MAR10001-742; Add translation de8382e18 MAR10001-742; Add migration for invoice e-mail template e9bbb0e1d MAR10001-742; Add migration for invoice e-mail template 5e73fe3fb MAR10001-742; Add IsSendEmailTransition workflow condition 3b99d8921 MAR10001-742; Add IsSendEmailTransition workflow condition 123c0434e merged develop branch into feature/MAR10001-714 branch 29bbcad6c merged develop branch into feature/MAR10001-714 branch f4a48dc3d merged develop branch into feature/MAR10001-714 branch fea788d98 merged develop branch into feature/MAR10001-714 branch 716f69fe1 - 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 b7c081cb7 - 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 9083c16e5 Merge branch 'develop' into feature/MAR10001-674 42ffd497d - CS fix -> fixed docblock ee037a4d4 Merge branch 'feature/MAR10001-739_Payment-term-invoice' into develop 7798de002 Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 50f910317 - Added Migrations to update entity_config tables and entity_config_field tables to set auditable to false for InventoryLevel && BalancedInventoryLevel ebd6baf56 Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 5e3dcf58b Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 437eb0df5 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow c26c4cd0a Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow efd9a82bf Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow c0256e204 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 7fb05b270 - 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 a546cf3f4 - 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 dc861c587 MAR10001-742; Add e-mail settings about sending invoices ec63c7a76 MAR10001-742; Add e-mail settings about sending invoices 041ed21c0 MAR10001-739; Fix migration namespace 3fad78266 - CS Fixes ce2722b62 - CS Fixes 8696b07e4 Merge branch 'feature/MAR10001-674' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-674 d37f12418 MAR10001-674: Order on Demand - fixed warehouses calculations for order fc82a7356 MAR10001-674: Order on Demand - fixed warehouses calculations for order 663149607 - remove unused code from validator e705e58d5 - Removed unused code - Added CS fixes where necessary 756dcea67 MAR10001-674: Order on Demand 23e5e6f89 MAR10001-674: Order on Demand 7e9bb647f MAR10001-674: Order on Demand 3d3bcc350 MAR10001-674: Order on Demand f4683f553 - Updated dev.lock files - Updated oro platform to version 3.1.13 bb5212522 - Updated dev.lock files - Updated oro platform to version 3.1.13 cd1c5f2b0 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php 3d17b9064 backmerged develop branch into feature/MAR10001-730 branch 4b57cc36f backmerged develop branch into feature/MAR10001-730 branch 35f2109cc backmerged develop branch into feature/MAR10001-730 branch 608d7956e backmerged develop branch into feature/MAR10001-730 branch f4cc70c09 MAR10001-730: Update CustomerBundle with Customer 80d05c795 MAR10001-730: Update CustomerBundle with Customer 2ca867546 MAR10001-730: Update CustomerBundle with Customer ab4959178 MAR10001-742; Add workflow action to send email with attachment 551422af0 MAR10001-742; Add workflow action to send email with attachment e796ca95c MAR10001-739; Add payment term to invoice view 00e5addd2 MAR10001-739; Calculate invoice due date b68195820 MAR10001-739; Add payment term during invoice generation 376b14521 MAR10001-739; Add getCustomerPaymentTerm to PaymentTermProvider d5f0ff2f9 MAR10001-739; Add payment term to invoice model bbe4f4e27 - platform update 827a74d3d - platform update 58c6d1bb6 MAR10001-13; Add demo data for invoice configuration 86867d3bf MAR10001-13; Add demo data for invoice configuration 9daa545b8 Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop e46245ea7 - Fixed typo in class name 4f7dad1f6 Merge branch 'feature/MAR10001-744_Payment-term-for-Company' into develop 91ab98143 - Small CS fixes; new line on end of file, formatting ano function over multiple lines bfcf14bd3 MAR10001-730: Move Customer 17ec80ebc MAR10001-730: Move Customer 55d1c48fc MAR10001-13; Add functional test 197e7ae69 MAR10001-13; Add functional test 1391e4d93 MAR10001-13; Update TableSizeProviderTest 5b3449ea7 MAR10001-13; Update TableSizeProviderTest 56e0d3d01 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 1fcaceed5 Squashed 'applications/marello-application-ee/' changes from d13f2b41e..a69ba4abb 8fd056727 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 6c8f2edc5 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 67e652aa8 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 52931de98 Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 3bb3068a2 Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements 73de19e5f Squashed 'applications/marello-application/' changes from 3d023f800..3a5a0ae59 3a5a0ae59 Update OroRequirements check to be compatible with Oro Platform 3.1.x 341f1346e - Updated demo data for PO in order to make sure there are actually POitem candiates for creating a PO 69b6d44df - Added test to verify correct registration of cron command - updated code to include correct registration of cron command b5f0b28d7 MAR10001-13; PdfBundle unit tests d42a9ea89 MAR10001-13; PdfBundle unit tests d32de0e5c MAR10001-13; Fix PDF bugs b13f6ec40 MAR10001-13; Fix PDF bugs e2078a5d3 - 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 5057b5dba Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification 5aa5e00f1 Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification 264e42ee4 - Added test to verify the working of the saving of the notification as activity target b4379a611 - updated phpdocblock removing parameter that isn't there anymore 3cb6d4388 - updated query for including purchaseInventory when selecting purchaseOrderItemCandidates 8a2d6dea1 - 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 35f19c20c Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification bede0276e Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 3e665b14d Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 24c7cd59f Merge branch 'develop' into feature/MAR10001-725 0de46972c Merge branch 'develop' into feature/MAR10001-725 4d3d9e317 Merge branch 'develop' into feature/MAR10001-725 ddbba0501 Merge branch 'develop' into feature/MAR10001-725 52c04f91b Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification eb83373e3 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 0771a6260 MAR10001-13; Add PDF button to invoice view a8b976bd0 MAR10001-13; Add PDF button to invoice view b3dd7d229 - changed Warehouse Location to Pick location - Updated migrations, tests and translations 286638244 - changed Warehouse Location to Pick location - Updated migrations, tests and translations 17f278515 MAR10001-725: Update ProductBundle 4442a0209 MAR10001-725: Update ProductBundle c38c2ba89 MAR10001-725: Update ProductBundle a093e74d5 MAR10001-744; PaymentTerm API tests d6eebd000 Merge branch 'feature/MAR10001-735-add-second-workflow' into develop f3c4e586b - Added an Interface to have some constants for order workflow names - Updated tests being more clean without the much duplicated code d9e9b7ac1 MAR10001-744; Adjust tests for Company PaymentTerm a38ce3001 MAR10001-744; Add PaymentTerm API d402c756a MAR10001-744; Add payment term to Company view and form 2590eddfb MAR10001-744; Add test for PaymentTermSelectType 754cc9a3d MAR10001-744; Add PaymentTermSelectType 95a00873f - Updated logic for moving default worfklows to pending when only one is active - Added test for logic to test scenario's where there is only a single one available, the entity not being eligible or when there is more than one available - Added tests to interact with default installation 0d3126a61 MAR10001-744; Add payment term to Company model a329c447b - Added first version of the OrderWorkflowStartListener for when a single workflow is active on the order and start it automatically e59e9b338 - Fix inventory level tests for CE version 634e09c8d Merge branch 'task/MAR10001-0-fix-inventory-level-functional-tests' into develop 314adb7ee - Added warehouseLocation to InventoryLevel form fields 22b572a3b - updated type hint for getWarehouseLocation() in InventoryLevel - Updated datagrid of inventory level to include warehouseLocation - Updated inventory level collection form to include warehouseLocation 4184fa6bd - added warehouseLocation to inventory level form type 3699d44e1 - Added Warehouselocation to InventoryLevel - Updated migrations to include warehouse location column - Added translation for new field warehouse location - Updated function/unit tests to test setting/getting and updating warehouse location 783e12d1f - Fix inventory level tests for CE version c4cb25498 - Fix inventory level tests for CE version e18bc681b - added currency of root entity(Invoice) for formatting correctly in PDF's f93f7750f - added currency of root entity(Invoice) for formatting correctly in PDF's 4c6ea2d12 Merge branch 'feature/MAR10001-701_Payment-term' into develop 5d534a859 - Fixed check in PaymentTermDeletePermissionProvider to take into account a null result from the PaymentTermProvider - Fixed PaymentTermControllerTest to count the result of the loaded fixture and verify 'results' d23d027e4 - Show inventory level collection when empty for CE version 0a3cd1041 - Adding PaymentTerm demo data - Updated payment term provider to check wether the id from the config exists before querying on the repository ffb78a397 - CS fixes db013471c - removed unsued and duplicate class 37bfb8d47 Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 57b78f692 Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 9719849ac Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 bada48fe5 Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 8a83a9d9e Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs 498e2c90e Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs d004d1a4b Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs 048ca9bcf Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs e7d8729f8 - updated lock files to have mpdf as dependency in lock files 13f02419a - updated lock files to have mpdf as dependency in lock files 883055c06 Merge commit '9fa49926a0e01508f988164f88559744622be764' into feature/MAR10001-701_Payment-term 48357abe8 MAR10001-718: Refactor LocaleBundle - backmerged develop branch c2b4a349b MAR10001-718: Refactor LocaleBundle - backmerged develop branch 19f681f6a MAR10001-717: Update applications with Oro platform 4.0.0 b4831a27b MAR10001-717: Update applications with Oro platform 4.0.0 e786173fd MAR10001-718: Refactor LocaleBundle ba992802e MAR10001-718: Refactor LocaleBundle ccddf39bc - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default 5ad9bcc47 MAR10001-717: Update applications with Oro platform 4.0.0 837111345 MAR10001-717: Update applications with Oro platform 4.0.0 4cab27945 MAR10001-717: Update applications with Oro platform 4.0.0 162e4a2e8 MAR10001-717: Update applications with Oro platform 4.0.0 c424e39c2 Merge branch 'develop' of https://github.com/marellocommerce/development-mono-repository into develop 13543c6a5 - removed unused code - todo add additional customer controller tests for create/update 0d959d084 - removed commented code 09eb13a96 - fixed testCompanyUpdateRemoveCustomers test now calling correct method for customer to assert - removed an assertion from testCompanyUpdateRemoveCustomers because assumption of the assertion was wrong c8c93f122 - CS Fixes - Updated Company controller test to test saving a company without customers assigned - Fixed Customer entity to allow the company to be empty - Added Company name and view link to Order view 58b76bdb0 - CS fixes 0c7035e9b Merge commit '11f7d8417a07b4a65cd787387c0e10cc56870352' into feature/MAR10001-692 deea8a109 - removed suppliers from product grid - added missing taxcode to product grid 0ac39ed58 Merge branch 'bugfix/MAR10001-711-images-load-slower-than-marello-20' into maintenance/2.1 fd8954fd9 - added addditional migration to update product images with `acl_protected` false in Entity config to change the caching directory of images - updated installer to include the `acl_protected` entity config by default in Product Image attachments 22b754da8 MAR10001-13; Add TableSizeProvider 7551ac4f9 MAR10001-13; Adjust template paper size to configuration abe50557f MAR10001-13; Add paper size configuration value 7481e5d9b MAR10001-13; Fix configuration validation 19d2f4cf4 - updated OrderView datagrid layouts to resemble the 'original' style from Oro 2a16c3e34 - remove lock files b53f12c7b - remove lock files from master 3637f5469 - Release preparation 2.1 68465c418 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 f92c46681 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 1e086d09e - updated branch aliases 2c7d9f62c - updated branch aliases 1899b4cc9 Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 00235777d - updated version number in upgrade notes 8305828a8 - prepared composer.json files for release 93b344eb8 - prepared composer.json files for release 66943d23c - prepared composer.json files for release 45b8ab62c - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 6f02ef191 - Added twig file extension to deal with image id being fetched as a result in the product grid and getting the correct image during PostgreSQL having issue with an object in the result - Fixed subscription controller test to include cancelBeforeDuration field since it is not nullable 946e9f5ad MAR10001-13; Add template for invoice PDFs 52e93f598 MAR10001-13; Add InvoiceTableProvider b62251e0a MAR10001-13; Add PDF rendering helper libs a7d0a5c5a MAR10001-13; Add DocumentTableProviderPass 1a85d5761 MAR10001-13; Add get_document_tables() Twig function 71e130d39 MAR100001-13; Add DocumentTableProvider 3533f0c3e - added back sorters in to two datagrids for invoices and packingslips 3822f42fa - updated translations - updated updated orderitem status Dropshipped to Dropshipping - updated datagrids with removal of exports and some sorters 962e68cf9 - updated dev.lock files …

…994f4f 1994f4f - Added composer.lock files for 3.0 applications 99411a9 - 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 6f261c0 Merge branch 'develop' into test 1de9afb Merge branch '3.0' into develop edd0d7d - 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 0f069d4 - fixing config for test environment on marello application ee 67cfafd - 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 8e3244f - 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 bb9731f - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications 0a67101 - 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 4ae7c41 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle b24be47 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 d02330f - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 03e4a0e - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings 159c929 - updated marello EE dev.lock f3d5531 - reverted to old sticky note icon d445499 - changed the sticky note text - reverted commmented line in phpunit.xml 3612645 - fixed the sticky note description and logo - updated help link on the question icon on the top f334d74 - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 6586846 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ 0c34245 - updated dev.lock with Oro Platform beta 4.1 4624439 - 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 c9336b9 - 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 752cd2c - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer 2968f00 - updated dev.lock 5a91317 - updated composer locks 4d68c18 merge branch 3.0 into feature/MAR10001-730 53687df merge branch 3.0 into feature/MAR10001-714 164b57c Merge branch '3.0' into feature/MAR10001-725 174f294 merge develop branch into feature/MAR10001-717 ' ca1d577 merge develop branch into feature/MAR10001-714 63ac41b Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 38381a0 - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 4cd24f0 merged develop branch into feature/MAR10001-714 branch b6a6295 Merge branch 'develop' into feature/MAR10001-674 8798a6b Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop d9c0a5a Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 4f1b64a - remove unused code from validator 47dcc22 - Updated dev.lock files - Updated oro platform to version 3.1.13 fd770c7 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php 8114ffe backmerged develop branch into feature/MAR10001-730 branch ce3e763 - platform update 4850109 - remove composer.lock file from marello application ee for branch 06c9a93 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 87da1df Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 1f1d98d Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 3a3691b Update OroRequirements check to be compatible with Oro Platform 3.1.x 87c1355 Merge branch 'develop' into feature/MAR10001-725 067aaf1 - updated lock files to have mpdf as dependency in lock files 4ad1a19 - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default ef1c3c8 MAR10001-717: Update applications with Oro platform 4.0.0 f7cd807 - remove lock files 48e23b4 - remove lock files from master git-subtree-dir: applications/marello-application-ee git-subtree-split: 1994f4f

558ee27 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 3caff5c - 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 701ced5 - 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 84f6cdb - Updated OrderWorkflowStart event listener's service definition to inject doctrinehelper 019f2cb - 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 494f56e - 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 1606efa - 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 e89e45b - removed required asterisk from Description on SalesChannel as this is not a required field 530a6a7 - removed required asterisk from description as this is not required in the SCG 009273c Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 fea3dea Squashed 'applications/marello-application-ee/' changes from a55ceb2..0ec7b82 036c532 Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 bde1161 Squashed 'applications/marello-application-ee/' changes from 1994f4f..a55ceb2 a6c8d71 - fix issue of search handler test where the actual search handler changed implementation slightly to let the unit test fail e97ee88 - added entity_grid_all_view_label to all relevant entities on CE c04039d - updated pricing js views in order to be able to disable channelpricing without errors in the console ae9617e - added invoice type to the invoice/creditmemo view for clarification c596c8b - 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 94fc209 - fixed functional of POcrons tests by updating the groupby clause in ProductRepository f5955e6 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL ff9ee70 - fixed InvoiceDownload functional test, name of pdf changed during changes made for creditmemo d4d6281 Merge branch 'maintenance/3.0' into feature/MAR10001-870 163ab2d - 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.. 6eaf912 - added pdf template for creditmemo - added requesthandler for creditmemo pdf - updated translations for creditmemo pdf - added company to pdf's a38aa28 - added company to invoice view - moved company above the 'general' customer info on order view - added company to invoice pdf 7dd6ec0 - removed `selectAll` from datagrids that were having issues with selecting rows only when having pgsql as db driver 054de9b Merge branch 'task/MAR10001-901-balanced-inventorylevels-disabled-products' into maintenance/3.0 f2f389a - 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 01cde10 - Fixed inventory levels on inventory item view when having PostgreSQL as db driver af6c1ec Merge branch 'maintenance/3.0' into feature/MAR10001-870 1419be6 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce ef767f3 - updated demo environment with oro 4.1.x - updated custom login page - removed deprecated ways of overriding templates 01e6aa6 Merge branch 'release/3.0.1' into maintenance/3.0 c1fd0bd Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 bb115a6 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 6957b89 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 1bbf00a Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 06455d8 - Updated 'all time' query to include the start date and not only the date greater than the start date to include all orders 7c804a3 - CS fixe 5d74461 Merge branch 'maintenance/3.0' into feature/MAR10001-867 592e6eb Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 2c8c343 Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 051c13f Squashed 'applications/marello-application-ee/' changes from a69ba4a..1994f4f f0f8b4f Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 9c356b2 Squashed 'applications/marello-application/' changes from 3a5a0ae..95a24c2 f4e957f Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 fba4fec - added check to see if emails are already enabled by the user, otherwise the migration will fail because of it ac692d8 - fixed issue with sending localized email notifications - fixed shipped order confirmation email template - fixed functional tests for sendProcessor f9e8f90 fixed failed repository b385cb5 - CS fix - Added fix for existing attributes to configure them correctly to show them in attribute groups and retain the original data 70af4bb - moved the image of the product view to separate template file in order try to control the divs better aaa5db0 - switch createdAt and tags columns in product grid using the buildAfter event eb37686 - added inline editing for product status in product grid 80a4a68 - added inline edit for tags - added inline edit for sku - shuffled some columns around in the product grid - removed taxcode as default column 6c2339f - added Product tags in entity config - added migration to enable product tags for existing products cb68105 - Added email as activity to Marello Customer which allows to show emails being sent with the Customer as context in the customer view 4288a99 - Added Additional data fields to Order entity - updated div's on the additional data of the product view fdfac1f - updated migrations to deal with postgres update, works on mysql too 0b55c0b - removed annotations from Customer entity to prevent issues with update schema, when creating fields on entities, when running postgresql 1ed26e0 - Added save and new buttons to SalesChannel and SalesChannelGroup create and update views 6ea50a3 - Added save and new buttons to Tax Jurisdictions, Tax Rates, Tax Rules and Tax Codes on both create and update views 321b4b8 merged maintenance/3.0 branch into 3.0-test 8588df8 fixed problem with schema update 7ef8975 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 59dcb24 Merge branch 'feature/MAR10001-759' 1bd6d9d made productName not audittable field da99088 MAR10001-867: Order statistics error when selecting 'All Time' as Date Range 9ced059 - 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 1994f4f - Added composer.lock files for 3.0 applications 93c4cfd - 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 99411a9 - 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 f4f1187 Merge branch 'develop' into test 6f261c0 Merge branch 'develop' into test 890bc4c Merge branch '3.0' into test bf520c8 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test 9e42a0e Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 1099432 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 96222d5 Merge branch '3.0' into develop 1de9afb Merge branch '3.0' into develop edd0d7d - 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 9c441bb - 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 8ae2b51 - Added migration to include organization id on the purchase order item f893f48 - changed path of Invoice template to MarelloInvoiceBundle:Pdf:invoice.html.twig instead of MarelloPdfBundle:Download:invoice.html.twig 48c97f4 - removed .class parameters from service container and replaced it with the FQCNs 6fd10ac - removed marello_product.entity.class parameter from service container and replaced it with the FQCN 4c92df6 - removed marello_catalog.category.entity.class parameter from service container and replaced it with the FQCN d941315 - 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 0ed506b - PSR2 CS fixes in PDF/InvoiceBundle 0f069d4 - fixing config for test environment on marello application ee 2628572 merged branch 3.0 into feature/MAR10001-849 dfe5317 MAR10001-849: PDF Bundle improvements b472d9b - 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 a2f6ad9 - 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 d102f04 - Fixed issue with entity classes defined in the service container instead of using the FQCN bca58d2 - 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 2628b0f - Added missing translation labels da1f3b6 - 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 57ac313 - Updated unit tests to use and test the new underlying structure of resizing images 9a75008 - Fixed AvailableInventoryValidatorTest by using the correct constructor arguments during the removal of the setDispatcher method b4f37e5 - 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 6caf7cc - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated 67cfafd - 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 8e3244f - 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 c77fecb - 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 10a9d16 - 100% fixed PSR2 issues on the Marello CE edition, excluding the Tests/Migrations directories 4f4187a - 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 .... b4870ca Merge branch 'feature/MAR10001-847' into task/MAR10001-0-merge-fixing-price-columns cf64f65 - 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 df0fcbc Merge branch 'feature/MAR10001-837' into 3.0 be43918 MAR10001-847: Fix prices in product datagrid bb9731f - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications c5f98d7 - updated to platform 4.1.0 - fixed reference to non-existent parameter 'oro_note.entity.class' 3bc836b Merge branch 'feature/MAR10001-845' into 3.0 868358a MAR10001-837: Inventory batch layout 211a10b - 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 117f9f6 MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener 8925acb - 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 f51087f Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0 1272066 - removed empty line from services.yml 740e160 Merge branch 'feature/MAR10001-842' into 3.0 3bb8656 - removed deprecations from different classes, some inf favor of constructor dependency injection - fixed default user&password for initializing db's in the docker container 2f206b5 Merge branch 'feature/MAR10001-776' into 3.0 199e00f Merge branch 'feature/MAR10001-776' into 3.0 05bb6fa MAR10001-776: Inventory Batches - fixed bug in replenishment f6d4aec - preparations for release c020867 Merge branch 'feature/MAR10001-776' into 3.0 c1365aa - 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 1b58ec9 MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled 01a6b68 - fixed issue with assigning saleschannel mass action where it wouldn't display the grid to select saleschannels to assign products to 01f05ce - fixed issue with foreign key update on inventory_item_id in the inventory_level_log table - added migration to update warehouseName on existing inventorylevelLogs 767e7dd MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders 3a3eaf9 [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 1d7aa3c - fixed AddressListener event which had typo's in the service definition which caused the address not being rendered in the Order datagrid a1ea4de - updated EmailTemplateManager with correct method call on the EmailTemplateRepository which was lost during merge c91932a - 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 0a4cca6 - 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 0b78eb5 - 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 0111f1a 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 0a67101 - 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 d0bea2d - 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 0d69779 - 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 ee24f45 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid 155aa20 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 ace3c3c - updated invoice email attachment template to match the subject of the invoice notification email 80a8c02 Merge branch 'feature/update-to-rc3' of https://github.com/marellocommerce/development-mono-repository into feature/update-to-rc3 b4f5c64 - 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 d6a164f - 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 3557bbb - updated customer update view to correctly display name in the tab of the browser 4ae7c41 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle 5d496d1 - fixed js component for purchase orders - fixed issue with showing currency symbol and prices 5b55a5a - fix controller - fix view eeeb38d - fixed create return button on order view page after the status of items have been changed to enums instead of strings 7d91b81 - fixed order of import for multiple entity.js of purchase order cfa523f - fixed missing nodeje module on purchase order multiple entities - fixed importing issue in the multiple entity of backbone 13ed75e - reworked the multiple entities setup for purchase orders regarding js components e4a979b - fixed typo in item view of purchase orders b37ee7e - expose additional js files for purchase order bundle - added some phpdoc to the LogoProvider - removed unnecessary dependency from LogoProvider in pdf bundle e4a4595 - 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 beac0f9 - 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 24fb484 - fixed issue with wrong service definitions in the pdf bundle in order to download invoice pdf's - fixed service definition of saleschannel configuration form 74a5067 Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 f199a78 - updated emailtemplate action to comply with php 7.2.x 978eb0d - make service public in order to use the service within symfony 4.4.x framework on other places 6cceb8a Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 b24be47 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 035b3da Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 5a85e96 merged branch 3.0 into feature/MAR10001-776 0eb06cd MAR10001-776: InventoryBatches fe0fd42 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 adbfae3 Merge branch 'feature/MAR10001-805' into feature/update-subscriptions-rc3 d02330f - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 75a354c - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 0a15f72 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription 9333890 - 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 03e4a0e - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings 159c929 - updated marello EE dev.lock 4e092cc - updated all Marello CE bundles with the new format for webpack a564abf - 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 ad6c213 - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc b84a70f MAR10001-776: Inventory Batches - new comments fixed 38106e4 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 f3d5531 - reverted to old sticky note icon a289d5d - reverted to old sticky note icon d445499 - changed the sticky note text - reverted commmented line in phpunit.xml 7f85cbf - changed the sticky note text - reverted commmented line in phpunit.xml 3612645 - fixed the sticky note description and logo - updated help link on the question icon on the top 1c09f2f - fixed the sticky note description and logo - updated help link on the question icon on the top fa44845 MAR10001-774: Remove increase / decrease external warehouses option 22bd8ec - CS fix 00a6ae1 Merge branch 'feature/MAR10001-765' into 3.0 83c26b7 Merge branch '3.0' into feature/MAR10001-776 9b42d84 MAR10001-802: WFA rule index is not rendering d1dda73 MAR10001-765: Update InventoryRebalance Command f334d74 - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 6586846 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ 4b4aeda - 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 ae0d1e5 - 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 037356b Merge branch 'feature/MAR10001-770' into 3.0 c22231e Merge branch 'feature/MAR10001-775' into maintenance/2.2 d4ae28d Merge branch 'feature/MAR10001-775' into 3.0 0d9d511 Merge branch 'feature/MAR10001-769' into 3.0 0c34245 - updated dev.lock with Oro Platform beta 4.1 4624439 - 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 c9336b9 - 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 752cd2c - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer 2968f00 - updated dev.lock 8d2a612 - Added migration to include organization id on the purchase order item 2367e1a - Added data column to PurchaseOrder b0babec MAR10001-775: Product widget failed to load when creating order without selecting a SalesChannel first 56b00f1 MAR10001-766: OroCommerce Bridge 16ae5b8 Merge branch 'develop' into feature/MAR10001-769 dc829a5 Merge branch 'feature/MAR10001-758' into develop bf194ee Merge branch 'feature/MAR10001-758' into maintenance/2.2 9e01626 Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 c233aab Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 5a91317 - updated composer locks c2c0b2d - updated branch aliases f305e73 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 de30018 MAR10001-759: Update OroCommerce bridge for Marello 2.2 0c7cd9d - CS fixes - Changed php version back to 7.1 63fdff6 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket e096805 Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 022b0fb MAR10001-759: Update OroCommerce bridge for Marello 2.2 bfa4e9d - added composer locks for release - updated composer json to correct version of marello 4d68c18 merge branch 3.0 into feature/MAR10001-730 53687df merge branch 3.0 into feature/MAR10001-714 164b57c Merge branch '3.0' into feature/MAR10001-725 174f294 merge develop branch into feature/MAR10001-717 ' ca1d577 merge develop branch into feature/MAR10001-714 63ac41b Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 38381a0 - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 4cd24f0 merged develop branch into feature/MAR10001-714 branch b6a6295 Merge branch 'develop' into feature/MAR10001-674 8798a6b Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop d9c0a5a Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 4f1b64a - remove unused code from validator 47dcc22 - Updated dev.lock files - Updated oro platform to version 3.1.13 fd770c7 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php 8114ffe backmerged develop branch into feature/MAR10001-730 branch ce3e763 - platform update 4850109 - remove composer.lock file from marello application ee for branch 06c9a93 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 87da1df Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 1f1d98d Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 3a3691b Update OroRequirements check to be compatible with Oro Platform 3.1.x 87c1355 Merge branch 'develop' into feature/MAR10001-725 067aaf1 - updated lock files to have mpdf as dependency in lock files 4ad1a19 - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default ef1c3c8 MAR10001-717: Update applications with Oro platform 4.0.0 f7cd807 - remove lock files 48e23b4 - remove lock files from master a69ba4a - Release preparation 2.1 94c2ac7 - updated version number in upgrade notes 10b7811 - prepared composer.json files for release 6922523 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 7308500 Merge branch 'develop' into feature/MAR10001-485-subscriptions 18b7a05 - CS fixes - Updated dev.lock 04cd981 - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 9f7032e Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions d8de161 Merge branch 'develop' into feature/MAR10001-485-subscriptions 77897ec Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into develop 5b45aff Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into feature/MAR10001-485-subscriptions aab29a8 - fixed issue with managedInventory interfering with updating inventoryLevels and or going from managed to unmanaged dada220 - change dev.lock 232372c - update dev.lock 4754df2 - updated paths for checking psr code style - added phpunit config to application root 0fe5fab - update environment files for easier setup with docker - added phpunit.xml.dist to root dir on marello-ee application - updated psr testing test script in dev.json to look at the vendor directory instead of the src/ dir b9f30f5 - added composer.lock to .gitignore - remove composer.lock files 558523e - Added generated lock files - Updated composer.json & dev.json files with correct branch alias versions git-subtree-dir: package/marello git-subtree-split: 558ee27

842772c Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 ca52781 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca950 Squashed 'package/marello/' changes from 1999cc1..b7ac5c4 31bdc5e - Updated validation on WarehouseGroup, remove required asterisk on description c739b3f Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 fea3dea Squashed 'applications/marello-application-ee/' changes from a55ceb2..0ec7b82 0398dad Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 bde1161 Squashed 'applications/marello-application-ee/' changes from 1994f4f..a55ceb2 423efea - remove internal versions f599228 - added entity_grid_all_view_label to all relevant entities on EE aacf6ac Merge branch 'maintenance/3.0' into feature/MAR10001-870 7708615 - made the status handler services for enabling/disabling datagrid row actions public for enabling/disabling rules on row action de62692 - updated services to be public in order to use the mass action handler and enable/disable wfa rules f63db91 - removed `selectAll` from datagrids that were having issues with selecting rows only when having pgsql as db driver 12038db - reverted ReplenishmentOrderRepository as service to fix the issue with alllocated cron command c302bb9 Merge branch 'maintenance/3.0' into feature/MAR10001-870 b58e3a7 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 6e8e344 Merge branch 'release/3.0.1' into maintenance/3.0 fbdd64c Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 9a9f5aa Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 ab570a0 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 227ee97 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 7fd041c - updated composer.json to internal versions 6dde980 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 0e1efed Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 051c13f Squashed 'applications/marello-application-ee/' changes from a69ba4a..1994f4f db16b5f Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 9c356b2 Squashed 'applications/marello-application/' changes from 3a5a0ae..95a24c2 580cf0b -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 2b5ca1c Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 9586a6d Squashed 'package/marello/' changes from 9051b1f..1999cc1 c0f2d07 - removed internal versions a5dbcde - 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 5b22a67 Merge branch '3.0-test' into maintenance/3.0 f9f41a2 merged maintenance/3.0 branch into 3.0-test 84ae871 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment 56fa9c9 fixed problem with schema update 307ca25 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 fef7637 Merge branch 'feature/MAR10001-759' 18b0ae4 made productName not audittable field 1994f4f - Added composer.lock files for 3.0 applications 1b6d842 - 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 99411a9 - 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 42de4d0 Merge branch 'develop' into test 6f261c0 Merge branch 'develop' into test de970ea Merge branch '3.0' into test 4f26502 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test 6e99112 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test b16fb8c Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 7824d81 Merge branch '3.0' into develop 1de9afb Merge branch '3.0' into develop edd0d7d - 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 3736a98 - removed .class parameters from service container and replaced it with the FQCNs 0f069d4 - fixing config for test environment on marello application ee fad81db - Added missing translation labels 5d74c3d - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated 67cfafd - 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 1e30065 - 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 8e3244f - 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 72d63c0 - 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 bb9731f - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications dbb18f8 Merge branch 'feature/MAR10001-845' into 3.0 a2b8a3d MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener d0d471a Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0 6c803bd Merge branch 'feature/MAR10001-842' into 3.0 77056b1 Merge branch 'feature/MAR10001-776' into 3.0 dd9645c Merge branch 'feature/MAR10001-776' into 3.0 f580c05 MAR10001-776: Inventory Batches - fixed bug in replenishment 993d22a Merge branch 'feature/MAR10001-776' into 3.0 5ece85e MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled 913156d MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders be05560 [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 7def929 - 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 0a67101 - 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 3b6dc91 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid 4ae7c41 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle 1fc0f6e - fixed js component for purchase orders - fixed issue with showing currency symbol and prices b24be47 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 bfbbca7 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 31fa770 merged branch 3.0 into feature/MAR10001-776 6810fd7 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 d02330f - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 9c4e096 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription 51ff680 - 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 03e4a0e - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings 159c929 - updated marello EE dev.lock 4c199af - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 5b525d7 - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc c67dace MAR10001-776: Inventory Batches - new comments fixed f3d5531 - reverted to old sticky note icon d445499 - changed the sticky note text - reverted commmented line in phpunit.xml 3612645 - fixed the sticky note description and logo - updated help link on the question icon on the top b049b77 - remove instore assistant bundle as we are going to move the code to a separate repo and introduce it as an extension b1b92a9 MAR10001-774: Remove increase / decrease external warehouses option d2ea56e Merge branch 'feature/MAR10001-765' into 3.0 336d292 Merge branch '3.0' into feature/MAR10001-776 6294462 MAR10001-802: WFA rule index is not rendering d4660b3 MAR10001-765: Update InventoryRebalance Command f334d74 - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 6586846 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ ffa5dde MAR10001-776: Inventory Batches - bug fixed 7286929 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order dab3244 Merge branch 'feature/MAR10001-769' into 3.0 0c34245 - updated dev.lock with Oro Platform beta 4.1 d94991b - updated dev.lock with Oro Platform beta 4.1 863b7c8 MAR10001-776: Inventory Batches 4624439 - 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 c9336b9 - 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 752cd2c - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer af00c6d Merge commit '6598534c16cde2c3e1c4989cbf79c56f99b9d43f' into maintenance/2.2 2968f00 - updated dev.lock 77c5004 MAR10001-759: Update OroCommerce bridge for Marello 2.2 - fixed functional tests 2e22d47 MAR10001-766: OroCommerce Bridge f0664be Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 24ffc8f Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 5a91317 - updated composer locks dc06cc7 - updated branch aliases 4ead445 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 4c0dfd6 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 651d560 Squashed 'package/marello/' changes from 14c2ac8..9051b1f 1c3874b Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 f4ccf6e Squashed 'package/marello/' changes from dafe2dd..14c2ac8 8e6e356 MAR10001-759: Update OroCommerce bridge for Marello 2.2 bfa4e9d - added composer locks for release - updated composer json to correct version of marello 3f5e14c merged branch develop into 3.0 407b49f Merge branch 'task/MAR10001-add-orocommerce' into develop 4d68c18 merge branch 3.0 into feature/MAR10001-730 3d541ef merge branch 3.0 into feature/MAR10001-730 53687df merge branch 3.0 into feature/MAR10001-714 3cb787a merge branch 3.0 into feature/MAR10001-714 164b57c Merge branch '3.0' into feature/MAR10001-725 2ead95a Merge branch '3.0' into feature/MAR10001-725 321a8be Merge branch '3.0' into feature/MAR10001-718 67d151d - finetuned composer json files for oro commerce b07887c Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop c86dada - Added Organization ownership to ReplenishmentOrderItem - Added migration to update current ReplenishmentOrderItems - Added translation for Organization label - Updated installer migration to include Organization column 174f294 merge develop branch into feature/MAR10001-717 ' c7cbf16 merge develop branch into feature/MAR10001-717 ' c27c3b4 MAR10001-714: Payment methods ca1d577 merge develop branch into feature/MAR10001-714 63ac41b Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 196ce99 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 38381a0 - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 06f7cea merged develop branch into feature/MAR10001-714 branch 4cd24f0 merged develop branch into feature/MAR10001-714 branch f9f9fc7 - 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 b6a6295 Merge branch 'develop' into feature/MAR10001-674 2d6e6c2 Merge branch 'develop' into feature/MAR10001-674 8798a6b Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 41eb181 Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop d9c0a5a Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow b152eff Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 8624481 - CS Fixes 3157f99 MAR10001-674: Order on Demand - fixed warehouses calculations for order 4f1b64a - remove unused code from validator 38dba3c MAR10001-674: Order on Demand 354eb2a MAR10001-674: Order on Demand 47dcc22 - Updated dev.lock files - Updated oro platform to version 3.1.13 fd770c7 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php 94156b1 backmerged develop branch into feature/MAR10001-730 branch 8114ffe backmerged develop branch into feature/MAR10001-730 branch fb45782 MAR10001-730: Update CustomerBundle with Customer 095c15e - platform update ce3e763 - platform update 4850109 - remove composer.lock file from marello application ee for branch 5e4e098 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 06c9a93 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 87da1df Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 2e19a3b Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 1f1d98d Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 3a3691b Update OroRequirements check to be compatible with Oro Platform 3.1.x 3a1cbf1 Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements 16fb64d - Updated demo data for PO in order to make sure there are actually POitem candiates for creating a PO da77ef4 Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification 8149da2 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 87c1355 Merge branch 'develop' into feature/MAR10001-725 133dcb6 Merge branch 'develop' into feature/MAR10001-725 620576b Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 9447e30 - changed Warehouse Location to Pick location - Updated migrations, tests and translations 0084c62 MAR10001-725: Update ProductBundle b933a9d - Added warehouseLocation to InventoryLevel form fields 7d95723 Merge branch 'feature/MAR10001-701_Payment-term' into develop f0847bf - removed unsued and duplicate class 5ac9cca Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 8ab5e23 Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 561fb31 Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs 067aaf1 - updated lock files to have mpdf as dependency in lock files 5a2955d - updated lock files to have mpdf as dependency in lock files 9fa4992 Squashed 'package/marello/' changes from aff5639..dafe2dd 9b319a2 Merge commit '9fa49926a0e01508f988164f88559744622be764' into feature/MAR10001-701_Payment-term 7f55039 MAR10001-718: Refactor LocaleBundle - backmerged develop branch 4ad1a19 - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default ef1c3c8 MAR10001-717: Update applications with Oro platform 4.0.0 7c18f4b MAR10001-717: Update applications with Oro platform 4.0.0 9ed64dc Merge commit '11f7d8417a07b4a65cd787387c0e10cc56870352' into feature/MAR10001-692 f7cd807 - remove lock files 48e23b4 - remove lock files from master a69ba4a - Release preparation 2.1 f57e272 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 950ed59 - updated branch aliases 5e32a3c Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 94c2ac7 - updated version number in upgrade notes 460559b - prepared composer.json files for release 10b7811 - prepared composer.json files for release 6922523 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 430259e - updated translations - updated updated orderitem status Dropshipped to Dropshipping - updated datagrids with removal of exports and some sorters 31cfe5b - removed check from WH listener in order to see the newly created external warehouses 738ac7d Merge commit '5bb4981c46c7990c597fb4344a600bcb969981c5' into feature/MAR10001-676 f62c634 - update translation on confirmation message when trying to delete an inventory level which still has inventory e13834e - merged bugfixes form MAR10001-680 with current code bf0bdd2 Merge commit 'fc161bcddd183c818ccdd11fc5e6934a84d6c566' into bugfix/MAR10001-680 ec68b5f - Added check for Back/Pre-order quantities where the MaxInventoryQty is null - Updated test to check the new order count in DB after if the maxQty is set for back/pre-order 7308500 Merge branch 'develop' into feature/MAR10001-485-subscriptions 18b7a05 - CS fixes - Updated dev.lock 7146d1e Merge branch 'develop' into feature/MAR10001-485-subscriptions ed64df0 Merge commit '5f12bd20893426c155ce26461eb08b0dc2da5297' into feature/MAR10001-670 5f12bd2 Squashed 'package/marello/' changes from bc19533..aff5639 08961a3 - removed unnecessary removal of modal during the disposal since it will be disposed by the parent view call cf1c765 - Changed name of the placeholder data twig function for clarification - Added additional tests for checking the functions of the Additional data Placeholder Provider feature f4715d0 - removed references of subscription bundle in Marello CE core - added the ability add additional placeholder data to render blocks - added additional placeholder data to orders, purcahse orders, suppliers, products and salesChannels 04cd981 - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 5c414a2 Merge commit 'b4d614d5d259ac0085a2f1583612c1d4ad37139a' into feature/MAR10001-485-subscriptions 6b33c2f Merge commit 'b1ef79ca49e261313c5007056254a522cc673dee' into feature/MAR10001-485-subscriptions b1ef79c Squashed 'package/marello/' changes from c8c0bdc..591b9c9 9efc39b Merge commit 'f5d918d8bfff382f5e781e8224b6116c9c38a277' into feature/MAR10001-485-subscriptions a27d7c2 Merge commit 'e5280b59fd2f4e57a38bc08bb62f43344bae4ef0' into feature/MAR10001-485-subscriptions e5280b5 Squashed 'package/marello/' changes from 7660d1a..c8c0bdc 9f7032e Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions 9994dac Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions cedbb82 - added fixes for non escaped twig tags in replenishment and return emails d8de161 Merge branch 'develop' into feature/MAR10001-485-subscriptions 81c0538 Merge branch 'develop' into feature/MAR10001-485-subscriptions 8ae6374 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 77897ec Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into develop 5b45aff Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into feature/MAR10001-485-subscriptions 0b6057f Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into feature/MAR10001-485-subscriptions c793617 - fixed issue with managedInventory interfering with updating inventoryLevels and or going from managed to unmanaged aab29a8 - fixed issue with managedInventory interfering with updating inventoryLevels and or going from managed to unmanaged 3bf91e8 Merge commit '097d4235d69c0c86a7df735078efbdfa75437cbd' into feature/MAR10001-485-subscriptions d616475 Squashed 'package/marello/' changes from bc19533..7660d1a 31a26c3 Merge commit 'd616475ea6c833b33481537e80d73a114b76df94' into feature/MAR10001-485-subscriptions 1156ddb - updated PSR-4 autoloading for marello, marello-enterprise and subscriptions - updated dev lock for enterprise application with subscriptions extension enabled dada220 - change dev.lock 232372c - update dev.lock 4754df2 - updated paths for checking psr code style - added phpunit config to application root 09dcc3e Merge commit 'b845ca9ad29f3b591839c9943f6f2e288d12868b' into feature/MAR10001-377 b55e936 Squashed 'package/marello/' changes from ea5a25e..bc19533 b988d6a Merge commit 'b55e936f3c6428ae97c2f440cd8df8e00e3a9127' into feature/MAR10001-377 2dfee55 Merge branch 'feature/MAR10001-604' into develop 0fe5fab - update environment files for easier setup with docker - added phpunit.xml.dist to root dir on marello-ee application - updated psr testing test script in dev.json to look at the vendor directory instead of the src/ dir 4b5ec7e Squashed 'package/marello/' changes from 836c77f..ea5a25e 915513e Merge commit '4b5ec7e8d02e9b7e079e43d024f18dc3a92a9c7d' into development 84e15a9 Merge commit '524a373109305ee69c29ade6f7eaa7bf0f34f6ac' into development 5d5fbe4 Merge commit '40a4d43559a871bd237a9a91e61f6bb33f6db69e' into feature/MAR10001-604 40a4d43 Squashed 'package/marello/' changes from 836c77f..22cfacd b9f30f5 - added composer.lock to .gitignore - remove composer.lock files 2effb1f - Added generated lock files - Updated composer.json & dev.json files with correct branch alias versions 558523e - Added generated lock files - Updated composer.json & dev.json files with correct branch alias versions 231ef5f Add 'applications/marello-application-ee/' from commit 'd13f2b41e079dff4eee99f8874928459658daaff' git-subtree-dir: package/marello-enterprise git-subtree-split: 842772c

…256f0d 6256f0d Merge commit '5d6d9bb3b66f70a2168ec1f1e44d78ef4e034283' into maintenance/3.0 4312b20 Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 0e72f4b Squashed 'package/marello-enterprise/' changes from ded77d2..6772f6e 8a92cd8 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca950 Squashed 'package/marello/' changes from 1999cc1..b7ac5c4 02e4cef - 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 2aee6d3 - 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 083de42 - 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 bcf5253 - updated bundle priority to make sure all marello migrations are being processed before the one of the bridge 28712fc - removed unused code and use class constant from SalesChannelGroup in OroCommerce integration settings 12c4499 - moved the order of some of the orocommerce settings for clarity 24896b6 - 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 38fd895 - 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 c546b47 - Updated paymentStatus with the correct constant to get the full paid status from the OrderNormalizer constant 7e89ed2 - CS fix 0a6076b - Updated EventListener to also remove the related SalesChannelGroup of the SalesChannel that was related to the integration when the integration is removed 0c2aeaa - updated validation for OroCommerce integration settings f2288df - 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 f896819 - updated versions in the orocommerce bridge README 80428e2 Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 fea3dea Squashed 'applications/marello-application-ee/' changes from a55ceb2..0ec7b82 71601ac Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 bde1161 Squashed 'applications/marello-application-ee/' changes from 1994f4f..a55ceb2 db67349 - changed author name to correct company 62cc466 - remove internal versions ec4af3f - Updated docs for orocommerce api bridge - updated docs for orocommerce bridge 921fe63 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 d9d4c04 MAR10001-879: Changes for correct selecting products by SKU and Organization 5fc05ab - CS fix 3a006b6 MAR10001-879: code optimization 8e74b04 Merge branch 'feature/MAR10001-870' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-870 53d1dbd MAR10001-879: Made ProductImage sync conditional 54527f5 - CS fixes - updated migrations to include indexes on tables that collide with a OroCommerce installation on PostGreSQL 1d117d3 MAR10001-879: Verify best possible approach for updating multiple products with multiple consumers in OroCommerce Bridge c8466a6 Merge branch 'maintenance/3.0' into feature/MAR10001-870 5ea3876 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce ead8291 Merge branch 'release/3.0.1' into maintenance/3.0 34e755c Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 23c2a36 Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 d5d6f53 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 611a7ee Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 5a85d15 - updated composer.json to internal versions 1b93a36 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 4751ced Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 051c13f Squashed 'applications/marello-application-ee/' changes from a69ba4a..1994f4f 5f57185 Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 9c356b2 Squashed 'applications/marello-application/' changes from 3a5a0ae..95a24c2 a58b756 -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 9c0afd1 Squashed 'package/marello-enterprise/' changes from 37e37f3..ded77d2 f5b0759 Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 9586a6d Squashed 'package/marello/' changes from 9051b1f..1999cc1 e00b588 - removed internal versions 267668e Merge branch '3.0-test' into maintenance/3.0 705c0ae merged maintenance/3.0 branch into 3.0-test a1339e5 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment d543339 fixed problem with schema update 384c8dc Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 e1bb79c Merge branch 'feature/MAR10001-759' 1994f4f - Added composer.lock files for 3.0 applications 99411a9 - 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 e64c5f4 Merge branch 'develop' into test 6f261c0 Merge branch 'develop' into test 1f5ae8a Merge branch '3.0' into test 7088e36 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test 9636ea8 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test 58dfdb0 Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 4a6e5ee Merge branch '3.0' into develop 1de9afb Merge branch '3.0' into develop edd0d7d - 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 9017c02 - removed .class parameters from service container and replaced it with the FQCNs 0f069d4 - fixing config for test environment on marello application ee 67cfafd - 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 8e3244f - 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 bb9731f - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications 0a67101 - 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 3c1ae9c Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 a2e8b55 Merge branch 'feature/CRH19001-18_Service-points' into feature/update-to-rc3 4ae7c41 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle 85e6b24 Merge branch 'feature/MAR10001-13_Create-pdfs' into feature/update-to-rc3 b24be47 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 5528fd0 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 d02330f - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 03e4a0e - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings 159c929 - updated marello EE dev.lock 7c5a437 - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation f3d5531 - reverted to old sticky note icon d445499 - changed the sticky note text - reverted commmented line in phpunit.xml 3612645 - fixed the sticky note description and logo - updated help link on the question icon on the top f334d74 - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 6586846 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ 35d6210 Merge branch 'feature/MAR10001-775' into maintenance/2.2 3f705f5 Merge branch 'feature/MAR10001-769' into 3.0 0c34245 - updated dev.lock with Oro Platform beta 4.1 4624439 - 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 c9336b9 - 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 752cd2c - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer 314d22c Merge commit '6598534c16cde2c3e1c4989cbf79c56f99b9d43f' into maintenance/2.2 6598534 Squashed 'package/marello-enterprise/' changes from c61c749..37e37f3 2968f00 - updated dev.lock 4c1b3b6 Merge branch 'feature/MAR10001-758' into develop f82e0da Merge branch 'feature/MAR10001-758' into maintenance/2.2 6698e05 Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 3997133 Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 5a91317 - updated composer locks c26d99d Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 6214e2f Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 651d560 Squashed 'package/marello/' changes from 14c2ac8..9051b1f eb0f9bc Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 f4ccf6e Squashed 'package/marello/' changes from dafe2dd..14c2ac8 bfa4e9d - added composer locks for release - updated composer json to correct version of marello 4d68c18 merge branch 3.0 into feature/MAR10001-730 53687df merge branch 3.0 into feature/MAR10001-714 164b57c Merge branch '3.0' into feature/MAR10001-725 174f294 merge develop branch into feature/MAR10001-717 ' ca1d577 merge develop branch into feature/MAR10001-714 63ac41b Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 38381a0 - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 4cd24f0 merged develop branch into feature/MAR10001-714 branch b6a6295 Merge branch 'develop' into feature/MAR10001-674 8798a6b Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop d9c0a5a Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 4f1b64a - remove unused code from validator 47dcc22 - Updated dev.lock files - Updated oro platform to version 3.1.13 fd770c7 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php 8114ffe backmerged develop branch into feature/MAR10001-730 branch ce3e763 - platform update 4850109 - remove composer.lock file from marello application ee for branch 06c9a93 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 87da1df Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 1f1d98d Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 3a3691b Update OroRequirements check to be compatible with Oro Platform 3.1.x 87c1355 Merge branch 'develop' into feature/MAR10001-725 067aaf1 - updated lock files to have mpdf as dependency in lock files 4ad1a19 - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default ef1c3c8 MAR10001-717: Update applications with Oro platform 4.0.0 f7cd807 - remove lock files 48e23b4 - remove lock files from master a69ba4a - Release preparation 2.1 94c2ac7 - updated version number in upgrade notes 10b7811 - prepared composer.json files for release 6922523 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 7308500 Merge branch 'develop' into feature/MAR10001-485-subscriptions 18b7a05 - CS fixes - Updated dev.lock 04cd981 - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 9f7032e Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions d8de161 Merge branch 'develop' into feature/MAR10001-485-subscriptions 77897ec Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into develop 5b45aff Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into feature/MAR10001-485-subscriptions aab29a8 - fixed issue with managedInventory interfering with updating inventoryLevels and or going from managed to unmanaged dada220 - change dev.lock 232372c - update dev.lock 4754df2 - updated paths for checking psr code style - added phpunit config to application root 0fe5fab - update environment files for easier setup with docker - added phpunit.xml.dist to root dir on marello-ee application - updated psr testing test script in dev.json to look at the vendor directory instead of the src/ dir b9f30f5 - added composer.lock to .gitignore - remove composer.lock files 558523e - Added generated lock files - Updated composer.json & dev.json files with correct branch alias versions git-subtree-dir: package/marello-orocommerce-bridge git-subtree-split: 6256f0d

let the user choose it's --url-application param

c239b1f

remove `--url-application` param from composer.json's script part, to let the user define its own url application.

brainOut changed the title ~~let the user choose it's --url-application param~~ let the user choose it's "--url-application" param value Dec 19, 2018

24198 merged commit c239b1f into marellocommerce:master Jan 17, 2019

24198 added a commit that referenced this pull request Jul 11, 2019

Merge pull request #2 from gplanchat/patch-1

0d337fe

Fixed fatal error on product save

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

let the user choose it's "--url-application" param value #2

let the user choose it's "--url-application" param value #2

brainOut commented Dec 19, 2018

let the user choose it's "--url-application" param value #2

let the user choose it's "--url-application" param value #2

Conversation

brainOut commented Dec 19, 2018