Skip to content

Commit

Permalink
Merge pull request magento#2416 from magento-commerce/7-21_integration
Browse files Browse the repository at this point in the history
7 21 integration
  • Loading branch information
dobooth authored Jul 27, 2021
2 parents 62d85e1 + e3fa57f commit 5a3da55
Show file tree
Hide file tree
Showing 12 changed files with 381 additions and 4 deletions.
3 changes: 3 additions & 0 deletions src/_data/main-nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@
- label: Rest Tutorials
url: /rest/tutorials/index.html

- label: Custom Attributes
url: /howdoi/custom-attributes/introduction.html

- label: Customize Product Creation Form
url: /howdoi/customize_product.html

Expand Down
8 changes: 8 additions & 0 deletions src/_data/toc/how-do-i.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
label: Customization tutorials
pages:
- label: Custom Attributes
children:
- label: Introduction
url: /howdoi/custom-attributes/introduction.html

- label: Add a text field attribute
url: /howdoi/custom-attributes/text-field.html

- label: Customize product creation form
children:

Expand Down
4 changes: 3 additions & 1 deletion src/cloud/architecture/pro-develop-deploy-workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ The following graphic demonstrates the Pro develop and deploy workflow, which us

## Development workflow {#develop}

The Integration environment provides a single, base `integration` branch containing your {{site.data.var.ece}} code. You can create up to four additional branches for developing your custom code, extensions, and third party integrations. This allows for a maximum of five _active_ branches deployed to Platform-as-a-Service (PaaS) containers.
The Integration environment provides a single, base integration branch containing your {{site.data.var.ece}} code. You can create one additional, environment branch. This allows for up to two active branches deployed to Platform-as-a-Service (PaaS) containers.(PaaS) containers.

{% include cloud/note-enhanced-integration-envs-kb.md%}

The {{site.data.var.ece}} environments support a flexible, continuous integration process. Begin by cloning the `integration` branch to your local project folder. Create a new branch, or multiple branches, to develop new features, configure changes, add extensions, and deploy updates:

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ If the new page has a `3-columns-double-footer` layout, create a custom page-lay

To add a block to the container, create the layout:

`app/design/frontend/<VendorName>/<ThemeName>/Magento_Theme/layout/3-columns-double-footer.xml`
`app/design/frontend/<VendorName>/<ThemeName>/Magento_Theme/layout/default.xml`

```xml
<?xml version="1.0"?>
Expand Down
2 changes: 1 addition & 1 deletion src/guides/v2.3/howdoi/checkout/checkout_new_step.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Create a mixin as follows:

initialize: function () {
// set visible to be initially false to have your step show first
this.isVisible = ko.observable(false);
this.visible = ko.observable(false);
this._super();

return this;
Expand Down
13 changes: 13 additions & 0 deletions src/guides/v2.3/howdoi/custom-attributes/introduction.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
layout: tutorial
group: how-do-i
subgroup:
title: Custom attributes
menu_node:
level3_subgroup: custom-attributes
menu_order: 1
contributor_name: Adarsh Manickam
contributor_link: https://github.com/drpayyne
---

The tutorials under this section guide Magento developers on setting up and configuring custom attributes.
Loading

0 comments on commit 5a3da55

Please sign in to comment.