From 639441431927db36b224ce13b5235f81911d26f2 Mon Sep 17 00:00:00 2001 From: Vinoth <50227665+VinothKumar361@users.noreply.github.com> Date: Mon, 2 Mar 2020 21:11:58 +0530 Subject: [PATCH 01/18] Removing deprecated region_id from createCustomerAddressMutation (#6754) --- src/guides/v2.3/graphql/mutations/create-customer-address.md | 1 - 1 file changed, 1 deletion(-) diff --git a/src/guides/v2.3/graphql/mutations/create-customer-address.md b/src/guides/v2.3/graphql/mutations/create-customer-address.md index 7ee976a5570..2551cb2820c 100644 --- a/src/guides/v2.3/graphql/mutations/create-customer-address.md +++ b/src/guides/v2.3/graphql/mutations/create-customer-address.md @@ -37,7 +37,6 @@ mutation { id region { region - region_id region_code } country_code From 7dd54176a566937c28b91d30fb9f9ecb9fe62b82 Mon Sep 17 00:00:00 2001 From: Vinoth <50227665+VinothKumar361@users.noreply.github.com> Date: Mon, 2 Mar 2020 21:41:01 +0530 Subject: [PATCH 02/18] Updating output attribute in place order mutation output object (#6753) * Updating place orderoutput attribute * Adding whitespace * adding whitespace after order_number * Add highlighting Co-authored-by: Kevin Harper --- src/guides/v2.3/graphql/mutations/place-order.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/graphql/mutations/place-order.md b/src/guides/v2.3/graphql/mutations/place-order.md index 42bda2e29cf..bdef96b4d96 100644 --- a/src/guides/v2.3/graphql/mutations/place-order.md +++ b/src/guides/v2.3/graphql/mutations/place-order.md @@ -73,8 +73,8 @@ Attribute | Data Type | Description Attribute | Data Type | Description --- | --- | --- -`order_id` String | The unique ID that identifies the order -`order_number` String | The unique ID that identifies the order +`order_id` | String! | Deprecated. Use `order_number` instead. The unique ID that identifies the order +`order_number` | String | The unique ID that identifies the order ## Errors From ee7cdb8960aa65e0b98b41874e9cf0d131e8f4ad Mon Sep 17 00:00:00 2001 From: Denys Saltanakhmedov Date: Mon, 2 Mar 2020 20:48:31 +0200 Subject: [PATCH 03/18] magento/devdocs#: Layout instructions. Small layout fixes (#6760) * magento/devdocs#: Layout instructions. Small layout fixes * Grammar fix Co-authored-by: Kevin Harper --- .../v2.3/ui_comp_guide/concepts/ui_comp_modifier_concept.md | 2 +- .../v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md | 2 +- .../v2.3/ui_comp_guide/concepts/ui_comp_uiclass_concept.md | 2 +- .../ui_comp_guide/concepts/ui_comp_xmldeclaration_concept.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_modifier_concept.md b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_modifier_concept.md index 39bfc29d543..580fb852077 100644 --- a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_modifier_concept.md +++ b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_modifier_concept.md @@ -97,7 +97,7 @@ Declare your modifier in your module Di configuration `/etc/adm ``` -, where `YourNamespace\YourModule\DataProvider\Modifier\Pool` is a [virtual class]({{ page.baseurl }}/extension-dev-guide/depend-inj.html#dependency-types). +where `YourNamespace\YourModule\DataProvider\Modifier\Pool` is a [virtual class]({{ page.baseurl }}/extension-dev-guide/depend-inj.html#dependency-types). (If you want to use this sample in your `di.xml`, replace the sample values with the real names of your entities.) diff --git a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md index c747efa3c61..a568c4d1846 100644 --- a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md +++ b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_template_literals.md @@ -46,7 +46,7 @@ Perhaps the most useful aspect of template literals is the ability to access oth UI Components can have a `...` node in the primary XML declaration file ([see an example]({{ page.baseurl }}/ui_comp_guide/concepts/ui_comp_xmldeclaration_concept.html#example-of-a-basic-components-configuration-file)). In that file, a `component` element can be added with a path reference to the RequireJS file. That file is loaded into the registry when it runs on the frontend and other JavaScript files can then access it by the *name* of the UI Component instead of the path to the file itself. The name often will look something like this: `example_component.example_component`. -Names of other registered modules can be added to the [server side](https://glossary.magento.com/server-side) configuration (XML or PHP) that is output through JSON. Those names can then be easily accessed in the JavaScript on the frontend. In the following example, the other UI Component's name will be obtained with a template literal in the `imports` object. When this JavaScript file is loaded, it will process the template literal and look up the name in the registry. If found, it will load that class. Because there is a colon (`:`), it will go on to find the property that is accessed in the other JavaScript class. +Names of other registered modules can be added to the [server side](https://glossary.magento.com/server-side) configuration ([XML](https://glossary.magento.com/xml) or [PHP](https://glossary.magento.com/php)) that is output through JSON. Those names can then be easily accessed in the JavaScript on the frontend. In the following example, the other UI Component's name will be obtained with a template literal in the `imports` object. When this JavaScript file is loaded, it will process the template literal and look up the name in the registry. If found, it will load that class. Because there is a colon (`:`), it will go on to find the property that is accessed in the other JavaScript class. ```javascript return Element.extend({ diff --git a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_uiclass_concept.md b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_uiclass_concept.md index f108aac1030..e3896e2e526 100644 --- a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_uiclass_concept.md +++ b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_uiclass_concept.md @@ -48,7 +48,7 @@ initialize: function () { } ``` -* The `_super()` method calls the parent UI component method with the same name as the `_super()` method's caller; if that method does not exists in the parent UI component, then the method tries to find it higher in the inheritance chain. +* The `_super()` method calls the parent UI component method with the same name as the `_super()` method's caller. If that method does not exists in the parent UI component, then the method tries to find it higher in the inheritance chain. As an example: diff --git a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_xmldeclaration_concept.md b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_xmldeclaration_concept.md index b6b2e8deeca..c64e927fa82 100644 --- a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_xmldeclaration_concept.md +++ b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_xmldeclaration_concept.md @@ -30,7 +30,7 @@ The instance configuration file name is the name of instance (`%instance_name%`) Following are the rules for the instance configuration files: * The top node must have the name of one of the basic UI components. -* The top node must contain a link to the XSD schema. +* The top node must contain a link to the [XSD](https://glossary.magento.com/xsd) schema. In the top node, there can be an `` node. The `` node contains the configuration for that basic UI component. The `` node's `name` attribute value must be `data`. The child nodes of the `` node will be the argument properties that will be passed in to the component. @@ -107,7 +107,7 @@ In the above example, within the top-level `
` node the `
` node i The `name` attribute value must be a unique among the other components on the same hierarchical level of the same parent node. Look at the `` node which `name` attribute has `data` value. The child nodes of this node are the arguments that will be passed in to the component. -All other child nodes are declared as items. ` ...` contains the children nodes that describe the configuration of the current UI component. Please note that although configuration for all components is different, there are base properties that are mostly the same for different components. For example, we can use `...` to define which JS file will be used as the Model for the Fieldset UI component in the above example. Reference to this JS file can be either be the full path to this file or the alias which is defined in [`require.js` configuration]({{ page.baseurl }}/javascript-dev-guide/javascript/js-resources.html). +All other child nodes are declared as items. ` ...` contains the children nodes that describe the configuration of the current UI component. Please note that although configuration for all components is different, there are base properties that are mostly the same for different components. For example, we can use `...` to define which JS file will be used as the Model for the Fieldset UI component in the above example. Reference to this JS file can be either be the full path to this file or the alias which is defined in [`require.js`]({{ page.baseurl }}/javascript-dev-guide/javascript/js-resources.html) configuration. In our example, the `...` node within `
` is omitted, because this property of the Fieldset UI component is already defined in `definition.xml`. From 08da66f0f52843f6ee82eea0abfa38ee7caa7761 Mon Sep 17 00:00:00 2001 From: anandhan-ziffity <59010249+anandhan-ziffity@users.noreply.github.com> Date: Tue, 3 Mar 2020 10:50:04 +0530 Subject: [PATCH 04/18] Add missing configuration --- src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md b/src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md index 7fb1e05aa45..ccf159394c9 100644 --- a/src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md +++ b/src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md @@ -17,6 +17,7 @@ All configuration is done in the `requirejs-config.js` file. It has a single roo var config = { 'map': {...}, 'paths': {...}, + 'deps':[...], 'shim': {...}, 'config': { 'mixins': {...}, From 1d114f99ddacd153ac3363bcf9f99ad92a0b3c61 Mon Sep 17 00:00:00 2001 From: karthik-ziffity Date: Tue, 3 Mar 2020 15:38:59 +0530 Subject: [PATCH 05/18] Added grunt exec and watch commands once grunt is setup --- src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md b/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md index e2d6d1dd85e..b1125c7b3d7 100644 --- a/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md +++ b/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md @@ -77,6 +77,11 @@ Where the following notation is used: - ``: specified in the `code_subtag` format, for example `en_US`. Only one locale can be specified here. To debug the theme with another locale, create one more theme declaration, having specified another value for `language`. - ``: path to the root source file, relative to the `app/design/frontend///web` directory. You need to specify all [root source files of the theme]({{ page.baseurl }}/frontend-dev-guide/css-topics/css-preprocess.html#css_preprocess_terms). If your theme [inherits] from a certain theme, and does not contain its own root source files, specify the root source files of the parent theme. +Once these all are set right you can run grunt to watch your changes. + +- Run `grunt exec:` from the root directory to republish the symlinks +- Run `grunt watch:`, so that grunt will watch for each and every changes you make. + ## Using custom Grunt configuration files There are several ways to declare a custom configuration file. From 75cde7d822da2e8d6abbb5a630599996b8b70325 Mon Sep 17 00:00:00 2001 From: Joseph Maxwell Date: Tue, 3 Mar 2020 06:36:37 -0600 Subject: [PATCH 06/18] Small grammar updates --- src/guides/v2.3/howdoi/checkout/checkout_payment.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/howdoi/checkout/checkout_payment.md b/src/guides/v2.3/howdoi/checkout/checkout_payment.md index 5736cbf460f..c3a178909ec 100644 --- a/src/guides/v2.3/howdoi/checkout/checkout_payment.md +++ b/src/guides/v2.3/howdoi/checkout/checkout_payment.md @@ -159,7 +159,7 @@ This configuration is stored in the `window.checkoutConfig` variable that is def In order to get access to the system configuration, your payment method or a group of payment methods has to implement the [`\Magento\Checkout\Model\ConfigProviderInterface`]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Checkout/Model/ConfigProviderInterface.php) interface, and the class implementing it must be injected to the composite config provider via DI [frontend](https://glossary.magento.com/frontend) configuration. The following code samples illustrate this. -A sample `.php` class implementing `\Magento\Checkout\Model\ConfigProviderInterface`: +This is a sample `.php` file implementing `\Magento\Checkout\Model\ConfigProviderInterface`: ```php?start_inline=1 class MyCustomPaymentConfigProvider implements \Magento\Checkout\Model\ConfigProviderInterface @@ -175,7 +175,7 @@ class MyCustomPaymentConfigProvider implements \Magento\Checkout\Model\ConfigPro } ``` -A sample DI configuration file of a custom module `/etc/frontend/di.xml`: +Here is the associated sample DI configuration file of a custom module `/etc/frontend/di.xml`: ```xml ... From ae527622a5d5ced84b0b6db309586369ce65cb21 Mon Sep 17 00:00:00 2001 From: Joseph Maxwell Date: Tue, 3 Mar 2020 07:18:51 -0600 Subject: [PATCH 07/18] Update requirejs.md --- src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md b/src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md index 7fb1e05aa45..98b79672db2 100644 --- a/src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md +++ b/src/guides/v2.3/javascript-dev-guide/javascript/requirejs.md @@ -52,7 +52,7 @@ You can also use the `map` configuration to override a JS module with a custom J ### paths {#requirejs-config-paths} -The `paths` configuration, similar to `map`, is used for aliasing not just any real AMD module that calls `define()`, but also any JS file (event from a URL), HTML templates, etc. Magento uses this to alias URLs and third party libraries. +The `paths` configuration, similar to `map`, is used for aliasing not just any real AMD module that calls `define()`, but also any JS file (even from a URL), HTML templates, etc. Magento uses this to alias URLs and third party libraries. ```javascript paths: { @@ -95,7 +95,7 @@ shim: { ### mixins {#requirejs-config-mixin} -The `mixins` configuration is used to overwrite component methods of an AMD module which returns either a UI component,a jQuery widget, or a JS object. Unlike the above configuration properties, the `mixins` property is under the `config` property, apart from the parent object called **config**. +The `mixins` configuration is used to overwrite component methods of an AMD module which returns either a UI component, a jQuery widget, or a JS object. Unlike the above configuration properties, the `mixins` property is under the `config` property, apart from the parent object called **config**. In this snippet, `Vendor_Module/js/module-mixin` will overwrite the existing component methods in `Vendor_Module/js/module` with the specified component methods. It is a convention to name the mixin by appending a `-mixin` to the original `path/to/js`, although not required. From 280f35bb44fb22c8d7f2445ce15879943b598b44 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 3 Mar 2020 08:52:53 -0600 Subject: [PATCH 08/18] Small grammar update --- src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md b/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md index b1125c7b3d7..3b6250ed427 100644 --- a/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md +++ b/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md @@ -77,9 +77,9 @@ Where the following notation is used: - ``: specified in the `code_subtag` format, for example `en_US`. Only one locale can be specified here. To debug the theme with another locale, create one more theme declaration, having specified another value for `language`. - ``: path to the root source file, relative to the `app/design/frontend///web` directory. You need to specify all [root source files of the theme]({{ page.baseurl }}/frontend-dev-guide/css-topics/css-preprocess.html#css_preprocess_terms). If your theme [inherits] from a certain theme, and does not contain its own root source files, specify the root source files of the parent theme. -Once these all are set right you can run grunt to watch your changes. +Once these are set correctly, run grunt to watch your changes. -- Run `grunt exec:` from the root directory to republish the symlinks +- Run `grunt exec:` from the root directory to republish the symlinks. - Run `grunt watch:`, so that grunt will watch for each and every changes you make. ## Using custom Grunt configuration files From f3f5fe9967f815ac2685d9bfa579319cc2d96bb7 Mon Sep 17 00:00:00 2001 From: Margaret Eker Date: Tue, 3 Mar 2020 10:49:39 -0600 Subject: [PATCH 09/18] Correct deprecated environment variable list (#6780) - Remove SKIP_SCD environment variable from list of deprecated commands in ece-tools release notes. This variable is not deprecated. --- src/cloud/release-notes/ece-release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloud/release-notes/ece-release-notes.md b/src/cloud/release-notes/ece-release-notes.md index cca854f9c0a..a576dd30a22 100644 --- a/src/cloud/release-notes/ece-release-notes.md +++ b/src/cloud/release-notes/ece-release-notes.md @@ -56,7 +56,7 @@ See [Upgrades and patches]({{ site.baseurl }}/cloud/project/project-upgrade-pare - {:.new}Added the `ERROR_REPORT_DIR_NESTING_LEVEL` environment variable to simplify error report data management in the `/var/report/` directory. See the variable description in the [build variables]({{site.baseurl}}/cloud/env/variables-build.html#error_report_dir_nesting_level) topic. - - {:.fix}Removed the `SCD_EXCLUDE_THEMES`, `STATIC_CONTENT_THREADS`,`DO_DEPLOY_STATIC_CONTENT`, `SKIP_SCD`, and `STATIC_CONTENT_SYMLINK` environment variables. See [Backward incompatible changes]({{site.baseurl}}/cloud/release-notes/backward-incompatible-changes.html#environment-configuration-changes). + - {:.fix}Removed the `SCD_EXCLUDE_THEMES`, `STATIC_CONTENT_THREADS`,`DO_DEPLOY_STATIC_CONTENT`, and `STATIC_CONTENT_SYMLINK` environment variables. See [Backward incompatible changes]({{site.baseurl}}/cloud/release-notes/backward-incompatible-changes.html#environment-configuration-changes). - {:.fix}Fixed an issue in the Elastic Suite configuration process so that the default configuration is overwritten as expected when you configure the `ELASTICSUITE_CONFIGURATION` deploy variable without the `_merge` option. From 000531a94ca3515731f5bc2b4be73858a5276824 Mon Sep 17 00:00:00 2001 From: ImgBotApp Date: Wed, 4 Mar 2020 15:30:01 +0000 Subject: [PATCH 10/18] [ImgBot] Optimize images /src/common/images/ui_comps/ui-text-result.png -- 12.10kb -> 10.84kb (10.39%) Signed-off-by: ImgBotApp --- src/common/images/ui_comps/ui-text-result.png | Bin 12389 -> 11102 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/common/images/ui_comps/ui-text-result.png b/src/common/images/ui_comps/ui-text-result.png index 55c2f4319873ed3a6d854696b881599ba3c8beba..9ce24f1e69d4339c702e4fcbbe73ac8726942282 100644 GIT binary patch delta 8066 zcmb7pWl$YallBDy1cxMC2zqgX%MI@C?gY00!CeQv!QF!sB)CIxcY+1?;O-7#$&dZ< zR_*uIZk_JuoI2fI-8IuwHBa@H;fhAg`?v5Q5Qy+9OA-V^$F>v|RkAcOse)pl1Ly?@ zvo9uyiIj>w2;@l(0{I1jK=&_Ke!C!$3kwLeZwLbMq<}zp_UTQ^d@lwhV_8Wt(DT2Q z-C7v`a)V+orR@X)fvNr}oU{t%DF}p#=BcLTtYYK_v3ImHxBOxTarUq`gS_MgfwY3l zQmx}Qi_3$7XRmh_uaSaYb+5m7*b(%<7<4t))KEX+;{DT<=1M?_?a9D6-~Sxx@c5M? zksx|1Izucl!*!p_q_N3)pRFn-FQvzQJI>nnjL!z8;m$!rCok~=-ShLf>7WA2-AG}? z1$Udl^Hi1gG!<$^RO%mZ*=y$Lja7bA7`0!xNfUT4-2Gy&CeTm&b}E^l_Se}julG3{BZ)r>kd3y z>#-G8Hyb2#%@hG1EWN{~{U*EG*~s3F;K59|gO3v(LaH}Y?PHRYT9{AY#ID_>ukfU! z4`5F%z?o5opd`+wTf1sO?fp()JM?)q`uRCjX}$8%hn`hH5C#rcId>wq%?Q@0JxI#j zu+G(e$iXVbHyiXtT0-ci)zbLOaJruriO7bwx#1N2kuQjfA5&6oHQ?tuG(-xxKMAIA z9a?ZoviDw*npi#^9=d@a2q_b@N*eQxPAQ9~tjRqV$YuDk%f zW6C(Ed+t~(+{AuSlAusMbepx@iWGNOmLQyuC8f#LC-@;3Jt$rZc6xmDV_R>f_*c8 zTDaD2qd-=i+rd!j>CbZv^Eaz;0%&+wMNVIy)m$Cv4L^EexbyM4I9r4rpYL?B>!(Vr zWIo-B>nIa?*)qR#kBF&n65C8nCS7iN`?p+Ch}p0 zf0u+}AAf`kSV@t(FuNK1+V*&jvIMLEfiq8wSDzW`3vT$|{yF)O&o zZJvI-MQ)T`-w-f}d)#p9&qC&JEBC*vUz6o5PgXQ}q+WM0zs|H+Lw8GU96EmojPAeB z;0pGTzTnng(UHCMY9NTZsGv^vc*v8zS!cgH`)FH!??fJYPs?X8DVr9JbNm(2&ei&- z>Dr(TK1zCn?nxtZ0ig6<_EOJHkofX;^kzzoDe5QZvCXEPk5}z?n_0VLCHIE^W_=dqM=_t)vCk>#BpT*i3ytBp=Uv7I67w)-}A>7rjY-gFk24RvvgIu+^8k(UXS5e}GJ z+ElzMpHhy7nDByDu)}{w@`Ig~Q?f6cv5V!DQnT5FP2~P93%MJHfcOk9qQj^@2s2(s zzSA|KMEZWYFN!>|*a1+q_#DBZ?2$Vi_{ReiU0Q(XBc>;n{> zkkM?q889W7IzeO{mFJDzhY&gh26HxHnq%r}yx=1~cBU*=2?dPV9~QrYDNP_u7fwEVV+g{xyPYLmNBYjH*_cPX85BhyQTHQKMu*FI&?aP>dp$d3Q4- zPfb87c@o@P{oVKUx?3b+973bi>X7gSrUV1i*Z@-8$3l=fq8a${`@3>wW6Mu&95@NV!M?QLYTcS>(%yp4cdCO%W}f?^URXtRNxl+sgrvFg0|2LfF$Bt)qVMUS2QGON)RX-OJg6W zw9L;5aS@ElC6cY$wW%b7mVcx~-Tq!nIA$oR_*!Y+@~H7RT|rhf{OC2tG?abqGom*I z^j+9mP9X`;;-TDJ?DsJ+k-xn^3!BA(QTEI0$LA$|-PlDLQOFIO_WRLoT8#^hsp}S@ zDUkuRxPI$={8Cyqg{stExwq=`wRHi9nL+$cOuuLJj7JEev|9~iXf(#K3Qt}-P=rqw z_0E$O>|0N~k-kYp4c|y^h^v~IB0*Wmt#wSxmNyqN>6tLk*JQjsUkYV&BdN7<^GQDn z`D-r3Ya^_JAa4bw7)t5bhBS|A4WuCA(P03>1sx+sJ91%vOv=~;sF5cEgFZ-F&CFRL zM{z>lm?)w$%+7gWM~7hAP)u{Z%j^g;AxPo=BgQy&84{nk)5Uy7FmxGWDAXt}LR~GK z-O{Tky7a}&&W~Oh{GoF;WMw`SflqruczHNFir7t#N%wbx@zGivWu_d8y+ZxlLk229 zj(UJjUv4JRG%4t$kl`ZxPyRkJ>lS}}`&jmn!h(iM2pEwQmlh>2$~0k~s-wK7rYm-c z)=#nRi<%AT4_DW=PTm4b>d=fhEm!02AN02KI{PJtO0r7D(78#iP)82xT&nd#lptVOyj}B)UNxv!PtDM=H;qd!Na@6&xM+P?s z9V?Ihi^-ycq(Gz}5yk{^znnt*cI^m20Zf$=!rWg|Tppu{B>U(l^Zni-x>IUp2k+LZ z`wvRx-P$n(K`5`uX2Y?lkEP@vi38NlE+rU)5YTqQShr&kQM8&~X*N3L$FMg74K#zy z@N;0c4$Mge+&jJwL?&<#6vtWOQ{aAwPG1D&Op>zJwHvkyhsLp(_Tc>7E=0#qovOyF zL=tvoUK<;!L>{>lfCm2dGa{27qFNW=mU+g&39FM>9c17BnF_J7_-em?Bhw2KOK49d(+ka-8QKrk*qwhLa4;h}6p#Od!fGNA0hmOd) z`wcQ{IYnYXjD02_0)ul@Gs#L3dHQ=v`8xX}c=rPN; zj|)p_=*p%W;-d>I5|>~k?zE?y(<}2@dzD`wsv3CJdL%f>#tKi}8P``@89=58M#KPvN+i14XE$i6u6OPL)%yk~^InjK6 z9|sjG7BLcn`Z{anw`t;S1HhAVsWsW}tXPm)1njCw-ortp<8?p_SW8h185!#sBHH}4 zTsG_=3Gi;Tcjj7;9D>)mt2)}!?g{^v&RYGirP zTRetFy7%5A(|?x61DA`wNG1PXz?K-wfNLK#t(wPSW304}m58G9!iKFqawh{~@XTOL zA(x$<3mD(aa6fQZcO?U?JL~m-ftIv@Ey_w^O9ae~QL8g`m@~y}mAyc4? z$gFzP!(h zPg$hkZB;4G*n7pT+7t z!BYnM0l1VgZd*!|BQg*OYg<}OSj~OmD5FYtQ-QD_c#i#X*y^XH`<!O3t(yCHR&cU{E(rojG<;|H7D>vQh z4fCw=^F9LX7b7Eolm9VcqUUv-m(33!ctIib7l0tW05-x4guuN(&x?YL{{icZ`r*I8 z|Jm(-6aO#&|Hkisc00A}&cyFl{a0S(BU$HOs+Z?>qhQ>GraeL9?IJn`}sgfQHA&3Ypy=sgoH z+IIP#YBiIRHC|-qurOBB^Q-KbrfpU~+G5vAW%Y?J9UALMM&k+hu{&23DV5zR%4Fk7 zL}}p0{k%_qQ$kMT6fz$8hdB4I6#m+|!PW1uBjDS$USU3W*Cy$GuH4ngGnTVEa7sj< zyz242wW77U)LVB+@?zJ**d79Fr$;iUpS-1QJ^grW*(Kdq)QUO8g3Ydg9w*?_kReWh z_q~sS+V!0Chw_1!R#8jjwmYwJ%AeF{Qu_z94en32nIAC`No)nMMEA>YEMn;&>`C2c zJN*jQn8R~+d!s0jc+=cY0Q}8q0Hx{TQ-_VnXs?o*X8qm)(hrngY)hb>8v<*9c2-~C z<*ZM5FBAWwAYOWu4U`Ho@?EWO%P-N1DoM$|z_oZ=+dY(SL-of1~<6GqHtQnZY^QFF;9YHA;uoLTQTT)Te zOn71lSU6dm{F8=@y_RPPZJ=+nz2eyNqGVFR-dmLD=DzE;iTTy}m6NAG6@@*#4=p#J z7M%R?Is+?NKR;eA@$=u1PD17Pj_TZ;=jNGKKJIh0WQnv+EYcU&@Rkl=+wQFO{A>xO zk5_1y-pt@d{@S;4{0q1~{M($+t zs^ACjav_dV3%PD*i3-Rc1Y2E|WKaGnDB~2Afit~Wf8*5$@LiNf0=ad;TXqGn_%Nf* z1RNBiZk8<4S|D3R+K|5?(2O9df0i;-bZqZ^TJb=)ZlalZLwe=kM$6yq@>9@J{jB^C z6geh)^UbE>(>Bc69yil9F6!$fh86mdNWLkSvO}09QOc5*`h=Wd=4ER1vMU<5`ECU! zLON?vt82RWGZX1?xbx-Y(0Oxfbe3R-_nOIprthh86X1Sp=i_E^@iaL!!-D1QRj=C8 zRPS)vdz|U5wNozGNWP_X{2LY8WN?@#TAn_HP177X%AAk&ctXly@N2tmg8Q%(OH!Fo z9Hn=_($d9xCwuYX_eYIyf5AO07rxqusq!@|X~d>>Mw!3bl?dR*$G7$4A5d7gSlM1N zpM+k#*8}p?OzG9T^FOFZ2CiC03ud8h>)tGq!}%|7@x-?i$YhiD&tZ_%l?V)F+3XNw95ra^l+0 zfjBRE==8Z^sgRoWaH0LP3qw}>0yoyrM~+s$K?LBbkI@FZTW5!Gl{?#r<{QysTgYOM z5Dy0Dwb-8%&iu~H8|FS`Gpley4xf8rGMGmwnX9g2ZZYw;e3yaM_S--C`NDB~@d@HX zT-IUc5Ln-Wyi$eo7KaaYTR@Q(@o`t^CiD3fRZvWfSMO^8h0KAd-$732I@dv2BD}CWgKe!?a329{?<4o(`f8A!qEmP2ib&~c9F2pd&1)A z-XV(GMM*RXaj-T%K{5?+poWZa)ueX6iR`8wQOW?(AW6p? z_DA2hpY-pJgLg7-Ah4fd{ybqt^vOQ+AJ6(q`aE{@>+t$RjpEE`$}ZkG`U?J8kk_w( zIeM~XaY++ea}u(usWSJlr|k>68ptlaqGDB(rMC(G!Nd+}TcSoP<4{hzl<({?dug&t zzU520<~du%ck8V9Zr-_#cdNjCauFTOXX0<;Lr;agjBrBIn78j&3)SkfAscq_q>@;COyyYvfY;)_$8$Kud+t;QQ; zV^;ij9TH4#of3wCeP;n*uH9>%6Ec|QyY7LuFCR<4x|#*n;Y2U%Wk{ii6=;q_r|HgD zjylasJ?oMv7U0>Q1Yp3K8`spnFahi~h*M{QtMqfnNl&D*FF#(bm#J6Ags8Up#AKr zETpsGC1G%;{E+d|e$EYJ_}`3@;)j!JBGIS(A3ZVAY69pzc4JIyD#SH!M3YSLJzx;G zR9)TTb7bR`2K+|bc5!?YHMuQpK5!_Qm*6Ts-U0%Pk*9#Y^t?`#dr$T+ZFDvF^F&Fp zgV=Ld`}?43;LHh~9WT(3F4QZo8h51e2>i{s%CgGKZ~7^g8P|qK-|`LX_mO4NI$Vf> z%<$O9Q7QD^_W@T&<1MN6gvmROh1f6OAC736{h+$Zk}APaGuVB^$~Va%5t@%*u+Y!q z(b}_hYU$cJQI@y;$AS!YUXJJsH9X5;6sRjvpV>bJbQSew(bEVyvC10VMvITY>3k#q z{uP;+%MKrMOTx@b4@mhZ9rzeMyFz*NN4RqOVVN5`B0g%Y=* z=fpb<0!bGbcM%xtwkk8>Q}I%3Ljc7cgLK^Y>pw;msuh>t8-I3c*DZI&+Yw-or30Jj zW?tVTVwo-YGYNEnjTDChC)xZS2#1nLSKE%UOj0u9GwA?|r}y#fd- zLu?l8j9Wy3l!IZpv_l5Ei9M^5HUK6=iq9gWz@0I^&^9KQ8a~=YZp|3K^_TkDUcZ|{s zlE0pSk0ljX)A1L4g{meCt$7xTyhAeAIivYZ1;?V26dh7T(8~sQwihC`fr=zY{IfJn zvdK$n--Vh44I3VKS{duFyNP&qr_KB4trWTH(%NPbkJLXsBbi|_A7^sa(XS8-2Kg3_ zNrNWf$gmOwu+N3|rou^k-^wFJU;4+u47M*mYMWIDb=*XrS5Y!Do1lwwx@Ue_s<$B_8WZV z`YlKM7q?44@#+$IlSj8#2f{ler3^I>thlZylr5%RU&!ReQHYX=6d+d^>)-vx zax%%lz4^*`%#4zf8pW&RNb+?~!kf63a}%Z$6T_`mR2*#S)GMDS`=2zM zf&3W(Gd_Fsnz7>Y#Yp8WuH|fMkRyauLIT F{{l0e13CZz delta 9363 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 Date: Thu, 5 Mar 2020 09:41:31 -0600 Subject: [PATCH 11/18] Updating customer output object in resolvers example (#6797) --- src/guides/v2.3/graphql/develop/resolvers.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/guides/v2.3/graphql/develop/resolvers.md b/src/guides/v2.3/graphql/develop/resolvers.md index dc6b457387f..18c2e74a329 100644 --- a/src/guides/v2.3/graphql/develop/resolvers.md +++ b/src/guides/v2.3/graphql/develop/resolvers.md @@ -341,9 +341,9 @@ type Customer @doc(description: "Customer defines the customer name and address default_shipping: String @doc(description: "The ID assigned to the shipping address") date_of_birth: String @doc(description: "The customer's date of birth") taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)") - id: Int @doc(description: "The ID assigned to the customer") is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\IsSubscribed") addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses") + gender: Int @doc(description: "The customer's gender (Male - 1, Female - 2)") } ``` @@ -361,7 +361,6 @@ mutation { } ) { customer { - id firstname lastname email @@ -378,7 +377,6 @@ A sample response: "data": { "createCustomer": { "customer": { - "id": 5, "firstname": "John", "lastname": "Doe", "email": "j.doe@example.com", From db52b0f6c578b2037ed14b1f54b8af7d7fd5d292 Mon Sep 17 00:00:00 2001 From: hguthrie Date: Thu, 5 Mar 2020 14:38:25 -0600 Subject: [PATCH 12/18] Fix link --- src/cloud/docker/docker-containers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloud/docker/docker-containers.md b/src/cloud/docker/docker-containers.md index b2f56d9708e..3eab8368e96 100644 --- a/src/cloud/docker/docker-containers.md +++ b/src/cloud/docker/docker-containers.md @@ -49,7 +49,7 @@ For example, the following command starts the Docker configuration generator in ./vendor/bin/ece-docker build:compose --mode="developer" --php 7.2 ``` -See [See Docker services containters] for details. +See [Docker service containers] for details. ## Request Flow From 75f0d91a27a7a0cd200b8ff20471cdf435764643 Mon Sep 17 00:00:00 2001 From: Margaret Eker Date: Thu, 5 Mar 2020 16:52:48 -0600 Subject: [PATCH 13/18] Fix error in procedure title "developer" should be "production" --- src/cloud/docker/docker-mode-production.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cloud/docker/docker-mode-production.md b/src/cloud/docker/docker-mode-production.md index 2f401fbfdde..951ba389978 100644 --- a/src/cloud/docker/docker-mode-production.md +++ b/src/cloud/docker/docker-mode-production.md @@ -12,7 +12,7 @@ Production mode is the default configuration setting for launching the Docker en {%include cloud/note-docker-config-reference-link.md%} {:.procedure} -To launch the Docker environment in developer mode: +To launch the Docker environment in production mode: 1. Download a Magento application template from the [Magento Cloud repository][cloud-repo]. Be careful to select the branch that corresponds with the Magento version. @@ -95,4 +95,4 @@ To launch the Docker environment in developer mode: [cloud-repo]: https://github.com/magento/magento-cloud [magento-creds]: {{site.baseurl}}/guides/v2.3/install-gde/prereq/connect-auth.html [services]: {{site.baseurl}}/cloud/docker/docker-containers.html#service-containers -[configure Xdebug]: {{site.baseurl}}/cloud/docker/docker-development-debug.html#configure-xdebug \ No newline at end of file +[configure Xdebug]: {{site.baseurl}}/cloud/docker/docker-development-debug.html#configure-xdebug From 964edbf4b2c33064d42654a1e872945f54129c7d Mon Sep 17 00:00:00 2001 From: chandru-199 <51230988+chandru-199@users.noreply.github.com> Date: Fri, 6 Mar 2020 22:27:27 +0530 Subject: [PATCH 14/18] applied_coupon field is deprecated (#6804) * applied_coupon field is deprecated * Major changes --- src/guides/v2.3/graphql/mutations/apply-coupon.md | 4 ++-- src/guides/v2.3/graphql/mutations/remove-coupon.md | 4 ++-- .../v2.3/graphql/tutorials/checkout/checkout-coupon.md | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/guides/v2.3/graphql/mutations/apply-coupon.md b/src/guides/v2.3/graphql/mutations/apply-coupon.md index db2432b6868..5c7a0a12b1c 100644 --- a/src/guides/v2.3/graphql/mutations/apply-coupon.md +++ b/src/guides/v2.3/graphql/mutations/apply-coupon.md @@ -32,7 +32,7 @@ mutation { } quantity } - applied_coupon { + applied_coupons { code } prices { @@ -73,7 +73,7 @@ mutation { "quantity": 1 } ], - "applied_coupon": { + "applied_coupons": { "code": "H20" }, "prices": { diff --git a/src/guides/v2.3/graphql/mutations/remove-coupon.md b/src/guides/v2.3/graphql/mutations/remove-coupon.md index 08bf26ed54b..1bd814b258d 100644 --- a/src/guides/v2.3/graphql/mutations/remove-coupon.md +++ b/src/guides/v2.3/graphql/mutations/remove-coupon.md @@ -30,7 +30,7 @@ mutation { } quantity } - applied_coupon { + applied_coupons { code } prices { @@ -65,7 +65,7 @@ mutation { "quantity": 1 } ], - "applied_coupon": null, + "applied_coupons": null, "prices": { "grand_total": { "value": 39, diff --git a/src/guides/v2.3/graphql/tutorials/checkout/checkout-coupon.md b/src/guides/v2.3/graphql/tutorials/checkout/checkout-coupon.md index 9173b4a74a7..ba988c3f544 100644 --- a/src/guides/v2.3/graphql/tutorials/checkout/checkout-coupon.md +++ b/src/guides/v2.3/graphql/tutorials/checkout/checkout-coupon.md @@ -34,7 +34,7 @@ mutation { } ) { cart { - applied_coupon { + applied_coupons { code } } @@ -49,7 +49,7 @@ mutation { "data": { "applyCouponToCart": { "cart": { - "applied_coupon": { + "applied_coupons": { "code": "{ COUPON_CODE }" } } @@ -69,7 +69,7 @@ For logged-in customers, send the customer's authorization token in the `Authori mutation { removeCouponFromCart(input: { cart_id: "{ CART_ID }" }) { cart { - applied_coupon { + applied_coupons { code } } @@ -84,7 +84,7 @@ mutation { "data": { "removeCouponFromCart": { "cart": { - "applied_coupon": { + "applied_coupons": { "applied_coupon": null } } From c98797b0da503b14dffffdd53c884bf0a88f916f Mon Sep 17 00:00:00 2001 From: chandru-199 <51230988+chandru-199@users.noreply.github.com> Date: Sat, 7 Mar 2020 00:32:15 +0530 Subject: [PATCH 15/18] Removed deprecated field in graphql query (#6803) --- src/guides/v2.3/graphql/queries/customer.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/guides/v2.3/graphql/queries/customer.md b/src/guides/v2.3/graphql/queries/customer.md index 8ed1478ede7..aa73a43d474 100644 --- a/src/guides/v2.3/graphql/queries/customer.md +++ b/src/guides/v2.3/graphql/queries/customer.md @@ -37,7 +37,6 @@ The following call returns information about the logged-in customer. Provide the region { region_code region - region_id } postcode country_code @@ -68,8 +67,7 @@ The following call returns information about the logged-in customer. Provide the "city": "Anytown", "region": { "region_code": "MI", - "region": "Michigan", - "region_id": 33 + "region": "Michigan" } "postcode": "78758", "country_code": "US", From eb9540b60c22f088e9def37cd30beff124b16db8 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Fri, 6 Mar 2020 13:56:06 -0600 Subject: [PATCH 16/18] Add missing link brackets --- src/cloud/docker/docker-containers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloud/docker/docker-containers.md b/src/cloud/docker/docker-containers.md index 3eab8368e96..ba0d15177d1 100644 --- a/src/cloud/docker/docker-containers.md +++ b/src/cloud/docker/docker-containers.md @@ -49,7 +49,7 @@ For example, the following command starts the Docker configuration generator in ./vendor/bin/ece-docker build:compose --mode="developer" --php 7.2 ``` -See [Docker service containers] for details. +See [Docker service containers][] for details. ## Request Flow From b42618e614b7c69d3a07a54c2f9bca41bee3753b Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Fri, 6 Mar 2020 13:56:23 -0600 Subject: [PATCH 17/18] Update src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md Co-Authored-By: Jeff Matthews --- src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md b/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md index 3b6250ed427..b9590b4562c 100644 --- a/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md +++ b/src/guides/v2.3/frontend-dev-guide/tools/using_grunt.md @@ -80,7 +80,7 @@ Where the following notation is used: Once these are set correctly, run grunt to watch your changes. - Run `grunt exec:` from the root directory to republish the symlinks. -- Run `grunt watch:`, so that grunt will watch for each and every changes you make. +- Run `grunt watch:` so that grunt will watch for file changes. ## Using custom Grunt configuration files From a19fc444ebfd8870fd9e770b5571d4959a78d652 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Fri, 6 Mar 2020 15:31:33 -0600 Subject: [PATCH 18/18] Fixed path --- src/cloud/docker/docker-containers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloud/docker/docker-containers.md b/src/cloud/docker/docker-containers.md index ba0d15177d1..ffffa542334 100644 --- a/src/cloud/docker/docker-containers.md +++ b/src/cloud/docker/docker-containers.md @@ -137,7 +137,7 @@ Now you can see all requests that are passing through the TLS container and chec [db]: {{site.baseurl}}/cloud/docker/docker-containers-service.html#database-container [elasticsearch]: {{site.baseurl}}/cloud/docker/docker-containers-service.html#elasticsearch-container [Docker CLI containers]: {{site.baseurl}}/cloud/docker/docker-containers-cli.html -[Docker service containers]: {{site.baseurl}}/cloud/docker-containers-service.html +[Docker service containers]: {{site.baseurl}}/cloud/docker/docker-containers-service.html [Web containers]: {{site.baseurl}}/cloud/docker/docker-php.html [Developer Mode]: {{site.baseurl}}/cloud/docker/docker-mode-developer.html [File Synchronization]: {{site.baseurl}}/cloud/docker/docker-syncing-data.html