Merge branch 'develop' into main

vuestorefront-community · May 25, 2022 · 17657ee · 17657ee
2 parents 681cd4c + 680a6d5
commit 17657ee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop-api",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0",
   "private": false,
   "sideEffects": false,
   "server": "server/index.js",

diff --git a/packages/composables/package.json b/packages/composables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0",
   "private": false,
   "sideEffects": false,
   "main": "lib/index.cjs.js",
@@ -16,7 +16,7 @@
     "update:update": "ncu -u"
   },
   "dependencies": {
-    "@vue-storefront/prestashop-api": "1.0.0-rc.3",
+    "@vue-storefront/prestashop-api": "1.0.0",
     "@vue-storefront/core": "~2.5.4"
   },
   "devDependencies": {

diff --git a/packages/theme/components/MyAccount/CreateAccountForm.vue b/packages/theme/components/MyAccount/CreateAccountForm.vue
@@ -59,10 +59,10 @@
           class="form__element"
         >
         <SfInput
-          v-model="currentPassword"
+          v-model="newPassword"
           type="password"
-          name="currentPassword"
-          label="Current Password"
+          name="newPassword"
+          label="Password"
           required
           class="form__element"
         />
@@ -110,7 +110,7 @@ export default defineComponent({
   setup(props, context) {
     const emit = context.emit;
     const { $router } = context.root;
-    const currentPassword = ref('');
+    const newPassword = ref('');
     const genderOptions = [
       { value: 1, label: 'male' },
       { value: 2, label: 'female' }
@@ -128,7 +128,7 @@ export default defineComponent({
     const submitForm = (resetValidationFn) => () => {
       const onComplete = () => {
         form.value = resetForm();
-        currentPassword.value = '';
+        newPassword.value = '';
         $router.push(context.root.localePath({ name: 'shipping' }));
         resetValidationFn();
       };
@@ -142,13 +142,13 @@ export default defineComponent({
           title: 'User Account Update'
         });
       };
-      if (currentPassword.value) {
-        form.value.password = currentPassword.value;
+      if (newPassword.value) {
+        form.value.password = newPassword.value;
       }
       emit('submit', { form, onComplete, onError });
     };
     return {
-      currentPassword,
+      newPassword,
       form,
       submitForm,
       genderOptions

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/prestashop-theme",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "build": "nuxt build -m",
@@ -24,7 +24,7 @@
     "@vue-storefront/middleware": "~2.5.4",
     "@vue-storefront/nuxt": "~2.5.4",
     "@vue-storefront/nuxt-theme": "~2.5.4",
-    "@vue-storefront/prestashop": "1.0.0-rc.3",
+    "@vue-storefront/prestashop": "1.0.0",
     "cookie-universal-nuxt": "^2.1.5",
     "core-js": "^3.19.0",
     "nuxt": "^2.15.8",