WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

 import com.spice.profitmandi.service.transaction.SDCreditService;
 import com.spice.profitmandi.service.transaction.TransactionService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.wallet.WalletService;
 import com.spice.profitmandi.service.whatsapp.WhatsappMessageService;
-import com.spice.profitmandi.service.whatsapp.WhatsappMessageType;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
 import in.shop2020.model.v1.order.WalletReferenceType;
 import org.apache.logging.log4j.LogManager;
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
     PinelabsOfferCacheService pinelabsOfferCacheService;
     @RequestMapping(value = "/wa-send-invoice", method = RequestMethod.GET)
     public String sendWhatsappMessage(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.ORDER_ID) int orderId, Model model) {
         try {
-            this.sendWhatsappInvoice(fofoOrderRepository.selectByOrderId(orderId));
+            FofoOrder fo = fofoOrderRepository.selectByOrderId(orderId);
+            notificationService.sendWhatsappInvoice(fo.getCustomerId(), fo.getFofoId(), fo.getInvoiceNumber(), "");
         } catch (Exception e) {
             LOGGER.error("Could not send whatsapp message for order {}", orderId, e);
+        }
         model.addAttribute("response1", true);
         return "response";
+        }
         return "response";
+    }
-    private boolean sendWhatsappInvoice(FofoOrder fofoOrder) throws Exception {
-        return this.sendWhatsappInvoice(fofoOrder, "");
-    }
-    private boolean sendWhatsappInvoice(FofoOrder fofoOrder, String whatsAppNo) throws Exception {
-        boolean shouldSendWhatsappMessage = notificationService.shouldSendWhatsappMessage(whatsAppNo);
-        boolean isSend = false;
-        if (shouldSendWhatsappMessage) {
-            Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
-            String mobileNumber;
-            if (!whatsAppNo.isEmpty()) {
-                mobileNumber = whatsAppNo;
-            } else {
-                mobileNumber = customer.getMobileNumber();
-            }
-            CustomRetailer retailer = retailerService.getFofoRetailer(fofoOrder.getFofoId());
-            String message = String.format("Dear %s,\n" +
-                    "Thank you for your purchase from SmartDukaan store - %s, %s.\n" +
-                    "Your purchase invoice is attached for your reference.\n" +
-                    "\n" +
-                    "Download our app for offers and updates on new products.\n" +
-                    "https://www.smartdukaan.com/b2c\n" +
-                    "\n" +
-                    "Best Regards\n" +
-                    "SmartDukaan", customer.getFirstName(), retailer.getBusinessName(), retailer.getAddress().getCity());
-            isSend = notificationService.sendWhatsappMediaMessage(message, mobileNumber, this.getPublicInvoiceUrl(fofoOrder.getInvoiceNumber()),
-                    this.getFileName(fofoOrder.getInvoiceNumber()), WhatsappMessageType.DOCUMENT);
-        }
-        return isSend;
-    }
-    private String getFileName(String invoiceNumber) {
-        return "INV-" + invoiceNumber.replace("/", "-") + ".pdf";
-    }
-    private String getPublicInvoiceUrl(String invoiceNumber) {
-        String base64Encoded = Base64.getMimeEncoder().encodeToString(invoiceNumber.getBytes(StandardCharsets.UTF_8));
-        String publicUrl = "https://partners.smartdukaan.com/wa-invoice-send/" + base64Encoded + ".pdf";
-        LOGGER.info("Public Whatsapp Url for Invoice Message - {}", publicUrl);
-        return publicUrl;
-    }
     @RequestMapping(value = "/order/bad_return", method = RequestMethod.POST)
     public ResponseEntity<?> badReturn(HttpServletRequest request, @RequestBody FoiBadReturnRequest foiBadReturnRequest,
                                        Model model) throws ProfitMandiBusinessException {
         LOGGER.info("request at uri {} body {}", request.getRequestURI(), foiBadReturnRequest);
         } catch (Exception e) {
             LOGGER.error("Exception during processScratchOffer for order {}: {}", fofoOrderId, e.getMessage(), e);
+        }
         LOGGER.info("Order has been created successfully...");
+        if (createOrderRequest.isSendInvoiceOnWhatsApp()) {
+            try {
+                FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(fofoOrderId);
+                if (fofoOrder != null && fofoOrder.getInvoiceNumber() != null) {
+                    notificationService.sendWhatsappInvoice(fofoOrder.getCustomerId(), fofoOrder.getFofoId(), fofoOrder.getInvoiceNumber(), "");
+                    LOGGER.info("WhatsApp invoice sent automatically for order {}", fofoOrderId);
+                }
+            } catch (Exception e) {
+                LOGGER.error("Failed to auto-send WhatsApp invoice for order {}", fofoOrderId, e);
+            }
+        }
         return "redirect:/get-order/?orderId=" + fofoOrderId;
+    }
     @GetMapping("/billedOrders")
     public String getBilledOrders(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
         return "response";
+    }
     @PutMapping(value = "/sendInvoiceOnWhatsApp")
     public String sendInvoiceOnWhatsApp(HttpServletRequest request, @RequestParam int orderId, @RequestParam String whatsAppMobile, Model model) throws Exception {
+        FofoOrder fo = fofoOrderRepository.selectByOrderId(orderId);
-        boolean isSend = this.sendWhatsappInvoice(fofoOrderRepository.selectByOrderId(orderId), whatsAppMobile);
+        boolean isSend = notificationService.sendWhatsappInvoice(fo.getCustomerId(), fo.getFofoId(), fo.getInvoiceNumber(), whatsAppMobile);
         model.addAttribute("response1", isSend);
         return "response";
+    }
     @Autowired

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java – Rev 36024 → 36064