diff --git a/resources/PosOrders/PosCheckoutController.js b/resources/PosOrders/PosCheckoutController.js index 8acb18e..598c743 100644 --- a/resources/PosOrders/PosCheckoutController.js +++ b/resources/PosOrders/PosCheckoutController.js @@ -23,11 +23,11 @@ const generateOrderId = async () => { export const createOrderCheckout = async (req, res) => { try { - const { address, cart, user, SalesType, paymentMode } = + const { address, cart, user, paymentMode } = req.body; // console.log(req.body) // Perform validation - if (!address || !cart || cart.length === 0 || !SalesType || !user || !paymentMode) { + if (!address || !cart || cart.length === 0 || !user || !paymentMode) { return res.status(400).json({ message: "Invalid order data" }); } @@ -71,7 +71,6 @@ export const createOrderCheckout = async (req, res) => { ...restOfShippingInfo, // Include other shipping information }, user, // Assuming you have authenticated users - SalesType, paymentMode, }); diff --git a/resources/PosOrders/PosRazerPayCheckoutController.js b/resources/PosOrders/PosRazerPayCheckoutController.js index 111fbe4..f7ae283 100644 --- a/resources/PosOrders/PosRazerPayCheckoutController.js +++ b/resources/PosOrders/PosRazerPayCheckoutController.js @@ -76,13 +76,13 @@ export const checkout = async (req, res) => { } // Extract required data from request parameters and body - const { email } = req.params; - const { address, cart, user, SalesType, paymentMode, subtotal } = req.body; + // const { email } = req.params; + const { address, cart, user, paymentMode, subtotal } = req.body; // Check for required parameters - if (!email) { - return res.status(400).send({ message: "Please enter the email" }); - } + // if (!email) { + // return res.status(400).send({ message: "Please enter the email" }); + // } if (cart.length < 1) { return res.status(400).json({ message: "Cart is empty!" }); @@ -136,7 +136,6 @@ export const checkout = async (req, res) => { ...restOfShippingInfo, }, user, - SalesType, paymentMode, razorpay_order_id: order.id, }); @@ -372,8 +371,10 @@ export const handlePayment = async (req, res) => { // Add any other key-value pairs as needed }, - success_url: `${process.env.FRONTEND_URL}/cart`, - cancel_url: `${process.env.FRONTEND_URL}/error`, + // success_url: `${process.env.FRONTEND_URL}/cart`, + sccess_url: `httphttp://localhost:5000/#/success`, + // cancel_url: `${process.env.FRONTEND_URL}/error`, + cancel_url: `http://localhost:5000/#/error`, }); // res.json({ sessionId: session.id }); diff --git a/resources/PosOrders/PosorderModel.js b/resources/PosOrders/PosorderModel.js index 5134084..2f3032d 100644 --- a/resources/PosOrders/PosorderModel.js +++ b/resources/PosOrders/PosorderModel.js @@ -102,13 +102,9 @@ const POSorderSchema = new mongoose.Schema( total_amount: { type: Number, default: 0 }, weight: { type: Number, default: 0 }, - SalesType: { - type: String, - enum: ["inStoreDelivery", "shipToCustomer"], - }, paymentMode: { type: String, - enum: ["QRCode", "Cash","SendPaymentLink"], + enum: ["QRCode", "Cash"], }, payment_status: { type: String,