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

merge latest M2 #1

Merged
merged 586 commits into from
Mar 26, 2019
Merged
Changes from 7 commits
Commits
Show all changes
586 commits
Select commit Hold shift + click to select a range
03b4e15
ENGCOM-4481: Resolve Issue : Search REST API returns wrong total_coun…
sidolov Mar 14, 2019
5376a81
ENGCOM-4405: Sorting by Websites not working in product grid in backo…
sidolov Mar 14, 2019
2a55512
ENGCOM-4238: Missed form validation in Admin Order Address Edit route…
sidolov Mar 14, 2019
18a20ae
ENGCOM-4071: [Forwardport] Use batches and direct queries to fix sale…
sidolov Mar 14, 2019
de12b55
ENGCOM-3725: MUI controller lacks JSON response, instead returns stat…
sidolov Mar 14, 2019
cefd38c
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-98151
BaDos Mar 14, 2019
99e7237
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop-pr
Mar 15, 2019
f3b92fb
Merge remote-tracking branch 'arcticfoxes/pr#3879' into 2.3-develop-pr
Mar 15, 2019
c77b2c7
spelling correction
ansari-ziyaurrahman Mar 15, 2019
6f83651
ENGCOM-4501: Spelling Correction #21763
magento-engcom-team Mar 15, 2019
4d90bc3
Merge branch 2.3-develop into ENGCOM-4475-magento-magento2-21649
magento-engcom-team Mar 15, 2019
648df72
Convert VerifyDisabledCustomerGroupFieldTest to MFTF #664
michal-krawczyk-qa Mar 15, 2019
23ed015
Fix functional tests.
nmalevanec Mar 15, 2019
ca99cc2
ENGCOM-4406: magento/magento2#12396: Total Amount cart rule without t…
magento-engcom-team Mar 15, 2019
7481afe
Merge branch 2.3-develop into ENGCOM-4406-magento-magento2-21288
magento-engcom-team Mar 15, 2019
409e00e
Merge remote-tracking branch 'mainline/2.3-develop' into issue-fix-21510
nmalevanec Mar 15, 2019
0acd6b6
Fix static tests.
nmalevanec Mar 15, 2019
ce17220
Merge pull request #3898 from magento-arcticfoxes/2.3-develop-pr
joanhe Mar 15, 2019
3097a70
ENGCOM-4440: Fix for issue #21510: Can't access backend indexers page…
magento-engcom-team Mar 15, 2019
383988d
merge upstream/2.3.1-release into 2.3-develop-pr
Mar 15, 2019
e9389ee
Merge branch '2.3-develop-mainline' into MC-12396-subtotal-excl-tax
nmalevanec Mar 15, 2019
1f79e42
merge magento/2.3-develop into magento-thunder/MAGETWO-95675
magento-cicd2 Mar 15, 2019
418d22b
MSI: Add deprecation message to CatalogInventory SPIs
Mar 15, 2019
f3ad13c
ENGCOM-4502: MSI: Add deprecation message to CatalogInventory SPIs #2…
magento-engcom-team Mar 15, 2019
d3e2da7
ENGCOM-4503: fix #21750 remove translation of product attribute label…
magento-engcom-team Mar 15, 2019
571f055
Fix functional tests.
nmalevanec Mar 15, 2019
1634d33
ENGCOM-4406: magento/magento2#12396: Total Amount cart rule without t…
magento-engcom-team Mar 15, 2019
1d9b1ba
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 11, 2019
7da997f
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
vgoncharenko Mar 15, 2019
885b7a9
MAGETWO-98592: [Elastic] Fix catalog search with elasticsearch6
vgoncharenko Mar 15, 2019
e78348e
merge magento/2.3-develop into magento-pangolin/mtf-eol-pr
magento-cicd2 Mar 15, 2019
f5d2d74
ENGCOM-4507: Update price-bundle.js so that correct tier price is cal…
magento-engcom-team Mar 15, 2019
7b1cd79
Merge pull request #3902 from magento-arcticfoxes/2.3-develop-pr
joanhe Mar 15, 2019
f555830
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 15, 2019
28ee51d
ENGCOM-4501: Spelling Correction #21763
sidolov Mar 15, 2019
91a26a9
ENGCOM-4498: Removed extra whitespaces #21740
sidolov Mar 15, 2019
9a3e2ee
ENGCOM-4490: Fixed wrong proxing in the inventory observer #21731
sidolov Mar 15, 2019
7fe9e2b
ENGCOM-4468: Correct spelling #21683
sidolov Mar 15, 2019
af9c4a8
ENGCOM-4452: Disable dropdown in JavaScript and CSS Settings in devel…
sidolov Mar 15, 2019
3623804
ENGCOM-4451: Fixed Whitespace issues for related, cross and upsell gr…
sidolov Mar 15, 2019
f8cb374
ENGCOM-4448: Fixed typo mistake #21600
sidolov Mar 15, 2019
223f67f
ENGCOM-4385: Fix long string display horizontal scroll in all pages i…
sidolov Mar 15, 2019
769604a
ENGCOM-4281: Fix/issue 18761 #21189
sidolov Mar 15, 2019
a9d69c4
ENGCOM-4242: [ForwardPort] #18896 Add Mexico Regions #21180
sidolov Mar 15, 2019
86bd66e
ENGCOM-3810: Issue #13612 Fixed. #20001
sidolov Mar 15, 2019
d2e5a19
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 15, 2019
49bbec4
Edited headings to be more consistent
mikeshatch Mar 15, 2019
b3a9e21
MQE-1476: Deliver weekly PR
okolesnyk Mar 15, 2019
4a63805
merge magento/2.3-develop into magento-pangolin/mtf-eol-pr
magento-cicd2 Mar 15, 2019
8ae314b
ENGCOM-4508: Edited headings to be more consistent #21782
magento-engcom-team Mar 15, 2019
b80c9dc
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 15, 2019
96ca3d4
While adding the product to Cart when the requested Qty is zero or le…
XxXgeoXxX Mar 16, 2019
345b70e
Covering the Share Wishist by integration test
eduard13 Mar 16, 2019
01eb7e6
Fix clearing admin quote address when removing all items
eduard13 Mar 16, 2019
fdc5754
ENGCOM-4510: [Forwardport] [Checkout] Fix clearing admin quote addres…
magento-engcom-team Mar 16, 2019
bd06fc9
magento-engcom/magento2ce#2680: Fixed static tests
sivaschenko Mar 16, 2019
68d793d
#19835 Fix admin header buttons flicker
Bravarg Mar 16, 2019
931f2ea
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 16, 2019
724e1e5
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 16, 2019
104d9b3
ENGCOM-4508: Edited headings to be more consistent #21782
sivaschenko Mar 16, 2019
db0d304
ENGCOM-4475: Fix #21648 Checkout Agreements checkbox missing asterisk…
sivaschenko Mar 16, 2019
69335b9
ENGCOM-3898: Fix for issue magento/magento2#18630 #18633
sivaschenko Mar 16, 2019
e91cff3
Convert UpdateShoppingCartTest to MFTF
rogyar Mar 16, 2019
5c101bf
Covering the Wishlist classes by integration and Unit Tests
eduard13 Mar 16, 2019
d49aa76
Small adjustment
eduard13 Mar 16, 2019
7a27743
Small adjustments
eduard13 Mar 16, 2019
b5803c5
magento/graphql-ce#482: [Test Coverage] 'SetBillingAddressOnCart' fun…
Mar 16, 2019
3666e03
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop Minor …
magento-engcom-team Mar 16, 2019
904a4a8
Convert FlushStaticFilesCacheButtonVisibilityTest to MFTF
atwix-framework Mar 17, 2019
fda4377
Move deploymentConfig to constructor in Locale Resolver
Bartlomiejsz Mar 18, 2019
b2004c3
fix NumberFormatter initialization when no currency is set
Bartlomiejsz Mar 18, 2019
b86f981
fix de_CH group symbol in unit test
Bartlomiejsz Mar 18, 2019
dc71ef1
ENGCOM-4502: Static tests fix.
p-bystritsky Mar 18, 2019
663a696
ENGCOM-4502: MSI: Add deprecation message to CatalogInventory SPIs #2…
magento-engcom-team Mar 18, 2019
1a5e412
Merge branch 2.3-develop into ENGCOM-4502-magento-magento2-21774
magento-engcom-team Mar 18, 2019
73d88aa
Revert "fix de_CH group symbol in unit test"
Bartlomiejsz Mar 18, 2019
88b6401
Fill data_hash from BULK response with correct data
silyadev Mar 18, 2019
2a0adf4
ENGCOM-4521: Fixed Inline block edit identifier validation #21376
magento-engcom-team Mar 18, 2019
705416e
Fix extra symbols
silyadev Mar 18, 2019
1c98757
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 18, 2019
5e63603
ENGCOM-4522: #19835 Fix admin header buttons flicker #21791
magento-engcom-team Mar 18, 2019
32a36a5
ENGCOM-4515: [Wishlist] Covering the Wishlist classes by integration …
magento-engcom-team Mar 18, 2019
cbbc79f
ENGCOM-4523: Fixed : Additional addresses DataTable Pagination count …
magento-engcom-team Mar 18, 2019
c4f8496
#20825 Missing required argument $productAvailabilityChecks of Magent…
kisroman Mar 18, 2019
13126a5
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 18, 2019
34a5218
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
vgoncharenko Mar 18, 2019
e79ae82
merge magento/2.3-develop into magento-epam/EPAM-PR-47
magento-cicd2 Mar 18, 2019
f0039d6
Flying Fists of Kung Fu Cleanup
lefte Mar 18, 2019
a55c94f
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 18, 2019
ab30fa6
ENGCOM-4525: Flying Fists of Kung Fu Cleanup #21826
magento-engcom-team Mar 18, 2019
e7a723a
MAGETWO-98151: Add support ZooKeeper locks
BaDos Mar 18, 2019
ed47c5d
ENGCOM-4510: [Forwardport] [Checkout] Fix clearing admin quote addres…
sidolov Mar 18, 2019
d2316e9
ENGCOM-4507: Update price-bundle.js so that correct tier price is cal…
sidolov Mar 18, 2019
bfce73c
ENGCOM-4503: fix #21750 remove translation of product attribute label…
sidolov Mar 18, 2019
a7f930a
ENGCOM-4502: MSI: Add deprecation message to CatalogInventory SPIs #2…
sidolov Mar 18, 2019
40b5feb
ENGCOM-4440: Fix for issue #21510: Can't access backend indexers page…
sidolov Mar 18, 2019
0dd4ef2
ENGCOM-4406: magento/magento2#12396: Total Amount cart rule without t…
sidolov Mar 18, 2019
b409de9
merge magento/2.3-develop into magento-pangolin/mtf-eol-pr
magento-cicd2 Mar 18, 2019
32764b1
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 18, 2019
a3f84b5
merge magento/2.3-develop into magento-helix/MC-6273
magento-cicd2 Mar 18, 2019
e86c156
Merge branch '632' of github.com:MilaLesechko/magento-functional-test…
okolesnyk Mar 18, 2019
f5653ab
MAGETWO-98617: Pager does not work on Newsletter Subscribers Admin page
dyushkin Mar 18, 2019
83a1c23
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 18, 2019
ac8d63d
MC-13613: Product mass update
slopukhov Mar 18, 2019
b2c4a00
Merge branch '2.3-develop' of github.com:magento/magento2ce into MC-1…
slopukhov Mar 18, 2019
9d65684
MAGETWO-98151: Add support ZooKeeper locks
BaDos Mar 18, 2019
aba95a8
Update test to correspond Magento standards
okolesnyk Mar 18, 2019
9c80db4
Merge branch '2.3-develop' of github.com:hws47a/magento-functional-te…
okolesnyk Mar 18, 2019
1b9a1b4
Add test case ids to community contributed tests
okolesnyk Mar 18, 2019
7dfdd68
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 18, 2019
5aef2fb
Fix unstable selector
okolesnyk Mar 19, 2019
b1d55f8
ENGCOM-4482: Fix #21692 - logic in constructor of address validator #…
magento-engcom-team Mar 19, 2019
3c362bf
ENGCOM-4531: Fill data_hash from BULK response with correct data #21815
magento-engcom-team Mar 19, 2019
9dc5f15
corrections after review
michal-krawczyk-qa Mar 19, 2019
3d049d6
Add anotation and change additional caches selector parametrized
atwix-framework Mar 19, 2019
9c7fbfd
Merge remote-tracking branch 'mainline/2.3-develop' into feature/fix_…
nmalevanec Mar 19, 2019
3808c33
MC-13613: Product mass update
slopukhov Mar 19, 2019
2a6cddd
MC-13613: Product mass update
slopukhov Mar 19, 2019
e09429f
Fix static tests.
nmalevanec Mar 19, 2019
2a3e5dd
ENGCOM-4482: Fix #21692 - logic in constructor of address validator #…
magento-engcom-team Mar 19, 2019
2e863d6
Merge pull request #3885 from magento-pangolin/mtf-eol-pr
okolesnyk Mar 19, 2019
166c0d4
MC-13613: Product mass update
slopukhov Mar 19, 2019
022827d
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-98151
BaDos Mar 19, 2019
82a58c2
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 19, 2019
09a6678
ENGCOM-4525: Flying Fists of Kung Fu Cleanup #21826
sidolov Mar 19, 2019
50ed69f
ENGCOM-4522: #19835 Fix admin header buttons flicker #21791
sidolov Mar 19, 2019
74b5602
ENGCOM-4515: [Wishlist] Covering the Wishlist classes by integration …
sidolov Mar 19, 2019
6d8112c
Merge remote-tracking branch 'mainline/2.3-develop' into MC-5784
krissyhiserote Mar 19, 2019
c8e9365
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 19, 2019
64643ab
merge magento/2.3-develop into magento-helix/MC-6273
magento-cicd2 Mar 19, 2019
251ce3c
MAGETWO-98151: Add support ZooKeeper locks
BaDos Mar 19, 2019
237b92b
MC-13613: Product mass update
slopukhov Mar 19, 2019
b35a832
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-95675
oshmyheliuk Mar 19, 2019
7590f54
magento/magento-functional-tests-migration#417: Convert CreateCustomO…
hws47a Mar 19, 2019
775296b
Merge branch '2.3-develop' of github.com:hws47a/magento-functional-te…
hws47a Mar 19, 2019
dd8d34e
Merge branch '2.3-develop' into 466-flush-static-files-cache-button-v…
okolesnyk Mar 19, 2019
de61025
Merge branch '2.3-develop' into 2.3-develop
okolesnyk Mar 19, 2019
53ae1a8
Merge branch '2.3-develop' of github.com:Michalk39/magento-functional…
okolesnyk Mar 19, 2019
7e6c9c0
Merge branch '466-flush-static-files-cache-button-visibility-test' of…
okolesnyk Mar 19, 2019
28d82a2
MAGETWO-98800: TunnelAction fails when Google Chart API is not available
slopukhov Mar 19, 2019
ef8c8df
Update test case ids and add minor fixes
okolesnyk Mar 19, 2019
fb16460
Merge branch 'community-tests-migration-pr' of github.com:magento-pan…
okolesnyk Mar 19, 2019
e8c12ae
Merge branch '2.3-develop' of github.com:magento/magento2ce into MQE-…
okolesnyk Mar 19, 2019
6ddeaaf
Fix typo
nasanabri Mar 19, 2019
a4b4463
ENGCOM-4536: Fix typo #21843
magento-engcom-team Mar 20, 2019
940163e
magento-engcom/magento2ce#2688: Skipped unstable test
Mar 20, 2019
0e8428c
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop Minor …
magento-engcom-team Mar 20, 2019
2bc2f5a
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 20, 2019
f8b9147
Reverting the PR#20861 changes because of violating accessibility sta…
eduard13 Mar 20, 2019
adf2d64
Static tests fix.
nmalevanec Mar 20, 2019
d23e22a
ENGCOM-4536: Fix typo #21843
magento-engcom-team Mar 20, 2019
b21a646
Merge branch 2.3-develop into ENGCOM-4536-magento-magento2-21843
magento-engcom-team Mar 20, 2019
933d35d
#20825 Missing required argument $productAvailabilityChecks of Magent…
kisroman Mar 20, 2019
5dbbffb
Merge remote-tracking branch 'mainline/2.3-develop' into 20825
kisroman Mar 20, 2019
52d71a5
Refactoring
rogyar Mar 20, 2019
a07956c
ENGCOM-4531: Static tests fix.
p-bystritsky Mar 20, 2019
d976a2b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 20, 2019
7436f30
Merge remote-tracking branch 'mainline/2.3-develop' into fixed-issue-…
nmalevanec Mar 20, 2019
50ce1f5
Fix static tests.
nmalevanec Mar 20, 2019
d67c819
ENGCOM-4523: Fixed : Additional addresses DataTable Pagination count …
magento-engcom-team Mar 20, 2019
b24277a
ENGCOM-4541: [Frontend] Fixing the accessibility standards violation …
magento-engcom-team Mar 20, 2019
897e5aa
ENGCOM-4531: Fill data_hash from BULK response with correct data #21815
magento-engcom-team Mar 20, 2019
4e13e66
Merge branch 2.3-develop into ENGCOM-4531-magento-magento2-21815
magento-engcom-team Mar 20, 2019
05f0bdf
Merge branch '2.3-develop' of github.com:magento/magento2ce into MC-1…
slopukhov Mar 20, 2019
37b5352
MC-13613: Product mass update
slopukhov Mar 20, 2019
fd2f66f
Merge branch '2.3-develop' of github.com:magento/magento2ce into MQE-…
okolesnyk Mar 20, 2019
1cdae60
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 20, 2019
5ccc91d
merge magento/2.3-develop into magento-helix/MC-6273
magento-cicd2 Mar 20, 2019
6f8d99c
281 - [Shipping methods] Support of UPS shipping method
atwixfirster Mar 20, 2019
34d5a76
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-95675
oshmyheliuk Mar 20, 2019
44439c8
Merge branch '648-update-shopping-cart' of github.com:rogyar/magento-…
okolesnyk Mar 20, 2019
30a2a80
magento/graphql-ce#281: [Shipping methods] Support of UPS shipping me…
atwixfirster Mar 20, 2019
2883b82
Merge pull request #3918 from magento-performance/MC-13613-PR
duhon Mar 20, 2019
ff32ab4
merge magento/2.3-develop into magento-pangolin/MQE-1069
magento-cicd2 Mar 20, 2019
989f237
Update test case ids and add minor fixes
okolesnyk Mar 20, 2019
0e2a928
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
vgoncharenko Mar 20, 2019
ccb284f
Fix unstable test
okolesnyk Mar 20, 2019
704a472
merge magento/2.3-develop into magento-helix/MC-6273
magento-cicd2 Mar 20, 2019
1ea4e00
ENGCOM-4543: #20825 Missing required argument $productAvailabilityChe…
magento-engcom-team Mar 20, 2019
2afc904
Merge branch 'MAGETWO-98643' of https://github.com/magento-tango/mage…
vkolesny Mar 20, 2019
c1c7a38
Merge branch 'MAGETWO-98621' of https://github.com/magento-tango/mage…
vkolesny Mar 20, 2019
b88fc33
Merge branch 'MAGETWO-98665' of https://github.com/magento-tango/mage…
vkolesny Mar 20, 2019
20d1ff7
Merge branch 'MAGETWO-98617' of https://github.com/magento-mpi/magent…
vkolesny Mar 20, 2019
fa7a749
MAGETWO-97830: Elasticsearch date field crash quicksearch
dhorytskyi Mar 20, 2019
77297a1
Merge pull request #3924 from magento-pangolin/MQE-1069
okolesnyk Mar 20, 2019
094dc81
merge magento/2.3-develop into magento-trigger/MC-5784
magento-cicd2 Mar 20, 2019
ef3cc36
Missing key model in Wishlist value data
XxXgeoXxX Mar 21, 2019
f8b955c
MAGETWO-98151: Add support ZooKeeper and flock locks
BaDos Mar 21, 2019
ca987be
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-98151
BaDos Mar 21, 2019
b5eaa81
MAGETWO-98151: Add support ZooKeeper and flock locks
BaDos Mar 21, 2019
a2ad442
MAGETWO-98151: Add support ZooKeeper and flock locks
BaDos Mar 21, 2019
f3e52e5
Merge branch 'MAGETWO-97830' of https://github.com/magento-tango/mage…
vkolesny Mar 21, 2019
6b6a281
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-95675
oshmyheliuk Mar 21, 2019
497e94a
Merge pull request #3922 from magento-trigger/MC-5784
irenelagno Mar 21, 2019
62cf03d
merge magento/2.3-develop into magento-pangolin/community-tests-migra…
magento-cicd2 Mar 21, 2019
2d9c915
MAGETWO-98151: Add support ZooKeeper and flock locks
BaDos Mar 21, 2019
ef79ed0
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-98151
BaDos Mar 21, 2019
1cb451a
MAGETWO-98151: Add support ZooKeeper and flock locks
BaDos Mar 21, 2019
31f3c2f
Merge remote-tracking branch 'epam/2.3-develop' into EPAM-PR-47
irenelagno Mar 21, 2019
8f45cf8
Merge pull request #3926 from magento-pangolin/community-tests-migrat…
okolesnyk Mar 21, 2019
b5e4c92
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
vgoncharenko Mar 21, 2019
d45be36
merge magento/2.3-develop into magento-epam/EPAM-PR-47
magento-cicd2 Mar 21, 2019
e0248ea
[+] added tests for SetPaymentMethodOnCart functionality
AlexandrKozyr Mar 21, 2019
fb6e7a9
ENGCOM-4551: Correct spelling #21884
magento-engcom-team Mar 22, 2019
cd86ba0
Merge branch 2.3-develop into ENGCOM-4543-magento-magento2-21820
magento-engcom-team Mar 22, 2019
06269b7
Merge pull request #3912 from magento-helix/MC-6273
duhon Mar 22, 2019
aa71030
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-95675
oshmyheliuk Mar 22, 2019
93e2812
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
vkolesny Mar 22, 2019
5a35838
merge magento/2.3-develop into magento-epam/EPAM-PR-47
magento-cicd2 Mar 22, 2019
abda912
merge magento/2.3-develop into magento-thunder/MAGETWO-98151
magento-cicd2 Mar 22, 2019
7270d7e
Merge pull request #3904 from magento-thunder/MAGETWO-95675
arhiopterecs Mar 22, 2019
9daccf7
merge magento/2.3-develop into magento-epam/EPAM-PR-47
magento-cicd2 Mar 22, 2019
bd000a7
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
vkolesny Mar 22, 2019
f7ce4de
ENGCOM-4551: Correct spelling #21884
sidolov Mar 22, 2019
2f4d12a
ENGCOM-4543: #20825 Missing required argument $productAvailabilityChe…
sidolov Mar 22, 2019
03197e9
ENGCOM-4541: [Frontend] Fixing the accessibility standards violation …
sidolov Mar 22, 2019
20a3619
ENGCOM-4536: Fix typo #21843
sidolov Mar 22, 2019
cbbca83
ENGCOM-4531: Fill data_hash from BULK response with correct data #21815
sidolov Mar 22, 2019
b451abc
ENGCOM-4523: Fixed : Additional addresses DataTable Pagination count …
sidolov Mar 22, 2019
23bfd35
ENGCOM-4521: Fixed Inline block edit identifier validation #21376
sidolov Mar 22, 2019
c10bf9c
ENGCOM-4482: Fix #21692 - logic in constructor of address validator #…
sidolov Mar 22, 2019
19e9ada
Merge pull request #3933 from magento-thunder/MAGETWO-98151
arhiopterecs Mar 22, 2019
9cd47aa
merge magento/2.3-develop into magento-mpi/pr_2019_03_20
magento-cicd2 Mar 22, 2019
b763696
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
vkolesny Mar 22, 2019
05e8120
Merge remote-tracking branch 'mpi/pr_2019_03_20' into pr_2019_03_20
vkolesny Mar 22, 2019
6e47753
merge magento/2.3-develop into magento-epam/EPAM-PR-47
magento-cicd2 Mar 22, 2019
16293e6
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 23, 2019
ff3c9b3
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Mar 25, 2019
277dba9
merge magento/2.3-develop into magento-epam/EPAM-PR-47
magento-cicd2 Mar 25, 2019
677f1b6
Merge pull request #3915 from magento-epam/EPAM-PR-47
irenelagno Mar 25, 2019
267a2b9
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
vkolesny Mar 25, 2019
73088cd
GraphQL-281: [Shipping methods] Support of UPS shipping method
naydav Mar 25, 2019
5aa062c
GraphQL-483: [Test Coverage] 'SetPaymentMethodOnCart' functionality
naydav Mar 25, 2019
89a0e4f
ENGCOM-4571: [+] added tests for SetPaymentMethodOnCart functionality…
magento-engcom-team Mar 25, 2019
3bcf336
ENGCOM-4572: Missing key model in Wishlist value data #506
magento-engcom-team Mar 25, 2019
62e79c3
ENGCOM-4573: 281 - [Shipping methods] Support of UPS shipping method …
magento-engcom-team Mar 25, 2019
ace2c37
ENGCOM-4575: While adding the product to Cart when the requested Qty …
magento-engcom-team Mar 25, 2019
18cafdc
GraphQL-482: [Test Coverage] 'SetBillingAddressOnCart' functionality
naydav Mar 25, 2019
f126d6b
ENGCOM-4579: Currency misspelled in graphql attributes #465
magento-engcom-team Mar 25, 2019
eb2c414
Merge remote-tracking branch 'origin/2.3-develop' into magento2/graph…
naydav Mar 25, 2019
594e556
GraphQL-482: [Test Coverage] 'SetBillingAddressOnCart' functionality
naydav Mar 25, 2019
509b212
ENGCOM-4574: #482: Adjusted test coverage for setting billing address…
magento-engcom-team Mar 25, 2019
9d6d4e2
Merge pull request #3937 from magento-mpi/pr_2019_03_20
dhorytskyi Mar 25, 2019
cd9ee48
ENGCOM-4579: Currency misspelled in graphql attributes #465
naydav Mar 25, 2019
4f0bf65
ENGCOM-4575: While adding the product to Cart when the requested Qty …
naydav Mar 25, 2019
3eb351a
ENGCOM-4574: #482: Adjusted test coverage for setting billing address…
naydav Mar 25, 2019
ab5486a
ENGCOM-4573: 281 - [Shipping methods] Support of UPS shipping method …
naydav Mar 25, 2019
0371936
ENGCOM-4572: Missing key model in Wishlist value data #506
naydav Mar 25, 2019
05c9b49
ENGCOM-4571: [+] added tests for SetPaymentMethodOnCart functionality…
naydav Mar 25, 2019
0d881fc
Merge pull request #3945 from magento-engcom/graphql-develop-prs
sivaschenko Mar 26, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions app/code/Magento/Sales/Model/Order/Address/Validator.php
Original file line number Diff line number Diff line change
@@ -61,6 +61,16 @@ public function __construct(
$this->countryFactory = $countryFactory;
$this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
->get(EavConfig::class);
}

/**
*
* @param \Magento\Sales\Model\Order\Address $address
* @return array
*/
public function validate(Address $address)
{
$warnings = [];

if ($this->isTelephoneRequired()) {
$this->required['telephone'] = 'Phone Number';
@@ -73,16 +83,7 @@ public function __construct(
if ($this->isFaxRequired()) {
$this->required['fax'] = 'Fax';
}
}

/**
*
* @param \Magento\Sales\Model\Order\Address $address
* @return array
*/
public function validate(Address $address)
{
$warnings = [];
foreach ($this->required as $code => $label) {
if (!$address->hasData($code)) {
$warnings[] = sprintf('"%s" is required. Enter and try again.', $label);
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Locale/Format.php
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
}

$formatter = new \NumberFormatter(
$localeCode . '@currency=' . $currency->getCode(),
$currency->getCode() ? $localeCode . '@currency=' . $currency->getCode() : $localeCode,
\NumberFormatter::CURRENCY
);
$format = $formatter->getPattern();
17 changes: 15 additions & 2 deletions lib/internal/Magento/Framework/Locale/Resolver.php
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@
namespace Magento\Framework\Locale;

use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\DeploymentConfig;
use Magento\Framework\App\ObjectManager;

class Resolver implements ResolverInterface
{
@@ -52,21 +54,29 @@ class Resolver implements ResolverInterface
*/
private $defaultLocalePath;

/**
* @var DeploymentConfig
*/
private $deploymentConfig;

/**
* @param ScopeConfigInterface $scopeConfig
* @param string $defaultLocalePath
* @param string $scopeType
* @param mixed $locale
* @param DeploymentConfig|null $deploymentConfig
*/
public function __construct(
ScopeConfigInterface $scopeConfig,
$defaultLocalePath,
$scopeType,
$locale = null
$locale = null,
DeploymentConfig $deploymentConfig = null
) {
$this->scopeConfig = $scopeConfig;
$this->defaultLocalePath = $defaultLocalePath;
$this->scopeType = $scopeType;
$this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->create(DeploymentConfig::class);
$this->setLocale($locale);
}

@@ -93,7 +103,10 @@ public function setDefaultLocale($locale)
public function getDefaultLocale()
{
if (!$this->defaultLocale) {
$locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
$locale = false;
if ($this->deploymentConfig->isAvailable() && $this->deploymentConfig->isDbAvailable()) {
$locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
}
if (!$locale) {
$locale = self::DEFAULT_LOCALE;
}