Merge branch 'dev' into 5655-afinar-login

docker-compose.yml

@@ -12,3 +12,6 @@ services:
       placement:
         constraints:
           - node.role == worker
+      resources:
+        limits:
+          memory: 1G

src/components/LeftMenu.vue

@@ -127,7 +127,7 @@ async function togglePinned(item, event) {
                             <QBtn
                                 v-if="item.isPinned === true"
                                 @click="togglePinned(item, $event)"
-                                icon="vn:pin_off"
+                                icon="remove_circle"
                                 size="xs"
                                 flat
                                 round
@@ -139,7 +139,7 @@ async function togglePinned(item, event) {
                             <QBtn
                                 v-if="item.isPinned === false"
                                 @click="togglePinned(item, $event)"
-                                icon="vn:pin"
+                                icon="push_pin"
                                 size="xs"
                                 flat
                                 round
@@ -163,7 +163,7 @@ async function togglePinned(item, event) {
                                 <QBtn
                                     v-if="item.isPinned === true"
                                     @click="togglePinned(item, $event)"
-                                    icon="vn:pin_off"
+                                    icon="remove_circle"
                                     size="xs"
                                     flat
                                     round
@@ -175,7 +175,7 @@ async function togglePinned(item, event) {
                                 <QBtn
                                     v-if="item.isPinned === false"
                                     @click="togglePinned(item, $event)"
-                                    icon="vn:pin"
+                                    icon="push_pin"
                                     size="xs"
                                     flat
                                     round
@@ -200,13 +200,11 @@ async function togglePinned(item, event) {
 </template>
 
 <style>
-.pinned .icon-pin,
+.pinned .q-btn {
-.pinned .icon-pin_off {
     visibility: hidden;
 }
 
-.pinned:hover .icon-pin,
+.pinned:hover .q-btn {
-.pinned:hover .icon-pin_off {
     visibility: visible;
 }
 </style>

src/css/icons.scss

@@ -26,12 +26,6 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-pin:before {
-    content: '\e950';
-}
-.icon-pin_off:before {
-    content: '\e95b';
-}
 .icon-frozen:before {
     content: '\e900';
 }
@@ -56,7 +50,7 @@
 .icon-greenery:before {
     content: '\e907';
 }
-.icon-planta:before {
+.icon-plant:before {
     content: '\e908';
 }
 .icon-handmade:before {
@@ -401,3 +395,18 @@
 .icon-trolley:before {
     content: '\e95c';
 }
+.icon-agency-term:before {
+    content: '\e950';
+}
+.icon-client-unpaid:before {
+    content: '\e95b';
+}
+.icon-trolley:before {
+    content: '\e95c';
+}
+.icon-grafana:before {
+    content: '\e965';
+}
+.icon-troncales:before {
+    content: '\e967';
+}

test/vitest/__tests__/components/common/VnSmsDialog.spec.js

@@ -0,0 +1,58 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import VnSmsDialog from 'components/common/VnSmsDialog.vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+
+describe('VnSmsDialog', () => {
+    let vm;
+    const orderId = 1;
+    const shipped = new Date();
+    const phone = '012345678';
+    const promise = (response) => {return response;};
+    const template = 'minAmount';
+    const locale = 'en';
+
+    beforeAll(() => {
+        vm = createWrapper(VnSmsDialog, {
+            propsData: {
+                data: {
+                    orderId,
+                    shipped
+                },
+                template,
+                locale,
+                phone,
+                promise
+            }
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('updateMessage()', () => {
+        it('should update the message value with the correct template and parameters', () => {
+            vm.updateMessage();
+
+            expect(vm.message).toEqual(`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`);
+        });
+    });
+
+    describe('send()', async () => {
+        it('should send the message', async () => {
+            vi.spyOn(vm.props, 'promise');
+            vm.message = 'Example message';
+            const response = {
+                orderId,
+                shipped,
+                destination: phone,
+                message: vm.message
+            };
+            await vm.send();
+
+            expect(vm.isLoading).toEqual(false);
+            expect(vm.props.promise).toHaveBeenCalledWith(response);
+        });
+    });
+});