Squashed 'applications/marello-application-ee/' changes from a69ba4a.…

….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 -…