@ozdao/martyrs 0.2.453 → 0.2.455

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

@@ -13,41 +13,43 @@
           @click="$router.push({ name: 'ProductEdit', params: { _id: product.owner.target, product: product._id } })"
           class="pos-absolute pos-t-regular pos-r-regular i-regular t-transp"
         />
+
+
+
         <h2 class="w-100 h1-product mn-b-small">{{ product.name }}</h2>
+        
         <Price :product="product" size="big" class="flex gap-micro flex-center pd-small br-solid br-1px br-black-transp-10 w-max mn-b-medium" />
 
-        <div v-if="product.description || product.specification" class="h-min-5r o-hidden radius-small bg-light mn-b-medium pos-relative">
-          <Tab
-            v-model:selected="tabProduct"
-            :tabs="[
-              {name: 'Description', value: 'description'},
-              {name: 'Specifications', value: 'specifications'}
-            ]"
-            tabClass="pd-thin bg-white radius-thin p-small uppercase t-medium"
-            class="gap-micro bg-light pos-relative z-index-2 pd-thin br-solid br-b br-black-transp-10"
-          />
-          <transition name="slide-fade">
-            <div v-if="tabProduct === 'description'" class="pd-medium">
-              <p v-if="product.description && !product.localization < 1 && !recommendation" class="w-100 t-transp">
-                {{ product.description }}
-              </p>
-              <p v-if="product.localization && product.localization.length > 1 && !recommendation" class="w-100 t-transp">
-                {{ t('description') }}
-              </p>
-            </div>
-            <div v-else class="cols-2 pd-medium w-100 gap-small">
-              <div
-                v-if="product.information.length > 0"
-                v-for="information in product.information"
-                class="w-100 pd-small radius-small bg-white product-information"
-              >
-                <p class="t-demi">{{ information.name }}</p>
-                <p>{{ information.value }}</p>
-              </div>
-            </div>
-          </transition>
+        <p v-if="product.description && !product.localization < 1 && !recommendation" class="w-100 t-transp mn-b-small">
+          {{ product.description }}
+        </p>
+        <p v-if="product.localization && product.localization.length > 1 && !recommendation" class="w-100 t-transp  mn-b-small">
+          {{ t('description') }}
+        </p>
+
+        <div class="cols-2 mn-b-small w-100 gap-small">
+          <div
+            v-if="product.information.length > 0"
+            v-for="information in product.information"
+            class="w-100 pd-small radius-small bg-light product-information"
+          >
+            <p class="t-demi">{{ information.name }}</p>
+            <p>{{ information.value }}</p>
+          </div>
         </div>
 
+        <p class="t-medium mn-b-small">Provided by</p>
+        <CardOrganization 
+          v-if="product.owner"
+          :organization="product.owner.target"
+          :showRating="true"
+          :showFollowers="false"
+          :showProducts="false"
+          class="bg-light mn-b-thin w-100 o-hidden radius-medium pd-small "
+        />
+
+
+
         <div class="w-max-33r">
           <div class="w-max-33r">
 		        <div v-if="product.listing === 'rent'">
@@ -71,8 +73,8 @@
 	          <div v-else>
 	            <Button
 	              v-if="product.available > 0"
-	              @click="addToCart(product, null)"
-	              class="h-3r w-100 bg-main button"
+	              :submit="() => addToCart(product, null)"
+	              class="h-3r w-max mobile:w-100 bg-main button"
 	            >
 	              <div class="gap-thin flex flex-center flex-nowrap">
 	                <IconShopcartAdd class="i-semi" />
@@ -99,10 +101,11 @@
 </template>
 
 <script setup>
-import { computed, ref, onMounted } from 'vue'
+import { computed, ref, onMounted, getCurrentInstance } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 
+
 import * as auth from '@martyrs/src/modules/auth/views/store/auth'
 import * as globals from '@martyrs/src/modules/globals/views/store/globals'
 import * as products from '@martyrs/src/modules/products/store/products'
@@ -120,8 +123,11 @@ import ImagesThumbnails from '@martyrs/src/modules/products/components/blocks/Im
 import Price from '@martyrs/src/modules/products/components/elements/Price.vue'
 import PopularProducts from '@martyrs/src/modules/products/components/sections/PopularProducts.vue'
 
+  import CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'
+
 const route = useRoute()
 const router = useRouter()
+const { proxy } = getCurrentInstance()
 
 const product = computed(() => products.state.current)
 const images = computed(() => products.state.current.images)
@@ -148,15 +154,15 @@ function closePopup() {
 const emits = defineEmits(['page-loading', 'page-loaded']);
   
 const pageProduct = ref(null)
- products.state.current = null
-// products.mutations.resetProduct()
+const orderOrganization = ref(null)
+
+products.state.current = null
 onMounted(async () => {
 
   emits('page-loading');
   await products.actions.read({ _id: route.params.product })
   emits('page-loaded');
 
-
   // route.meta.title.en = product.value.name
   // route.meta.title.ru = roduct.value.name
 
@@ -170,14 +176,27 @@ function validateToCard(product) {
 
 async function addToCart(product, selectedDates = null) {
   try {
-    if (shopcart.state.organization !== product.owner.target) {
+    // Если организация товара отличается от текущей в корзине
+    if (shopcart.state.organization && shopcart.state.organization !== product.owner.target) {
+      const result = await proxy.$alert({
+        title: 'Start a new order?',
+        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: 'Start New Order', value: true }
+        ]
+      })
+
+      if (!result) throw error
+
       shopcart.state.organization = product.owner.target
       shopcart.state.positions = []
     }
+
     await shopcart.actions.addProductToCart(product, product.owner.target, selectedDates)
     return true
   } catch (error) {
-    console.error('Ошибка при добавлении товара в корзину:', error)
+    console.error('Error while adding product to cart:', error)
     throw error
   }
 }

package/src/modules/products/controllers/products.controller.js

@@ -10,6 +10,9 @@ const openai = new OpenAI({
   apiKey: process.env.OPENAI_API_KEY,
 });
 
+const queryProcessorGlobals = require('@martyrs/src/modules/globals/controllers/utils/queryProcessor');
+
+
 // Factory
 const controllerFactory = (db) => {
   const Product = db.product;
@@ -253,6 +256,10 @@ const controllerFactory = (db) => {
             }
           }
         },
+        // For owner
+        queryProcessorGlobals.getOwnerUserLookupStage(),
+        queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+        queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
        {
         $set: {
           available: {

package/src/modules/products/store/products.js

@@ -24,7 +24,6 @@ const state = reactive({
     sale: 0,
     price: 0,
     price_cost: 0,
-    price_currency: '$',
     localization: [],
     modifications: [],
     quantityDiscount: [],

package/src/styles/base/all.scss

@@ -159,6 +159,7 @@ body {
 	.o-hidden 	{overflow: hidden; }
 	.o-scroll 	{overflow: scroll; }
 	.o-y-scroll {overflow-y: scroll; }
+	.o-x-scroll {overflow-y: scroll; }
 	.o-x-hidden {overflow-x: hidden; touch-action: pan-y;}
 	.o-auto 		{overflow: auto; }
 	.o-visible 	{overflow: visible; } 

package/src/styles/typography.scss

@@ -59,6 +59,28 @@ a:hover   { cursor: pointer;}
 .lh-medium 	{ line-height: 1.250; }
 .lh-regular { line-height: 1.125; }
 .lh-light  	{ line-height: 1.000; }
+/*Text trim*/
+.t-trim {
+	display: -webkit-box;
+  -webkit-box-orient: vertical;  
+  overflow: hidden;
+  -webkit-line-clamp: 1;
+}
+
+.t-trim-2 {
+	display: -webkit-box;
+  -webkit-box-orient: vertical;  
+  overflow: hidden;
+  -webkit-line-clamp: 2;
+}
+
+.t-trim-3 {
+	display: -webkit-box;
+  -webkit-box-orient: vertical;  
+  overflow: hidden;
+  -webkit-line-clamp: 3;
+}
+
 
 
 // Text decoration