@ozdao/martyrs 0.2.487 → 0.2.488

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

@@ -216,7 +216,6 @@ import Feed from '@martyrs/src/components/Feed/Feed.vue'
 
 import IconDelete from '@martyrs/src/modules/icons/navigation/IconDelete.vue'
 
-import EditArray from "@martyrs/src/modules/organizations/components/blocks/EditArray.vue";
 import DepartmentSub from "@martyrs/src/modules/organizations/components/blocks/DepartmentSub.vue";
 
 import CardUser from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue'

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

@@ -96,7 +96,7 @@
 							<router-link 
 								class=" uppercase t-nowrap t-semi  pd-thin"
 								:to="{
-									name:'Leftovers', 
+									name:'OrganizationInventoryList', 
 									params: {
 										_id: route.params._id
 									}
@@ -153,7 +153,7 @@
 		          :editAccess="hasAccess(route.params._id, 'spots', 'edit', auth.state.accesses, auth.state.access.roles)"
 		          :showDeliveryOptions="true"
 		          :showPaymentOptions="true"
-		          class="radius-medium bg-light mn-b-thin"
+		          class="radius-medium h-min-big bg-light mn-b-thin"
 		        />
 			    </Feed>
 

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

@@ -67,9 +67,9 @@
 		  </MenuItem>
 
 		  <MenuItem 
-		  	v-if="hasAccess(route.params._id, 'leftovers', 'read', auth.state.accesses, auth.state.access.roles)"
+		  	v-if="hasAccess(route.params._id, 'inventory', 'read', auth.state.accesses, auth.state.access.roles)"
 		  	@click="router.push({
-		  		name: 'Leftovers', 
+		  		name: 'OrganizationInventoryList', 
 		  		params: {
 		  			_id: route.params._id
 		  		}
@@ -77,7 +77,7 @@
 		  	class="cursor-pointer">
 		  	<IconLeftovers class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
 		    <span>
-		    	Leftovers
+		    	Inventory
 		    </span>
 		  </MenuItem>
 

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

@@ -33,7 +33,7 @@
 				gap-micro pd-small pd-t-thin pd-b-thin
 				br-b br-solid br-black-transp
 			"
-			tabClass="bg-light pd-small radius-small w-100"
+			classTab="bg-light pd-small radius-small w-100"
 		/>
 			<div class="pd-small  h-100  bg-white">
 				<transition name="slide-fade">

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

@@ -100,7 +100,7 @@
       />
     </div>
 
-    <p class="w-max-50r mn-t-regular mn-b-medium p-big">
+    <p class="w-max-50r mn-t-regular mn-b-medium p-semi">
    		<Text :text="organization.profile.description || ''" :showToggleText="true" :maxLen="320" />
   	</p>  
 

package/src/modules/organizations/configs/navigation.organization.config.js

@@ -101,15 +101,15 @@ export const navigationItems = [
         )
       },
       {
-        title: 'Leftovers',
+        title: 'Inventory',
         iconComponent: IconLeftovers,
         route: (auth, route) => ({
-          name: 'Leftovers',
+          name: 'OrganizationInventoryList',
           params: { _id: route.params._id }
         }),
         visible: (auth, route) => hasAccess(
           route.params._id, 
-          'leftovers', 
+          'inventory', 
           'read', 
           auth.accesses, 
           auth.access.roles

package/src/modules/organizations/controllers/utils/lookupConfigs.js

@@ -4,6 +4,27 @@ const lookupConfigs = {
       from: 'products',
       localField: '_id',
       foreignField: 'owner.target',
+      pipeline: [
+        {
+          $lookup: {
+            from: 'variants',
+            localField: '_id',
+            foreignField: 'product',
+            pipeline: [
+              {
+                $project: {
+                  _id: 1,
+                  name: 1,
+                  price: 1,
+                  quantity: 1,
+                  type: 1,
+                },
+              },
+            ],
+            as: 'variants',
+          },
+        },
+      ],
       as: 'products',
     },
     additionalStages: [
@@ -45,4 +66,4 @@ const lookupConfigs = {
     },
   },
 };
-export default lookupConfigs;
+export default lookupConfigs;

package/src/modules/organizations/models/schemas/accesses.schema.js

@@ -139,7 +139,7 @@ const accessesSchema = {
       default: false,
     },
   },
-  leftovers: {
+  inventory: {
     read: {
       type: Boolean,
       default: false,

package/src/modules/organizations/organizations.client.js

@@ -20,7 +20,6 @@ import CardDepartment from './components/blocks/CardDepartment.vue';
 import CardOrganization from './components/blocks/CardOrganization.vue';
 import Contacts from './components/blocks/Contacts.vue';
 import DepartmentSub from './components/blocks/DepartmentSub.vue';
-import EditArray from './components/blocks/EditArray.vue';
 import EmptyState from './components/blocks/EmptyState.vue';
 import Rating from './components/blocks/Rating.vue';
 import Socials from './components/blocks/Socials.vue';
@@ -59,7 +58,6 @@ export {
   DepartmentSub,
   DetailsTabSection,
   Documents,
-  EditArray,
   EmptyState,
   MembersAdd,
   Organization,
@@ -98,7 +96,6 @@ const ModuleOrganization = {
       DepartmentEdit,
       // Blocks
       CardOrganization,
-      EditArray,
       Unit,
       DepartmentSub,
       CardDepartment,

package/src/modules/organizations/router/organizations.js

@@ -6,7 +6,6 @@ import { createEventRoutes } from '@martyrs/src/modules/events/router/events.js'
 import { createRentsRoutes } from '@martyrs/src/modules/rents/views/router/rents.router.js';
 
 import categoriesRoutes from '@martyrs/src/modules/products/router/categories.router.js';
-import leftoversRoutes from '@martyrs/src/modules/products/router/leftovers.router.js';
 import { createProductRoutes } from '@martyrs/src/modules/products/router/products.router.js';
 
 import galleryBackofficeRoutes from '@martyrs/src/modules/gallery/router/gallery.backoffice.router.js';
@@ -73,7 +72,6 @@ const organizations = {
         createEventRoutes('Organization_'),
         createRentsRoutes('Organization_'),
         ...categoriesRoutes,
-        ...leftoversRoutes,
         ...paymentsRoutes,
         ...galleryBackofficeRoutes,
         ...backofficeRoutes,

package/src/modules/products/components/blocks/CardProduct.vue

@@ -68,7 +68,7 @@
 
 			<slot></slot>
 
-			<div class="flex-v-center flex-nowrap flex">
+			<div v-if="product.variants?.length > 0" class="flex-v-center flex-nowrap flex">
 				<Price 
 					:product="product" 
 					size="small" 

package/src/modules/products/components/blocks/ProductVariants.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="w-100">
-    <div v-if="selected" class="mn-b-small">
-      <span class="h2 t-bold">${{ selected.price.toFixed(2) }}</span>
-    </div>
-
     <div
       v-for="group in groups"
       :key="group.label"
@@ -115,7 +111,11 @@ watch(selectedAttributes, attrs => {
   const m = props.productVariants.find(v =>
     Object.entries(attrs).every(([k, x]) => v.attributes.find(a => a.name === k && a.value === x))
   );
-  m ? pick(m) : (selected.value = null);
+  if (m && selected.value?._id !== m._id) {
+    pick(m);
+  } else if (!m) {
+    selected.value = null;
+  }
 });
 
 onMounted(() => props.productVariants.length === 1 && pick(props.productVariants[0]));

package/src/modules/products/components/elements/Price.vue

@@ -14,7 +14,7 @@
       :class="{
         'p-medium': !size,
         'p-small': size === 'small',
-        'p-big': size === 'big'
+        'p-semi': size === 'big'
       }"
       class="p-small mn-l-micro t-transp"
     >

package/src/modules/products/components/forms/StockHistoryView.vue

@@ -83,7 +83,7 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import PlaceholderImage from '@martyrs/src/modules/icons/placeholders/PlaceholderImage.vue'
-import * as leftovers from '@martyrs/src/modules/products/store/leftovers.js'
+import * as inventory from '@martyrs/src/modules/inventory/store/ inventory.store.js'
 
 const props = defineProps({
   product: {
@@ -104,9 +104,9 @@ onMounted(async () => {
 
 async function loadHistory() {
   try {
-    // Use the leftovers read action to get history for this product
-    const data = await leftovers.actions.read({ 
-      'positions._id': props.product._id 
+    // Use the inventory adjustments action to get history for this product
+    const data = await inventory.actions.fetchAdjustments({ 
+      productId: props.product._id 
     })
     
     history.value = data || []

package/src/modules/products/components/pages/Categories.vue

@@ -20,7 +20,8 @@
       </router-link>
     </Block>
 
-     <Feed
+    <div class="rows-1">
+      <Feed
         :search="true"
         :showLoadMore="false"
         :states="{
@@ -43,7 +44,7 @@
         v-slot="{ 
           items 
         }"
-        class="cols-1 pos-relative w-100 rows-1 gap-thin"
+        class="rows-1 gap-thin"
       >
         <Tree 
           v-if="items" 
@@ -58,6 +59,7 @@
           />
         </Tree>
       </Feed>
+    </div>
   </div>
 </template>
 

package/src/modules/products/components/pages/CategoryEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!isLoading"  class="pd-thin bg-white for-transition w-100">
+  <div v-if="!isLoading"  class="rows-auto pd-thin bg-white for-transition w-100">
     <Block v-if="!MOBILE_APP" class="radius-medium mn-b-thin flex-nowrap flex-v-center flex">
       <h1   class="mn-r-auto">
         {{route.params.category ? 'Edit Category' : 'Add Category'}}
@@ -17,21 +17,21 @@
       title="Profile"
       class="mn-b-thin"
     >
-      <div class="mn-b-medium w-100 flex-nowrap gap-thin flex">
+      <div  class="cols-auto-1fr mn-b-thin w-100 ">
         <UploadImage 
            v-model:photo="categories.state.current.photo"
           :uploadPath="'categories'"
-          class="w-8r aspect-1x1 o-hidden mn-r-small radius-extra" 
+          class="aspect-1x1 h-100 o-hidden mn-r-small radius-extra" 
         />
        <Field
             v-model:field="categories.state.current.name"
             label="Name"
             placeholder="Enter category name"
-            class="w-100 mn-b-small bg-white radius-small pd-medium"
+            class="w-100 bg-white radius-small pd-medium"
           />  
       </div>
 
-        <div class="mn-b-medium w-100 flex-nowrap gap-thin flex">
+        <div class="mn-b-thin w-100 flex-nowrap gap-thin flex">
 
 
          <Field
@@ -58,11 +58,11 @@
           'published',
           'removed'
         ]"
-        placeholder="Display product"
-        class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+        placeholder="Select category"
+        class="pos-relative w-100 bg-white radius-small pd-medium"
       />
 
-      <div class="flex-v-center flex-nowrap flex">
+      <!-- <div class="flex-v-center flex-nowrap flex">
         <h4  class="mn-r-thin t-medium">Localization</h4>
           
         <button 
@@ -71,7 +71,7 @@
         >
           +
         </button>
-      </div>
+      </div> -->
       <div 
         class="gap-thin mn-b-thin flex-nowrap flex" 
         v-for="(item, index) in categories.state.current.translations" 
@@ -247,5 +247,18 @@
 </script>
 
 <style lang="scss">
-  /* Your styles here */
+.container {
+  max-width: 100%;
+  margin: auto;
+}
+
+.grid {
+ 
+}
+
+.square {
+  aspect-ratio: 1 / 1;
+  height: 100%;
+  background: #ccc;
+}
 </style>

package/src/modules/products/components/pages/Product.vue

@@ -44,16 +44,16 @@
           :discounts="product.discounts"
           :regularPrice="100"
           @variant-selected="handleVariantSelected"
-          @add-to-cart="handleAddVariantToCart"
+          @add-to-cart="handleAddToCart"
           @update-images="handleUpdateImages"
         />
 
-        <div  v-if="product.included" class="mn-b-small flex-nowrap flex flex-v-center">
+        <div v-if="product.included" class="mn-b-small flex-nowrap flex flex-v-center">
           <IconList class="mn-r-micro i-medium"/>
           <p class="t-medium ">Included</p>
         </div>
 
-        <div   v-if="product.included" class="cols-1 mn-b-medium w-100 ">
+        <div v-if="product.included" class="cols-1 mn-b-medium w-100 ">
           <div
             class="w-100 pd-small radius-small flex flex-column gap-small bg-light"
           >
@@ -62,7 +62,7 @@
         </div>
 
 
-        <div class="mn-b-small flex-nowrap flex flex-v-center">
+        <div v-if="product.attributes && product.attributes.length > 0" class="mn-b-small flex-nowrap flex flex-v-center">
           <IconInfo class="mn-r-micro i-medium"/>
           <p class="t-medium ">Product Details</p>
         </div>
@@ -173,7 +173,7 @@ products.state.current = null
 onMounted(async () => {
   emits('page-loading');
   
-  await products.actions.read({ _id: route.params.product, lookup: ['recommended'] })
+  await products.actions.read({ _id: route.params.product, lookup: ['variants','recommended','inventory'] })
   
   // Инициализируем текущие изображения изображениями товара
   currentImages.value = [...productImages.value]
@@ -210,25 +210,33 @@ function handleUpdateImages(images) {
   }
 }
 
-// Обработчик добавления варианта в корзину
-async function handleAddVariantToCart(variantItem) {
+// Функция добавления товара в корзину - теперь требует выбранный вариант
+async function handleAddToCart({variant, quantity}) {
+  console.log('variant is', variant)
+   console.log('quantity is', quantity)
+  let selectedDates = null
+
   try {
+    if (!variant) {
+      throw new Error('Variant is required for adding product to cart')
+    }
+
     if (!shopcart.state.organization) {
       shopcart.state.organization = product.value.owner.target._id
     }
     
-    // Проверка на товар с арендой
     if (product.value.listing === 'rent') {
-      const selectedDates = await proxy.$dateSelector({
-        product: product.value
-      });
+      selectedDates = await proxy.$dateSelector(
+        product.value._id,
+        variant._id,
+        quantity,
+        variant.price || product.value.price
+      );
       
       if (!selectedDates) throw new Error('Date selection cancelled')
-      
-      variantItem.selectedDates = selectedDates
     }
     
-    // Проверка на разные организации в корзине
+    // Если организация товара отличается от текущей в корзине
     if (shopcart.state.organization !== product.value.owner.target._id) {
       const result = await proxy.$alert({
         title: 'Replace items in your cart?',
@@ -245,80 +253,22 @@ async function handleAddVariantToCart(variantItem) {
       shopcart.state.organization = product.value.owner.target._id
     }
 
-    // Аналитика: регистрируем добавление в корзину
     if (typeof gtag === 'function') {
       gtag('event', 'add_to_cart', {
         currency: returnCurrency(),
-        value: variantItem.price || 0,
+        value: variant.price || 0,
         items: [{
-          item_id: variantItem._id,
-          item_name: variantItem.name,
-          price: variantItem.price || 0,
+          item_id: product.value._id,
+          item_name: product.value.name,
+          price: variant.price || product.value.price || 0,
           quantity: 1,
           item_category: product.value.category || '',
           item_brand: product.value.owner?.target?.profile?.name || ''
         }]
       });
     }
-    
-    // Добавляем вариант в корзину
-    await shopcart.actions.addVariantToCart(variantItem, product.value.owner.target._id)
-    return true
-  } catch (error) {
-    console.error('Error while adding variant to cart:', error)
-    throw error
-  }
-}
-
-// Оригинальная функция добавления товара в корзину (для товаров без вариантов)
-async function addToCart(product) {
-  let selectedDates = null
-
-  try {
-    if (!shopcart.state.organization) {
-      shopcart.state.organization = product.owner.target._id
-    }
-    if (product.listing === 'rent') {
-      selectedDates = await proxy.$dateSelector({
-        product: product.value
-      });
-      
-      if (!selectedDates) throw new Error('Date selection cancelled')
-      
-    }
-    // Если организация товара отличается от текущей в корзине
-    if (shopcart.state.organization !== product.owner.target._id) {
-      const result = await proxy.$alert({
-        title: 'Replace items in your cart?',
-        message: `Your cart has items from another vendor. If you continue, we'll clear it so you can order from this one instead.`,
-        actions: [
-          { label: 'Cancel', value: false },
-          { label: 'Replace', value: true }
-        ]
-      })
-
-      if (!result) throw new Error('Cart replacement cancelled')
-
-      shopcart.state.positions = []
-      shopcart.state.organization = product.owner.target._id
-    }
-
-    if (typeof gtag === 'function') {
-      gtag('event', 'add_to_cart', {
-        currency: returnCurrency(),
-        value: product.price || 0,
-        items: [{
-          item_id: product._id,
-          item_name: product.name,
-          price: product.price || 0,
-          quantity: 1,
-          item_category: product.category || '',
-          item_brand: product.owner?.target?.profile?.name || ''
-        }]
-      });
-    }
-    
-    await shopcart.actions.addProductToCart(product, product.owner.target._id, selectedDates)
+ 
+    await shopcart.actions.addProductToCart(product.value, variant, product.value.owner.target._id, selectedDates, quantity)
     return true
   } catch (error) {
     console.error('Error while adding product to cart:', error)

package/src/modules/products/components/pages/ProductEdit.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="isPageLoaded" class="w-100 bg-white pd-thin gap-thin">
     
-    <Block v-if="!MOBILE_APP" class="flex-nowrap gap-thin flex-v-center flex">
+    <Block v-if="!MOBILE_APP" class="flex-nowrap mn-b-thin gap-thin flex-v-center flex">
       <h2 class="t-truncate mn-r-auto">
         {{ route.params.product ? products.state.current.name : 'Create Product' }}
       </h2>
@@ -35,7 +35,8 @@
         { label: 'Recommended', value: 'recommended' },
         { label: 'Localization', value: 'localization' }
       ]"
-      class="flex-child-default bg-light radius-medium h-max pd-thin o-x-scroll"
+      class="flex-child-default gap-micro scroll-hide bg-light radius-medium h-max pd-thin mn-b-thin o-x-scroll"
+      classTab="bg-white"
     />
 
     <!-- Tab Content -->
@@ -239,7 +240,6 @@
       <Button 
         v-if="route.params.product"
         :submit="onDelete" 
-        :callback="redirectTo"
         class="bg-red t-white w-100"
       >
         Delete 
@@ -247,7 +247,6 @@
 
       <Button 
         :submit="onSubmit" 
-        :callback="redirectTo"
         class="w-100 bg-main"
       >
         Save
@@ -351,12 +350,6 @@ onMounted(async() => {
 
 async function onSubmit() {
   try {
-    // // Проверка на наличие хотя бы одного варианта
-    // if (!products.state.current.variants || products.state.current.variants.length === 0) {
-    //   setError({ response: { data: { errorCode: "PRODUCT_MUST_HAVE_VARIANT" }} })
-    //   return;
-    // }
-      console.log('product is',products.state.current)
     if (route.params.product) {
       await products.actions.update(route.params.product, products.state.current)
     } else {
@@ -364,13 +357,11 @@ async function onSubmit() {
         target: route.params._id || auth.state.user._id,
         type: route.params._id ? 'organization' : 'user'
       }
-      
       products.state.current.creator = {
         target: auth.state.user._id,
         type: 'user',
         hidden: false
       }
-
       await products.actions.create(products.state.current)
     }
     

package/src/modules/products/components/pages/Products.vue

@@ -34,7 +34,7 @@
         z-index-1
 
       "
-      tabClass="bg-light  uppercase pd-small radius-small w-100"
+      classTab="bg-light  uppercase pd-small radius-small w-100"
   />
 
   <div class="cols-2-1_3 br-1px br-solid br-light h-100 z-index-3 pos-relative radius-medium">
@@ -77,7 +77,8 @@
           prices: route.query.prices,
           delivery: route.query.delivery,
           search: route.query.search,
-          ...(tabProducts !== 'all' && { status: tabProducts })
+          ...(tabProducts !== 'all' && { status: tabProducts }),
+          lookup: ['variants']
           // user: user
         }"
         v-slot="{ 

package/src/modules/products/components/sections/EditIngredients.vue

@@ -59,9 +59,18 @@
         class=""
       >
         <CardOrderItem
-          v-for="(product, index) in items" :key="product._id"
+          v-for="(product, index) in items" 
+          :key="`${product._id}_${product.variant || 'no-variant'}_${index}`"
           :editable="false" 
-          :product="product" 
+          :productId="product._id"
+          :variantId="product.variant"
+          :images="product.images"
+          :name="product.name"
+          :quantity="product.quantity || 1"
+          :unit="product.unit"
+          :dates="product.date"
+          :listing="product.listing"
+          :price="product.price"
           @click="() => { 
             let p = { ...product };
             p.quantity = 1;

package/src/modules/products/components/sections/EditRecommended.vue

@@ -13,8 +13,7 @@
         :key="product._id" 
         :image="product.images?.[0] ? (FILE_SERVER_URL || '') + product.images[0] : ''"
         :name="product.name"
-        :title="product.name"
-        :subtitle="`${returnCurrency()}${product.price}`"
+        :title="`${returnCurrency()}${product.price}`"
         :showThumbnail="true"
         :actions="[
           {
@@ -61,19 +60,9 @@
           v-for="(product, index) in items" :key="product._id"
           :image="product.images?.[0] ? (FILE_SERVER_URL || '') + product.images[0] : ''"
           :name="product.name"
-          :title="product.name"
-          :subtitle="`${returnCurrency()}${product.price}`"
+          :title="`${returnCurrency()}${product.price}`"
           :showThumbnail="true"
-          :actions="[
-            {
-              label: 'Add',
-              class: 'bg-main t-white',
-              handler: () => {
-                globals.actions.add(recommended, product);
-                closeRecommendedPopup();
-              }
-            }
-          ]"
+          @click="globals.actions.add(recommended, product); closeRecommendedPopup();"
           class="bg-white pd-thin radius-medium w-100 mn-b-thin cursor-pointer hover-scale-1"
         />
       </Feed>