-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.3-develop' of github.com:magento/graphql-ce into date…
…-type-not-hide-formatting
- Loading branch information
Showing
33 changed files
with
270 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
...code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\Directory\Setup\Patch\Data; | ||
|
|
||
| use Magento\Framework\Setup\ModuleDataSetupInterface; | ||
| use Magento\Framework\Setup\Patch\DataPatchInterface; | ||
|
|
||
| /** | ||
| * Class AddCountriesCaribbeanCuracaoKosovoSintMaarten | ||
| * | ||
| * @package Magento\Directory\Setup\Patch | ||
| */ | ||
| class AddCountriesCaribbeanCuracaoKosovoSintMaarten implements DataPatchInterface | ||
| { | ||
| /** | ||
| * @var ModuleDataSetupInterface | ||
| */ | ||
| private $moduleDataSetup; | ||
|
|
||
| /** | ||
| * AddCountriesCaribbeanCuracaoKosovoSintMaarten constructor. | ||
| * @param ModuleDataSetupInterface $moduleDataSetup | ||
| */ | ||
| public function __construct( | ||
| ModuleDataSetupInterface $moduleDataSetup | ||
| ) { | ||
| $this->moduleDataSetup = $moduleDataSetup; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public function apply() | ||
| { | ||
| /** | ||
| * Fill table directory/country | ||
| */ | ||
| $data = [ | ||
| [ | ||
| 'country_id' => 'BQ', | ||
| 'iso2_code' => 'BQ', | ||
| 'iso3_code' => 'BES', | ||
| ], | ||
| [ | ||
| 'country_id' => 'CW', | ||
| 'iso2_code' => 'CW', | ||
| 'iso3_code' => 'CUW', | ||
| ], | ||
| [ | ||
| 'country_id' => 'SX', | ||
| 'iso2_code' => 'SX', | ||
| 'iso3_code' => 'SXM', | ||
| ], | ||
| [ | ||
| 'country_id' => 'XK', | ||
| 'iso2_code' => 'XK', | ||
| 'iso3_code' => 'XKX', | ||
| ], | ||
| ]; | ||
|
|
||
| $this->moduleDataSetup->getConnection()->insertOnDuplicate( | ||
| $this->moduleDataSetup->getTable('directory_country'), | ||
| $data | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public static function getDependencies() | ||
| { | ||
| return [ | ||
| InitializeDirectoryData::class | ||
| ]; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| public function getAliases() | ||
| { | ||
| return []; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAddProductCheckboxTest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> | ||
| <test name="AdminCreateOrderAddProductCheckboxTest"> | ||
| <annotations> | ||
| <title value="Create Order in Admin and Add Product"/> | ||
| <stories value="Create order and add product using checkbox"/> | ||
| <description value="Create order in Admin panel, add product by clicking checkbox, and verify it is checked"/> | ||
| <features value="Sales"/> | ||
| <severity value="AVERAGE"/> | ||
| <group value="Sales"/> | ||
| </annotations> | ||
|
|
||
| <before> | ||
| <!-- Create simple customer --> | ||
| <createData entity="Simple_US_Customer_CA" stepKey="createSimpleCustomer"/> | ||
|
|
||
| <!-- Create simple product --> | ||
| <createData entity="ApiProductWithDescription" stepKey="createSimpleProduct"/> | ||
|
|
||
| <!-- Login to Admin Panel --> | ||
| <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> | ||
| </before> | ||
|
|
||
| <!-- Initiate create new order --> | ||
| <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer"> | ||
| <argument name="customer" value="$$createSimpleCustomer$$"/> | ||
| </actionGroup> | ||
|
|
||
| <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/> | ||
| <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSkuFilterBundle"/> | ||
| <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchBundle"/> | ||
| <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/> | ||
| <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/> | ||
| <seeCheckboxIsChecked selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="verifyProductChecked"/> | ||
|
|
||
| <after> | ||
| <actionGroup ref="logout" stepKey="logout"/> | ||
| <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/> | ||
| <deleteData createDataKey="createSimpleCustomer" stepKey="deleteSimpleCustomer"/> | ||
| </after> | ||
| </test> | ||
| </tests> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.