@ozdao/prometheus-framework 0.2.39 → 0.2.41

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

@@ -28,11 +28,12 @@ const actions = {
   setShopcart() {
     try {
       const storedShopcart = localStorage.getItem('shopcart');
+
       if (storedShopcart) {
         const shopcartData = JSON.parse(storedShopcart);
         state.positions = shopcartData.positions; // Восстанавливаем продукты
         state.organization = shopcartData.organization; // Восстанавливаем _id организации
-      }
+      } 
     } catch (error) {
       console.error(error);
       throw error;
@@ -74,11 +75,16 @@ const actions = {
 
     if (cartItemIndex > -1) {
       state.positions.splice(cartItemIndex, 1);
-
-      localStorage.setItem('shopcart', JSON.stringify(state.positions));
+      
+      // Сохраняем весь объект корзины, а не только позиции
+      localStorage.setItem('shopcart', JSON.stringify({
+        positions: state.positions,
+        organization: state.organization
+      }));
     }
   },
 
+
   decrementItemQuantity(_id) {
     const cartItem = state.positions.find(
       (item) => item._id === _id
@@ -92,10 +98,15 @@ const actions = {
         state.positions.splice(cartItemIndex, 1);
       }
 
-      localStorage.setItem('shopcart', JSON.stringify(state.positions));
+      // Сохраняем весь объект корзины, а не только позиции
+      localStorage.setItem('shopcart', JSON.stringify({
+        positions: state.positions,
+        organization: state.organization
+      }));
     }
   },
 
+
   incrementItemQuantity(_id) {
     const cartItem = state.positions.find(
       (item) => item._id === _id
@@ -104,10 +115,15 @@ const actions = {
     if (cartItem) {
       cartItem.quantity++;
 
-      localStorage.setItem('shopcart', JSON.stringify(state.positions));
+      // Сохраняем весь объект корзины, а не только позиции
+      localStorage.setItem('shopcart', JSON.stringify({
+        positions: state.positions,
+        organization: state.organization
+      }));
     }
   },
 
+
   resetShopcart({ state }) {
     state.positions = [];
     

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -16,10 +16,10 @@
         class="h-4r w-4r"
       />
       
-      <div class="pos-relative w-100 flex-child-1 flex-child mn-l-small w-100">
+      <div class="pos-relative w-100 flex-h-center flex flex-column flex-child-1 flex-child mn-l-thin w-100">
         
         <!-- <Text :text="organization.profile.name ? organization.profile.name : ''" :maxLen="18" class="h3 d-block"/> -->
-        <p class="h3 t-truncate">{{organization.profile.name}}</p>
+        <p class="h4 t-truncate">{{organization.profile.name}}</p>
         <!-- RATING -->
         <!-- <div v-if="showRating && organization.rating" class="w-max star-container flex-v-center flex">
           <img
@@ -38,8 +38,8 @@
           class="pos-relative p-small"
         />
 
-        <div v-if="showFollowers">
-          <p class="mn-b-thin">{{organization.numberOfSubscribers}} followers</p>
+        <div v-if="showFollowers" class="flex-center gap-thin pd-r-thin pd-l-thin flex-nowrap flex mn-t-thin bg-white radius-extra w-max">
+          <p class="mn-t-thin mn-b-thin">{{organization.numberOfSubscribers}} followers</p>
 
           <ButtonToggleMembership
             v-if="
@@ -51,9 +51,9 @@
             :role="'subscriber'" 
             :target="organization._id" 
             :status="organization.isSubscriber" 
-            :text="{create: 'Follow', remove: 'Unfollow'}"
+            :text="{create: '+', remove: '-'}"
             @updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
-            class="w-min" 
+            class="i-semi" 
           />
         </div>
 

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

@@ -191,7 +191,7 @@
 	const router 	= useRouter()
 	const route 	= useRoute()
 	// Accesing state
-	let tab = route.query.tab ? route.query.tab : 'community';
+	let tab = route.query.tab ? route.query.tab : 'products';
 
 	const organizationData = ref(null)
 

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

@@ -1,12 +1,12 @@
 <template>
 	<transition name="slide-fade">
-		<section class="t-center flex-center flex-column flex pd-medium radius-big bg-grey">
+		<section class="flex-center flex flex-column t-center pd-medium radius-big bg-grey">
 
 			<Dropdown 
 				v-if="user._id !== organization.owner"
-				:label="'...'" 
+				:label="{ component: IconEllipsis, class: 'i-regular t-transp' }"
 				:align="'right'"
-				class="cursor-pointer pos-absolute pos-r-0 pos-t-0 pd-thin radius-extra "
+				class="cursor-pointer pos-absolute pos-r-regular pos-t-regular pd-thin radius-extra "
 			>
 				<section 
 					class="bg-black pd-thin radius-small"
@@ -34,7 +34,7 @@
 				      :status="organization.isBlocked" 
 				      :text="{create: 'Block', remove: 'Unblock'}"
 				      @updateMembership="event => handleMembershipUpdate(event, 'isBlocked')"
-				       class="t-white  mn-t-thin bg-red" 
+				       class="t-white w-100 mn-t-thin bg-red" 
 			    	/>
 				</section>
       </Dropdown>
@@ -53,7 +53,7 @@
 			<img 
 				v-if="organization.profile.photo" 
 				:src="(FILE_SERVER_URL || '') + organization.profile.photo" 
-				class="radius-big bg-grey flex-center flex mn-b-small i-extra" 
+				class="radius-big bg-grey flex-center flex mn-b-small w-8r" 
 			/>
 
 			<PlaceholderOrganizationPic
@@ -61,48 +61,45 @@
 				class="radius-medium mn-b-small i-extra"
 			/>
 
-	        <h1
-	        	class="mn-b-thin"
-	        >
-	    		{{ organization.profile.name }}
-	    	</h1>
-
-	        <p class="mn-b-medium p-big">
-		     	<Text :text="organization.profile.description || ''" :maxLen="240" />
-	      	</p>  
-
-
-	        
-	    <Chips 
+      <h1
+      	class="mn-b-thin"
+      >
+	  		{{ organization.profile.name }}
+	  	</h1>
+
+     	<div class="flex-center  pd-r-thin pd-l-thin flex-nowrap flex mn-t-thin bg-white radius-extra w-max">
+     		<IconFollowing class="i-medium mn-r-micro t-transp"/>
+
+        <p class="mn-t-thin p-medium t-medium uppercase mn-b-thin">{{organization.numberOfSubscribers}} followers</p>
+
+        <ButtonToggleMembership
+          v-if="
+		      	user._id 
+		      	&& route.params._id 
+		      	&& route.params._id !== user._id
+		      	&& organization.owner !== user._id
+		      "
+          :user="user._id"
+          :type="'organization'" 
+          :role="'subscriber'" 
+          :target="organization._id" 
+          :status="organization.isSubscriber" 
+          :text="{create: '+', remove: '-'}"
+          @updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
+          class=" mn-l-thin p-medium t-medium radius-extra i-semi" 
+        />
+      </div>
+
+      <p class="w-max-50r mn-t-regular mn-b-medium p-big">
+     		<Text :text="organization.profile.description || ''" :maxLen="240" />
+    	</p>  
+
+    	<Chips 
       	v-if="organization.profile?.tags?.length > 0" 
       	:chips="organization.profile.tags"
-      	class="mn-b-semi"
+      	class="p-medium"
      	/>
 
-		 	<p 
-				class="t-semi mn-b-small"
-			>
-				<!-- 👍 3 212 likes ·  -->
-				<!-- 💬 342 comments ·  -->
-				👨‍👨‍👧‍👧 {{organization.numberOfSubscribers}} followers
-			</p>
-
-		 	<ButtonToggleMembership
-    		v-if="
-	      	user._id 
-	      	&& route.params._id 
-	      	&& route.params._id !== user._id
-	      	&& organization.owner !== user._id
-	      "
-	      :user="user._id"
-	      :type="'organization'" 
-      	:role="'subscriber'" 
-	      :target="organization._id" 
-	      :status="organization.isSubscriber" 
-				:text="{create: 'Follow', remove: 'Unfollow'}"
-	      @updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
-	      class="w-min mn-b-medium	mn-r-auto mn-l-auto" 
-    	/>
 
       <h4 
       	v-if="Object.values(organization.socials).some(value => value)" 
@@ -148,7 +145,9 @@
 	import Text  		from '@pf/src/components/Text/Text.vue'
 	import Chips  from '@pf/src/components/Chips/Chips.vue'
 	// Icons
+	import IconFollowing from '@pf/src/modules/icons/entities/IconFollowing.vue'
 	import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
+	import IconEllipsis from '@pf/src/modules/icons/navigation/IconEllipsis.vue'
 	import PlaceholderOrganizationPic from '@pf/src/modules/icons/placeholders/PlaceholderOrganizationPic.vue'
 	// Org Module
 	import ButtonToggleMembership from '@pf/src/modules/organizations/components/elements/ButtonToggleMembership.vue'

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

@@ -14,8 +14,8 @@
 	        	:key="organization._id" 
 		      	:organization="organization"
 		      	:user="auth.state.user"
-				@updateMembership="handleMembershipUpdate"
-				class="w-max"
+						@updateMembership="handleMembershipUpdate"
+						class="w-max-20r radius-big"
 		    />
 		</div>
 	</div>
@@ -35,9 +35,8 @@
 	onMounted(async () => {
 		publics.value = await organization.actions.read({
 			user: auth.state.user._id,
-			sort: "numberOfMemberships",
+			sortParam: "profile.tags",
 			limit: 10,
-			types: ['public']
 		});
 	});
 

package/src/modules/payments/controller/payments.controller.js

@@ -3,239 +3,93 @@ var jwt = require("jsonwebtoken");
 var axios = require('axios');
 var bcrypt = require("bcryptjs");
 var crypto = require('crypto');
-const { v4: uuidv4 } = require('uuid');
 
-var TerminalKey = process.env.TINKOFF_TERMINAL_KEY;
-var TerminalPassword = process.env.TINKOFF_TERMINAL_PASSWORD;
+const QRCode = require('qrcode');
 
 const controllerFactory = (db) => {
   const Payment = db.payment;
+  const Wallet = db.wallet;
   const Order = db.order;
 
-  const getAll = (req, res) => {
-    Payment.find({}).sort({'createdAt': 'desc'}).exec((err, paymentes) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!paymentes) {return res.status(404).send({ message: "Paymentes not found." }); }
-      // If succes
-      res.status(200).send(paymentes);
-    });
-  };
-
   const create = (req, res) => {
-    console.log(req.body)
-    Payment.create({
-      type: req.body.type,
-      order: req.body.order, 
-      positions: req.body.positions
-    }, (err, payment) => {
-      if (err) {return res.status(500).send({ message: err }); }
-      if (!payment) {return res.status(404).send({ message: "Something wrong when updating product. (with files)" }); }
-      res.status(200).send(payment);
-    })
-  };
+    const { amount, positions, userId } = req.body;
 
-  const get = (req, res) => {
-    Payment.findOne({ _id: req.params._id }).exec((err, payment) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!payment) {return res.status(404).send({ message: "Payment not found." }); }
-      // If succes
-      res.status(200).send(payment);
-    });
-  };
+    const newPayment = new Payment({ amount, positions, user: userId });
+    await newPayment.save();
 
-  const update = (req, res) => {
+    const qrData = `PaymentID:${newPayment._id};Amount:${amount}`;
+    const qrCode = await QRCode.toDataURL(qrData);
+
+    res.send({ qrCode, paymentId: newPayment._id });
+  };
 
-    Payment.findOneAndUpdate({ PaymentId: req.params._id }, req.body, { new: true, upsert: true}).exec((err, payment) => {
+  const read = (req, res) => {
+    Payment.find({}).sort({'createdAt': 'desc'}).exec((err, paymentes) => {
       // If error
       if (err) {return res.status(500).send({ message: err }); }
       // If not found
-      if (!payment) {return res.status(404).send({ message: "Payment not found." }); }
+      if (!paymentes) {return res.status(404).send({ message: "Paymentes not found." }); }
       // If succes
-      res.status(200).send(payment);
+      res.status(200).send(paymentes);
     });
   };
 
-  const deletePayment = (req, res) => {
-    Payment.findOneAndDelete({_id: req.params._id}, (err, payment) => {
-      if (err) {return res.status(500).send({ message: err }); }
-      if (!payment) {return res.status(404).send({ message: "Something wrong when deleting payment." }); }
-      res.status(200).send(payment);
-    })
-  };
-
-  function createToken (request) {
-    request = Object.entries(request).map(function(key) {
-      return { [key[0]]: key[1] }
-      })
-      request.push({Password: TerminalPassword})
-      request.sort(function(a, b){
-      if(Object.keys(a)[0] < Object.keys(b)[0]) { return -1; }
-      if(Object.keys(a)[0] > Object.keys(b)[0]) { return 1; }
-      return 0;
-        })
-    const requestContacted = request.map(function(key) {
-      return Object.values(key)[0]
-     }).join("")
-
-    const hash = crypto.createHash('sha256').update(requestContacted).digest('hex');
-
-    return hash
-  } 
-  const newpayment = (req, res) => {
-    // Data for payment init
-    console.log(req.body.phone);
-    // Send request to Tinkoff
-    axios.post('https://securepay.tinkoff.ru/v2/Init', {
-      TerminalKey: TerminalKey,
-      Amount: '350000',
-      OrderId: req.body._id,
-      Recurrent: 'y',
-      PayType: "О",
-      CustomerKey: req.body.phone,
-      Description: 'Оплата в интернет-магазине',
-      Data: {
-        phone: req.body.phone,
-      },
-      // SuccessURL: 'http://tandem.ohmybike.ru/rent/' + OrderId,
-      // FailURL: 'http://tandem.ohmybike.ru/account'
-      // SuccessURL: 'http://localhost:8082/rent/' + OrderId,
-      // FailURL: 'http://localhost:8082/account'
-    }).then(function(response) {
-        const payment = new Payment(response.data);
-        payment.save((err, payment) => {
-          if (err) {
-            res.status(500).send({ message: err });
-            return;
-          }
-
-          payment.save(err => {
-            if (err) {
-              res.status(500).send({ message: err });
-              return;
-            }
-            res.send(response.data);
-          });
-        })
-    }).catch(function(error) {
-      res.send(error);
-    })
-
-  };
-  const setpayment = (req, res) => {
-    // Data for payment
-    const payment = new Payment({
-      OrderId: req.body.OrderId,
-      Success: req.body.Success,
-      Status: req.body.Status,
-      PaymentId: req.body.PaymentId,
-      ErrorCode: req.body.ErrorCode,
-      Message: req.body.Message,
-      Details: req.body.Details
-    });
-    // Wright to db
-    console.log(payment)
+  const update = (req, res) => {
+    const session = await mongoose.startSession();
+    session.startTransaction();
+    try {
+      const { paymentId, walletId } = req.body; // Теперь мы работаем с walletId
 
-    payment.save((err, payment) => {
-      if (err) {
-        res.status(500).send({ message: err });
-        return;
+      const payment = await Payment.findById(paymentId).session(session);
+      
+      if (!payment) {
+        throw new Error('Payment not found');
+      }
+      if (payment.status !== 'pending') {
+        throw new Error('Payment is not in a pending state');
       }
 
-      payment.save(err => {
-        if (err) {
-          res.status(500).send({ message: err });
-          return;
-        }
+      const wallet = await Wallet.findById(walletId).session(session);
 
-        res.send({ message: "Payment was created successfully!" });
-      });
-    })
-  };
-  const getstatus = (req, res) => {
-    console.log(req.body.order)
-    Payment.findOne({    
-      OrderId: req.body.order
-    })
-    .sort({createdAt: -1})
-    .exec((err, payment) => {
-      if (err) {
-        res.status(500).send({ message: err });
-        return;
-      }
-      if (!payment) {
-        return res.status(404).send({ message: "Payment Not found." });
+      if (!wallet) {
+        throw new Error('Wallet not found');
       }
 
-     
-      if (payment.Status === 'CONFIRMED') {
-        console.log(payment.Status)
-        console.log(req.body.order)
-         Order.findOneAndUpdate({ _id: req.body.order, status: 'Подтвержден' }, {$set: {status: "Ожидает отправки"}},{ new: true}).catch(function(error) {
-        res.status(500).send(error);
-      });
+      if (wallet.amount < payment.amount) {
+        throw new Error('Insufficient funds');
       }
 
-      axios.post('https://securepay.tinkoff.ru/v2/GetState', {
-        TerminalKey: TerminalKey,
-        PaymentId: payment.PaymentId,
-        Token: createToken({TerminalKey: TerminalKey, PaymentId: payment.PaymentId})
-      }).then(function(response) {
-        payment.Status = response.data.Status
-        payment.save()
-        res.send(response.data);
-      }).catch(function(error) {
-        res.status(500).send(error);
-      });
-    });
+      // Списание средств с кошелька
+      wallet.amount -= payment.amount;
+      await wallet.save({ session });
+
+      // Обновление статуса платежа
+      payment.status = 'completed';
+      await payment.save({ session });
+
+      await session.commitTransaction();
+      res.send('Payment processed successfully');
+    } catch (error) {
+      await session.abortTransaction();
+      res.status(500).send(error.message);
+    } finally {
+      session.endSession();
+    }
   };
 
-  const addcustomer = (req, res) => {
-    console.log(req.body)
-
-    axios.post('https://securepay.tinkoff.ru/v2/AddCustomer', {
-      TerminalKey: TerminalKey,
-      CustomerKey: req.body,
-      Token: createToken({TerminalKey: TerminalKey, CustomerKey: req.body.phone})
-    })
-    .then(function(response) {
-      res.send(response.data);
-    })
-    .catch(function(error) {
-      res.status(500).send(error);
-    });
-  }
-
-  const getcustomercards = (req, res) => {
-    axios.post('https://securepay.tinkoff.ru/v2/GetCardList', {
-      TerminalKey: TerminalKey,
-      CustomerKey: req.body.phone,
-      Token: createToken({TerminalKey: TerminalKey, CustomerKey: req.body.phone})
-    })
-    .then(function(response) {
-      console.log(response.data)
-      res.send(response.data);
+  const deletePayment = (req, res) => {
+    Payment.findOneAndDelete({_id: req.params._id}, (err, payment) => {
+      if (err) {return res.status(500).send({ message: err }); }
+      if (!payment) {return res.status(404).send({ message: "Something wrong when deleting payment." }); }
+      res.status(200).send(payment);
     })
-    .catch(function(error) {
-      res.status(500).send(error);
-    });
-  }
+  };
 
   return {
-    getAll,
     create,
-    get,
+    read,
     update,
     delete: deletePayment,  
-    createToken,
-    newpayment,
-    setpayment,
-    getstatus,
-    addcustomer,
-    getcustomercards
   };
 };