| Line 1149... |
Line 1149... |
| 1149 |
emailModel.put("pendingOrder", pendingOrder);
|
1149 |
emailModel.put("pendingOrder", pendingOrder);
|
| 1150 |
emailModel.put("date", dateTimeFormatter);
|
1150 |
emailModel.put("date", dateTimeFormatter);
|
| 1151 |
|
1151 |
|
| 1152 |
String[] customerEmail = null;
|
1152 |
String[] customerEmail = null;
|
| 1153 |
if (customer.getEmailId() != null) {
|
1153 |
if (customer.getEmailId() != null) {
|
| 1154 |
customerEmail = new String[] { customer.getEmailId(), "tejbeer.kaur@smartdukaan.com" };
|
1154 |
customerEmail = new String[] { customer.getEmailId() };
|
| - |
|
1155 |
|
| - |
|
1156 |
List<String> bccTo = Arrays.asList("tejbeer.kaur@smartdukaan.com");
|
| 1155 |
|
1157 |
|
| 1156 |
emailService.sendMailWithAttachments("Order Cancellation", "order-pending-cancel.vm", emailModel,
|
1158 |
emailService.sendMailWithAttachments("Order Cancellation", "order-pending-cancel.vm", emailModel,
|
| 1157 |
customerEmail, null, null);
|
1159 |
customerEmail, null, bccTo.toArray(new String[0]));
|
| 1158 |
|
1160 |
|
| 1159 |
}
|
1161 |
}
|
| 1160 |
|
1162 |
|
| 1161 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
|
1163 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
|
| 1162 |
&& !status.contains(OrderStatus.BILLED) && !status.contains(OrderStatus.UNSETTLED)
|
1164 |
&& !status.contains(OrderStatus.BILLED) && !status.contains(OrderStatus.UNSETTLED)
|
| Line 1210... |
Line 1212... |
| 1210 |
emailModel.put("pendingOrder", pendingOrder);
|
1212 |
emailModel.put("pendingOrder", pendingOrder);
|
| 1211 |
emailModel.put("date", dateTimeFormatter);
|
1213 |
emailModel.put("date", dateTimeFormatter);
|
| 1212 |
Customer customer = customerRepository.selectById(pendingOrder.getCustomerId());
|
1214 |
Customer customer = customerRepository.selectById(pendingOrder.getCustomerId());
|
| 1213 |
String[] customerEmail = null;
|
1215 |
String[] customerEmail = null;
|
| 1214 |
if (customer.getEmailId() != null) {
|
1216 |
if (customer.getEmailId() != null) {
|
| 1215 |
customerEmail = new String[] { customer.getEmailId(), "tejbeer.kaur@smartdukaan.com" };
|
1217 |
customerEmail = new String[] { customer.getEmailId() };
|
| - |
|
1218 |
List<String> bccTo = Arrays.asList("tejbeer.kaur@smartdukaan.com");
|
| 1216 |
|
1219 |
|
| 1217 |
emailService.sendMailWithAttachments("Order Delivered with SmartDukaan", "order-delivered.vm", emailModel,
|
1220 |
emailService.sendMailWithAttachments("Order Delivered with SmartDukaan", "order-delivered.vm", emailModel,
|
| 1218 |
customerEmail, null, null);
|
1221 |
customerEmail, null, bccTo.toArray(new String[0]));
|
| 1219 |
|
1222 |
|
| 1220 |
}
|
1223 |
}
|
| 1221 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
|
1224 |
if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
|
| 1222 |
&& !status.contains(OrderStatus.BILLED) && !status.contains(OrderStatus.UNSETTLED)
|
1225 |
&& !status.contains(OrderStatus.BILLED) && !status.contains(OrderStatus.UNSETTLED)
|
| 1223 |
&& !status.contains(OrderStatus.CLAIMED))
|
1226 |
&& !status.contains(OrderStatus.CLAIMED))
|