Subversion Repositories SmartDukaan

Rev

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

Rev 33312 Rev 33697
Line 42... Line 42...
42
import com.spice.profitmandi.service.inventory.Combo;
42
import com.spice.profitmandi.service.inventory.Combo;
43
import com.spice.profitmandi.service.inventory.ComboOptionModel;
43
import com.spice.profitmandi.service.inventory.ComboOptionModel;
44
import com.spice.profitmandi.service.inventory.InventoryService;
44
import com.spice.profitmandi.service.inventory.InventoryService;
45
import com.spice.profitmandi.service.inventory.MappedComboModel;
45
import com.spice.profitmandi.service.inventory.MappedComboModel;
46
import com.spice.profitmandi.service.order.OrderService;
46
import com.spice.profitmandi.service.order.OrderService;
-
 
47
import com.spice.profitmandi.service.transaction.SDCreditService;
47
import com.spice.profitmandi.service.user.RetailerService;
48
import com.spice.profitmandi.service.user.RetailerService;
48
import com.spice.profitmandi.web.model.LoginDetails;
49
import com.spice.profitmandi.web.model.LoginDetails;
49
import com.spice.profitmandi.web.util.CookiesProcessor;
50
import com.spice.profitmandi.web.util.CookiesProcessor;
50
import com.spice.profitmandi.web.util.MVCResponseSender;
51
import com.spice.profitmandi.web.util.MVCResponseSender;
51
import in.shop2020.model.v1.order.OrderStatus;
52
import in.shop2020.model.v1.order.OrderStatus;
Line 765... Line 766...
765
        model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
766
        model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
766
 
767
 
767
        return "cancel-order-modal";
768
        return "cancel-order-modal";
768
    }
769
    }
769
 
770
 
-
 
771
    @Autowired
-
 
772
    SDCreditService sdCreditService;
-
 
773
 
-
 
774
 
770
    @RequestMapping(value = "/cancelOrder", method = RequestMethod.POST)
775
    @RequestMapping(value = "/cancelOrder", method = RequestMethod.POST)
771
    public String cancelOrder(HttpServletRequest request, @RequestBody OrderCancellationModel orderCancellationModel, Model model) throws Exception {
776
    public String cancelOrder(HttpServletRequest request, @RequestBody OrderCancellationModel orderCancellationModel, Model model) throws Exception {
772
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
777
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
773
        LOGGER.info("orderId" + orderCancellationModel.getOrderIds());
778
        LOGGER.info("orderId" + orderCancellationModel.getOrderIds());
774
 
779
 
Line 789... Line 794...
789
                    }
794
                    }
790
                    sendCancellationNotificationToPartner(order, orderCancellationModel.getReason());
795
                    sendCancellationNotificationToPartner(order, orderCancellationModel.getReason());
791
                    model.addAttribute("response1", mvcResponseSender.createResponseString(true));
796
                    model.addAttribute("response1", mvcResponseSender.createResponseString(true));
792
 
797
 
793
                }
798
                }
-
 
799
                sdCreditService.settleBlockedLoan(orders.get(0).getTransactionId());
794
            }
800
            }
795
        } catch (TransactionServiceException | TException e) {
801
        } catch (TransactionServiceException | TException e) {
796
            model.addAttribute("response1", mvcResponseSender.createResponseString(false));
802
            model.addAttribute("response1", mvcResponseSender.createResponseString(false));
797
 
803
 
798
        }
804
        }