From b560d3a32428a1fd03349a23eb410b71be7e2aae Mon Sep 17 00:00:00 2001 From: pawan-dot <71133473+pawan-dot@users.noreply.github.com> Date: Fri, 28 Jun 2024 17:23:51 +0530 Subject: [PATCH] shippin address --- .../Orders/RazerPayCheckoutController.js | 286 +++++++-------- resources/Orders/orderController.js | 344 ++++++++---------- resources/Orders/orderModel.js | 12 +- .../ShippingAddresses/ShippingAddressModel.js | 26 +- 4 files changed, 287 insertions(+), 381 deletions(-) diff --git a/resources/Orders/RazerPayCheckoutController.js b/resources/Orders/RazerPayCheckoutController.js index 2953b38..f21613c 100644 --- a/resources/Orders/RazerPayCheckoutController.js +++ b/resources/Orders/RazerPayCheckoutController.js @@ -225,10 +225,41 @@ export const checkout = async (req, res) => { ? item?.variant?.gst_Id?.tax : item?.product?.master_GST?.tax )) / - 100 + 100 )?.toFixed(2), total_gst_amount: Number( Number(item?.quantity) * + Number( + (Number( + item?.variant?.price + ? item?.variant?.price + : item?.product?.master_price + ) * + Number( + item?.variant?.gst_Id?.tax + ? item?.variant?.gst_Id?.tax + : item?.product?.master_GST?.tax + )) / + 100 + ) + )?.toFixed(2), + gst_rate: item?.variant?.gst_Id?.tax + ? item?.variant?.gst_Id?.tax + : item?.product?.master_GST?.tax, + tax_Name: item?.variant?.gst_Id?.name + ? item?.variant?.gst_Id?.name + : item?.product?.master_GST?.name, + product_Subtotal: Number( + Number( + item.quantity * + Number( + item?.variant?.price + ? item?.variant?.price + : item?.product?.master_price + ) + ) + + Number( + Number(item.quantity) * Number( (Number( item?.variant?.price @@ -240,40 +271,9 @@ export const checkout = async (req, res) => { ? item?.variant?.gst_Id?.tax : item?.product?.master_GST?.tax )) / - 100 - ) - )?.toFixed(2), - gst_rate: item?.variant?.gst_Id?.tax - ? item?.variant?.gst_Id?.tax - : item?.product?.master_GST?.tax, - tax_Name: item?.variant?.gst_Id?.name - ? item?.variant?.gst_Id?.name - : item?.product?.master_GST?.name, - product_Subtotal: Number( - Number( - item.quantity * - Number( - item?.variant?.price - ? item?.variant?.price - : item?.product?.master_price - ) - ) + - Number( - Number(item.quantity) * - Number( - (Number( - item?.variant?.price - ? item?.variant?.price - : item?.product?.master_price - ) * - Number( - item?.variant?.gst_Id?.tax - ? item?.variant?.gst_Id?.tax - : item?.product?.master_GST?.tax - )) / - 100 - ) + 100 ) + ) )?.toFixed(2), })); @@ -384,40 +384,31 @@ export const paymentVerification = async (req, res) => { from: `${process.env.SEND_EMAIL_FROM}`, // Change to your verified sender subject: `Your Order #${findSameOrder?.orderID} Confirmation`, - html: `

Welcome to Smellika - Let the Shopping Begin!

- Hi ${ - findSameOrder?.shippingInfo?.first_Name - }, + html: `

Welcome to Tavisa - Let the Shopping Begin!

+ Hi ${findSameOrder?.shippingInfo?.first_Name + }, -

Great news! Your order #${ - findSameOrder?.orderID +

Great news! Your order #${findSameOrder?.orderID } has been confirmed. Here are the details

-

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} - ${ - findSameOrder?.shippingInfo?.company_name - ? ",Company Name :" + findSameOrder?.shippingInfo?.company_name + "" - : "" - } ${ - findSameOrder?.shippingInfo?.gst_number +

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} + ${findSameOrder?.shippingInfo?.company_name + ? ",Company Name :" + findSameOrder?.shippingInfo?.company_name + "" + : "" + } ${findSameOrder?.shippingInfo?.gst_number ? ", GST_NO:" + findSameOrder?.shippingInfo?.gst_number : "" - }

-

Any Discount : ${ - findSameOrder?.isCouponUsed + }

+

Any Discount : ${findSameOrder?.isCouponUsed ? "Yes ,₹" + - Number(findSameOrder?.couponUsed?.discount_amount) + - " , COUPON_CODE:" + - findSameOrder?.couponUsed?.coupon_code + Number(findSameOrder?.couponUsed?.discount_amount) + + " , COUPON_CODE:" + + findSameOrder?.couponUsed?.coupon_code : "No Discount" - }

+ }

Order Items :

@@ -439,47 +430,37 @@ export const paymentVerification = async (req, res) => { ${findSameOrder?.orderItems - ?.map( - (product, index) => ` + ?.map( + (product, index) => ` - - - - + + + - - - - + + + + ` - ) - .join("")} + ) + .join("")} - +
${ - index + 1 + ${index + 1 }${ - product.name - }${ - product?.variant_Name - }${ - product.name - }${product.name + }${product?.variant_Name + }${product.name + }${ - product.quantity - }₹${ - product.price - }₹${ - product?.gst_amount - }₹${ - product?.product_Subtotal - }${product.quantity + }₹${product.price + }₹${product?.gst_amount + }₹${product?.product_Subtotal + }
Total Amount :₹${ - findSameOrder?.total_amount - }₹${findSameOrder?.total_amount + }
@@ -487,7 +468,7 @@ export const paymentVerification = async (req, res) => {
Best regards,
- Team Smellika`, + Team Tavisa`, }); // console.log("findSameOrder", findSameOrder); @@ -501,7 +482,7 @@ export const paymentVerification = async (req, res) => { // razorpay_signature, // }); - res.redirect(`https://smellika.com/shop`); + res.redirect(`https://ayurpulse-website.netlify.app/shop`); // res.redirect( // `http://localhost:5173/cart/paymentsuccess?reference=${razorpay_payment_id}` // ); @@ -554,39 +535,30 @@ export const pospaymentVerification = async (req, res) => { from: `${process.env.SEND_EMAIL_FROM}`, // Change to your verified sender subject: `Your Order #${findSameOrder?.orderID} Confirmation`, - html: `

Welcome to Smellika - Let the Shopping Begin!

- Hi ${ - findSameOrder?.shippingInfo?.first_Name - }, + html: `

Welcome to Tavisa - Let the Shopping Begin!

+ Hi ${findSameOrder?.shippingInfo?.first_Name + }, -

Great news! Your order #${ - findSameOrder?.orderID +

Great news! Your order #${findSameOrder?.orderID } has been confirmed. Here are the details

-

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} - ${ - findSameOrder?.shippingInfo?.company_name - ? ",Company Name :" + findSameOrder?.shippingInfo?.company_name + "" - : "" - } ${ - findSameOrder?.shippingInfo?.gst_number +

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} + ${findSameOrder?.shippingInfo?.company_name + ? ",Company Name :" + findSameOrder?.shippingInfo?.company_name + "" + : "" + } ${findSameOrder?.shippingInfo?.gst_number ? ", GST_NO:" + findSameOrder?.shippingInfo?.gst_number : "" - }

-

Any Discount: ${ - findSameOrder?.isCouponUsed - ? "Yes ,₹" + - Number(findSameOrder?.couponUsed?.discount_amount) + - " , COUPON_CODE:" + - findSameOrder?.couponUsed?.coupon_code - : "No Discount" + }

+

Any Discount: ${findSameOrder?.isCouponUsed + ? "Yes ,₹" + + Number(findSameOrder?.couponUsed?.discount_amount) + + " , COUPON_CODE:" + + findSameOrder?.couponUsed?.coupon_code + : "No Discount" }

Order Items :

@@ -609,47 +581,37 @@ export const pospaymentVerification = async (req, res) => { ${findSameOrder?.orderItems - ?.map( - (product, index) => ` + ?.map( + (product, index) => ` - - - - + + + - - - - + + + + ` - ) - .join("")} + ) + .join("")} - +
${ - index + 1 + ${index + 1 }${ - product.name - }${ - product?.variant_Name - }${ - product.name - }${product.name + }${product?.variant_Name + }${product.name + }${ - product.quantity - }₹${ - product.price - }₹${ - product?.gst_amount - }₹${ - product?.product_Subtotal - }${product.quantity + }₹${product.price + }₹${product?.gst_amount + }₹${product?.product_Subtotal + }
Total Amount :₹${ - findSameOrder?.total_amount - }₹${findSameOrder?.total_amount + }
@@ -657,7 +619,7 @@ export const pospaymentVerification = async (req, res) => {
Best regards,
- Team Smellika`, + Team Tavisa`, }); // console.log("findSameOrder", findSameOrder); @@ -801,24 +763,24 @@ export const webhook = async (req, res) => { from: `${process.env.SEND_EMAIL_FROM}`, // Change to your verified sender subject: `Your Order #${findOrder?.orderID} Confirmation`, - html: `

Welcome to Smellika - Let the Shopping Begin!

+ html: `

Welcome to Tavisa - Let the Shopping Begin!

Hi ${findOrder?.shippingInfo?.first_Name},

Great news! Your order #${findOrder?.orderID} has been confirmed. Here are the details


Best regards,
- Team Smellika`, + Team Tavisa`, }); // Items: [List of Purchased Items] // Total Amount: [Total Amount] // Shipping Address: [Shipping Address] - // We'll keep you updated on the shipping progress. Thanks for choosing Smellika! + // We'll keep you updated on the shipping progress. Thanks for choosing Tavisa! // Best regards - // Team Smellika + // Team Tavisa console.log( "event.data.object", event.data.object, diff --git a/resources/Orders/orderController.js b/resources/Orders/orderController.js index 645feb9..bdcc620 100644 --- a/resources/Orders/orderController.js +++ b/resources/Orders/orderController.js @@ -173,21 +173,18 @@ export const updateOrderStatusById = async (req, res) => { to: `${order?.user?.email}`, // Change to your recipient from: `${process.env.SEND_EMAIL_FROM}`, // Change to your verified sender subject: `Order #${order?.orderID} Update: Cancellation and Refund Process`, - html: ` Hi ${ - order?.shippingInfo?.first_Name - }, -

We hope this message finds you well. We're writing to inform you that your order ${ - order?.orderID - } has been canceled. We understand that circumstances may change, and we're here to assist you throughout the process.

+ html: ` Hi ${order?.shippingInfo?.first_Name + }, +

We hope this message finds you well. We're writing to inform you that your order ${order?.orderID + } has been canceled. We understand that circumstances may change, and we're here to assist you throughout the process.

-

Any Discount : ${ - order?.isCouponUsed - ? "Yes ,₹" + - Number(order?.couponUsed?.discount_amount) + - " , COUPON_CODE:" + - order?.couponUsed?.coupon_code - : "No Discount" - }

+

Any Discount : ${order?.isCouponUsed + ? "Yes ,₹" + + Number(order?.couponUsed?.discount_amount) + + " , COUPON_CODE:" + + order?.couponUsed?.coupon_code + : "No Discount" + }

Items :

@@ -205,53 +202,42 @@ export const updateOrderStatusById = async (req, res) => { ${order?.orderItems - ?.map( - (product, index) => ` + ?.map( + (product, index) => ` - + - - - + + + - - - - + + + ` - ) - .join("")} + ) + .join("")} - +
${ - index + 1 - }${index + 1 + }${ - product.name - }${ - product?.variant_Name - }${ - product.name - }${product.name + }${product?.variant_Name + }${product.name + }${ - product.quantity - }₹${ - product.price - }₹${ - product?.gst_amount - }₹${ - product.product_Subtotal + ${product.quantity + }₹${product.price + }₹${product?.gst_amount + }₹${product.product_Subtotal }
Total Amount :₹${ - order?.total_amount - }₹${order?.total_amount + }
-

Cancellation Reason : ${ - req.body?.ReasonforCancellation - }

+

Cancellation Reason : ${req.body?.ReasonforCancellation + }

Refund Information: The amount from your canceled order will be processed for a refund. Please allow up to 7 working days for the amount to be transferred back to your original payment method.

If you have any concerns or further questions, please feel free to reply to this email. We appreciate your understanding and hope to serve you better in the future. @@ -259,7 +245,7 @@ export const updateOrderStatusById = async (req, res) => {
Best regards,
- Team Smellika`, + Team Tavisa`, }); return res .status(200) @@ -271,22 +257,19 @@ export const updateOrderStatusById = async (req, res) => { to: `${order?.user?.email}`, // Change to your recipient from: `${process.env.SEND_EMAIL_FROM}`, // Change to your verified sender subject: `Your Order #${order?.orderID} is in Processing!`, - html: `

Exciting news! Your order #${ - order?.orderID - } has entered the processing phase. Our team is diligently preparing your items for dispatch. Rest assured, we're working hard to ensure everything is perfect for you.

- Hi ${ - order?.shippingInfo?.first_Name - }, + html: `

Exciting news! Your order #${order?.orderID + } has entered the processing phase. Our team is diligently preparing your items for dispatch. Rest assured, we're working hard to ensure everything is perfect for you.

+ Hi ${order?.shippingInfo?.first_Name + },

Order Status : Processing

-

Any Discount : ${ - order?.isCouponUsed - ? "Yes ,₹" + - Number(order?.couponUsed?.discount_amount) + - " , COUPON_CODE:" + - order?.couponUsed?.coupon_code - : "No Discount" - }

+

Any Discount : ${order?.isCouponUsed + ? "Yes ,₹" + + Number(order?.couponUsed?.discount_amount) + + " , COUPON_CODE:" + + order?.couponUsed?.coupon_code + : "No Discount" + }

Order Items :

@@ -308,57 +291,47 @@ export const updateOrderStatusById = async (req, res) => { ${order?.orderItems - ?.map( - (product, index) => ` + ?.map( + (product, index) => ` - + - - - + + + - - - - + + + ` - ) - .join("")} + ) + .join("")} - +
${ - index + 1 - }${index + 1 + }${ - product.name - }${ - product?.variant_Name - }${ - product.name - }${product.name + }${product?.variant_Name + }${product.name + }${ - product.quantity - }₹${ - product.price - }₹${ - product?.gst_amount - }₹${ - product.product_Subtotal + ${product.quantity + }₹${product.price + }₹${product?.gst_amount + }₹${product.product_Subtotal }
Total Amount :₹${ - order?.total_amount - }₹${order?.total_amount + }
We'll send you another email with the tracking details as soon as your order is dispatched. If you have any questions or need assistance, feel free to reply to this email.
-
Thank you for choosing Smellika!
+
Thank you for choosing Tavisa!

Best regards,
- Team Smellika`, + Team Tavisa`, }); return res .status(200) @@ -394,28 +367,23 @@ export const updateOrderStatusById = async (req, res) => { to: `${order?.user?.email}`, // Change to your recipient from: `${process.env.SEND_EMAIL_FROM}`, // Change to your verified sender subject: `Your Order #${order?.orderID} is On Its Way!`, - html: ` Hi ${ - order?.shippingInfo?.first_Name - }, -

Exciting news! Your order #${ - order?.orderID - } has been dispatched and is en route to you. 🚚 Here are the details:

+ html: ` Hi ${order?.shippingInfo?.first_Name + }, +

Exciting news! Your order #${order?.orderID + } has been dispatched and is en route to you. 🚚 Here are the details:

-

Courier Name : ${ - req.body.courierName - }

-

Courier Tracking ID : ${ - req.body.TrackingID - }

+

Courier Name : ${req.body.courierName + }

+

Courier Tracking ID : ${req.body.TrackingID + }

-

Any Discount : ${ - order?.isCouponUsed - ? "Yes ,₹" + - Number(order?.couponUsed?.discount_amount) + - " , COUPON_CODE:" + - order?.couponUsed?.coupon_code - : "No Discount" - }

+

Any Discount : ${order?.isCouponUsed + ? "Yes ,₹" + + Number(order?.couponUsed?.discount_amount) + + " , COUPON_CODE:" + + order?.couponUsed?.coupon_code + : "No Discount" + }

Items :

@@ -436,59 +404,49 @@ export const updateOrderStatusById = async (req, res) => { ${order?.orderItems - ?.map( - (product, index) => ` + ?.map( + (product, index) => ` - + - - - + + + - - - - + + + ` - ) - .join("")} + ) + .join("")} - +
${ - index + 1 - }${index + 1 + }${ - product.name - }${ - product?.variant_Name - }${ - product.name - }${product.name + }${product?.variant_Name + }${product.name + }${ - product.quantity - }₹${ - product.price - }₹${ - product?.gst_amount - }₹${ - product.product_Subtotal + ${product.quantity + }₹${product.price + }₹${product?.gst_amount + }₹${product.product_Subtotal }
Total Amount :₹${ - order?.total_amount - }₹${order?.total_amount + }

Order Status : Dispatched

If you have any questions or need assistance, feel free to reply to this email.

-
Thanks for choosing Smellika! We hope you enjoy your purchase. +
Thanks for choosing Tavisa! We hope you enjoy your purchase.

Best regards,
- Team Smellika`, + Team Tavisa`, }); return res .status(200) @@ -501,20 +459,17 @@ export const updateOrderStatusById = async (req, res) => { to: `${order?.user?.email}`, // Change to your recipient from: `${process.env.SEND_EMAIL_FROM}`, // Change to your verified sender subject: `Your Order #${order?.orderID} Has Been Delivered!`, - html: ` Hi ${ - order?.shippingInfo?.first_Name - }, -

Great news! Your order #${ - order?.orderID - } has been successfully delivered to your doorstep. We hope everything is just as you expected!

-

Any Discount : ${ - order?.isCouponUsed - ? "Yes ,₹" + - Number(order?.couponUsed?.discount_amount) + - " , COUPON_CODE:" + - order?.couponUsed?.coupon_code - : "No Discount" - }

+ html: ` Hi ${order?.shippingInfo?.first_Name + }, +

Great news! Your order #${order?.orderID + } has been successfully delivered to your doorstep. We hope everything is just as you expected!

+

Any Discount : ${order?.isCouponUsed + ? "Yes ,₹" + + Number(order?.couponUsed?.discount_amount) + + " , COUPON_CODE:" + + order?.couponUsed?.coupon_code + : "No Discount" + }

Items :

@@ -537,34 +492,25 @@ export const updateOrderStatusById = async (req, res) => { ?.map( (product, index) => ` - + - - - + + + - - - - + + + + ` @@ -572,26 +518,24 @@ export const updateOrderStatusById = async (req, res) => { .join("")} - +
${ - index + 1 - }${index + 1 + }${ - product.name - }${ - product?.variant_Name - }${ - product.name - }${product.name + }${product?.variant_Name + }${product.name + }${ - product.quantity - }₹${ - product.price - }₹${ - product?.gst_amount - }₹${ - product.product_Subtotal - }${product.quantity + }₹${product.price + }₹${product?.gst_amount + }₹${product.product_Subtotal + }
Total Amount :₹${ - order?.total_amount - }₹${order?.total_amount + }
-

Delivery Date: ${ - req.body.DDate - }

+

Delivery Date: ${req.body.DDate + }

Your satisfaction is our priority, and we'd love to hear about your experience. Please take a moment to share your thoughts by leaving a review. Your feedback is invaluable to us!

If you have any questions or concerns about your order, feel free to reply to this email.
-
Thank you for choosing Smellika! We hope to serve you again soon. +
Thank you for choosing Tavisa! We hope to serve you again soon.

Best regards,
- Team Smellika`, + Team Tavisa`, }); return res diff --git a/resources/Orders/orderModel.js b/resources/Orders/orderModel.js index e8589b7..90ca307 100644 --- a/resources/Orders/orderModel.js +++ b/resources/Orders/orderModel.js @@ -50,12 +50,12 @@ const orderSchema = new mongoose.Schema( type: String, required: true, }, - company_name: { - type: String, - }, - gst_number: { - type: String, - }, + // company_name: { + // type: String, + // }, + // gst_number: { + // type: String, + // }, addressId: { type: mongoose.Schema.ObjectId, ref: "ShippingAddress", diff --git a/resources/ShippingAddresses/ShippingAddressModel.js b/resources/ShippingAddresses/ShippingAddressModel.js index 336e7db..632880c 100644 --- a/resources/ShippingAddresses/ShippingAddressModel.js +++ b/resources/ShippingAddresses/ShippingAddressModel.js @@ -38,19 +38,19 @@ const shippingAddressSchema = new mongoose.Schema( type: String, required: true, }, - company_name: { - type: String, - }, - gst_number: { - type: String, - validate: { - validator: function (v) { - // Regular expression for Indian GST number validation - return /^(\d{2}[A-Z]{5}\d{4}[A-Z]{1}\d[Z]{1}[A-Z\d]{1})$/.test(v); - }, - message: (props) => `${props.value} is not a valid Indian GST number!`, - }, - }, + // company_name: { + // type: String, + // }, + // gst_number: { + // type: String, + // validate: { + // validator: function (v) { + // // Regular expression for Indian GST number validation + // return /^(\d{2}[A-Z]{5}\d{4}[A-Z]{1}\d[Z]{1}[A-Z\d]{1})$/.test(v); + // }, + // message: (props) => `${props.value} is not a valid Indian GST number!`, + // }, + // }, default: { type: Boolean, default: false,