Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/featuer/bo-2260-ig-merchant-port…
Browse files Browse the repository at this point in the history 
…al-forgot-password' into featuer/bo-2260-ig-merchant-portal-forgot-password

# Conflicts:
#	_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md
#	_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md
  • Loading branch information
@asmarovydlo
asmarovydlo committed Jan 6, 2025
2 parents 20d6f40 + 2c7b118 commit 6844267
Show file tree
Hide file tree
Showing 918 changed files with 2,003 additions and 1,546 deletions.
3 changes: 2 additions & 1 deletion Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ task :check_pbc do
/docs\/pbc\/\w+\/[\w-]+\/202307\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202403\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202400\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202311\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202311\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202505\.0\/.+/,
/docs\/pbc\/\w+\/[\w-]+\/202404\.0\/.+/
]
run_htmlproofer_with_retry("./_site", options)
Expand Down
2 changes: 1 addition & 1 deletion _archive/release-notes/release-notes-202212.0/release-notes-202212.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Adapting your offerings to your customers' needs and locales is crucial for prov

#### Number formatting in the Storefront

For an effortless shopping experience, the localized number formatting is available throughout the Storefront for any user locale. Whether it is a catalog, product details page, cart, checkout, or customer account, your customers and guests can now enjoy their known number format. This helps to avoid any confusion about pricing or quantities.
For an effortless shopping experience, the localized number formatting is available throughout the Storefront for any user locale. Whether it's a catalog, product details page, cart, checkout, or customer account, your customers and guests can now enjoy their known number format. This helps to avoid any confusion about pricing or quantities.

##### Documentation

Expand Down
1 change: 1 addition & 0 deletions _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ versions:
'202311.0': '202311.0'
'202404.0': '202404.0'
'202410.0': '202410.0'
'202505.0': '202505.0'

# versioned categories - these must match corresponding directories
versioned_categories:
Expand Down
2 changes: 2 additions & 0 deletions _data/sidebars/dg_dev_sidebar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,8 @@ entries:

- title: Internationalization and multi-store
nested:
- title: Adding stores in a multi-database setup
url: /docs/dg/dev/internationalization-and-multi-store/adding-stores-in-a-multi-database-setup.html
- title: Handling internationalization
url: /docs/dg/dev/internationalization-and-multi-store/handling-internationalization.html
- title: Managing glossary keys
Expand Down
8 changes: 8 additions & 0 deletions _data/sidebars/pbc_all_sidebar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1485,6 +1485,10 @@ entries:
nested:
- title: Marketplace Merchant
url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-feature.html
- title: Marketplace Merchant + Promotions & Discounts
url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-promotions-and-discounts-feature.html
include_versions:
- "202505.0"
- title: Marketplace Merchant B2B Contract Requests
url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-b2b-contract-requests-feature.html
include_versions:
Expand Down Expand Up @@ -1949,6 +1953,10 @@ entries:
url: /docs/pbc/all/offer-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-product-offer-marketplace-product-feature.html
- title: Marketplace Product Offer + Quick Add to Cart
url: /docs/pbc/all/offer-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-product-offer-quick-add-to-cart-feature.html
- title: Marketplace Product Offer + Promotions & Discounts feature
url: /docs/pbc/all/offer-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-product-offer-promotions-and-discounts-feature.html
include_versions:
- "202505.0"
- title: Product Offer Shipment Availability
url: /docs/pbc/all/offer-management/marketplace/install-and-upgrade/install-features/install-the-product-offer-shipment-availability-feature.html
- title: Product Offer Shipment
Expand Down
2 changes: 1 addition & 1 deletion _drafts/acp-apps-development/develop-an-app/app-manifest.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ For the manifest, make sure to follow these conditions:
|description | Full description of the app. New line symbols and HTML tags are not allowed. | "description": "BS PAYONE GmbH is headquartered in Frankfurt am Main and is one of the leading omnichannel-payment providers in Europe. In addition to providing customer support to numerous Savings Banks (Sparkasse) the full-service payment service provider also provides cashless payment transaction services to more than 255,000 customers from stationary trade to the automated and holistic processing of e-commerce and mobile payments." |
|developedBy | Optional. Provides information about who developed the App. | "developedBy": "Spryker Systems GmbH" |
|url | URL to a homepage of the application provider (not visible in the AppCatalog). | "url": "https://www.payone.com/DE-en" |
|isAvailable | Shows if the application is currently available. Possible values:<br><ul><li>false — the application is not available, it isn't possible to connect and configure it.</li><li>true — the application is available, it’s possible to connect, configure, and use it.</li></ul> | "isAvailable": true |
|isAvailable | Shows if the application is currently available. Possible values:<br><ul><li>false — the application is not available, it's not possible to connect and configure it.</li><li>true — the application is available, it’s possible to connect, configure, and use it.</li></ul> | "isAvailable": true |
|businessModels | An array of suite types that are compatible with the application. Possible values:<ul><li>B2C</li><li>B2B</li><li>B2C_MARKETPLACE</li><li>B2B_MARKETPLACE</li></ul> | See *businessModels example* under this table. |
|categories | An array of categories that the application belongs to. Possible values:<ul><li>BUSINESS_INTELLIGENCE</li><li>CONSENT_MANAGEMENT</li><li>LOYALTY_MANAGEMENT</li><li>PAYMENT</li><li>PRODUCT_INFORMATION_MANAGEMENT</li><li>SEARCH</li><li>TAX</li><li>USER_GENERATED_CONTENT</li></ul> | See *categories example* under this table. |
|pages | Adds additional content to the application detail page. This part contains an object with a page type and its blocks.<br>Possible page types (object keys):<ul><li>Overview</li><li>Legal</li></ul>Each page can contain no or multiple blocks. Each block should be specified by an object with the following keys:<ul><li>title — header of the block;</li><li>type — the way the data is displayed. Possible values:<ul><li>list<li>text</li></ul><li>data — information that is displayed inside the block. Can be a string, if *type=text*, or an array of strings if *type=list*.</li></ul> | See *pages example* under this table. |
Expand Down
2 changes: 1 addition & 1 deletion _drafts/acp-apps-development/develop-an-app/sync-api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ redirect_from:
- /docs/acp/user/sync-api.html
---

[Sync API](https://github.com/spryker-sdk/sync-api/) is the synchronous API that Spryker supports. In the Spryker terminology, it is also known as [Glue API](/docs/dg/dev/glue-api/{{site.version}}/old-glue-infrastructure/glue-rest-api.html) with its [REST API B2C Demo Shop](/docs/dg/dev/glue-api/{{site.version}}/old-glue-infrastructure/rest-api-marketplace-b2c-demo-shop-reference.html) and [REST API B2B Demo Shop](/docs/dg/dev/glue-api/{{site.version}}/old-glue-infrastructure/rest-api-b2b-demo-shop-reference.html) endpoints. The schema files we use follow the [OpenAPI specification](https://swagger.io/specification/).
[Sync API](https://github.com/spryker-sdk/sync-api/) is the synchronous API that Spryker supports. In the Spryker terminology, it's also known as [Glue API](/docs/dg/dev/glue-api/{{site.version}}/old-glue-infrastructure/glue-rest-api.html) with its [REST API B2C Demo Shop](/docs/dg/dev/glue-api/{{site.version}}/old-glue-infrastructure/rest-api-marketplace-b2c-demo-shop-reference.html) and [REST API B2B Demo Shop](/docs/dg/dev/glue-api/{{site.version}}/old-glue-infrastructure/rest-api-b2b-demo-shop-reference.html) endpoints. The schema files we use follow the [OpenAPI specification](https://swagger.io/specification/).
Spryker uses schema files to generate code for your project, including predefined test cases. The purpose of doing so is to let you focus on building your business logic without caring about the boilerplate code.

## Code generation
Expand Down
2 changes: 1 addition & 1 deletion ...irtual-machine/configuring-debugging-in-devvm/configuring-debugging-in-devvm.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Define servers in PhpStorm:
1. In PhpStorm, go to **Preferences** > **Languages & Frameworks** > **PHP** > **Servers**.
2. Add a new server:
1. Select **+**.
2. Enter a **Name**. For example, `zed.mysprykershop.com` (it is used in CLI below).
2. Enter a **Name**. For example, `zed.mysprykershop.com` (it's used in CLI below).
3. For **Host**, enter `~^zed\.de\..+\.local$`.
4. Select **Use path mappings**.
5. For **Absolute path on server**, select `/data/shop/development/current`.
Expand Down
2 changes: 1 addition & 1 deletion ...nfiguring-spryker-with-devvm/configuring-spryker-after-installing-with-devvm.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ We will soon deprecate the DevVM and stop supporting it. Therefore, we highly re

## Configuring Git

If you want to commit from within the VM, it is recommended to set the right Git preferences:
If you want to commit from within the VM, it's recommended to set the right Git preferences:

```bash
git config --global user.email "[email protected]"
Expand Down
Loading

0 comments on commit 6844267

Please sign in to comment.