conflict resolved

resources/Content/AboutUsModel.js

@@ -0,0 +1,22 @@
+import mongoose from "mongoose";
+const { Schema, model } = mongoose;
+
+const aboutUsSchema = new Schema(
+  {
+    aboutUsContent: {
+      type: String,
+      default:''
+    },
+    addedBy: {
+      type: mongoose.Schema.ObjectId,
+      ref: "User",
+      required: true,
+    },
+  },
+  { timestamps: true }
+);
+
+export const AboutUs = model(
+  "AboutUs",
+  aboutUsSchema
+);

resources/Content/ContentController.js

@@ -2,6 +2,7 @@ import { PrivacyAndPolicy } from "./PrivacyPolicyModel.js";
 import { Refundpolicy } from "./RefundModel.js";
 import { Shipping } from "./ShippingModel.js";
 import { TermsAndCondition } from "./TermsandConditonModel.js";
+import { AboutUs } from './AboutUsModel.js'
 
 export const AddTermsAndConditions = async (req, res) => {
   try {
@@ -51,24 +52,24 @@ export const getTermsAndCondition = async (req, res) => {
 export const updateTermsAndConditions = async (req, res) => {
   try {
     if (!req?.user) return res.status(400).json({ message: "please login !" });
-     // new content
+    // new content
-     const { content } = req.body;
+    const { content } = req.body;
 
-     // id of the  terms and conndition document
+    // id of the  terms and conndition document
-     const id = req.query.id;
+    const id = req.query.id;
- 
+
-     // object for updated  terms and conndition data
+    // object for updated  terms and conndition data
-     const updatedTermsData = {
+    const updatedTermsData = {
       termsAndContionContent: content,
-       addedBy: req.user._id
+      addedBy: req.user._id
-     }
+    }
- 
+
-     // update the  terms and conndition in database
+    // update the  terms and conndition in database
-     const termsAndCondition = await TermsAndCondition.findByIdAndUpdate(
+    const termsAndCondition = await TermsAndCondition.findByIdAndUpdate(
-       { _id: id },
+      { _id: id },
-       { $set: updatedTermsData },
+      { $set: updatedTermsData },
-       { new: true }
+      { new: true }
-     );
+    );
 
     res.status(200).json({
       success: true,
@@ -88,10 +89,10 @@ export const RefundPolicy = async (req, res) => {
     if (!req?.user) return res.status(400).json({ message: "please login !" });
     // console.log(req?.user)
     const { content } = req.body;
-    const  refundPolicy = await Refundpolicy.create({
+    const refundPolicy = await Refundpolicy.create({
-        addedBy: req.user._id,
+      addedBy: req.user._id,
-        Refundpolicy: content,
+      Refundpolicy: content,
-      });
+    });
 
     res.status(200).json({
       success: true,
@@ -130,22 +131,22 @@ export const updateRefundPolicy = async (req, res) => {
   try {
     if (!req?.user) return res.status(400).json({ message: "please login !" });
 
-    const {content} = req.body;
+    const { content } = req.body;
-     // id of the refund policy document
+    // id of the refund policy document
-     const id = req.query.id;
+    const id = req.query.id;
-    
+
-     // object for updated refund policy data
+    // object for updated refund policy data
-     const updatedRefundPolicyData = {
+    const updatedRefundPolicyData = {
-       Refundpolicy: content,
+      Refundpolicy: content,
-       addedBy: req.user._id
+      addedBy: req.user._id
-     }
+    }
- 
+
-     // update the refund policy in database
+    // update the refund policy in database
-     const refundPolicy = await Refundpolicy.findByIdAndUpdate(
+    const refundPolicy = await Refundpolicy.findByIdAndUpdate(
-       { _id: id },
+      { _id: id },
-       { $set: updatedRefundPolicyData },
+      { $set: updatedRefundPolicyData },
-       { new: true }
+      { new: true }
-     );
+    );
 
     res.status(200).json({
       success: true,
@@ -305,7 +306,7 @@ export const updateShipping = async (req, res) => {
       shippingContent: content,
       addedBy: req.user._id
     }
-    
+
     // update the shipping policy in database
     const shipping = await Shipping.findByIdAndUpdate(
       { _id: id },
@@ -325,3 +326,88 @@ export const updateShipping = async (req, res) => {
     });
   }
 };
+
+// About us controller functions
+
+export const AddAboutUs = async (req, res) => {
+  try {
+    if (!req?.user) return res.status(400).json({ message: "please login !" });
+    // console.log(req?.user)
+
+    req.body.user = req.user._id;
+    const { content } = req.body;
+    const aboutUs = await AboutUs.create({
+      aboutUs: content,
+      addedBy: req.user._id,
+    });
+
+    res.status(201).json({
+      success: true,
+      aboutUs,
+      message: "Added successfully",
+    });
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};
+
+export const getAboutUs = async (req, res) => {
+  try {
+    // if (!req?.user) return res.status(400).json({ message: "please login !" });
+    // console.log(req?.user)
+
+    const aboutUs = await AboutUs.find();
+
+    res.status(200).json({
+      success: true,
+      aboutUs,
+      message: "Found successfully ",
+    });
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};
+
+export const updateAboutUs = async (req, res) => {
+  try {
+    if (!req?.user) return res.status(400).json({ message: "please login !" });
+
+    // new content
+    const { content } = req.body;
+
+    // id of the about us document
+    const id = req.query.id;
+
+    // object for updated about us data
+    const updatedAboutUsData = {
+      aboutUsContent: content,
+      addedBy: req.user._id
+    }
+
+    // update the about us in database
+    const aboutUs = await AboutUs.findByIdAndUpdate(
+      { _id: id },
+      { $set: updatedAboutUsData },
+      { new: true }
+    );
+
+    res.status(200).json({
+      success: true,
+      aboutUs,
+      message: "updated successfully ",
+    });
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};
+
+

resources/Content/ContentRoutes.js

@@ -11,7 +11,10 @@ import {
   updatePrivacyPolicy,
   updateShipping,
   updateTermsAndConditions,
-  updateRefundPolicy
+  updateRefundPolicy,
+  AddAboutUs,
+  getAboutUs,
+  updateAboutUs
 } from "./ContentController.js";
 import { isAuthenticatedUser, authorizeRoles } from "../../middlewares/auth.js";
 
@@ -51,6 +54,13 @@ router
 router
   .route("/refund-policy-update")
   .patch(isAuthenticatedUser, authorizeRoles("admin"), updateRefundPolicy);
-//
+//about us
+router
+  .route("/about-us")
+  .post(isAuthenticatedUser, authorizeRoles("admin"), AddAboutUs);
+router.route("/about-us").get(getAboutUs);
+router
+  .route("/about-us-update")
+  .patch(isAuthenticatedUser, authorizeRoles("admin"), updateAboutUs);
 
 export default router;

resources/Orders/RazerPayCheckoutController.js

@@ -56,15 +56,23 @@ export const checkout = async (req, res) => {
     const { address, cart, subtotal } = req.body;
     if (cart.length < 1)
       return res.status(400).json({ message: "cart is empty!" });
-    switch (true) {
+    if (!address)
-      //validation
+      return res
-      case !address: {
+        .status(404)
-        return res.status(404).json({ msg: "please provide shipping address" });
+        .json({ message: "please select shipping address!" });
-      }
+    if (!subtotal)
-      case !subtotal: {
+      return res
-        return res.status(404).json({ msg: "please provide product subtotal" });
+        .status(404)
-      }
+        .json({ message: "please provide product subtotal!" });
-    }
+    // switch (true) {
+    //   //validation
+    //   case !address: {
+    //     return res.status(404).json({ msg: "please select shipping address" });
+    //   }
+    //   case !subtotal: {
+    //     return res.status(404).json({ msg: "please provide product subtotal" });
+    //   }
+    // }
     let addss = await shippingAddress.findById(address);
     let shipping = {
       first_Name: addss.first_Name,
@@ -77,12 +85,18 @@ export const checkout = async (req, res) => {
       country: addss.country,
       addressId: address,
     };
+    // console.log("cart", cart[0]?.product?.gst);
     const orderItems = await cart.map((item) => ({
       product: item.product._id,
       name: item.product.name,
-      price: item.product.total_amount,
+      price: item.product.price,
+      total_Amount: item.product.total_amount,
+
       image: item.product.image,
       quantity: item.quantity,
+      gst_amount: item.product.gst_amount,
+      gst_rate: item.product.gst?.tax,
+      tax_Name: item.product.gst?.name,
       product_Subtotal: item.subtotal,
     }));
 
@@ -130,7 +144,7 @@ export const paymentVerification = async (req, res) => {
       path: "user",
       select: "name email -_id",
     });
-    console.log("findSameOrder", findSameOrder);
+    // console.log("findSameOrder", findSameOrder);
     if (findSameOrder) {
       (findSameOrder.razorpay_payment_id = razorpay_payment_id), // await Payment.create({
         (findSameOrder.isPaid = true),
@@ -143,7 +157,7 @@ export const paymentVerification = async (req, res) => {
       await findSameOrder.save();
     }
     //send email to customer
-
+    // console.log("findSameOrder", findSameOrder);
     await sendEmail({
       to: `${findSameOrder?.user?.email}`, // Change to your recipient
 
@@ -151,10 +165,84 @@ export const paymentVerification = async (req, res) => {
 
       subject: `Your Order #${findSameOrder?.orderID} Confirmation`,
       html: ` <h1 style="color: #333; text-align: center; font-family: Arial, sans-serif;">Welcome to Smellika - Let the Shopping Begin!</h1>
-       <strong style="color: #1b03a3; font-size: 16px"> Hi ${findSameOrder?.shippingInfo?.first_Name},</strong>
+       <strong style="color: #1b03a3; font-size: 16px"> Hi ${
+         findSameOrder?.shippingInfo?.first_Name
+       },</strong>
        
-        <p style="color: #555; font-size: 15px;">Great news! Your order #${findSameOrder?.orderID} has been confirmed. Here are the details</p>
+        <p style="color: #555; font-size: 15px;">Great news! Your order #${
-        <br/>
+          findSameOrder?.orderID
+        } has been confirmed. Here are the details</p>            
+ <h4 style="color: #333; font-family: Arial, sans-serif;">Shipping Address : ${
+   findSameOrder?.shippingInfo?.first_Name
+ }  ${findSameOrder?.shippingInfo?.last_Name} , ${
+        findSameOrder?.shippingInfo?.street
+      } ${findSameOrder?.shippingInfo?.city} ${
+        findSameOrder?.shippingInfo?.state
+      } ${findSameOrder?.shippingInfo?.country}, PIN-${
+        findSameOrder?.shippingInfo?.postalCode
+      }, Phone Number: ${findSameOrder?.shippingInfo?.phone_Number}</h4>
+        <h4 style="color: #333; font-family: Arial, sans-serif;">Order Items :</h4>
+        <table style="border-collapse: collapse; width: 100%;">
+  <thead>
+    <tr>
+          <th style="border: 1px solid #555; padding: 2px; text-align: center;">S No.</th>
+
+      <th style="border: 1px solid #555; padding: 2px; text-align: center;">Product Name</th>
+            <th style="border: 1px solid #555; padding: 2px; text-align: center;">Image</th>
+
+      <th style="border: 1px solid #555; padding: 2px; text-align: center;">Quantity</th>
+      <th style="border: 1px solid #555; padding: 2px; text-align: center;">Price</th>
+            <th style="border: 1px solid #555; padding: 2px; text-align: center;">GST Amount</th>
+
+            <th style="border: 1px solid #555; padding: 2px; text-align: center;">SubTotal</th>
+
+    </tr>
+  </thead>
+  <tbody>
+    ${findSameOrder?.orderItems
+      ?.map(
+        (product, index) => `
+      <tr>
+              <td style="border: 1px solid #555; padding: 2px; text-align: center;">${
+                index + 1
+              }</td>
+
+        <td style="border: 1px solid #555; padding: 2px; text-align: center;">${
+          product.name
+        }</td>
+                <td style="border: 1px solid #555; padding: 2px; text-align: center;"><img src="${
+                  product?.image[0]?.url
+                }" alt="${
+          product.name
+        }"  style="max-width: 40px; height: auto;"></td>
+
+        <td style="border: 1px solid #555; padding: 2px; text-align: center;">${
+          product.quantity
+        }</td>
+        <td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${
+          product.price
+        }</td>
+         <td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${
+           product?.gst_amount
+         }</td>
+                <td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${
+                  product.product_Subtotal
+                }</td>
+
+      </tr>
+    `
+      )
+      .join("")}
+       <tr>
+      <th colspan="6" style="border: 1px solid #555; padding: 2px; text-align: right;">Total Amount :</th>
+      <td style="border: 1px solid #555; padding: 2px; text-align: center;">₹${
+        findSameOrder?.total_amount
+      }</td>
+    </tr>
+  </tbody>
+</table>
+
+<br/>
         <span style="color: #555; font-size: 13px;">Best regards,</span><br/>
         
         <span style="color: #555; font-size: 13px;">Team Smellika</span>`,
@@ -171,7 +259,7 @@ export const paymentVerification = async (req, res) => {
     //   razorpay_signature,
     // });
 
-    res.redirect(`http://localhost:5173/account`);
+    res.redirect(`https://smellika.com/shop`);
     // res.redirect(
     //   `http://localhost:5173/cart/paymentsuccess?reference=${razorpay_payment_id}`
     // );

resources/Orders/orderController.js

@@ -36,7 +36,33 @@ export const getAllOrder = async (req, res) => {
     });
   }
 };
-
+export const getOrders = async (req, res) => {
+  try {
+    const order = await Order.find({
+      payment_status: "success",
+    })
+      .populate({
+        path: "user",
+        select: "name -_id",
+      })
+      .populate({
+        path: "shippingInfo.addressId",
+      })
+      .sort({ updatedAt: -1 });
+    if (order) {
+      res.status(201).json({
+        success: true,
+        order,
+        message: "All Order Fetched",
+      });
+    }
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};
 export const getSingleOrder = async (req, res) => {
   try {
     if (!req.params.id)

resources/Orders/orderModel.js

@@ -66,6 +66,10 @@ const orderSchema = new mongoose.Schema(
           type: Number,
           default: "",
         },
+        total_Amount: {
+          type: Number,
+          default: "",
+        },
         quantity: {
           type: Number,
           default: "",
@@ -77,6 +81,18 @@ const orderSchema = new mongoose.Schema(
           type: Number,
           default: "",
         },
+        gst_amount: {
+          type: Number,
+          default: "",
+        },
+        gst_rate: {
+          type: Number,
+          default: "",
+        },
+        tax_Name: {
+          type: String,
+          default: "",
+        },
         product: {
           type: mongoose.Schema.ObjectId,
           ref: "Product",

resources/Orders/orderRoute.js

@@ -2,6 +2,7 @@ import bodyParser from "body-parser";
 import {
   deleteOneOrder,
   getAllOrder,
+  getOrders,
   getSingleOrder,
   getUserSelf,
   updateOrderStatusById,
@@ -46,6 +47,9 @@ router.route("/user/self").get(isAuthenticatedUser, getUserSelf);
 router
   .route("/getAll/:status")
   .get(isAuthenticatedUser, authorizeRoles("admin"), getAllOrder);
+  router
+  .route("/getAll/")
+  .get(isAuthenticatedUser, authorizeRoles("admin"), getOrders);
 router.route("/getOne/:id").get(isAuthenticatedUser, getSingleOrder);
 router.route("/change/status/:id").patch(updateOrderStatusById);
 

resources/ShippingAddresses/ShippingAddressController.js

@@ -115,7 +115,7 @@ export const deleteSelfShippingAddress = async (req, res) => {
       await address.remove();
       return res.status(200).json({
         success: true,
-        message: "shipping Address Deleted Successfully!!",
+        message: "Shipping Address Deleted Successfully!",
       });
     } else {
       return res.status(400).json({
@@ -130,3 +130,105 @@ export const deleteSelfShippingAddress = async (req, res) => {
     });
   }
 };
+
+// update shipping addresss
+export const updateShippingAddress = async (req, res) => {
+  try {
+    const {
+      first_Name,
+      last_Name,
+      phone_Number,
+      street,
+      city,
+      state,
+      postalCode,
+      country,
+    } = req.body;
+    const _id = req.params.id;
+    if (!req.params.id)
+      return res
+        .status(400)
+        .json({ message: "please Provide shipping Address Id" });
+    const getselfAddress = await shippingAddress.findById(req.params.id);
+    if (!getselfAddress) {
+      return res.status(404).json({
+        success: false,
+        message: "No shipping Address  Found!",
+      });
+    }
+    switch (true) {
+      //validation
+      case !first_Name: {
+        return res.status(404).json({ msg: "please provide first_Name" });
+      }
+      case !last_Name: {
+        return res.status(404).json({ msg: "please provide last_Name" });
+      }
+      case !phone_Number: {
+        return res.status(404).json({ msg: "please provide phone_Number" });
+      }
+      case !street: {
+        return res.status(404).json({ msg: "please provide street" });
+      }
+      case !city: {
+        return res.status(404).json({ msg: "please provide city" });
+      }
+      case !state: {
+        return res.status(404).json({ msg: "please provide state" });
+      }
+      case !postalCode: {
+        return res.status(404).json({ msg: "please provide postalCode" });
+      }
+      case !country: {
+        return res.status(404).json({ msg: "please provide country" });
+      }
+    }
+    const updateAddressData = {
+      first_Name,
+      last_Name,
+      phone_Number,
+      street,
+      city,
+      state,
+      postalCode,
+      country,
+    }
+    const updateShippingAddress = await shippingAddress.findByIdAndUpdate(
+      { _id: _id },
+      { $set: updateAddressData },
+      { new: true }
+    );
+
+
+    res.status(201).json({
+      success: true,
+      updateShippingAddress,
+      message: "Shipping Address updated",
+    });
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};
+
+export const getSingleSippingAddress = async (req, res) => {
+  try {
+    let _id = req.params.id
+    const address = await shippingAddress.findById({ _id: _id })
+
+    if (address) {
+      res.status(201).json({
+        success: true,
+        address,
+        message: "Shipping Address Fetched",
+      });
+    }
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};

resources/ShippingAddresses/ShippingAddressRoute.js

@@ -4,6 +4,8 @@ import {
   getSingleUserSippingAddress,
   deleteSelfShippingAddress,
   getSingleUserSippingAddressForAdmin,
+  updateShippingAddress,
+  getSingleSippingAddress,
 } from "./ShippingAddressController.js";
 import { authorizeRoles, isAuthenticatedUser } from "../../middlewares/auth.js";
 const router = express.Router();
@@ -25,4 +27,7 @@ router
   .route("/delete/:id")
   .delete(isAuthenticatedUser, deleteSelfShippingAddress);
 
+router.route("/update/:id").patch(isAuthenticatedUser, updateShippingAddress);
+router.route("/get/:id").get(isAuthenticatedUser, getSingleSippingAddress);
+
 export default router;