Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
samberrry committed Feb 1, 2023
2 parents b943020 + a4984ce commit 5a4643f
Show file tree
Hide file tree
Showing 40 changed files with 1,605 additions and 235 deletions.
5 changes: 4 additions & 1 deletion docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ module.exports = {
children: [
['/', 'Introduction'],
['/guide/getting-started', 'Getting started'],
['/guide/internationalization', 'Internationalization'],
['/guide/payment-options', 'Payment Basics'],
['/guide/multi-language', 'Multi Language'],
['/guide/supported-features', 'Supported Features'],
['/guide/about', 'About'],
]
},
Expand All @@ -88,6 +89,8 @@ module.exports = {
children: [
['/guide/releases/v1.0.0', 'v1.0.0'],
['/guide/releases/v1.1.0', 'v1.1.0'],
['/guide/releases/v1.1.1', 'v1.1.1'],
['/guide/releases/v1.2.0', 'v1.2.0'],
]
}
]
Expand Down
3 changes: 2 additions & 1 deletion docs/guide/about.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# About

## Resources

- [Tutorial - Let's start Vue Storefront Development](https://www.binshops.com/tutorial/vue-storefront-tutorial)
- [Tutorial - How to contribute to open source](https://www.binshops.com/tutorial/learn-how-to-contribute-to-open-source-and-github-projects-tutorial)
- [Vue Storefront Documentation](https://docs.vuestorefront.io/v2/)
- [Community Chat](https://discord.vuestorefront.io)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Multi Language
Multi-language support added in version 1.1.0. The PrestaShop integration supports single language by default. However, to support multi-language we need to do some configurations.
# Internationalization
Internationalization support added in version 1.1.0. The PrestaShop integration supports single language by default. However, to support multi-language we need to do some configurations.

## How to enable multi-lang support?
To get multi-language support working properly, we need to enable the desired languages on both PrestaShop BO and VSF integration (within nuxt configuration). To enable your desired languages in front side, first locate the `packages/theme/nuxt.config.js` file and then try to add your language in `i18n.locales` section.
Expand Down
3 changes: 3 additions & 0 deletions docs/guide/releases/v1.1.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## v1.1.1 Release
- [Hotfix] Not redirecting to the checkout page [#59](https://github.com/vuestorefront-community/prestashop/issues/59)
- [Fix] language miss-match with PrestaShop instance
22 changes: 22 additions & 0 deletions docs/guide/releases/v1.2.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
## v1.2.0 Release

## Requirement
- Latest REST API version 2.5.1 and above

## Features
- [Feature] Added shipping price to delivery option and cart preview Issue [#79](https://github.com/vuestorefront-community/prestashop/issues/79)
- [Feature] Added Czech language PR [#78](https://github.com/vuestorefront-community/prestashop/pull/78)
- [Feature] Added sub menu support to both desktop and mobile menus [#84](https://github.com/vuestorefront-community/prestashop/pull/84)
- [Feature] Handling cart errors, check for product availability PR [#85](https://github.com/vuestorefront-community/prestashop/pull/85)
- [Feature] Disables add to cart button when the item is not available [#86](https://github.com/vuestorefront-community/prestashop/pull/86)
- [Feature] Stop adding out-of-stock product PR [#88](https://github.com/vuestorefront-community/prestashop/pull/88)

## Fixes
- [Fix] Language selector is showing on a mobile version in single language Issue [#76](https://github.com/vuestorefront-community/prestashop/issues/76)
- [Fix] Carrier is not selected correctly in checkout step Issue [#70](https://github.com/vuestorefront-community/prestashop/issues/70)
- [Fix] The total and subtotal prices in the checkout steps are incorrect [#67](https://github.com/vuestorefront-community/prestashop/issues/67)
- [Fix] app.i18n.cookieValues used instead of app.$cookies.get Issue [#65](https://github.com/vuestorefront-community/prestashop/issues/65)
- [Fix] Filters checkboxes not showing current state [#87](https://github.com/vuestorefront-community/prestashop/pull/87)

## Dependencies
- Updated @vue-storefront/core dependency to 2.7.2
77 changes: 77 additions & 0 deletions docs/guide/supported-features.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Supported Features

## Product Page
| Feature | Support | Description |
|---------|----------|--------------------------|
| Image gallery || |
| Product description || |
| Product combinations (Attributes) || |
| Product features || |
| Checking product availability || |
| List comments || Native comment module |
| Add a comment || Native comment module |
| Product customization ||

## Category Page
| Feature | Support | Description |
|---------|----------|--------------------------|
| Product Listing Pages || |
| Product filters || Native Faceted search module |
| Quick search || Native Faceted search module |
| Grid/list mode || |
| Product sorting || Native Faceted search module |
| Breadcrumb || Native Faceted search module |

## Cart Management
| Feature | Support | Description |
|---------|----------|--------------------------|
| Add to cart || |
| Remove from cart || |
| Update cart || |
| Cart error handling || Handling scenarios like checking product availability |

## My Account
| Feature | Support | Description |
|---------|----------|--------------------------|
| Account info/ edit || |
| Password change || |
| Address management || |
| Order history || |
| Order details || |
| Order return || |

## Checkout
| Feature | Support | Description |
|---------|----------|--------------------------|
| Log in / Create an account in checkout || |
| Create and remove address || |
| Get carriers and select one || |
| Payment options: pay by check - bank wire || |

## Authentication
| Feature | Support | Description |
|---------|----------|--------------------------|
| Login and registration || |

## Home Page
| Feature | Support | Description |
|---------|----------|--------------------------|
| Menu: categories || Native main menu module |
| Featured products || Native featured products module |

## Go Further
| Feature | Support | Description |
|---------|----------|--------------------------|
| Internationalization - Multi-language support || |
| Multi-currency support || |
| Multistore || |

## Available Languages
| Feature | Support | Description |
|---------|----------|--------------------------|
| English || |
| German || |
| Spanish || |
| French || |
| Italian || |
| Czech || |
14 changes: 7 additions & 7 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
"ref-md": "api-documenter markdown --i api-reference --o api-reference"
},
"devDependencies": {
"@microsoft/api-documenter": "^7.13.65",
"@microsoft/api-extractor": "^7.18.17",
"@vuepress/plugin-active-header-links": "^1.8.2",
"@vuepress/plugin-back-to-top": "^1.8.2",
"@vuepress/plugin-medium-zoom": "^1.8.2",
"@vuepress/plugin-search": "^1.8.2",
"@microsoft/api-documenter": "^7.17.12",
"@microsoft/api-extractor": "^7.23.1",
"@vuepress/plugin-active-header-links": "^1.9.7",
"@vuepress/plugin-back-to-top": "^1.9.7",
"@vuepress/plugin-medium-zoom": "^1.9.7",
"@vuepress/plugin-search": "^1.9.7",
"handlebars": "^4.7.7",
"typescript": "^4.5.4",
"vuepress": "^1.8.2"
"vuepress": "^1.9.7"
},
"dependencies": {
"sass-loader": "^8.0.2",
Expand Down
Loading

0 comments on commit 5a4643f

Please sign in to comment.