Subversion Repositories SmartDukaan

Rev

Rev 34194 | Rev 34211 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34194 Rev 34204
Line 543... Line 543...
543 
        }
 543 
        }
544 
 
 544 
 
545 
        return "response";
 545 
        return "response";
546 
    }
 546 
    }
547 
 
 547 
 
548 
    private void sendWhatsappInvoice(FofoOrder fofoOrder) throws Exception {
 548 
    private boolean sendWhatsappInvoice(FofoOrder fofoOrder) throws Exception {
549 
        this.sendWhatsappInvoice(fofoOrder, "");
 549 
        return this.sendWhatsappInvoice(fofoOrder, "");
550 
    }
 550 
    }
551 
 
 551 
 
552 
    private void sendWhatsappInvoice(FofoOrder fofoOrder, String whatsAppNo) throws Exception {
 552 
    private boolean sendWhatsappInvoice(FofoOrder fofoOrder, String whatsAppNo) throws Exception {
- 
 
 553 
        boolean shouldSendWhatsappMessage = notificationService.shouldSendWhatsappMessage(whatsAppNo);
- 
 
 554 
        boolean isSend=false;
- 
 
 555 
        if (shouldSendWhatsappMessage) {
553 
        Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
 556 
            Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
- 
 
 557 
            String mobileNumber;
- 
 
 558 
            if (!whatsAppNo.isEmpty()) {
- 
 
 559 
            mobileNumber = whatsAppNo;
- 
 
 560 
        } else {
- 
 
 561 
            mobileNumber = customer.getMobileNumber();
- 
 
 562 
        }
554 
        CustomRetailer retailer = retailerService.getFofoRetailer(fofoOrder.getFofoId());
 563 
        CustomRetailer retailer = retailerService.getFofoRetailer(fofoOrder.getFofoId());
555 
        String message = String.format("Dear %s,\n" +
 564 
        String message = String.format("Dear %s,\n" +
556 
                "Thank you for your purchase from SmartDukaan store - %s, %s.\n" +
 565 
                "Thank you for your purchase from SmartDukaan store - %s, %s.\n" +
557 
                "Your purchase invoice is attached for your reference.\n" +
 566 
                "Your purchase invoice is attached for your reference.\n" +
558 
                "\n" +
 567 
                "\n" +
559 
                "Download our app for offers and updates on new products.\n" +
 568 
                "Download our app for offers and updates on new products.\n" +
560 
                "https://www.smartdukaan.com/b2c\n" +
 569 
                "https://www.smartdukaan.com/b2c\n" +
561 
                "\n" +
 570 
                "\n" +
562 
                "Best Regards\n" +
 571 
                "Best Regards\n" +
563 
                "SmartDukaan", customer.getFirstName(), retailer.getBusinessName(), retailer.getAddress().getCity());
 572 
                "SmartDukaan", customer.getFirstName(), retailer.getBusinessName(), retailer.getAddress().getCity());
564 
        String mobileNumber;
 - 
 
565 
        if (!whatsAppNo.isEmpty()) {
 - 
 
566 
            mobileNumber = whatsAppNo;
 - 
 
567 
        } else {
 - 
 
568 
            mobileNumber = customer.getMobileNumber();
 - 
 
569 
        }
 573 
 
570 
        boolean shouldSendWhatsappMessage = notificationService.shouldSendWhatsappMessage(mobileNumber);
 - 
 
571 
        if (shouldSendWhatsappMessage) {
 - 
 
572 
            notificationService.sendWhatsappMediaMessage(message, mobileNumber, this.getPublicInvoiceUrl(fofoOrder.getInvoiceNumber()),
 574 
            isSend =notificationService.sendWhatsappMediaMessage(message, mobileNumber, this.getPublicInvoiceUrl(fofoOrder.getInvoiceNumber()),
573 
                    this.getFileName(fofoOrder.getInvoiceNumber()), WhatsappMessageType.DOCUMENT);
 575 
                    this.getFileName(fofoOrder.getInvoiceNumber()), WhatsappMessageType.DOCUMENT);
574 
        }
 576 
        }
- 
 
 577 
        return isSend;
575 
    }
 578 
    }
576 
 
 579 
 
577 
    private String getFileName(String invoiceNumber) {
 580 
    private String getFileName(String invoiceNumber) {
578 
        return "INV-" + invoiceNumber.replace("/", "-") + ".pdf";
 581 
        return "INV-" + invoiceNumber.replace("/", "-") + ".pdf";
579 
    }
 582 
    }
Line 1737... Line 1740...
1737 
        return "response";
 1740 
        return "response";
1738 
    }
 1741 
    }
1739 
 
 1742 
 
1740 
    @PutMapping (value = "/sendInvoiceOnWhatsApp")
 1743 
    @PutMapping (value = "/sendInvoiceOnWhatsApp")
1741 
    public String sendInvoiceOnWhatsApp(HttpServletRequest request ,@RequestParam int orderId,@RequestParam String whatsAppMobile, Model model) throws Exception {
 1744 
    public String sendInvoiceOnWhatsApp(HttpServletRequest request ,@RequestParam int orderId,@RequestParam String whatsAppMobile, Model model) throws Exception {
1742 
        try {
 - 
 
1743 
            this.sendWhatsappInvoice(fofoOrderRepository.selectByOrderId(orderId),whatsAppMobile);
 1745 
            boolean isSend=this.sendWhatsappInvoice(fofoOrderRepository.selectByOrderId(orderId),whatsAppMobile);
1744 
            model.addAttribute("response1", true);
 1746 
            model.addAttribute("response1", isSend);
1745 
            LOGGER.info(" Invoice send on whatsapp");
 - 
 
1746 
        } catch (Exception e) {
 - 
 
1747 
            LOGGER.info("Invoice not send on whatsapp");
 - 
 
1748 
            model.addAttribute("response1", false);
 - 
 
1749 
            e.printStackTrace();
 - 
 
1750 
        }
 - 
 
1751 
        return "response";
 1747 
        return "response";
1752 
    }
 1748 
    }
1753 
 
 1749 
 
1754 
 
 1750 
 
1755 
}
 1751 
}
1756 
 
 1752 
 
1757 
 
 - 
 
1758 
 
 - 
 
1759 
 
 - 
 
1760 
 
 -