@lancom/shared 0.0.328 → 0.0.330
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/scss/_common.scss +3 -0
- package/components/common/contacts-phone.vue +42 -10
- package/components/quotes/quote_view/quote_product_color_simple_products/quote-product-color-simple-products.vue +2 -2
- package/components/subscribe/subscribe.vue +12 -10
- package/feeds/google-shopping.js +10 -4
- package/package.json +1 -1
package/assets/scss/_common.scss
CHANGED
|
@@ -1,15 +1,29 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<span
|
|
3
|
-
|
|
2
|
+
<span
|
|
3
|
+
class="wrapper"
|
|
4
|
+
:class="{
|
|
5
|
+
'wrapper--label': !!label
|
|
6
|
+
}">
|
|
7
|
+
<span
|
|
4
8
|
v-if="icon"
|
|
5
|
-
class="icon
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
class="icon">
|
|
10
|
+
<i class="icon-smartphone"></i>
|
|
11
|
+
</span>
|
|
12
|
+
<span>
|
|
13
|
+
<span
|
|
14
|
+
v-if="label"
|
|
15
|
+
class="label">
|
|
16
|
+
{{ label }}
|
|
17
|
+
</span>
|
|
18
|
+
<span class="phone">
|
|
19
|
+
<a
|
|
20
|
+
:href="`tel:${contacts.phone}`"
|
|
21
|
+
:style="{ color }"
|
|
22
|
+
@click="onClick">
|
|
23
|
+
{{contacts.phone}}
|
|
24
|
+
</a>
|
|
25
|
+
</span>
|
|
26
|
+
</span>
|
|
13
27
|
</span>
|
|
14
28
|
</template>
|
|
15
29
|
|
|
@@ -27,6 +41,9 @@ export default {
|
|
|
27
41
|
color: {
|
|
28
42
|
type: String,
|
|
29
43
|
default: '#303030'
|
|
44
|
+
},
|
|
45
|
+
label: {
|
|
46
|
+
type: String
|
|
30
47
|
}
|
|
31
48
|
},
|
|
32
49
|
computed: {
|
|
@@ -42,5 +59,20 @@ export default {
|
|
|
42
59
|
}
|
|
43
60
|
};
|
|
44
61
|
</script>
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
<style lang="scss" scoped>
|
|
65
|
+
@import "@/assets/scss/variables";
|
|
66
|
+
.wrapper {
|
|
67
|
+
&--label {
|
|
68
|
+
display: flex;
|
|
69
|
+
align-items: center;
|
|
70
|
+
.label, .phone {
|
|
71
|
+
display: block;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
</style>
|
|
76
|
+
|
|
45
77
|
|
|
46
78
|
|
|
@@ -58,14 +58,14 @@
|
|
|
58
58
|
{{ group.amount }}
|
|
59
59
|
</div>
|
|
60
60
|
</div>
|
|
61
|
-
<div class="QuoteProductColorSimpleProducts__total mt-6">
|
|
61
|
+
<!-- <div class="QuoteProductColorSimpleProducts__total mt-6">
|
|
62
62
|
<div class="lc_title-small">
|
|
63
63
|
Subtotal:
|
|
64
64
|
</div>
|
|
65
65
|
<div class="lc_body-small">
|
|
66
66
|
{{ group.productsTotal | price(currency) }}
|
|
67
67
|
</div>
|
|
68
|
-
</div>
|
|
68
|
+
</div> -->
|
|
69
69
|
</div>
|
|
70
70
|
</div>
|
|
71
71
|
</div>
|
|
@@ -2,16 +2,18 @@
|
|
|
2
2
|
<div
|
|
3
3
|
data-aos="aosFadeUp"
|
|
4
4
|
class="Subscribe__wrapper">
|
|
5
|
-
<
|
|
6
|
-
<
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
<
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
5
|
+
<div class="Subscribe__info">
|
|
6
|
+
<slot name="header">
|
|
7
|
+
<div class="Subscribe__title lc_h2">
|
|
8
|
+
Subscribe to our <span>news letter</span>
|
|
9
|
+
</div>
|
|
10
|
+
</slot>
|
|
11
|
+
<slot name="description">
|
|
12
|
+
<div class="Subscribe__description lc_regular16">
|
|
13
|
+
Sign up for new product relesses, free design rescurrces, and a chance to win 36 free custom printed shirts.
|
|
14
|
+
</div>
|
|
15
|
+
</slot>
|
|
16
|
+
</div>
|
|
15
17
|
<div v-if="isSubscribed">
|
|
16
18
|
<div class="Subscribe__success lc_h5 mt-5">
|
|
17
19
|
Subscribed successfully
|
package/feeds/google-shopping.js
CHANGED
|
@@ -36,12 +36,18 @@ async function googleShoppingFeed(axios, config, availableStores, country, endSl
|
|
|
36
36
|
return !availableStores || availableStores.includes(sp.storeCode);
|
|
37
37
|
})
|
|
38
38
|
.map(sp => {
|
|
39
|
-
const
|
|
40
|
-
const
|
|
41
|
-
const
|
|
39
|
+
const filterImagesByType = imgType => (product.images || []).filter(i => (i.types || []).includes(imgType) && sp.color._id === i.color).map(i => i.image);
|
|
40
|
+
const feedImages = filterImagesByType('feed_primary');
|
|
41
|
+
const frontImages = filterImagesByType('front');
|
|
42
|
+
const backImages = filterImagesByType('back');
|
|
43
|
+
const additionalImages = filterImagesByType('additional_image_link');
|
|
42
44
|
const catalogFrontImages = (product.images || []).filter(i => (i.types || []).includes('catalog_front')).map(i => i.image);
|
|
43
45
|
const image = spliceFirstImage(feedImages) || spliceFirstImage(frontImages) || spliceFirstImage(catalogFrontImages) || spliceFirstImage(backImages) || null;
|
|
44
|
-
const images =
|
|
46
|
+
const images = [
|
|
47
|
+
...additionalImages,
|
|
48
|
+
...((!backImages?.includes(image) && getImages(backImages)) || (!frontImages?.includes(image) && getImages(frontImages)) || [])
|
|
49
|
+
.filter(image => !additionalImages.includes(image))
|
|
50
|
+
];
|
|
45
51
|
const feedTitle = (product.feedTitle || '')
|
|
46
52
|
.replace(/{colour}/g, sp.color.name)
|
|
47
53
|
.replace(/{size}/g, sp.size.name)
|