diff --git a/package.json b/package.json
index fc4bdceb..984b596f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "store-admin",
- "version": "7.0.3",
+ "version": "7.0.4",
"private": true,
"description": "Admin panel for Heseya Store API",
"author": "Heseya",
@@ -19,7 +19,7 @@
"postinstall": "patch-package"
},
"dependencies": {
- "@heseya/store-core": "7.1.0-beta.3",
+ "@heseya/store-core": "7.1.0-beta.5",
"@sentry/tracing": "^7.6.0",
"@sentry/vue": "^7.6.0",
"ant-design-vue": "^1.7.8",
diff --git a/src/components/AutocompleteInput.vue b/src/components/AutocompleteInput.vue
index ab5a8021..80b91cda 100644
--- a/src/components/AutocompleteInput.vue
+++ b/src/components/AutocompleteInput.vue
@@ -81,7 +81,7 @@ export default defineComponent({
props: {
value: {
type: [String, Object, Array] as PropType<
- UUID | AutocompleteBaseItem | UUID[] | AutocompleteBaseItem[]
+ UUID | AutocompleteBaseItem | UUID[] | AutocompleteBaseItem[] | null
>,
default: () => [],
},
diff --git a/src/components/modules/products/view/ProductBasicDetails.vue b/src/components/modules/products/view/ProductBasicDetails.vue
index 06d0c698..d8aab6b5 100644
--- a/src/components/modules/products/view/ProductBasicDetails.vue
+++ b/src/components/modules/products/view/ProductBasicDetails.vue
@@ -33,7 +33,7 @@
/>
@@ -45,7 +45,6 @@
prop-mode="id"
mode="single"
:disabled="disabled"
- :rules="{ required: form.manufacturer_id }"
class="sale-configurator__autocomplete"
>
@@ -137,6 +136,14 @@ export default defineComponent({
this.form.translations[this.editedLang].description_short = value
},
},
+ formSafetyInformation: {
+ get() {
+ return this.form.safety_information || undefined
+ },
+ set(value: string) {
+ this.form.safety_information = value
+ },
+ },
},
methods: {
diff --git a/src/views/products/View.vue b/src/views/products/View.vue
index 6b29c448..cd32910a 100644
--- a/src/views/products/View.vue
+++ b/src/views/products/View.vue
@@ -158,6 +158,10 @@
{{ $t('galleryTitle') }}
+
+ {{ $t('rewardImagesTitle') }}
+
+
@@ -170,6 +174,7 @@
"titleNew": "Nowy produkt",
"baseFormTitle": "Informacje podstawowe",
"galleryTitle": "Zdjęcia i wideo produktu",
+ "rewardImagesTitle": "Wyróżnienia produktu",
"deleteConfirm": "Czy na pewno chcesz usunąć ten produkt?",
"nav": {
"goTo": "Przejdź do produktu"
@@ -266,6 +271,7 @@ const EMPTY_FORM: ProductComponentForm = {
order: null,
schemas: [],
gallery: [],
+ reward_images: [],
tags: [],
seo: undefined,
attributes: [],
@@ -276,6 +282,8 @@ const EMPTY_FORM: ProductComponentForm = {
published: [],
translations: {},
banner: null,
+ safety_information: undefined,
+ manufacturer_id: undefined,
}
export default defineComponent({
@@ -439,6 +447,7 @@ export default defineComponent({
...this.form,
order: this.form.order || 0,
media: this.form.gallery.map(({ id }) => id),
+ reward_images: this.form.reward_images.map(({ id }) => id),
tags: this.form.tags.map(({ id }) => id),
schemas: this.form.schemas.map(({ id }) => id),
related_sets: this.form.related_sets.map(({ id }) => id),
@@ -525,15 +534,15 @@ export default defineComponent({
.product-page {
display: grid;
- grid-template-rows: auto;
+ grid-template-rows: auto max-content;
grid-gap: 14px;
align-items: start;
grid-template-columns: 1fr;
- grid-template-areas: 'visibility' 'gallery' 'main';
+ grid-template-areas: 'visibility' 'gallery' 'rewards' 'main';
@media ($viewport-7) {
grid-template-columns: 2.6fr 1fr;
- grid-template-areas: 'main visibility' 'main gallery' 'main .';
+ grid-template-areas: 'main visibility' 'main gallery' 'main rewards' 'main .';
}
&__main {
@@ -545,6 +554,9 @@ export default defineComponent({
&__gallery {
grid-area: gallery;
}
+ &__rewards {
+ grid-area: rewards;
+ }
&__subtitle {
font-size: 1em;
diff --git a/yarn.lock b/yarn.lock
index 7defb5f2..0604eabb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1224,10 +1224,10 @@
dependencies:
"@hapi/hoek" "^9.0.0"
-"@heseya/store-core@7.1.0-beta.3":
- version "7.1.0-beta.3"
- resolved "https://registry.yarnpkg.com/@heseya/store-core/-/store-core-7.1.0-beta.3.tgz#25aa447242ee5b8cc91cbe97a80ac09f130671e3"
- integrity sha512-J7loGuyVig0aFmFy2M6s65pwmsHAJUVdPThRxNS31izFHBcZySkWFROeWTUzr7qn2bTFMAK4GdRrd7WJEyEzUg==
+"@heseya/store-core@7.1.0-beta.5":
+ version "7.1.0-beta.5"
+ resolved "https://registry.yarnpkg.com/@heseya/store-core/-/store-core-7.1.0-beta.5.tgz#26059425d252a8e5816a3c87a0fcf8ccc7c3412f"
+ integrity sha512-2oqNwj4yWED9vbtgIXzroOwz5n6hYhZqNSiCPm+4MZj1BiryDK0zxCaAMv8z1upZxmosYf7IQ7Apf0NRgFehcQ==
dependencies:
flat "^5.0.2"
form-data "^4.0.0"