@ozdao/prometheus-framework 0.2.54 → 0.2.56

package/src/modules/globals/components/blocks/BlockSearch.vue

@@ -26,17 +26,18 @@ const updateSearch = (search) => {
 <template>
   <div class="flex-v-center flex-nowrap flex pd-small bg-grey w-100 radius-big">
     <IconSearch class="i-medium t-transp mn-r-thin" />
+
     <Field
       :placeholder="placeholder"
-      @update:field="search => stateSearch = search"
+      @update:field="search => updateSearch(search)"
       class="w-100"
     />
 
-    <button 
+    <!-- <button 
       class="pd-r-small pd-l-small pd-t-thin pd-b-thin p-medium uppercase p-small t-medium cursor-pointer radius-extra bg-main" 
       @click="updateSearch(stateSearch)"
     >
       {{ button }}
-    </button>
+    </button> -->
   </div>
 </template>

package/src/modules/globals/store/globals.js

@@ -67,7 +67,7 @@ const actions = {
     }
   },
 
-  update(array, item, index) {
+  update(array, item) {
     const existingItemIndex = array.findIndex(i => i._id === item._id);
 
     if (existingItemIndex === -1) {
@@ -77,13 +77,44 @@ const actions = {
     }
   },
 
-  delete(array, item, iindex) {
+  delete(array, item) {
     const existingItemIndex = array.findIndex(c => c._id === item._id);
 
     if (existingItemIndex !== -1) {
       array.splice(existingItemIndex, 1);
     }
   }, 
+
+
+  increment(array, item) {
+    console.log(array)
+    console.log(item)
+    const arrayItem = array.find(
+      (i) => i._id === item._id
+    );
+
+    if (arrayItem) {
+      arrayItem.quantity++;
+    }
+  },
+
+  decrement(array, item) {
+    const arrayItem = array.find(
+      (i) => i._id === item._id
+    );
+
+    const arrayItemIndex = array.indexOf(arrayItem);
+    
+    if (arrayItemIndex > -1) {
+      arrayItem.quantity--;
+      
+      if (arrayItem.quantity < 1) array.splice(arrayItemIndex, 1);
+    }
+  },
+
+  reset(array) {
+    array = [];
+  },
 }
 
 const errorMessages = {

package/src/modules/orders/components/blocks/CardOrderItem.vue

@@ -1,7 +1,6 @@
 <template>
 	<div 
     class="gap-small pos-relative cols-1"
-    style="box-sizing: content-box;" 
   >
 
     <div class="pos-relative  w-100 gap-thin flex-stretch flex-nowrap flex">
@@ -39,7 +38,7 @@
         <!-- Quantity -->
         <div v-if="editable" class="mn-t-thin gap-thin flex-nojustify flex">
           <IconAdd
-            @click="increase(product)"
+            @click="increase_(product)"
             class="hover-scale-1 cursor-pointer bg-grey i-big pd-thin radius-small"
           />
           <IconMinus
@@ -72,15 +71,37 @@
 
 	const router = useRouter()
 
+  const emits = defineEmits(['increase', 'decrease', 'remove'])
+
 	const props = defineProps({
 		product: Object,
 		editable: String,
 		increase: Function,
 		decrease: Function,
 		remove: Function
-
 	})
 
+  function increase_ (product)  {
+    if (props.increase) {
+      props.increase(product)
+    }
+    emits('increase', product)
+  }
+
+  function decrease (product) {
+    if (props.decrease) {
+      props.decrease(product)
+    }
+    emits('decrease', product)
+  }
+
+  function remove (product) {
+    if (props.remove) {
+      props.remove(product)
+    }
+    emits('remove', product)
+  }
+
 </script>
 
 <style lang="scss">

package/src/modules/orders/components/pages/EditOrder.vue

@@ -1,62 +1,104 @@
 <template>
-  <header class="mn-b-medium flex-v-center flex-nowrap flex">
-    <h2 class="mn-r-medium">Edit Order</h2>
-  </header>
-  
-	<Block
-    title="Add Position"
-    class="mn-b-semi"
-  >
-    <CardPosition 
-      @add="addProduct"
-      :products="Products"
-    />
-  </Block>
-
-  <Block
-    title="Invetory Sheet"
-    class="mn-b-semi"
-  >
-    <span 
-      v-if="orders.state.current.positions.length === 0" 
-      class="w-100"
+  <div>
+    <header class="mn-b-medium flex-v-center flex-nowrap flex">
+      <h2 class="mn-r-medium">Create Order</h2>
+    </header>
+
+    <Popup 
+      title="Добавить участника" 
+      @close-popup="closeProductsPopup" 
+      :isPopupOpen="isOpenProductsPopup"
+      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
     >
-      No positions added yet
-    </span> 
-
-    <CardPosition 
-     v-for="(product, index) in orders.state.current.positions" 
-      :key="product._id" 
-      :product="product"
-      :products="Products"
-      @add="addProduct"
-      @delete="deleteProduct"
-      @update="updateProduct"
-    />
-  </Block>
-<!-- 
-  <FormOrderDetails 	
-		:order="orders.state.current"  
-		@create="handleCreate"
-		class="bg-grey pd-medium radius-big mn-b-semi"
-	/> -->
-
-
-<div class="mn-thinw-100 flex-v-center flex block">
-	<p class="p-big">Сумма к оплате:
-		<span v-if="order.info?.delivery === 'Самовывоз'" class="p-big t-semi">{{ orderTotalPrice / 100 }} ₽</span>
-		<span v-if="order.info?.delivery === 'Курьером'" class="p-big t-semi">{{ orderTotalPrice / 100 + 350 }} ₽</span>
-		<span v-if="order.info?.delivery === 'Почтой'" class="p-big t-semi">{{ orderTotalPrice / 100 + 550 }} ₽</span>
-		(Заказ {{orderTotalPrice / 100}} ₽ + доставка
-		<span v-if="order.info?.delivery === 'Самовывоз'" >0</span>
-		<span v-if="order.info?.delivery === 'Курьером'" >350</span>
-		<span v-if="order.info?.delivery === 'Почтой'">550</span>
-	    ₽)  
-	</p>
-
-	<button class="mn-l-auto button">Запросить онлайн</button>
-</div>
 
+      <h3 class="mn-b-small">Add to order</h3>
+
+      <div class="bg-grey mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
+        <Feed
+          :search="true"
+          :states="{
+            empty: {
+              title: 'No Products Found',
+              description: 'Currently, there are no such products available.'
+            }
+          }"
+          :store="{
+            read: (options) => products.actions.read(options),
+            state: null
+          }"
+          :options="{
+            organization: route.params._id
+          }"
+          v-slot="{ 
+            items 
+          }"
+          class=""
+        >
+          <CardOrderItem
+            v-for="(product, index) in items" :key="product._id"
+            :editable="false" 
+            :product="product" 
+            @click="() => { 
+              let p = { ...product };
+              p.quantity = 1;
+              globals.actions.add(orders.state.current.positions, p) 
+              closeProductsPopup();
+            }"
+            class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+          />
+        </Feed>
+      </div>
+    </Popup>
+
+    <Block
+      title="Invetory Sheet"
+      :actions="[{
+        label: '+',
+        function: () => openProductsPopup()
+      }]"
+      class="mn-b-semi"
+    >
+      <span 
+        v-if="orders.state.current.positions.length === 0" 
+        class="w-100"
+      >
+        No positions added yet
+      </span> 
+
+      <CardOrderItem
+        v-for="(product, index) in orders.state.current.positions" 
+        :key="product._id"
+        :editable="true" 
+        :product="product" 
+        @increase="() => { globals.actions.increment(orders.state.current.positions, product) }"
+        @decrease="() => { globals.actions.decrement(orders.state.current.positions, product) }"
+        @remove="() => { globals.actions.delete(orders.state.current.positions, product) }"
+        class="mn-b-thin pd-thin radius-medium bg-white"
+      /> 
+    </Block>
+  <!-- 
+    <FormOrderDetails 	
+  		:order="orders.state.current"  
+  		@create="handleCreate"
+  		class="bg-grey pd-medium radius-big mn-b-semi"
+  	/> -->
+
+
+  <div class="mn-thinw-100 flex-v-center flex block">
+  	<p class="p-big">Сумма к оплате:
+  		<span v-if="order?.info?.delivery === 'Самовывоз'" class="p-big t-semi">{{ orderTotalPrice / 100 }} ₽</span>
+  		<span v-if="order?.info?.delivery === 'Курьером'" class="p-big t-semi">{{ orderTotalPrice / 100 + 350 }} ₽</span>
+  		<span v-if="order?.info?.delivery === 'Почтой'" class="p-big t-semi">{{ orderTotalPrice / 100 + 550 }} ₽</span>
+  		(Заказ {{orderTotalPrice / 100}} ₽ + доставка
+  		<span v-if="order?.info?.delivery === 'Самовывоз'" >0</span>
+  		<span v-if="order?.info?.delivery === 'Курьером'" >350</span>
+  		<span v-if="order?.info?.delivery === 'Почтой'">550</span>
+  	    ₽)  
+  	</p>
+
+  	<button class="mn-l-auto button">Запросить онлайн</button>
+  </div>
+</div>
 
 
 </template>
@@ -66,79 +108,43 @@
   import { computed, ref, defineProps, onMounted, reactive, toRefs, watch } from 'vue'
   import { useRoute } from 'vue-router'
 
+  import Feed from '@pf/src/components/Feed/Feed.vue'
+  import Popup from '@pf/src/components/Popup/Popup.vue';
 	import Block from '@pf/src/components/Block/Block.vue';
 
-  import ListPositions from '@pf/src/modules/products/components/blocks/ListPositions.vue'
+  import CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
+
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
   
-  // import FormOrderDetails from '@pf/src/modules/orders/components/sections/FormOrderDetails.vue'
 
   // Import your store
+  import * as globals from '@pf/src/modules/globals/store/globals';
   import * as orders from '@pf/src/modules/orders/store/orders';
 	import * as products from '@pf/src/modules/products/store/products';
 
   // Accessing router
   const route = useRoute()
 
-  // Define props
-  const props = defineProps(['showProduct'])
-  props.showProduct = [];
+  // Popup
+  const isOpenProductsPopup = ref(false);
 
-  function addProduct(product) {
-    orders.actions.addProduct(product);
+  function openProductsPopup() {
+    isOpenProductsPopup.value = true;
   }
 
-  function deleteProduct(product) {
-    orders.actions.deleteProduct(product) 
+  function closeProductsPopup() {
+    isOpenProductsPopup.value = false;
   }
 
-  // Reactive data
-  let data = reactive([])
-  let reactiveData = toRefs(data)
-  var showAddNew = ref(false)
-	const Products = ref([])
+  // Data
+  let order = ref(null)
 
-  // Initialize order and products
-  let order = ref({})
-  // Replace store orders.actions with your orders.actions
   onMounted(async () => {
-    // Replace Vuex orders.actions with your orders.actions
-    try {
-      const productsResponse = await products.actions.read({
-        organization: '65141c476cf9860013b49f6d'
-      });
-      console.log(productsResponse)
-      Products.value = productsResponse;
-    } catch (error) {
-      console.error('error');
-    }
-
-    await orders.actions.fetchOrder(route.params.id) // Implement this action in your store
-
-    order.value = orders.state.current
-  })
+    // await orders.actions.fetchOrder(route.params.id) // Implement this action in your store
 
+    // order.value = orders.state.current
+  })
 
-  function saveItemList() {
-    orders.actions.updateOrderpositions(route.params.id) // Replace Vuex action with your action
-  }
-
-  function changeEdit(index) {
-    data[index] = !data[index]
-  }
-
-  function resetOrderList() {
-    orders.actions.fetchOrder(route.params.id) // Replace Vuex action with your action
-  }
-
-  function changeAdd() {
-    showAddNew.value = !showAddNew.value
-  }
-
-  // Replace computed properties with reactive orders.state
-  // Update this line to match your orders.state structure
-  const orderTotalPrice = computed(() => 100) // Implement this getter in your orders.actions
-  const orderProducts = computed(() => []) // Implement this getter in your orders.actions
 </script>
 
 

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

@@ -109,6 +109,7 @@
 					Change Invetory
 				</router-link>
 
+				
 				<router-link 
 					class="d-block mn-l-auto uppercase t-semi bg-white pd-thin radius-extra "
 					:to="{

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

@@ -22,7 +22,7 @@ const organizations = [{
     ...membersRoutes,
     ...departmentRoutes,
     ...productRoutes,
-    ...backofficeRoutes
+    // ...backofficeRoutes
     
   ]
 }];

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

@@ -12,7 +12,7 @@ const organizationRoutes = [{
       ru: 'Организация'
     }
   },
-  component: () => layoutEmpty,
+  component: layoutEmpty,
   children: [
     {
       path: '',
@@ -25,7 +25,7 @@ const organizationRoutes = [{
       },
       component: () => import('@pf/src/modules/organizations/components/pages/Organization.vue'),
     },
-    ...backofficeRoutes
+    ...backofficeRoutes 
   ],
 }, {
   path: 'create',

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

@@ -75,9 +75,9 @@
 	])
 
 	const productSelected = ref(null);
-	const productQuantity = ref(null);
+	const productQuantity = ref(1);
 	const productQuantityType = ref('pcs');
-	const productPrice = ref(null);
+	const productPrice = ref(0);
 
 	const isProductValid = computed(() => 
     productSelected.value 
@@ -87,14 +87,14 @@
 
 	watch(props.array, () => {
 	  productSelected.value = props.product
-		productQuantity.value = props.product.quantity
+		productQuantity.value = props.product.quantity || 1
 		productPrice.value = props.product.price
 		productQuantityType.value = props.product.type
 	});
 
 	if (props.product) {
 		productSelected.value = props.product
-		productQuantity.value = props.product.quantity
+		productQuantity.value = props.product.quantity || 1
 		productPrice.value = props.product.price
 		productQuantityType.value = props.product.type
 	}
@@ -105,7 +105,7 @@
 	  emits('update', {
 	    ...productSelected.value,
 	    price: productPrice.value,
-	    quantity: productQuantity.value,
+	    quantity: productQuantity.value || 1,
 	    type: productQuantityType.value
 	  });
 	});
@@ -115,7 +115,7 @@
 		emits('add', {
 			...productSelected.value,
 			price: productPrice.value,
-			quantity: productQuantity.value,
+			quantity: productQuantity.value || 1,
 			type: productQuantityType.value
 	  });
 	}
@@ -124,7 +124,7 @@
 	  emits('delete', {
 			...productSelected.value,
 			price: productPrice.value,
-			quantity: productQuantity.value,
+			quantity: productQuantity.value || 1,
 			type: productQuantityType.value
 	  });
 	}

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

@@ -96,6 +96,8 @@ const actions = {
       query.search = options.search;
     }
 
+    console.log(options.search)
+
     query.sort = 'createdAt';
     
     query.skip = options.skip || 0;