Skip to content
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

[Forwardport] Move breadcrumb json configuration to viewmodel #36

Merged
merged 435 commits into from
Jun 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
435 commits
Select commit Hold shift + click to select a range
57b9cd2
Correct return type of methods and typo correction.
Jun 11, 2018
bd15eb3
bool primitive type in return type
Jun 15, 2018
3000eac
Remove unneeded class import
orlangur Jun 15, 2018
849d23d
Navigation dropdown caret icon.
tejashkumbhare Jun 13, 2018
f4912a2
Removed unnecessary blank line from xml.
sanganinamrata Jun 16, 2018
b01a948
Fixed syntax for before-after operators in less files.
sanganinamrata Jun 16, 2018
010b16f
Correct sentence in comment section in class file.
sanganinamrata Jun 16, 2018
492e81e
MAGETWO-92007: A first few ui_component labels are removing on Add li…
DianaRusin Jun 19, 2018
9777137
ENGCOM-2038: Navigation dropdown caret icon. #16225
magento-engcom-team Jun 19, 2018
d934010
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr24
zakdma Jun 19, 2018
8e05035
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-92826
zakdma Jun 19, 2018
c40cafa
Merge remote-tracking branch 'origin/MAGETWO-92826' into 2.3-develop-…
zakdma Jun 19, 2018
1525c69
MAGETWO-92308: Wrong price and Cart Subtotal at mini shopping cart
zakdma Jun 19, 2018
c8e7c0c
ENGCOM-2043: [Forwardport] Correct return type of methods and typo co…
magento-engcom-team Jun 19, 2018
9912388
Added integration test for checking admin login attempts cleanup
rogyar Jun 19, 2018
5bf729c
Missing copyrights added
rogyar Jun 19, 2018
a34c148
array_push(...) calls behaving as '$array[] = ...', $array[] = works …
lfluvisotto Jun 14, 2018
6be8f8c
1164: OnePageCheckoutOfflinePaymentMethodsTest rework to support MSI …
nmalevanec Jun 19, 2018
8271e93
MC-168: Admin should be able to assign attributes to an attribute set
tomreece Jun 19, 2018
fea2d9d
Merge remote-tracking branch 'origin/2.3-develop' into RE-develop-pr
tomreece Jun 19, 2018
6794646
Merge remote-tracking branch 'mainline/2.3-develop' into DEVOPS-2632-2.3
slavvka Jun 19, 2018
900824e
MAGETWO-91734: Cannot cancel guest order paid with gift card
danielrenaud Jun 19, 2018
4b9ccba
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-91545
Jun 19, 2018
39b1462
DEVOPS-2632: Sample Data Builds Migrated from Bamboo
slavvka Jun 19, 2018
4933bb9
Merge branch '2.3-develop' into RE-develop-pr
tomreece Jun 19, 2018
79bd644
MAGETWO-92877: Write Core Application Logs to Syslog
shiftedreality Jun 19, 2018
aec7fa3
MAGETWO-92877: Write Core Application Logs to Syslog
shiftedreality Jun 19, 2018
7d536c3
MAGETWO-91545: Error not found page issue in change status and update…
dthampy Jun 19, 2018
2f09370
merge magento/2.3-develop into magento-borg/MAGETWO-91545
Jun 19, 2018
3422dae
merge magento/2.3-develop into magento-borg/DEVOPS-2632-2.3
Jun 19, 2018
860b2d0
Merge remote-tracking branch 'origin/MAGETWO-92308' into 2.3-develop-…
OlgaVasyltsun Jun 20, 2018
99d9b06
MAGETWO-90838: Can't save customer address on adminhtml when country …
DianaRusin Jun 20, 2018
c4e0e58
ENGCOM-2054: [Forwardport] array_push(...) calls behaving as '$array[…
magento-engcom-team Jun 20, 2018
c274bfb
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-89238
RuslanKostiv1 Jun 20, 2018
eedbf51
MAGETWO-92885: Unable to delete Fixed Tax Attribute from attribute set
svitja Jun 20, 2018
94db8ff
ENGCOM-2060: magento/magento2#15255 unlock customer after password re…
magento-engcom-team Jun 20, 2018
88fae0a
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr24
zakdma Jun 20, 2018
303f1f0
ENGCOM-2063: [FORWARDPORT #15097] Add field to filter to collection #…
magento-engcom-team Jun 20, 2018
67d2dc2
ENGCOM-2064: [Forwardport] Variant product image in sidebar wishlist …
magento-engcom-team Jun 20, 2018
dac6f9d
ENGCOM-2065: Forwardport] Feature space between category page #1 #15726
magento-engcom-team Jun 20, 2018
9669bd6
ENGCOM-2066: [Forwardport] [BUGFIX] #15564 Generated admin API token …
magento-engcom-team Jun 20, 2018
2884e23
ENGCOM-2067: [Forwardport] Add missing table aliases to fields mappin…
magento-engcom-team Jun 20, 2018
9ff7742
Merge pull request #2717 from magento-pangolin/RE-develop-pr
okolesnyk Jun 20, 2018
f9866da
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-91545
Jun 20, 2018
b91cdef
merge magento/2.3-develop into magento-borg/MAGETWO-91497-product-web…
Jun 20, 2018
d37aab1
merge magento/2.3-develop into magento-arcticfoxes/MAGETWO-91435
Jun 20, 2018
707b4d2
merge magento/2.3-develop into magento-borg/MAGETWO-91734
Jun 20, 2018
badfe3c
Simplified TypeProcessor
YevSent Jun 20, 2018
be6a01f
Merge pull request #2705 from magento-borg/MAGETWO-91545
cpartica Jun 20, 2018
54e1a71
MAGETWO-61209: Fixed issue with mage/calendar when setting `numberOfM…
Jun 20, 2018
e874ff0
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-61209-…
Jun 20, 2018
683115a
merge magento/2.3-develop into magento-borg/DEVOPS-2632-2.3
Jun 20, 2018
6b79615
Merge remote-tracking branch 'origin/MAGETWO-91734' into MAGETWO-91671
danielrenaud Jun 20, 2018
fcffcc1
ENGCOM-2074: Simplified TypeProcessor #16275
magento-engcom-team Jun 20, 2018
7e10aad
merge magento/2.3-develop into magento-borg/MAGETWO-91734
Jun 20, 2018
ecd53ff
MAGETWO-91671: Different order statuses with zero value and none zero…
danielrenaud Jun 20, 2018
a60fd3e
MAGETWO-92773: [GraphQL] Products cannot be fetched in parent/anchor …
Jun 21, 2018
beb6398
Merge remote-tracking branch 'remotes/mainline/2.3-develop' into MAGE…
Jun 21, 2018
c2c4f29
Merge pull request #2730 from magento-borg/MAGETWO-91734
paliarush Jun 21, 2018
c47e1c9
Merge remote-tracking branch 'remotes/mainline/2.3-develop' into MAGE…
Jun 21, 2018
092e6ec
DOBISSUE date format changed after customer tries to register with sa…
KaushikChavda May 17, 2018
c180386
DOBISSUE date format changed after customer tries to register with sa…
KaushikChavda May 24, 2018
85a98b2
DOBISSUE date format changed after customer tries to register with sa…
KaushikChavda May 24, 2018
b6375da
DOBISSUE fix travis-ci error.
KaushikChavda May 24, 2018
0973ca3
DOBUSSUE fixed On Create New Customer Account page DOB field always c…
KaushikChavda Jun 13, 2018
8eb668b
Merge pull request #2706 from magento-architects/MAGETWO-92773-Anchor…
paliarush Jun 21, 2018
3be62d9
MAGETWO-92885: Unable to delete Fixed Tax Attribute from attribute set
svitja Jun 21, 2018
42992be
ENGCOM-2075: [Forwardport] DOBISSUE date format changed after custome…
magento-engcom-team Jun 21, 2018
a1caccf
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-92885
svitja Jun 21, 2018
a5245cd
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr24
zakdma Jun 21, 2018
597354e
Merge remote-tracking branch 'origin/MAGETWO-90838' into 2.3-develop-…
OlgaVasyltsun Jun 21, 2018
7cebc0a
ENGCOM-2074: Simplified TypeProcessor #16275
Jun 21, 2018
31b92c9
ENGCOM-2067: [Forwardport] Add missing table aliases to fields mappin…
Jun 21, 2018
382c84c
ENGCOM-2066: [Forwardport] [BUGFIX] #15564 Generated admin API token …
Jun 21, 2018
6b168c5
ENGCOM-2065: Forwardport] Feature space between category page #1 #15726
Jun 21, 2018
51d838c
ENGCOM-2064: [Forwardport] Variant product image in sidebar wishlist …
Jun 21, 2018
7a308a2
ENGCOM-2063: [FORWARDPORT #15097] Add field to filter to collection #…
Jun 21, 2018
8843aa2
ENGCOM-2060: magento/magento2#15255 unlock customer after password re…
Jun 21, 2018
e57d347
ENGCOM-2054: [Forwardport] array_push(...) calls behaving as '$array[…
Jun 21, 2018
e35df97
ENGCOM-2043: [Forwardport] Correct return type of methods and typo co…
Jun 21, 2018
ea666af
ENGCOM-2038: Navigation dropdown caret icon. #16225
Jun 21, 2018
73a3438
ENGCOM-1944: Use correct error message for duplicate error key in pro…
Jun 21, 2018
8af7c44
Merge remote-tracking branch 'origin/MAGETWO-92007' into 2.3-develop-…
svitja Jun 21, 2018
9e3d468
ENGCOM-2081: [Forwardport] Refactored javascript code of admin notifi…
magento-engcom-team Jun 21, 2018
89ca28f
Improve trim email address in customer account login page
dankhrapiyush Jun 21, 2018
5c1e8f7
Remove blank line at eof in trim-input.js
dankhrapiyush Jun 21, 2018
2697952
Merge pull request #2732 from magento-tsg/2.3-develop-pr24
Jun 21, 2018
bfce026
Trim email address in customer account create page
dankhrapiyush Jun 21, 2018
472c141
Trim email address in customer authentication popup
dankhrapiyush Jun 21, 2018
4bc0d18
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 21, 2018
fb735e0
ENGCOM-2082: [Forwardport 2.3] Trim email address in customer account…
magento-engcom-team Jun 21, 2018
a0ff63d
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
shiftedreality Jun 21, 2018
de6e48d
Merge remote-tracking branch 'origin/MAGETWO-92885' into 2.3-develop-…
svitja Jun 21, 2018
3cdd4f6
Merge remote-tracking branch 'origin/MAGETWO-89238' into PANDA-PR-2.3
RuslanKostiv1 Jun 21, 2018
f836c69
Merge remote-tracking branch 'origin/MAGETWO-75530-2.3-develop' into …
RuslanKostiv1 Jun 21, 2018
c873f14
Strict types added
rogyar Jun 21, 2018
dcca458
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 21, 2018
81d8ea6
merge magento/2.3-develop into magento-borg/MAGETWO-91497-product-web…
Jun 21, 2018
63cef66
merge magento/2.3-develop into magento-borg/DEVOPS-2632-2.3
Jun 21, 2018
fe3564f
Minor improvements
rogyar Jun 21, 2018
70c5c51
Merge pull request #2728 from magento-borg/MAGETWO-91497-product-website
cpartica Jun 21, 2018
2ee4bf3
ENGCOM-2092: [Forwardport 2.3] Captcha: Added integration test for ch…
magento-engcom-team Jun 21, 2018
c290d21
Merge branch '2.3-develop' into MAGETWO-86795
nathanjosiah Jun 21, 2018
858de32
Issue#17 Logic using route cutsomizations for async api routes. Creat…
Jun 22, 2018
1d7c283
Merge branch 'issue-17-custom-route-for-bulk-api' of github.com:magen…
Jun 22, 2018
057a6b7
Merge pull request #6 from NamrataChangani/2.3-develop-PR-port-16181
sanganinamrata Jun 22, 2018
5a7d18d
Merge pull request #4 from NamrataChangani/2.3-develop-PR-port-16183
sanganinamrata Jun 22, 2018
a6616eb
ENGCOM-2099: [Fowardport] Correct sentence in comment section in clas…
magento-engcom-team Jun 22, 2018
b6a7bb9
Correct code formatting
hitesh-wagento Jun 5, 2018
0b412dc
Correct code formatting
hitesh-wagento Jun 5, 2018
da4584b
Correct code formatting
hitesh-wagento Jun 5, 2018
2dd2c77
Correct code formatting
hitesh-wagento Jun 5, 2018
0cb6d7e
ENGCOM-2101: [Forwardport] [Correct code formatting] #16321
magento-engcom-team Jun 22, 2018
56d3c45
Fixed typo error
gelanivishal Jun 19, 2018
c9c9472
ENGCOM-2103: [Forwardport] Fixed typo error #16326
magento-engcom-team Jun 22, 2018
544c7b6
Fix HTML minification problem #5316
lisovyievhenii Jun 22, 2018
9804cb1
Merge branch '2.3-develop' of https://github.com/lisovyievhenii/magen…
lisovyievhenii Jun 22, 2018
1784a1a
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr25
zakdma Jun 22, 2018
ba6af44
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
shiftedreality Jun 22, 2018
584a1c7
ENGCOM-2105: MAGETWO-61209: Issue #7379 Calendar widget (jQuery UI Da…
magento-engcom-team Jun 22, 2018
58dd07a
ENGCOM-1514: Issue 14351: Product import doesn't change \`Enable Qty…
magento-engcom-team Jun 22, 2018
d7cbc94
merge magento/2.3-develop into magento-arcticfoxes/MAGETWO-88814
Jun 22, 2018
7d26365
This PR is a fix for issue #15627 where the default sorting behaviour…
dverkade Jun 22, 2018
3a3839b
Add new constant for PATCH method
nuzil Jun 22, 2018
345823b
Merge pull request #2738 from magento-thunder/MAGETWO-92877
arhiopterecs Jun 22, 2018
4026499
merge magento/2.3-develop into magento-arcticfoxes/MAGETWO-88814
Jun 22, 2018
caf42c9
Merge remote-tracking branch 'mainline/2.3-develop' into DEVOPS-2632-2.3
slavvka Jun 22, 2018
c19e2d8
MC-191: Admin should be able to remove Product Images assigned as Bas…
tomreece Jun 19, 2018
c36f3b7
MC-172: [Visual Merchandiser] Admin should be able to mass assign pro…
jilu1 Jun 18, 2018
1a06f4a
Merge pull request #2745 from magento-arcticfoxes/MAGETWO-88814
cpartica Jun 22, 2018
40ce12d
Merge remote-tracking branch 'mainline/2.3-develop' into DEVOPS-2632-2.3
slavvka Jun 22, 2018
a640632
MC-186: Admin should be able to apply fixed pricing for Bundled Product
Clendenin Jun 22, 2018
47421ba
MC-221: Admin should be able to select/edit the “Attributes Set” when…
Clendenin Jun 22, 2018
17a5946
MC-216: Admin should be able to delete a bundle product
Clendenin Jun 22, 2018
06660ae
MC-214: Admin should be able to filter product list by type = Bundle …
Clendenin Jun 22, 2018
ba8ae0c
MC-218: Admin should be able to mass delete bundle products
Clendenin Jun 22, 2018
df106be
MC-186: Admin should be able to apply fixed pricing for Bundled Product
Clendenin Jun 22, 2018
96da9ee
MC-217: Admin should be able to mass change bundle products status to…
Clendenin Jun 22, 2018
95c560d
MC-220: Admin should be able to select a “Bundle Product” product typ…
Clendenin Jun 22, 2018
7976db0
MC-225: Admin should be able to save and publish a bundle product
Clendenin Jun 22, 2018
2cf7256
MC-215: Admin should be able to change a bundle product status to Ena…
Clendenin Jun 22, 2018
e13e108
MC-172: [Visual Merchandiser] Admin should be able to mass assign pro…
jilu1 Jun 18, 2018
a9771d6
MC-389: [Visual Merchandiser] Admin should be able to mass remove pro…
jilu1 Jun 18, 2018
30ecf98
MC-389: [Visual Merchandiser] Admin should be able to mass remove pro…
jilu1 Jun 19, 2018
babc351
MC-223: Admin should be able to add/edit bundle items when creating/e…
Clendenin Jun 22, 2018
f60bd52
Fix var tags.
evktalo Jun 22, 2018
527660a
MC-223: Admin should be able to add/edit bundle items when creating/e…
Clendenin Jun 22, 2018
92b9a39
Merge pull request #2719 from magento-borg/DEVOPS-2632-2.3
slavvka Jun 22, 2018
55d3b79
MC-221: Admin should be able to select/edit the “Attributes Set” when…
Clendenin Jun 22, 2018
9cd301f
MC-216: Admin should be able to delete a bundle product
Clendenin Jun 22, 2018
3ec441b
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop
tomreece Jun 22, 2018
cfb588b
MC-218: Admin should be able to mass delete bundle products
Clendenin Jun 22, 2018
c4bc702
MC-215: Admin should be able to change a bundle product status to Ena…
Clendenin Jun 22, 2018
acb24d3
MC-215: Admin should be able to change a bundle product status to Ena…
Clendenin Jun 22, 2018
8690b25
merge magento/2.3-develop into magento-arcticfoxes/MAGETWO-91435
Jun 22, 2018
235e08a
ENGCOM-2105: MAGETWO-61209: Issue #7379 Calendar widget (jQuery UI Da…
Jun 23, 2018
a0f04c7
ENGCOM-2103: [Forwardport] Fixed typo error #16326
Jun 23, 2018
08e0aac
ENGCOM-2101: [Forwardport] [Correct code formatting] #16321
Jun 23, 2018
ae00d88
ENGCOM-2099: [Fowardport] Correct sentence in comment section in clas…
Jun 23, 2018
d927f46
ENGCOM-2092: [Forwardport 2.3] Captcha: Added integration test for ch…
Jun 23, 2018
60521be
ENGCOM-2082: [Forwardport 2.3] Trim email address in customer account…
Jun 23, 2018
34def88
ENGCOM-2081: [Forwardport] Refactored javascript code of admin notifi…
Jun 23, 2018
557c3d1
ENGCOM-2075: [Forwardport] DOBISSUE date format changed after custome…
Jun 23, 2018
080a6ec
ENGCOM-1514: Issue 14351: Product import doesn't change `Enable Qty …
Jun 23, 2018
721fe0f
Adjust html minifier test to cover possible cases of issue #5316
lisovyievhenii Jun 23, 2018
acd6a9f
ENGCOM-2112: Issue 5316 #16332
magento-engcom-team Jun 23, 2018
3d1babc
Fixed static test failures
Jun 23, 2018
82a5a96
ENGCOM-2115: Magento_Sales integration tests: fix invoice_list fixtur…
magento-engcom-team Jun 23, 2018
43fbc8f
ENGCOM-2116: [Forwardport] Fix #15627: Product order in category chan…
magento-engcom-team Jun 23, 2018
4b49996
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
Jun 25, 2018
ad9705e
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr25
zakdma Jun 25, 2018
a8178be
1164: OnePageCheckoutOfflinePaymentMethodsTest rework to support MSI …
nmalevanec Jun 25, 2018
8068746
Merge remote-tracking branch 'mainline/2.3-develop' into PANDA-PR-2.3
igrybkov Jun 25, 2018
eafa69d
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr25
zakdma Jun 25, 2018
3732c76
ENGCOM-2124: Fix type hints in WebapiAsync [2.3-develop] #16136
magento-engcom-team Jun 25, 2018
73cdea5
Merge remote-tracking branch 'mainline/2.3-develop' into issue-17-cus…
vrann Jun 25, 2018
cfb3509
Merge branch 'issue-17-custom-route-for-bulk-api' of https://github.c…
vrann Jun 25, 2018
cff322c
Merge remote-tracking branch 'bulk/issue-17-custom-route-for-bulk-api…
vrann Jun 25, 2018
d29803c
MAGETWO-89238: [Sales email] Disabled invoice emails produce performa…
le0n4eg Jun 25, 2018
646b8cf
MAGETWO-89238: [Sales email] Disabled invoice emails produce performa…
le0n4eg Jun 25, 2018
2192271
Merge remote-tracking branch 'origin/MAGETWO-89238' into PANDA-PR-2.3
le0n4eg Jun 25, 2018
819a3a3
MC-223: Admin should be able to add/edit bundle items when creating/e…
Clendenin Jun 25, 2018
01fcaf2
merge magento/2.3-develop into magento-arcticfoxes/MAGETWO-91435
Jun 25, 2018
26a0408
ENGCOM-2027: 1164: OnePageCheckoutOfflinePaymentMethodsTest rework to…
magento-engcom-team Jun 25, 2018
f6bc76f
ENGCOM-2124: Fix type hints in WebapiAsync [2.3-develop] #16136
Jun 25, 2018
cbd3277
ENGCOM-2116: [Forwardport] Fix #15627: Product order in category chan…
Jun 25, 2018
6fa0424
ENGCOM-2115: Magento_Sales integration tests: fix invoice_list fixtur…
Jun 25, 2018
1877e55
ENGCOM-2112: Issue 5316 #16332
Jun 25, 2018
d986ac1
ENGCOM-2032: Fixed breadcrumb quote issue in product page #16148
Jun 25, 2018
6a06383
ENGCOM-2027: 1164: OnePageCheckoutOfflinePaymentMethodsTest rework to…
Jun 25, 2018
91ae1a1
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop
tomreece Jun 25, 2018
dbe8c7b
Merge pull request #2729 from magento-arcticfoxes/MAGETWO-91435
cpartica Jun 25, 2018
b1a2907
MC-223: Admin should be able to add/edit bundle items when creating/e…
Clendenin Jun 25, 2018
ea16909
MC-221: Admin should be able to select/edit the “Attributes Set” when…
Clendenin Jun 25, 2018
99d6268
MC-186: Admin should be able to apply fixed pricing for Bundled Product
Clendenin Jun 25, 2018
ee16a2e
MC-214: Admin should be able to filter product list by type = Bundle …
Clendenin Jun 25, 2018
a417fca
MC-216: Admin should be able to delete a bundle product
Clendenin Jun 25, 2018
36758fa
Merge branch '2.3-develop' into MAGETWO-86795
nathanjosiah Jun 25, 2018
da60866
MC-216: Admin should be able to delete a bundle product
Clendenin Jun 25, 2018
a816c41
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-62310-…
dthampy Jun 25, 2018
f524c08
Merge branch 'RE-develop' of github.com:magento-pangolin/magento2ce i…
Clendenin Jun 25, 2018
988125c
MQE-1090: Stabilize RE-develop branch
tomreece Jun 25, 2018
2f0074a
MAGETWO-62310: Product "Use Default Value" checkbox for an attributes…
danielrenaud Jun 25, 2018
81520c8
Merge pull request #2757 from magento-borg/MAGETWO-62310-use-default-…
cpartica Jun 25, 2018
1ab9ed1
merge magento/2.3-develop into magento-borg/MAGETWO-91671
Jun 25, 2018
bf71446
Merge pull request #2758 from magento-borg/MAGETWO-91671
cpartica Jun 26, 2018
5a78f21
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 26, 2018
01103d9
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 26, 2018
4353482
Merge remote-tracking branch 'mainline/2.3-develop' into PANDA-PR-2.3
igrybkov Jun 26, 2018
26bac6f
Merge pull request #2754 from magento-panda/PANDA-PR-2.3
igrybkov Jun 26, 2018
03f1c9c
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr25
zakdma Jun 26, 2018
6c69054
Merge pull request #2762 from magento-tsg/2.3-develop-pr25
Jun 26, 2018
00f985b
MQE-1090: Stabilize RE-develop branch
tomreece Jun 26, 2018
fae5de2
MC-401: Advanced Attributes Not Removing From Preview
krissyhiserote Jun 26, 2018
82901ad
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop
tomreece Jun 26, 2018
26cbef3
MC-256: Tax for Simple Product Quote should be recalculated according…
leviv Jun 26, 2018
1cc0e00
Merge remote-tracking branch 'mainline/2.3-develop' into issue-17-cus…
vrann Jun 26, 2018
ecddf5e
magento/bulk-api-ce#17: Add possibility to define custom route for bu…
vrann Jun 26, 2018
4cf896d
Merge remote-tracking branch 'bulk/issue-17-custom-route-for-bulk-api…
vrann Jun 26, 2018
536a796
MC-191: Admin should be able to remove Product Images assigned as Bas…
tomreece Jun 26, 2018
6718752
Merge branch '2.3-develop' into MAGETWO-86795
nathanjosiah Jun 26, 2018
5621bd9
MAGETWO-86795: Admin Create Customer functional test fails
nathanjosiah Jun 26, 2018
7a6c902
Merge remote-tracking branch 'comwrap/async-status-search' into bulk-…
vrann Jun 26, 2018
c41ffe5
Merge pull request #2765 from magento-engcom/bulk-custom-route
vrann Jun 27, 2018
a17c1fa
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
e35695a
Merge remote-tracking branch 'mainline/2.3-develop' into status-searc…
vrann Jun 27, 2018
f67a1e3
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
ed95acd
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
5d7b3ca
add description for new classed/interfaces, remove not duplicated int…
Jun 27, 2018
8412217
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
054f22f
Merge remote-tracking branch 'comwrap/async-status-search' into bulk-…
vrann Jun 27, 2018
9bd966f
Merge remote-tracking branch 'comwrap/async-status-search' into bulk-…
vrann Jun 27, 2018
ef60eb2
Merge remote-tracking branch 'bulk/bulk-status-search' into status-se…
vrann Jun 27, 2018
ad68d7e
merge magento/2.3-develop into magento-borg/MAGETWO-86795
Jun 27, 2018
9cc2c04
merge magento/2.3-develop into magento-obsessive-owls/MC-401-remove-a…
Jun 27, 2018
0339078
Merge pull request #2741 from magento-borg/MAGETWO-86795
irenelagno Jun 27, 2018
b80f894
Merge remote-tracking branch 'mainline/2.3-develop' into MC-401-remov…
tjwiebell Jun 27, 2018
ae1a034
Merge remote-tracking branch 'origin/2.3-develop' into status-searchapi
vrann Jun 27, 2018
910eaca
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
2a3c1ad
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
96885cb
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop-pr
tomreece Jun 27, 2018
168ecf4
Merge pull request #2764 from magento-obsessive-owls/MC-401-remove-ad…
tjwiebell Jun 27, 2018
8d75e92
Merge remote-tracking branch 'mainline/2.3-develop' into status-searc…
vrann Jun 27, 2018
0525263
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop-pr
tomreece Jun 27, 2018
ce48579
Merge pull request #2769 from magento-engcom/status-searchapi
vrann Jun 27, 2018
aee9de9
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop-pr
tomreece Jun 28, 2018
f947cad
Merge pull request #2763 from magento-pangolin/RE-develop-pr
okolesnyk Jun 28, 2018
cc5c33b
Move breadcrumb json configuration to viewmodel
diedburn May 25, 2018
ce39035
Added escape text.
gelanivishal May 28, 2018
35ce945
Make new Json dependency backwards compatible
tdgroot Jun 2, 2018
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
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,12 @@
</ul>
</div>

<script>
require([
"jquery",
"Magento_Ui/js/modal/modal"
], function($){
if (this.modal) {
this.modal.html($('[data-role="system_messages_list"]').html());
} else {
this.modal = $('[data-role="system_messages_list"]').modal({
modalClass: 'modal-system-messages ui-popup-message',
type: 'popup',
buttons: []
});
<script type="text/x-magento-init">
{
"[data-role=system_messages_list]": {
"Magento_AdminNotification/js/system/messages/popup": {
class: 'modal-system-messages ui-popup-message'
}
}
}
this.modal.modal('openModal');
});
</script>
</script>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

define([
'jquery',
'Magento_Ui/js/modal/modal'
], function ($) {
'use strict';

return function (data, element) {
if (this.modal) {
this.modal.html($(element).html());
} else {
this.modal = $(element).modal({
modalClass: data.class,
type: 'popup',
buttons: []
});
}
this.modal.modal('openModal');
};
});
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
namespace Magento\AsynchronousOperations\Api;

/**
* Interface BulkStatusInterface
* Interface BulkStatusInterface.
*
* Bulk summary data with list of operations items short data.
*
* @api
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ interface DetailedBulkOperationsStatusInterface extends BulkSummaryInterface
/**
* Retrieve operations list.
*
* @return \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface[]
* @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
*/
public function getOperationsList();

/**
* Set operations list.
*
* @param \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface[] $operationStatusList
* @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $operationStatusList
* @return $this
*/
public function setOperationsList($operationStatusList);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);

namespace Magento\AsynchronousOperations\Api\Data;

/**
* Bulk operation search result interface.
*
* An bulk is a group of queue messages. An bulk operation item is a queue message.
* @api
*/
interface OperationSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
{
/**
* Get list of operations.
*
* @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
*/
public function getItems();

/**
* Set list of operations.
*
* @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $items
* @return $this
*/
public function setItems(array $items);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);

namespace Magento\AsynchronousOperations\Api;

/**
* Bulk operation item repository interface.
*
* An bulk is a group of queue messages. An bulk operation item is a queue message.
* @api
*/
interface OperationRepositoryInterface
{
/**
* Lists the bulk operation items that match specified search criteria.
*
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
* @return \Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface
*/
public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
}
5 changes: 2 additions & 3 deletions app/code/Magento/AsynchronousOperations/Model/Operation.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
*/
namespace Magento\AsynchronousOperations\Model;

use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface;
use Magento\AsynchronousOperations\Api\Data\OperationInterface;
use Magento\Framework\DataObject;
use Magento\Framework\Api\ExtensibleDataInterface;

/**
* Class Operation
*/
class Operation extends DataObject implements DetailedOperationStatusInterface, ExtensibleDataInterface
class Operation extends DataObject implements OperationInterface
{
/**
* @inheritDoc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Magento\AsynchronousOperations\Model;

use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterfaceFactory;
use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
use Magento\Framework\EntityManager\EntityManager;

/**
Expand All @@ -20,7 +20,7 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
private $entityManager;

/**
* @var DetailedOperationStatusInterfaceFactory
* @var OperationInterfaceFactory
*/
private $operationFactory;

Expand All @@ -33,12 +33,12 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
* OperationManagement constructor.
*
* @param EntityManager $entityManager
* @param DetailedOperationStatusInterfaceFactory $operationFactory
* @param OperationInterfaceFactory $operationFactory
* @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
EntityManager $entityManager,
DetailedOperationStatusInterfaceFactory $operationFactory,
OperationInterfaceFactory $operationFactory,
\Psr\Log\LoggerInterface $logger
) {
$this->entityManager = $entityManager;
Expand All @@ -65,7 +65,6 @@ public function changeOperationStatus(
$operationEntity->setResultMessage($message);
$operationEntity->setSerializedData($data);
$operationEntity->setResultSerializedData($resultData);
$operationEntity->setResultSerializedData($resultData);
$this->entityManager->save($operationEntity);
} catch (\Exception $exception) {
$this->logger->critical($exception->getMessage());
Expand Down
108 changes: 108 additions & 0 deletions app/code/Magento/AsynchronousOperations/Model/OperationRepository.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);

namespace Magento\AsynchronousOperations\Model;

use Magento\Framework\EntityManager\EntityManager;
use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
use Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterfaceFactory as SearchResultFactory;
use Magento\AsynchronousOperations\Api\Data\OperationExtensionInterfaceFactory;
use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
use Magento\Framework\Exception\InputException;
use Magento\Framework\Exception\NoSuchEntityException;

/**
* Repository class for @see \Magento\AsynchronousOperations\Api\OperationRepositoryInterface
*/
class OperationRepository implements \Magento\AsynchronousOperations\Api\OperationRepositoryInterface
{
/**
* @var EntityManager
*/
private $entityManager;

/**
* @var CollectionFactory
*/
private $collectionFactory;

/**
* @var SearchResultFactory
*/
private $searchResultFactory;

/**
* @var JoinProcessorInterface
*/
private $joinProcessor;

/**
* @var \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterfaceFactory
*/
private $operationExtensionFactory;

/**
* @var CollectionProcessorInterface
*/
private $collectionProcessor;

/**
* @var \Psr\Log\LoggerInterface
*/
private $logger;

/**
* OperationRepository constructor.
*
* @param EntityManager $entityManager
* @param CollectionFactory $collectionFactory
* @param SearchResultFactory $searchResultFactory
* @param JoinProcessorInterface $joinProcessor
* @param OperationExtensionInterfaceFactory $operationExtension
* @param CollectionProcessorInterface $collectionProcessor
* @param \Psr\Log\LoggerInterface $logger
*/
public function __construct(
EntityManager $entityManager,
CollectionFactory $collectionFactory,
SearchResultFactory $searchResultFactory,
JoinProcessorInterface $joinProcessor,
OperationExtensionInterfaceFactory $operationExtension,
CollectionProcessorInterface $collectionProcessor,
\Psr\Log\LoggerInterface $logger
) {
$this->entityManager = $entityManager;
$this->collectionFactory = $collectionFactory;
$this->searchResultFactory = $searchResultFactory;
$this->joinProcessor = $joinProcessor;
$this->operationExtensionFactory = $operationExtension;
$this->collectionProcessor = $collectionProcessor;
$this->logger = $logger;
$this->collectionProcessor = $collectionProcessor;
}

/**
* @inheritDoc
*/
public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
{
/** @var \Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface $searchResult */
$searchResult = $this->searchResultFactory->create();

/** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
$collection = $this->collectionFactory->create();
$this->joinProcessor->process($collection, \Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
$this->collectionProcessor->process($searchCriteria, $collection);
$searchResult->setSearchCriteria($searchCriteria);
$searchResult->setTotalCount($collection->getSize());
$searchResult->setItems($collection->getItems());

return $searchResult;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ protected function setUp()
$this->entityManagerMock = $this->createMock(\Magento\Framework\EntityManager\EntityManager::class);
$this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
$this->operationFactoryMock = $this->createPartialMock(
\Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterfaceFactory::class,
\Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory::class,
['create']
);
$this->operationMock =
$this->createMock(\Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface::class);
$this->createMock(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
$this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
$this->model = new \Magento\AsynchronousOperations\Model\OperationManagement(
$this->entityManagerMock,
Expand Down
5 changes: 3 additions & 2 deletions app/code/Magento/AsynchronousOperations/etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<preference for="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" type="Magento\AsynchronousOperations\Model\BulkSummary" />
<preference for="Magento\AsynchronousOperations\Api\Data\OperationInterface" type="Magento\AsynchronousOperations\Model\Operation" />
<preference for="Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface" type="Magento\AsynchronousOperations\Model\Operation" />
<preference for="Magento\AsynchronousOperations\Api\Data\OperationListInterface" type="Magento\AsynchronousOperations\Model\OperationList" />
<preference for="Magento\Framework\Bulk\BulkManagementInterface" type="Magento\AsynchronousOperations\Model\BulkManagement" />
<preference for="Magento\AsynchronousOperations\Api\BulkStatusInterface" type="Magento\AsynchronousOperations\Model\BulkOperationsStatus" />
Expand All @@ -17,10 +16,12 @@
<preference for="Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface" type="Magento\AsynchronousOperations\Model\OperationStatus" />
<preference for="Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Detailed" />
<preference for="Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Short" />
<preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
<preference for="Magento\AsynchronousOperations\Api\OperationRepositoryInterface" type="Magento\AsynchronousOperations\Model\OperationRepository" />
<type name="Magento\Framework\EntityManager\MetadataPool">
<arguments>
<argument name="metadata" xsi:type="array">
<item name="Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface" xsi:type="array">
<item name="Magento\AsynchronousOperations\Api\Data\OperationInterface" xsi:type="array">
<item name="entityTableName" xsi:type="string">magento_operation</item>
<item name="identifierField" xsi:type="string">id</item>
</item>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
<extension_attributes for="Magento\AsynchronousOperations\Api\Data\OperationInterface">
<attribute code="start_time" type="string">
<resources>
<resource ref="Magento_Logging::system_magento_logging_bulk_operations"/>
</resources>
<join reference_table="magento_bulk" join_on_field="bulk_uuid" reference_field="uuid">
<field column="start_time">start_time</field>
</join>
</attribute>
</extension_attributes>
</config>
Loading