| Line 684... |
Line 684... |
| 684 |
}
|
684 |
}
|
| 685 |
}
|
685 |
}
|
| 686 |
}
|
686 |
}
|
| 687 |
}
|
687 |
}
|
| 688 |
|
688 |
|
| 689 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers();
|
689 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(false);
|
| 690 |
if (fofoId > 0) {
|
690 |
if (fofoId > 0) {
|
| 691 |
CustomRetailer customRetailer = customRetailersMap.get(fofoId);
|
691 |
CustomRetailer customRetailer = customRetailersMap.get(fofoId);
|
| 692 |
model.addAttribute("retailerName",
|
692 |
model.addAttribute("retailerName",
|
| 693 |
customRetailer.getBusinessName() + "-" + customRetailer.getAddress().getCity());
|
693 |
customRetailer.getBusinessName() + "-" + customRetailer.getAddress().getCity());
|
| 694 |
FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
|
694 |
FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
|
| Line 905... |
Line 905... |
| 905 |
int inTransitQty = (inTransitQuantity == null ? 0 : inTransitQuantity);
|
905 |
int inTransitQty = (inTransitQuantity == null ? 0 : inTransitQuantity);
|
| 906 |
catalogListingModel.setInTransitQuantity(catalogListingModel.getInTransitQuantity() + inTransitQty);
|
906 |
catalogListingModel.setInTransitQuantity(catalogListingModel.getInTransitQuantity() + inTransitQty);
|
| 907 |
|
907 |
|
| 908 |
}
|
908 |
}
|
| 909 |
|
909 |
|
| 910 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers();
|
910 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(false);
|
| 911 |
if (fofoId > 0) {
|
911 |
if (fofoId > 0) {
|
| 912 |
CustomRetailer customRetailer = customRetailersMap.get(fofoId);
|
912 |
CustomRetailer customRetailer = customRetailersMap.get(fofoId);
|
| 913 |
model.addAttribute("retailerName",
|
913 |
model.addAttribute("retailerName",
|
| 914 |
customRetailer.getBusinessName() + "-" + customRetailer.getAddress().getCity());
|
914 |
customRetailer.getBusinessName() + "-" + customRetailer.getAddress().getCity());
|
| 915 |
FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
|
915 |
FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
|
| Line 1466... |
Line 1466... |
| 1466 |
}
|
1466 |
}
|
| 1467 |
}
|
1467 |
}
|
| 1468 |
}
|
1468 |
}
|
| 1469 |
}
|
1469 |
}
|
| 1470 |
|
1470 |
|
| 1471 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers();
|
1471 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(false);
|
| 1472 |
if (fofoId > 0) {
|
1472 |
if (fofoId > 0) {
|
| 1473 |
CustomRetailer customRetailer = customRetailersMap.get(fofoId);
|
1473 |
CustomRetailer customRetailer = customRetailersMap.get(fofoId);
|
| 1474 |
model.addAttribute("retailerName",
|
1474 |
model.addAttribute("retailerName",
|
| 1475 |
customRetailer.getBusinessName() + "-" + customRetailer.getAddress().getCity());
|
1475 |
customRetailer.getBusinessName() + "-" + customRetailer.getAddress().getCity());
|
| 1476 |
FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
|
1476 |
FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
|