@ozdao/prometheus-framework 0.2.58 → 0.2.60

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

@@ -149,7 +149,7 @@
 	     		v-if="orders.state.current.status_history"
 	     		:statusHistory="orders.state.current.status_history"
 	     		:statusCurrent="orders.state.current.status"
-	     		:edit="route.name === 'AdminOrderEdit'"
+	     		:edit="route.name === 'Order Edit'"
 	     	/>
 
 	     <!-- 	<button 
@@ -196,7 +196,7 @@
 		    	:username="
 		    		route.name === 'Order Status' ? order.user?.name || 'User' : 'Weeder Support'
 		    	"
-		    	:chatID="order._id"
+		    	:chatID="route.params.order"
 		    	class="radius-semi bg-white o-hidden"
 		    />
 
@@ -232,37 +232,38 @@
 
 	onMounted(async()=>{
 		order.value = await orders.actions.read({_id: route.params.order})
+		order.value = order.value[0]
 
 		productsOrganization.value = await products.actions.read({
-	    organization: order.value[0].owner.target
+	    organization: order.value?.owner.target._id
 	  });
 
 	  orderOrganization.value = await organizations.actions.read({
-	    _id: order.value[0].owner.target,
-	    // location: globals.state.position?.location,
+	    _id: order.value?.owner.target._id,
+	    location: globals.state.position?.location,
 	  });
 
 	})
 
 	let cartTotalPrice = computed(() => {
-    return Number(order.value[0]?.positions.reduce((total, product) => {
+    return Number(order.value?.positions.reduce((total, product) => {
       return total + product.price * product.quantity;
     }, 0));
   })
 
   let cartTotalAmount = computed(() => {
-    return Number(order.value[0]?.positions.reduce((total, product) => {
+    return Number(order.value?.positions.reduce((total, product) => {
       return total + product.quantity;
     }, 0));
   })
 
   let orderProducts = computed(() => {
-    return order.value[0]?.positions.map(({ _id, quantity }) => {
+    return order.value?.positions.map(({ _id, quantity }) => {
 
 	    const product = productsOrganization.value.find(product => product._id === _id)
 
 	    console.log(product)
-	    console.log(productOrganization)
+	    console.log(productsOrganization)
 
 	    return {
 	      name: product.name,

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

@@ -26,18 +26,39 @@
     class="cols-3 gap-thin"
   >
 
-    <div 
-      v-for="order in orders.state.all" 
-      class="bg-grey pd-small radius-big"
-    > 
-      Status: {{order.status}} 
+    <router-link 
+       v-for="order in orders.state.all" 
+      :to="{ 
+        name: 'Order Edit', 
+        params: { 
+          order: order._id 
 
+        }
+      }" 
+       class="bg-grey radius-big"
+    >
+      <CardHeader 
+        :class="{
+          'mn-b-small pd-medium': type !== 'short',
+          'flex-child-order-last flex-child mn-l-small': type === 'short',
+        }"
+        :entity="order"
+        :entityType="'order'"
+        :user="auth.state.user"
+        :owner="order.creator" 
+        :creator="order.creator"
+        :date="order.createdAt"
+      />
+      <div class="pd-small">
       <p 
         class="w-100 mn-b-thin p-big"
       >
         Order No.: #{{order._id}} 
       </p>
 
+      <span class="mn-b-thin pd-r-thin pd-l-thin pd-b-nano pd-t-nano bg-second radius-extra t-white t-medium d-block w-max uppercase">
+        {{order.status}}
+      </span>
       <p
         class="mn-b-small t-transp w-100"
       >
@@ -49,23 +70,9 @@
         class="mn-b-small"
       >
      
-        Order Created: {{formatDate(order.createdAt)}}
-        
-        <router-link 
-          :to="{ 
-            name: 'AdminOrderEdit', 
-            params: { 
-              order: order._id 
-
-            }
-          }" 
-          class="i-small"
-        >
-          EDIT
-        </router-link>
       </p>
-
-    </div>
+      </div>
+     </router-link>
   </section>
 </template>
 
@@ -76,8 +83,10 @@
   import Tab      from '@pf/src/components/Tab/Tab.vue'
 
   import * as orders from '@pf/src/modules/orders/store/orders';
+  import * as auth from '@pf/src/modules/auth/store/auth';
 
   import CardOrder from '@pf/src/modules/orders/components/blocks/CardOrder.vue'
+  import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
 
   const route = useRoute();
   const router = useRouter();

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

@@ -64,7 +64,7 @@ const controllerFactory = (db) => {
         req.query
       ), 
       // For creator
-      queryProcessorGlobals.getCreatorUserLookupStage(),
+      queryProcessorGlobals.getCreatorUserLookupStage(), 
       queryProcessorGlobals.getCreatorOrganizationLookupStage(),
       // For owner
       queryProcessorGlobals.getOwnerUserLookupStage(),

package/src/modules/orders/models/order.model.js

@@ -4,6 +4,15 @@ module.exports = (db) => {
     
   const OrderSchema = new db.mongoose.Schema({
    client: {
+      type: { 
+        type: String,
+        trim: true 
+      },
+      target: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        refPath: 'client.type',
+      },
+      table: { type: String, trim: true },
       name: { type: String, trim: true },
       phone: { type: Object, trim: true },
       email: { type: String, trim: true },
@@ -72,7 +81,7 @@ module.exports = (db) => {
     }
   });
 
-  // applyOwnershipSchema(OrderSchema,db);
+  applyOwnershipSchema(OrderSchema,db);
 
   const Order = db.mongoose.model("Order", OrderSchema);
 

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

@@ -50,13 +50,8 @@ const state = reactive({
 });
 
 const actions = {
-  async create(positions, owner, creator) {
+  async create(order) {
     try {
-      let order = {
-        positions: positions,
-        owner: owner,
-        creator: creator
-      }
       const response = await $axios.post('/api/orders/create', order);
 
       state.all.push(response.data);

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

@@ -19,7 +19,7 @@
 		<Field 
 			v-model:field="productQuantity" 
 			type="number"  
-			label="Quantity" 
+			label="Qty" 
 			class="bg-white pd-small radius-small" 
 		>
 		<Select 

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

@@ -111,9 +111,9 @@
   const productNew = ref(null);
 
   const totalPrice = computed(() => {
-    return leftovers.state.current.positions.reduce((sum, position) => {
+    return Number(leftovers.state.current.positions.reduce((sum, position) => {
       return sum + position.price;
-    }, 0);
+    }, 0));
   });
 
   onMounted(async () => {