Skip to content

237 adapt get source item configuration to global configuration #12442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1592 commits
Select commit Hold shift + click to select a range
3ca6de9
WIP: added missing typecast to int for stock id
belinda-tschampel Oct 27, 2017
505f630
MIS: Implement filtering for export functionality
vadimjustus Oct 27, 2017
7158415
add filter type
Oct 27, 2017
36ac202
Merge branch 'msi-source-export' of github.com:magento-engcom/msi int…
vadimjustus Oct 27, 2017
9034ba4
Merge branch 'msi-inventory-mapping-ui' of github.com:magento-engcom/…
steinkopffp Oct 27, 2017
bc2709c
MSI: Extend filtering logic for stock_source export
vadimjustus Oct 27, 2017
f132680
MSI: remove useless code
vadimjustus Oct 27, 2017
5b557f6
MSI: #131
Oct 27, 2017
af4a7d3
Merge pull request #148 from magento-engcom/msi-inventory-mapping-ui
Oct 27, 2017
e8fdeeb
MSI: #131
Oct 27, 2017
297b77c
[MSI] Introduce initial Inventory Configuration Module
deiserh Oct 27, 2017
298b03d
MSI: Move Сarrier Сodes validation to service layer
Oct 27, 2017
cdf1165
MSI: Move Сarrier Сodes validation to service layer
Oct 27, 2017
92e5937
WIP: followed review comments
belinda-tschampel Oct 27, 2017
7a3648a
Merge branch 'msi-inventory-mapping' into saleschannels-integration-w…
steinkopffp Oct 27, 2017
9aa2d5e
WIP: improve code like review comments and add plugin for getList me…
hamplr Oct 27, 2017
03de324
Merge branch 'msi-inventory-mapping' of github.com:magento-engcom/msi…
hamplr Oct 27, 2017
c063161
MSI: Refactore filtering logic in order to reduce complexity
vadimjustus Oct 27, 2017
932699a
WIP: another implementation of review comments
belinda-tschampel Oct 27, 2017
14cf3b4
remove obsolete collection and resource model
hamplr Oct 27, 2017
db4403a
Merge branch 'msi-inventory-mapping' of github.com:magento-engcom/msi…
belinda-tschampel Oct 27, 2017
23077d5
MSI: #131
Oct 27, 2017
b7d0b11
Merge branch 'msi-inventory-mapping' of github.com:magento-engcom/msi…
belinda-tschampel Oct 27, 2017
ea6a9d3
Merge branch 'msi-inventory-mapping' into saleschannels-integration-w…
steinkopffp Oct 27, 2017
2e9cb8d
Clean up
Oct 27, 2017
4c6f6f5
bugfix
hamplr Oct 27, 2017
9aa0010
Merge branch 'msi-inventory-mapping' into saleschannels-integration-w…
steinkopffp Oct 27, 2017
b6ba017
MSI: Move Сarrier Сodes validation to service layer
Oct 27, 2017
57873d6
bugfix
hamplr Oct 27, 2017
1fab7e3
Merge pull request #142 from magento-engcom/move-carrier-codes-valida…
Oct 27, 2017
5c59b7b
Merge branch 'msi-inventory-mapping' into saleschannels-integration-w…
steinkopffp Oct 28, 2017
03018f8
MSI: Fix intergration tests
vadimjustus Oct 28, 2017
1985acc
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 28, 2017
85a86e7
Merge branch 'msi-inventory-mapping' into saleschannels-integration-w…
steinkopffp Oct 28, 2017
ede56c5
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 28, 2017
9a0c3c6
Merge branch 'msi-inventory-mapping' into saleschannels-integration-w…
steinkopffp Oct 28, 2017
3e030af
removed old and unused id definition from interface
belinda-tschampel Oct 28, 2017
deb9889
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 28, 2017
d7a7256
MSI: Implement integration tests for stock_source export entity
vadimjustus Oct 28, 2017
acec395
MSI Added Read Write Model Setupscipt to create db table and plugin t…
deiserh Oct 28, 2017
c1dfd97
Merge branch 'msi-inventory-mapping' of github.com:magento-engcom/msi…
belinda-tschampel Oct 28, 2017
7173a71
MSI: Refactore getAttributeCollection method for stock_sources export…
vadimjustus Oct 28, 2017
afa2fa2
created replace functionality for sales channels
belinda-tschampel Oct 28, 2017
56317f4
MSI: Refactore filtering logic for stock_source export entity
vadimjustus Oct 28, 2017
89ccf2e
MSI: Introduce API interfaces for Assigning Stocks to Sales channels.…
belinda-tschampel Oct 28, 2017
de65ba5
MSI: Static improvements
vadimjustus Oct 28, 2017
8a160f8
[MSI] Added load and save functionality for qty notification
deiserh Oct 28, 2017
c91f2a6
MSI: Introduce API interfaces for Assigning Stocks to Sales channels.…
belinda-tschampel Oct 28, 2017
fe30b3d
MSI: Refactore stock_source export entity dependencies
vadimjustus Oct 28, 2017
33df249
MSI: Introduce API interfaces for Assigning Stocks to Sales channels.…
belinda-tschampel Oct 28, 2017
08e9c97
MSI: Introduce API interfaces for Assigning Stocks to Sales channels.…
belinda-tschampel Oct 28, 2017
3c7e465
MSI: Introduce API interfaces for Assigning Stocks to Sales channels.…
belinda-tschampel Oct 28, 2017
c16378f
MSI: Fix static code style issues
vadimjustus Oct 29, 2017
18ad378
MSI: Move SPI interfaces for export to model directory
vadimjustus Oct 29, 2017
d41337a
MSI: remove useless datetime filter processor
vadimjustus Oct 29, 2017
d70bb8f
MSI Import/Export: added comments for SPI interfaces
maghamed Oct 29, 2017
709ec81
Merge pull request #147 from magento-engcom/msi-source-export
maghamed Oct 29, 2017
307de4f
Merge pull request #116 from magento-engcom/msi-source-import-export
maghamed Oct 29, 2017
68bbd24
MSI: Introduce API interfaces for Assigning Stocks to Sales channels.…
belinda-tschampel Oct 29, 2017
798ed3c
Providing grid with rendered content
steinkopffp Oct 29, 2017
a1e6f1c
Merge branch 'develop' into msi-inventory-mapping
Oct 29, 2017
57331a9
adding website names
steinkopffp Oct 29, 2017
0cfb6a2
MSI: Introduce API interfaces for Assigning Stocks to Sales channels.…
belinda-tschampel Oct 29, 2017
64844dd
Merge branch 'msi-inventory-mapping' of github.com:magento-engcom/msi…
belinda-tschampel Oct 29, 2017
643a0c0
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 29, 2017
9717141
Merge branch 'msi-inventory-mapping' of github.com:magento-engcom/msi…
belinda-tschampel Oct 29, 2017
2387b38
MSI: Introduce API interfaces for Assigning Stocks to Sales channels.…
belinda-tschampel Oct 29, 2017
bc158c1
Merge branch 'msi-inventory-mapping' into saleschannels-integration-w…
steinkopffp Oct 29, 2017
dbc1782
Merge remote-tracking branch 'origin/saleschannels-integration-with-a…
belinda-tschampel Oct 29, 2017
f0fd2f7
adding code refactoring
steinkopffp Oct 29, 2017
fd58c1b
refactoring and cleaning structur
steinkopffp Oct 29, 2017
df14d78
refactoring and cleaning structur
steinkopffp Oct 29, 2017
d9e8ffb
WIP: Extended saving of stock to include the extions attribute data f…
belinda-tschampel Oct 29, 2017
dece474
WIP MSI: #167
Oct 29, 2017
ee32518
Fixed a js bug where ui_component labels have the wrong sort order.
deiserh Oct 29, 2017
0192187
wip
Oct 29, 2017
4a6851a
Stock Removal. Throw an exception and allow to delete just unassigned…
bartekszymanski Oct 30, 2017
eca0775
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 31, 2017
dd34411
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 31, 2017
e7d7f56
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 31, 2017
94fc80a
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 31, 2017
2b2d1aa
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 31, 2017
5ab2060
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 31, 2017
d414201
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Oct 31, 2017
ee8875e
Stock Removal. Test
bartekszymanski Oct 31, 2017
58ad448
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Nov 1, 2017
c17ecbb
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Nov 1, 2017
2ec3519
MSI: Introduce API interfaces for Assigning Stocks to Sales channels
Nov 1, 2017
f872393
MSI: Inventory sales backorder functionality
Nov 1, 2017
a423acd
Merge remote-tracking branch 'origin/develop' into inventory-sales-ba…
Nov 1, 2017
77d66a0
MSI: Assign Website at the time of Creation to the Default Stock
Nov 2, 2017
fb81eee
Merge pull request #150 from magento-engcom/msi-inventory-mapping
Nov 2, 2017
967c9f6
Assign Website at the time of Creation to the Default Stock
Nov 2, 2017
b533c11
Merge remote-tracking branch 'origin/develop' into saleschannels-inte…
Nov 2, 2017
12aacd1
Merge remote-tracking branch 'origin/develop' into msi-add-reservatio…
Nov 2, 2017
362ab22
MSI: Create Plugins to invalidate StockItem indexes when Stock-to-Sou…
vgoncharenko Nov 3, 2017
21082cd
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 3, 2017
6685c19
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 3, 2017
374eea8
Merge remote-tracking branch 'origin/develop' into sales-channels-ui-…
Nov 3, 2017
0618cc2
Merge remote-tracking branch 'origin/saleschannels-integration-with-a…
Nov 3, 2017
28295dc
FIX composer installation error
enriquei4 Nov 4, 2017
eeaa0a8
Merge pull request #176 from magento-engcom/fix-insallation-error-com…
maghamed Nov 4, 2017
c143657
Improve plugin to update legacy tables
enriquei4 Nov 5, 2017
2d7f35d
Deleted Resolver id files unnecesary
enriquei4 Nov 5, 2017
b9dbba5
add integration test to check in the new sources the stock
enriquei4 Nov 5, 2017
7ba4e2a
Merge branch 'msi-add-reservation-to-stockItem-table' of github.com:m…
Nov 5, 2017
b9d579d
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
14ae0bd
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
e23ce30
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
a2f0430
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
1ac98b4
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
b37b37c
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
59a30af
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
480643b
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
ae325b7
MSI: Integrate the Sales Channel output to the Manage Stock view
Nov 6, 2017
39320a3
Merge pull request #173 from magento-engcom/sales-channels-ui-adaption
Nov 6, 2017
0116b31
Merge remote-tracking branch 'origin/develop' into msi-website-defaul…
Nov 6, 2017
6444ecc
MSI: Assign Website at the time of Creation to the Default Stock
Nov 7, 2017
bb6fdac
Merge pull request #156 from magento-engcom/inventory-sales-backorder
Nov 7, 2017
044e1a4
MSI: Slight refactoring
Nov 7, 2017
427ac79
Merge remote-tracking branch 'origin/develop' into move-product-assign
Nov 7, 2017
b74924f
Merge remote-tracking branch 'origin/move-product-assign' into move-p…
Nov 7, 2017
73f4a5d
MSI: Move Product on Stock Assigning from Inventory Module to Invento…
Nov 7, 2017
3cbb1a4
MSI: Validate source items
Nov 7, 2017
acba620
Merge remote-tracking branch 'origin/develop' into validate-source-items
Nov 7, 2017
a115298
MSI: Validate source items
Nov 7, 2017
9360161
MSI: Validate source items
Nov 7, 2017
5c5d83b
Merge branch 'develop' into fix-static-tests-stock-save
bartekszymanski Nov 7, 2017
5982bf5
move event to save processor
bartekszymanski Nov 7, 2017
331f9d7
unused class remove
bartekszymanski Nov 7, 2017
13e02fc
MSI: Validate source items
Nov 8, 2017
d622ab2
MSI: Validate source items
Nov 8, 2017
0193c07
Merge pull request #139 from magento-engcom/move-product-assign
Nov 8, 2017
31f6163
Merge pull request #138 from magento-engcom/validate-source-items
Nov 8, 2017
415617a
MSI: Fix stock grid
Nov 8, 2017
3585836
Merge remote-tracking branch 'origin/develop' into msi-source-remove-…
Nov 8, 2017
9e835c6
MSI: Remove the Single Delete Command for Source Items
Nov 8, 2017
1ed2562
MSI: Remove the Single Delete Command for Source Items
Nov 8, 2017
8e24baa
MSI: Remove the Single Delete Command for Source Items
Nov 9, 2017
00695bb
Merge pull request #140 from magento-engcom/msi-source-remove-delte-c…
Nov 9, 2017
336d4dd
Merge remote-tracking branch 'origin/develop' into source-item-webapi
Nov 9, 2017
48f0f90
Fix issue #181
aleron75 Nov 9, 2017
426ad4e
MSI: Source item webapi
Nov 9, 2017
1babe8d
MSI: Source item webapi
Nov 9, 2017
2c3a75e
MSI: Source item webapi
Nov 9, 2017
9d4984f
Merge pull request #136 from magento-engcom/source-item-webapi
Nov 9, 2017
f7ff64e
Merge pull request #145 from magento-engcom/fix-static-tests-stock-save
Nov 9, 2017
af3e298
Fix Issue #182
aleron75 Nov 9, 2017
637617d
Merge remote-tracking branch 'origin/develop' into msi-website-defaul…
Nov 9, 2017
ab0f11f
fix tests
Nov 9, 2017
8e2e1bf
fix static tests
Nov 9, 2017
1ea3d1c
MSI: Update phpunit.xml.dist for integration tests
Nov 9, 2017
37fbad2
Merge remote-tracking branch 'remotes/origin/develop' into prevent-de…
bartekszymanski Nov 9, 2017
f6b11f0
MSI: Update phpunit.xml.dist for api functional tests
Nov 9, 2017
cb6eb12
MSI: Bugfixing of SalesChannelManagement
Nov 10, 2017
d870dcf
Merge pull request #196 from magento-engcom/msi-issue-182
Nov 10, 2017
8029156
MSI: Bugfixing of Default Source and Default Stock
Nov 10, 2017
ad75612
Merge pull request #195 from magento-engcom/msi-issue-181
Nov 10, 2017
3c46fa9
Merge remote-tracking branch 'origin/develop' into prevent-delete-sto…
Nov 10, 2017
9f2929e
MSI: Stock Removal. Throw an exception and allow to delete just unass…
Nov 10, 2017
3bb236f
MSI: Stock Removal. Throw an exception and allow to delete just unass…
Nov 10, 2017
ca0caa2
MSI: Stock Removal. Throw an exception and allow to delete just unass…
Nov 10, 2017
fc4a71b
Merge pull request #171 from magento-engcom/prevent-delete-stock-sale…
Nov 10, 2017
5c541a8
Merge branch 'develop' into inventory-configuration-base
rogyar Nov 12, 2017
b2980af
Bootstrap for api-functional tests
rogyar Nov 12, 2017
139cd0e
Merge remote-tracking branch 'origin/develop' into msi-website-defaul…
Nov 13, 2017
2c54538
MSI: Assign Website at the time of Creation to the Default Stock
Nov 13, 2017
101de5a
MSI: Assign Website at the time of Creation to the Default Stock
Nov 13, 2017
0698655
MSI: Assign Website at the time of Creation to the Default Stock
Nov 13, 2017
c5f3252
Merge pull request #165 from magento-engcom/msi-website-default-stock
Nov 13, 2017
df4b80b
Added return type to the API setter
rogyar Nov 13, 2017
8868327
Added temporary web api configuration for getting stock item configur…
rogyar Nov 13, 2017
bd3bd5a
Minor refactoring. API-functional Test for getting inventory configur…
rogyar Nov 14, 2017
c50b638
Merge branch 'develop' of https://github.com/magento-engcom/msi into …
vgoncharenko Nov 15, 2017
4fdb922
MSI: Create Plugins to invalidate StockItem indexes when Stock-to-Sou…
vgoncharenko Nov 15, 2017
abc34b5
API-functional Test for saving inventory configuration
rogyar Nov 15, 2017
9cbf759
Rollback fixture for source item configuration
rogyar Nov 15, 2017
3d223f5
Resource model for removing inventory item configuration
rogyar Nov 15, 2017
967b101
Integration test for the new remove functionality
rogyar Nov 15, 2017
cde9493
SuppressWarnings removing, code quality improvement
bartekszymanski Nov 16, 2017
b99191a
Refactoring and tests fixes
rogyar Nov 16, 2017
c1c2a2b
ACL configuration added
rogyar Nov 16, 2017
72e45b7
Redundant resource model removed
rogyar Nov 16, 2017
7b1eaec
Fix Integration Test for replace command
Nov 18, 2017
e280568
[TASK] MSI #204: Add documentation GetProductQuantityInStockTest and …
Nov 18, 2017
428058c
[TASK] MSI: #204 Add new testcase for check no affect other sources …
Nov 18, 2017
6400c03
[TASK] MSI #204: Add new testcase for check no affect other sources w…
Nov 18, 2017
6bd6d29
MSI: #206 - Added strict type static code test
DwayneH Nov 18, 2017
3207e33
[TASK] MSI #204: Add new testcase for check no affect other sources
Nov 18, 2017
edea52d
Merge pull request #205 from magento-engcom/fix-204
maghamed Nov 18, 2017
327cb7e
Add StockImporterInterface extension point to core product import
Nov 18, 2017
0ccb544
#207 - Inject Preference for StockItemImportyer
Nov 18, 2017
675b192
Remove Search criteria classes
Nov 18, 2017
667e7d1
MSI #206 - Added blacklist and description
DwayneH Nov 18, 2017
f2ca93a
Fixed integration test for checking old/new stock changes, improved d…
sinisa86 Nov 19, 2017
66ee874
Remove confusing doc tag
Nov 19, 2017
a751e98
Update file doc with Magento Copyright lines
Nov 19, 2017
7a698a0
Remove unused class declaration
Nov 19, 2017
b06e080
Remove php ^7.1 return type hint
Nov 19, 2017
90fb91d
Fix Bundle Import integration test throwing undefined index
Nov 19, 2017
789c16b
Fixed conflicts because of changes in di.xml
sinisa86 Nov 19, 2017
716d705
Add Check for if qty isset in import function
Nov 20, 2017
4c0ca74
Fixed code sniffer failure because of empty line at the end of the file
sinisa86 Nov 20, 2017
fe9ef65
MSI: Indexation improvement
Nov 20, 2017
40d82f7
MSI: Indexation improvement
Nov 20, 2017
5fcdea8
MSI: Indexation improvement
Nov 20, 2017
6a88d8b
Merge remote-tracking branch 'origin/develop' into MSI-invalidate-sto…
Nov 20, 2017
b5ef708
MSI: Indexation improvement
Nov 20, 2017
79760cb
MSI: Indexation improvement
Nov 20, 2017
551ab92
MSI: Indexation improvement
Nov 20, 2017
eaf1b21
Merge pull request #141 from magento-engcom/MSI-invalidate-stockItem-…
Nov 20, 2017
2cd9038
Integration Test for StockItemImporter
Nov 21, 2017
5a386bc
Fix static test line characters check
Nov 21, 2017
cebb2f8
Move object create() to get() incase already available in cache
Nov 21, 2017
1af4493
Fix Backwards Compatibility
Nov 21, 2017
290d919
Add data type in PHP Doc for StockItemImporter variable
Nov 21, 2017
1ddb686
Merge pull request #211 from magento-engcom/qty-processing-import-export
maghamed Nov 21, 2017
f47fd27
merge with dev - reindex to operation class
bartekszymanski Nov 21, 2017
9d7be19
reindex to operation class
bartekszymanski Nov 21, 2017
ef6f15f
Broken modularity in InventoryCatalog
bartekszymanski Nov 21, 2017
74465a8
Merge branch 'msi-develop' into msi-add-reservation-to-stockItem-table
maghamed Nov 22, 2017
2e6976c
Fixed broken builds for GitHub issue #167
maghamed Nov 22, 2017
36f759e
Merge pull request #170 from magento-engcom/msi-add-reservation-to-st…
maghamed Nov 22, 2017
9489af1
Merge pull request #215 from magento-engcom/modularity-inventory-catalog
Nov 22, 2017
7cf460f
Merge pull request #209 from magento-engcom/206-static-strict-types-test
maghamed Nov 22, 2017
3f73f0f
Merge remote-tracking branch 'origin/develop' into install-data-code-…
Nov 23, 2017
513e64d
MSI: @SuppressWarnings removing
Nov 23, 2017
91795d5
Merge pull request #202 from magento-engcom/install-data-code-quality
Nov 23, 2017
a2c431d
Added data setup script which assigns Main Website to Default Stock
sinisa86 Nov 24, 2017
a43e962
Added integration tests which checks if Main website has been associa…
sinisa86 Nov 24, 2017
088c7ca
Fixed PHP code sniffer related error in AssignWebsiteToDefaultStockTest
sinisa86 Nov 24, 2017
5bd6991
MSI: Assign main website to default stock
Nov 24, 2017
d33c139
Merge pull request #221 from magento-engcom/199_assign_main_website_t…
Nov 24, 2017
68a071d
Merge branch 'develop' into inventory-configuration-base
rogyar Nov 25, 2017
088bae8
Unnecessary plugin removed
rogyar Nov 25, 2017
ff844a9
Minor code style fixes for static tests
rogyar Nov 25, 2017
b3345b4
Separate API interface for removing source item configuration
rogyar Nov 25, 2017
27afffc
Enhanced database structure and flow for working with the database
rogyar Nov 25, 2017
08ea098
Resolve variables types issues
rogyar Nov 25, 2017
ee87b50
Refactored GetSourceItemConfiguration resource
dmytro-ch Nov 25, 2017
9939a10
Add DI config for GetSourceItemConfigurationInterface
dmytro-ch Nov 25, 2017
443ecce
MSI: Inventory configuration base
Nov 25, 2017
dda10fd
Merge branch 'inventory-configuration-base' into 237-adapt-get-source…
dmytro-ch Nov 25, 2017
558fc4a
Merge branch 'inventory-configuration-base' of github.com:magento-eng…
rogyar Nov 25, 2017
921e192
Add source item global configuration to GetSourceItemConfiguration
dmytro-ch Nov 25, 2017
12f20d2
Fixed issue with product save
rogyar Nov 25, 2017
7cfe972
[MSI] Introduce initial Inventory Configuration Module
Nov 25, 2017
9c53279
[MSI] Introduce initial Inventory Configuration Module
Nov 25, 2017
bda77ef
Merge branch 'inventory-configuration-base' into 237-adapt-get-source…
dmytro-ch Nov 25, 2017
325f038
Fixed di issue in GetSourceItemConfiguration
dmytro-ch Nov 25, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Order deny,allow
Deny from all
46 changes: 46 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/.metadata
/.project
/.settings
/.vscode
atlassian*
/nbproject
/robots.txt
Expand Down
4 changes: 0 additions & 4 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,6 @@
order allow,deny
deny from all
</Files>
<Files CONTRIBUTING.md>
order allow,deny
deny from all
</Files>
<Files COPYING.txt>
order allow,deny
deny from all
Expand Down
4 changes: 0 additions & 4 deletions .htaccess.sample
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,6 @@
order allow,deny
deny from all
</Files>
<Files CONTRIBUTING.md>
order allow,deny
deny from all
</Files>
<Files COPYING.txt>
order allow,deny
deny from all
Expand Down
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ env:
- TEST_SUITE=integration INTEGRATION_INDEX=1
- TEST_SUITE=integration INTEGRATION_INDEX=2
- TEST_SUITE=integration INTEGRATION_INDEX=3
- TEST_SUITE=functional ACCEPTANCE_INDEX=1
- TEST_SUITE=functional ACCEPTANCE_INDEX=2
- TEST_SUITE=functional
matrix:
exclude:
- php: 7.0
Expand All @@ -40,9 +39,7 @@ matrix:
- php: 7.0
env: TEST_SUITE=js GRUNT_COMMAND=static
- php: 7.0
env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
- php: 7.0
env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
env: TEST_SUITE=functional
cache:
apt: true
directories:
Expand All @@ -51,7 +48,7 @@ cache:
- $HOME/node_modules
- $HOME/yarn.lock
before_install: ./dev/travis/before_install.sh
install: composer install --no-interaction --prefer-dist
install: composer install --no-interaction
before_script: ./dev/travis/before_script.sh
script:
# Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,35 @@
*/
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;

use Magento\Backend\App\Action;
use Magento\Framework\Controller\ResultFactory;

class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
{
/**
* @var \Magento\AdminNotification\Model\NotificationService
*/
private $notificationService;

/**
* @param Action\Context $context
* @param \Magento\AdminNotification\Model\NotificationService|null $notificationService
* @throws \RuntimeException
*/
public function __construct(
Action\Context $context,
\Magento\AdminNotification\Model\NotificationService $notificationService = null
) {
parent::__construct($context);
$this->notificationService = $notificationService?: \Magento\Framework\App\ObjectManager::getInstance()
->get(\Magento\AdminNotification\Model\NotificationService::class);
}

/**
* Mark notification as read (AJAX action)
*
* @return void
* @return \Magento\Framework\Controller\Result\Json|void
* @throws \InvalidArgumentException
*/
public function execute()
{
Expand All @@ -21,17 +44,15 @@ public function execute()
$notificationId = (int)$this->getRequest()->getPost('id');
$responseData = [];
try {
$this->_objectManager->create(
\Magento\AdminNotification\Model\NotificationService::class
)->markAsRead(
$notificationId
);
$this->notificationService->markAsRead($notificationId);
$responseData['success'] = true;
} catch (\Exception $e) {
$responseData['success'] = false;
}
$this->getResponse()->representJson(
$this->_objectManager->create(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($responseData)
);

/** @var \Magento\Framework\Controller\Result\Json $resultJson */
$resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
$resultJson->setData($responseData);
return $resultJson;
}
}
12 changes: 6 additions & 6 deletions app/code/Magento/AdminNotification/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-media-storage": "100.2.*",
"magento/framework": "100.2.*",
"magento/module-ui": "100.2.*",
"magento/module-store": "100.3.*",
"magento/module-backend": "100.3.*",
"magento/module-media-storage": "100.3.*",
"magento/framework": "100.3.*",
"magento/module-ui": "100.3.*",
"lib-libxml": "*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
"version": "100.3.0-dev",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
8 changes: 3 additions & 5 deletions app/code/Magento/AdminNotification/registration.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/

\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'Magento_AdminNotification',
__DIR__
);
use \Magento\Framework\Component\ComponentRegistrar;

ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);
18 changes: 9 additions & 9 deletions app/code/Magento/AdvancedPricingImportExport/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-catalog": "101.1.*",
"magento/module-catalog-inventory": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/module-import-export": "100.2.*",
"magento/module-catalog-import-export": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-store": "100.2.*",
"magento/framework": "100.2.*"
"magento/module-catalog": "101.2.*",
"magento/module-catalog-inventory": "100.3.*",
"magento/module-eav": "100.3.*",
"magento/module-import-export": "100.3.*",
"magento/module-catalog-import-export": "100.3.*",
"magento/module-customer": "100.3.*",
"magento/module-store": "100.3.*",
"magento/framework": "100.3.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
"version": "100.3.0-dev",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
8 changes: 3 additions & 5 deletions app/code/Magento/AdvancedPricingImportExport/registration.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/

\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'Magento_AdvancedPricingImportExport',
__DIR__
);
use \Magento\Framework\Component\ComponentRegistrar;

ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdvancedPricingImportExport', __DIR__);
6 changes: 3 additions & 3 deletions app/code/Magento/Authorization/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"description": "Authorization module provides access to Magento ACL functionality.",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-backend": "100.2.*",
"magento/framework": "100.2.*"
"magento/module-backend": "100.3.*",
"magento/framework": "100.3.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
"version": "100.3.0-dev",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
8 changes: 3 additions & 5 deletions app/code/Magento/Authorization/registration.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/

\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'Magento_Authorization',
__DIR__
);
use \Magento\Framework\Component\ComponentRegistrar;

ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Authorization', __DIR__);
20 changes: 10 additions & 10 deletions app/code/Magento/Authorizenet/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-sales": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-quote": "100.2.*",
"magento/module-checkout": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-payment": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/framework": "100.2.*"
"magento/module-sales": "100.3.*",
"magento/module-store": "100.3.*",
"magento/module-quote": "100.3.*",
"magento/module-checkout": "100.3.*",
"magento/module-backend": "100.3.*",
"magento/module-payment": "100.3.*",
"magento/module-catalog": "101.2.*",
"magento/framework": "100.3.*"
},
"suggest": {
"magento/module-config": "100.2.*"
"magento/module-config": "100.3.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
"version": "100.3.0-dev",
"license": [
"proprietary"
],
Expand Down
8 changes: 3 additions & 5 deletions app/code/Magento/Authorizenet/registration.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/

\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'Magento_Authorizenet',
__DIR__
);
use \Magento\Framework\Component\ComponentRegistrar;

ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Authorizenet', __DIR__);
3 changes: 2 additions & 1 deletion app/code/Magento/Backend/Block/Widget/Grid/Extended.php
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ public function removeColumn($columnId)
if ($this->getColumnSet()->getChildBlock($columnId)) {
$this->getColumnSet()->unsetChild($columnId);
if ($this->_lastColumnId == $columnId) {
$this->_lastColumnId = array_pop($this->getColumnSet()->getChildNames());
$names = $this->getColumnSet()->getChildNames();
$this->_lastColumnId = array_pop($names);
}
}
return $this;
Expand Down
16 changes: 8 additions & 8 deletions app/code/Magento/Backend/Model/Menu/Item.php
Original file line number Diff line number Diff line change
Expand Up @@ -467,15 +467,15 @@ public function toArray()
{
return [
'parent_id' => $this->_parentId,
'module_name' => $this->_moduleName,
'module' => $this->_moduleName,
'sort_index' => $this->_sortIndex,
'depends_on_config' => $this->_dependsOnConfig,
'dependsOnConfig' => $this->_dependsOnConfig,
'id' => $this->_id,
'resource' => $this->_resource,
'path' => $this->_path,
'action' => $this->_action,
'depends_on_module' => $this->_dependsOnModule,
'tooltip' => $this->_tooltip,
'dependsOnModule' => $this->_dependsOnModule,
'toolTip' => $this->_tooltip,
'title' => $this->_title,
'target' => $this->target,
'sub_menu' => isset($this->_submenu) ? $this->_submenu->toArray() : null
Expand All @@ -492,15 +492,15 @@ public function toArray()
public function populateFromArray(array $data)
{
$this->_parentId = $this->_getArgument($data, 'parent_id');
$this->_moduleName = $this->_getArgument($data, 'module_name', 'Magento_Backend');
$this->_moduleName = $this->_getArgument($data, 'module', 'Magento_Backend');
$this->_sortIndex = $this->_getArgument($data, 'sort_index');
$this->_dependsOnConfig = $this->_getArgument($data, 'depends_on_config');
$this->_dependsOnConfig = $this->_getArgument($data, 'dependsOnConfig');
$this->_id = $this->_getArgument($data, 'id');
$this->_resource = $this->_getArgument($data, 'resource');
$this->_path = $this->_getArgument($data, 'path', '');
$this->_action = $this->_getArgument($data, 'action');
$this->_dependsOnModule = $this->_getArgument($data, 'depends_on_module');
$this->_tooltip = $this->_getArgument($data, 'tooltip', '');
$this->_dependsOnModule = $this->_getArgument($data, 'dependsOnModule');
$this->_tooltip = $this->_getArgument($data, 'toolTip');
$this->_title = $this->_getArgument($data, 'title');
$this->target = $this->_getArgument($data, 'target');
if (isset($data['sub_menu'])) {
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/Test/Unit/Model/Menu/ItemTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ class ItemTest extends \PHPUnit\Framework\TestCase
'title' => 'Item Title',
'action' => '/system/config',
'resource' => 'Magento_Config::config',
'depends_on_module' => 'Magento_Backend',
'depends_on_config' => 'system/config/isEnabled',
'tooltip' => 'Item tooltip',
'dependsOnModule' => 'Magento_Backend',
'dependsOnConfig' => 'system/config/isEnabled',
'toolTip' => 'Item tooltip',
];

protected function setUp()
Expand Down
Loading