@ozdao/martyrs 0.2.477 → 0.2.479

package/src/modules/orders/store/shopcart.js

@@ -1,11 +1,10 @@
 /////////////////////////////
 // DEPENDENCIES
 /////////////////////////////
-import { reactive, watch, computed  } from "vue";
+import { computed, reactive, watch } from 'vue';
 // Dependencies
-import Cookies from 'js-cookie'
-// Globals 
-import { setError }   from '@martyrs/src/modules/globals/views/store/globals'
+// Globals
+import { setError } from '@martyrs/src/modules/globals/views/store/globals.js';
 
 /////////////////////////////
 // State
@@ -13,7 +12,7 @@ import { setError }   from '@martyrs/src/modules/globals/views/store/globals'
 const state = reactive({
   organization: null,
   positions: [],
-  currentState: false
+  currentState: false,
 });
 
 /////////////////////////////
@@ -29,28 +28,29 @@ const helpers = {
       listing: product.listing,
       quantity: 1,
       org_id: organization,
-      type: type
+      type: type,
     };
   },
 
   saveToStorage() {
-    localStorage.setItem(CART_STORAGE_KEY, JSON.stringify({
-      positions: state.positions,
-      organization: state.organization
-    }));
+    localStorage.setItem(
+      CART_STORAGE_KEY,
+      JSON.stringify({
+        positions: state.positions,
+        organization: state.organization,
+      })
+    );
   },
 
   async validateProduct(product) {
     const serverProduct = await api.fetchProduct(product._id);
-    
+
     if (!serverProduct) {
       return false;
     }
 
-    return serverProduct.price === product.price &&
-           serverProduct.name === product.name &&
-           serverProduct.available !== false;
-  }
+    return serverProduct.price === product.price && serverProduct.name === product.name && serverProduct.available !== false;
+  },
 };
 
 /////////////////////////////
@@ -64,35 +64,30 @@ const SYNC_INTERVAL = 30000; // 30 seconds in milliseconds
 const api = {
   async fetchProduct(productId) {
     try {
-      const response = await fetch(`/api/products/read`, { _id: productId});
+      const response = await fetch(`/api/products/read`, { _id: productId });
       return await response.json();
     } catch (error) {
       console.error('Failed to fetch product:', error);
       return null;
     }
-  }
+  },
 };
 
 async function syncWithServer() {
   try {
     const invalidProducts = [];
-    
+
     for (let i = 0; i < state.positions.length; i++) {
       const product = state.positions[i];
       const serverProduct = await api.fetchProduct(product._id);
-      
-      if (!serverProduct || 
-          serverProduct.price !== product.price || 
-          serverProduct.name !== product.name || 
-          serverProduct.available === false) {
+
+      if (!serverProduct || serverProduct.price !== product.price || serverProduct.name !== product.name || serverProduct.available === false) {
         invalidProducts.push(product._id);
       }
     }
 
     if (invalidProducts.length > 0) {
-      state.positions = state.positions.filter(
-        product => !invalidProducts.includes(product._id)
-      );
+      state.positions = state.positions.filter(product => !invalidProducts.includes(product._id));
       helpers.saveToStorage();
       setError('Some products were removed from cart due to changes on server');
     }
@@ -119,8 +114,7 @@ const stopPeriodicSync = () => {
 // Actions
 /////////////////////////////
 const actions = {
-
-  toggleShopcart () {
+  toggleShopcart() {
     state.currentState = state.currentState ? false : true;
   },
 
@@ -132,19 +126,16 @@ const actions = {
         const shopcartData = JSON.parse(storedShopcart);
         state.positions = shopcartData.positions; // Восстанавливаем продукты
         state.organization = shopcartData.organization; // Восстанавливаем _id организации
-      } 
+      }
     } catch (error) {
       console.error(error);
       throw error;
     }
   },
 
-
   addProductToCart(product, organization, date) {
-    console.log('organization shopcart is', organization)
-    const cartItem = state.positions.find(
-      (item) => item._id === product._id
-    );
+    console.log('organization shopcart is', organization);
+    const cartItem = state.positions.find(item => item._id === product._id);
 
     if (cartItem) {
       cartItem.quantity++;
@@ -156,93 +147,154 @@ const actions = {
         listing: product.listing,
         price: product.price,
         quantity: 1,
-        date: date, 
+        date: date,
         org_id: organization, // Добавляем _id организации к каждому продукту
       });
     }
-    state.organization = organization
+    state.organization = organization;
 
     // Обновляем объект корзины в localStorage, включая _id организации
-    localStorage.setItem('shopcart', JSON.stringify({
-      positions: state.positions,
-      organization: organization // Сохраняем _id организации в корне объекта корзины
-    }));
+    localStorage.setItem(
+      'shopcart',
+      JSON.stringify({
+        positions: state.positions,
+        organization: organization, // Сохраняем _id организации в корне объекта корзины
+      })
+    );
+  },
+
+  async addVariantToCart(variantItem, organizationId, selectedDates = null) {
+    try {
+      // Убедимся, что организация установлена 
+      state.organization = organizationId;
+      
+      // Проверим, есть ли этот вариант уже в корзине
+      const existingPosition = state.positions.find(
+        position => position.product._id === variantItem._id && position.variantId === variantItem.variantId
+      );
+      
+      if (existingPosition) {
+        // Обновляем существующую позицию
+        existingPosition.quantity += 1;
+        
+        // Если есть выбранные даты для аренды, обновляем их
+        if (selectedDates) {
+          existingPosition.selectedDates = selectedDates;
+        }
+      } else {
+        // Создаем новую позицию
+        const position = {
+          product: {
+            _id: variantItem._id,
+            name: variantItem.name,
+            price: variantItem.price,
+            sku: variantItem.sku
+          },
+          variantId: variantItem.variantId,
+          attributes: variantItem.attributes || [],
+          quantity: 1,
+          price: variantItem.price,
+        };
+        
+        // Добавляем даты для товаров с арендой
+        if (selectedDates) {
+          position.selectedDates = selectedDates;
+        }
+        
+        // Добавляем позицию в корзину
+        state.positions.push(position);
+      }
+      
+      // Обновляем локальное хранилище
+      updateLocalStorage();
+      
+      // Отправляем уведомление о добавлении в корзину
+      showNotification('Product added to cart');
+      
+      return true;
+    } catch (error) {
+      console.error('Error adding variant to cart:', error);
+      return false;
+    }
   },
 
 
   removeProduct(_id) {
-    const cartItem = state.positions.find(
-      (item) => item._id === _id
-    );
+    const cartItem = state.positions.find(item => item._id === _id);
     const cartItemIndex = state.positions.indexOf(cartItem);
 
     if (cartItemIndex > -1) {
       state.positions.splice(cartItemIndex, 1);
-      
+
       // Сохраняем весь объект корзины, а не только позиции
-      localStorage.setItem('shopcart', JSON.stringify({
-        positions: state.positions,
-        organization: state.organization
-      }));
+      localStorage.setItem(
+        'shopcart',
+        JSON.stringify({
+          positions: state.positions,
+          organization: state.organization,
+        })
+      );
     }
   },
 
-
   decrementItemQuantity(_id) {
-    const cartItem = state.positions.find(
-      (item) => item._id === _id
-    );
+    const cartItem = state.positions.find(item => item._id === _id);
     const cartItemIndex = state.positions.indexOf(cartItem);
-    
+
     if (cartItemIndex > -1) {
       cartItem.quantity--;
-      
+
       if (cartItem.quantity < 1) {
         state.positions.splice(cartItemIndex, 1);
       }
 
       // Сохраняем весь объект корзины, а не только позиции
-      localStorage.setItem('shopcart', JSON.stringify({
-        positions: state.positions,
-        organization: state.organization
-      }));
+      localStorage.setItem(
+        'shopcart',
+        JSON.stringify({
+          positions: state.positions,
+          organization: state.organization,
+        })
+      );
     }
   },
 
-
   incrementItemQuantity(_id) {
-    const cartItem = state.positions.find(
-      (item) => item._id === _id
-    );
+    const cartItem = state.positions.find(item => item._id === _id);
 
     if (cartItem) {
       cartItem.quantity++;
 
       // Сохраняем весь объект корзины, а не только позиции
-      localStorage.setItem('shopcart', JSON.stringify({
-        positions: state.positions,
-        organization: state.organization
-      }));
+      localStorage.setItem(
+        'shopcart',
+        JSON.stringify({
+          positions: state.positions,
+          organization: state.organization,
+        })
+      );
     }
   },
 
   updateRentDates({ productId, dates }) {
-    const product = state.positions.find(p => p._id === productId)
+    const product = state.positions.find(p => p._id === productId);
 
     if (product) {
-      product.date = dates // Предполагается, что dates — объект { start, end }
+      product.date = dates; // Предполагается, что dates — объект { start, end }
     }
 
-    localStorage.setItem('shopcart', JSON.stringify({
-      positions: state.positions,
-      organization: state.organization
-    }));
+    localStorage.setItem(
+      'shopcart',
+      JSON.stringify({
+        positions: state.positions,
+        organization: state.organization,
+      })
+    );
   },
 
-
   resetShopcart() {
     state.positions = [];
-    
+
     localStorage.removeItem('shopcart');
   },
 };
@@ -252,23 +304,27 @@ const actions = {
 /////////////////////////////
 const getters = {
   cartTotalPrice: computed(() => {
-    return Number(state.positions.reduce((total, product) => {
-      // Проверяем тип листинга
-      if (product.listing === 'rent') {
-        const start = new Date(product.date.start)
-        const end = new Date(product.date.end)
-        const diffTime = Math.abs(end - start)
-        return total + product.price * (Math.ceil(diffTime / (1000 * 60 * 60 * 24)) + 1);
-      } else {
-        // Для обычных товаров умножаем на количество
-        return total + product.price * (product.quantity || 1);
-      }
-    }, 0));
+    return Number(
+      state.positions.reduce((total, product) => {
+        // Проверяем тип листинга
+        if (product.listing === 'rent') {
+          const start = new Date(product.date.start);
+          const end = new Date(product.date.end);
+          const diffTime = Math.abs(end - start);
+          return total + product.price * (Math.ceil(diffTime / (1000 * 60 * 60 * 24)) + 1);
+        } else {
+          // Для обычных товаров умножаем на количество
+          return total + product.price * (product.quantity || 1);
+        }
+      }, 0)
+    );
   }),
   cartTotalAmount: computed(() => {
-    return Number(state.positions.reduce((total, product) => {
-      return total + product.quantity;
-    }, 0));
+    return Number(
+      state.positions.reduce((total, product) => {
+        return total + product.quantity;
+      }, 0)
+    );
   }),
   getStoreCartState: computed(() => {
     return Number(state.currentState);
@@ -277,21 +333,17 @@ const getters = {
 /////////////////////////////
 // History
 /////////////////////////////
-const history = []
-history.push(state) 
+const history = [];
+history.push(state);
 
 /////////////////////////////
 // Watch
 /////////////////////////////
 watch(state, (newState, oldState) => {
-  history.push(newState)
-})
+  history.push(newState);
+});
 
 /////////////////////////////
 // Module Export
 /////////////////////////////
-export {
-  state,
-  actions,
-  getters
-}
+export { actions, getters, state };

package/src/modules/orders/store/testimonials.js

@@ -1,8 +1,8 @@
 // Dependencies
 import axios from 'axios';
-import { reactive } from "vue";
+import { reactive } from 'vue';
 
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true})
+const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true });
 
 // State
 const state = reactive({
@@ -20,7 +20,7 @@ const actions = {
   },
 
   async createTestimonial(testimonial) {
-    console.log(testimonial.profile.photo)
+    console.log(testimonial.profile.photo);
     try {
       const formData = new FormData();
       formData.append('avatar', testimonial.profile.photo);
@@ -29,12 +29,12 @@ const actions = {
       formData.append('position', testimonial.position);
       formData.append('description', testimonial.description);
 
-      console.log(formData)
+      console.log(formData);
 
       const response = await $axios.post('/api/testimonials/create', formData, {
         headers: {
-          'Content-Type': 'multipart/form-data'
-        }
+          'Content-Type': 'multipart/form-data',
+        },
       });
 
       state.testimonials.push(response.data);
@@ -68,7 +68,4 @@ const actions = {
   },
 };
 
-export {
-  state,
-  actions
-};
+export { actions, state };

package/src/modules/organizations/components/elements/ButtonToggleMembership.vue

@@ -12,8 +12,8 @@
   import Button from "@martyrs/src/components/Button/Button.vue";
   
   import { ref } from 'vue'
-  import * as auth from '@martyrs/src/modules/auth/views/store/auth'
-  import * as memberships from '@martyrs/src/modules/organizations/store/memberships'
+  import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
+  import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
 
   const emits = defineEmits(['updateMembership'])
 

package/src/modules/organizations/components/pages/Department.vue

@@ -65,7 +65,7 @@ import { useRoute, useRouter } from 'vue-router';
 import Spoiler from '@martyrs/src/components/Spoiler/Spoiler.vue';
 import DepartmentSub from '@martyrs/src/modules/organizations/components/blocks/DepartmentSub.vue';
 import User from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
-import * as departments from '@martyrs/src/modules/organizations/store/departments';
+import * as departments from '@martyrs/src/modules/organizations/store/departments.js';
 
 import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue'
 

package/src/modules/organizations/components/pages/DepartmentEdit.vue

@@ -221,9 +221,9 @@ import DepartmentSub from "@martyrs/src/modules/organizations/components/blocks/
 
 import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue'
 
-import * as globals from "@martyrs/src/modules/globals/views/store/globals";
-import * as departments from "@martyrs/src/modules/organizations/store/departments";
-import * as memberships from "@martyrs/src/modules/organizations/store/memberships";
+import * as globals from "@martyrs/src/modules/globals/views/store/globals.js";
+import * as departments from "@martyrs/src/modules/organizations/store/departments.js";
+import * as memberships from "@martyrs/src/modules/organizations/store/memberships.js";
 
 const router = useRouter();
 const route = useRoute();

package/src/modules/organizations/components/pages/Members.vue

@@ -184,12 +184,12 @@ import CardDepartment from '@martyrs/src/modules/organizations/components/blocks
 
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue'
 
-import * as auth      from '@martyrs/src/modules/auth/views/store/auth'
-import * as globals      from '@martyrs/src/modules/globals/views/store/globals'
-import * as invites from '@martyrs/src/modules/organizations/store/invites';
-import * as memberships from '@martyrs/src/modules/organizations/store/memberships';
-import * as organization  from '@martyrs/src/modules/organizations/store/organizations'
-import * as departments from '@martyrs/src/modules/organizations/store/departments';
+import * as auth      from '@martyrs/src/modules/auth/views/store/auth.js'
+import * as globals      from '@martyrs/src/modules/globals/views/store/globals.js'
+import * as invites from '@martyrs/src/modules/organizations/store/invites.js';
+import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js';
+import * as organization  from '@martyrs/src/modules/organizations/store/organizations.js'
+import * as departments from '@martyrs/src/modules/organizations/store/departments.js';
 
 const route   = useRoute()
 const router   = useRouter()

package/src/modules/organizations/components/pages/Organization.vue

@@ -46,14 +46,14 @@
 			    v-slot="{ 
 			      items 
 			    }"
-			    class="row-1 gap-thin"
+			    class="rows-1 gap-thin"
 			  >
 			    <CardBlogpost 
 			      v-for="item in items" 
 			      :key="item._id" 
 			      :blogpost="item" 
 			      :user="auth.state.user._id" 
-			      class="h-max-40r mn-b-medium"
+			      class="h-max-40r bg-light radius-medium"
 			    />
 			  </Feed>
 			</transition>
@@ -78,7 +78,7 @@
 				>
 					<Block
 						v-if="hasAccess(route.params._id, null, null, auth.state.accesses, auth.state.access.roles)"
-						class="o-x-scroll scroll-hide w-100 pos-relative mn-b-small"
+						class="o-x-scroll pd-small scroll-hide w-100 pos-relative mn-b-thin"
 					>
 						<div class="w-100 gap-thin flex flex-nowrap	 o-x-scroll">
 							<router-link 
@@ -153,7 +153,7 @@
 		          :editAccess="hasAccess(route.params._id, 'spots', 'edit', auth.state.accesses, auth.state.access.roles)"
 		          :showDeliveryOptions="true"
 		          :showPaymentOptions="true"
-		          class="radius-big bg-light mn-b-thin"
+		          class="radius-medium bg-light mn-b-thin"
 		        />
 			    </Feed>
 
@@ -196,14 +196,14 @@
 	// Local
 	import Products from '@martyrs/src/modules/products/components/pages/Products.vue';
 	// Import state
-	import * as auth from '@martyrs/src/modules/auth/views/store/auth';
-	import * as organization from '@martyrs/src/modules/organizations/store/organizations';
-	import * as memberships from '@martyrs/src/modules/organizations/store/memberships';
-	import * as departments from '@martyrs/src/modules/organizations/store/departments';
+	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js';
+	import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js';
+	import * as departments from '@martyrs/src/modules/organizations/store/departments.js';
 	// Community
   import * as blog from '@martyrs/src/modules/community/store/blogposts.js';
 	// Spots
-	import * as spots from '@martyrs/src/modules/spots/store/spots';
+	import * as spots from '@martyrs/src/modules/spots/store/spots.js';
 	// Init router
 	const router 	= useRouter()
 	const route 	= useRoute()

package/src/modules/organizations/components/pages/OrganizationBackoffice.vue

@@ -211,9 +211,9 @@ import IconLeftovers from '@martyrs/src/modules/icons/entities/IconLeftovers.vue
 /////////////////////////////
 import { useRoute, useRouter } from 'vue-router'
 
-import * as auth  from '@martyrs/src/modules/auth/views/store/auth'
+import * as auth  from '@martyrs/src/modules/auth/views/store/auth.js'
 
-import * as organizations  from '@martyrs/src/modules/organizations/store/organizations'
+import * as organizations  from '@martyrs/src/modules/organizations/store/organizations.js'
 
 const route = useRoute()
 const router = useRouter()

package/src/modules/organizations/components/pages/OrganizationCreate.vue

@@ -42,8 +42,8 @@ import Select from '@martyrs/src/components/Select/Select.vue';
 import Button from '@martyrs/src/components/Button/Button.vue';
 import Places from '@martyrs/src/modules/organizations/components/sections/Places.vue';
 
-import * as auth from '@martyrs/src/modules/auth/views/store/auth';
-import * as organization from '@martyrs/src/modules/organizations/store/organizations';
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import * as organization from '@martyrs/src/modules/organizations/store/organizations.js';
 
 const router = useRouter();
 const route = useRoute();

package/src/modules/organizations/components/pages/OrganizationDetails.vue

@@ -50,8 +50,8 @@ import Field from '@martyrs/src/components/Field/Field.vue';
 import Select from '@martyrs/src/components/Select/Select.vue';
 import Button from '@martyrs/src/components/Button/Button.vue';
 import Places from '@martyrs/src/modules/organizations/components/sections/Places.vue';
-import * as auth from '@martyrs/src/modules/auth/views/store/auth';
-import * as organization from '@martyrs/src/modules/organizations/store/organizations';
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import * as organization from '@martyrs/src/modules/organizations/store/organizations.js';
 import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/inputs.validation';
 
 const router = useRouter();

package/src/modules/organizations/components/pages/OrganizationEdit.vue

@@ -125,9 +125,9 @@
   import Button from '@martyrs/src/components/Button/Button.vue';
   import Popup from '@martyrs/src/components/Popup/Popup.vue';
 
-  import * as auth from '@martyrs/src/modules/auth/views/store/auth';
-  import * as organization from '@martyrs/src/modules/organizations/store/organizations';
-  import * as memberships from '@martyrs/src/modules/organizations/store/memberships';
+  import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+  import * as organization from '@martyrs/src/modules/organizations/store/organizations.js';
+  import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js';
 
   const route = useRoute()
   const router = useRouter()

package/src/modules/organizations/components/pages/OrganizationPeople.vue

@@ -33,7 +33,7 @@ import Button   from '@martyrs/src/components/Button/Button.vue'
 
 import Unit   from '@martyrs/src/modules/organizations/components/sections/Unit.vue'
 
-import * as organization from '@martyrs/src/modules/organizations/store/organizations'
+import * as organization from '@martyrs/src/modules/organizations/store/organizations.js'
 
 const router  = useRouter()
 const route   = useRoute()

package/src/modules/organizations/components/pages/Organizations.vue

@@ -86,8 +86,8 @@
 	import Tab from '@martyrs/src/components/Tab/Tab.vue'
 	import Feed from '@martyrs/src/components/Feed/Feed.vue'
 
-	import * as auth from '@martyrs/src/modules/auth/views/store/auth';
-	import * as organizations from '@martyrs/src/modules/organizations/store/organizations';
+	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+	import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
 
 	import Card from '@martyrs/src/modules/globals/views/components/blocks/Card.vue';
 	import CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'

package/src/modules/organizations/components/sections/DetailsTabSection.vue

@@ -167,8 +167,8 @@
 	// Report Module
 	import FormReport from '@martyrs/src/modules/reports/components/sections/FormReport.vue' 
 	// Store 
-	import * as organizations 	from '@martyrs/src/modules/organizations/store/organizations'
-	import * as memberships 	from '@martyrs/src/modules/organizations/store/memberships'
+	import * as organizations 	from '@martyrs/src/modules/organizations/store/organizations.js'
+	import * as memberships 	from '@martyrs/src/modules/organizations/store/memberships.js'
 	// ///////////////////////////////////////
  	// Components Props
  	// ///////////////////////////////////////

package/src/modules/organizations/components/sections/MembersAdd.vue

@@ -119,7 +119,7 @@
   // Import validation
   import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/inputs.validation'
   // Store
-  import * as users from '@martyrs/src/modules/auth/views/store/users';
+  import * as users from '@martyrs/src/modules/auth/views/store/users.js';
   // Props
   const props = defineProps({
     organization: Object,