| Line 385... |
Line 385... |
| 385 |
retailer.setType(RetailerType.GSTIN);
|
385 |
retailer.setType(RetailerType.GSTIN);
|
| 386 |
}
|
386 |
}
|
| 387 |
if(updateRetailerRequest.getDocumentId() > 0){
|
387 |
if(updateRetailerRequest.getDocumentId() > 0){
|
| 388 |
if(retailer.getDocumentId() != null && retailer.getDocumentId() != updateRetailerRequest.getDocumentId()) {
|
388 |
if(retailer.getDocumentId() != null && retailer.getDocumentId() != updateRetailerRequest.getDocumentId()) {
|
| 389 |
documentRepository.deleteById(retailer.getDocumentId());
|
389 |
documentRepository.deleteById(retailer.getDocumentId());
|
| 390 |
retailer.setDocumentId(updateRetailerRequest.getDocumentId());
|
- |
|
| 391 |
documentRepository.markDocumentAsPersisted(updateRetailerRequest.getDocumentId());
|
- |
|
| 392 |
}
|
390 |
}
|
| - |
|
391 |
retailer.setDocumentId(updateRetailerRequest.getDocumentId());
|
| - |
|
392 |
documentRepository.markDocumentAsPersisted(updateRetailerRequest.getDocumentId());
|
| 393 |
}
|
393 |
}
|
| 394 |
retailerRepository.persist(retailer);
|
394 |
retailerRepository.persist(retailer);
|
| 395 |
return retailer;
|
395 |
return retailer;
|
| 396 |
}
|
396 |
}
|
| 397 |
|
397 |
|
| Line 531... |
Line 531... |
| 531 |
shop.setRetailerId(retailerId);
|
531 |
shop.setRetailerId(retailerId);
|
| 532 |
shop.setName(customShop.getName());
|
532 |
shop.setName(customShop.getName());
|
| 533 |
if(customShop.getDocumentId() > 0){
|
533 |
if(customShop.getDocumentId() > 0){
|
| 534 |
if(shop.getDocumentId() != null && shop.getDocumentId() != customShop.getDocumentId()) {
|
534 |
if(shop.getDocumentId() != null && shop.getDocumentId() != customShop.getDocumentId()) {
|
| 535 |
documentRepository.deleteById(shop.getDocumentId());
|
535 |
documentRepository.deleteById(shop.getDocumentId());
|
| 536 |
shop.setDocumentId(customShop.getDocumentId());
|
- |
|
| 537 |
documentRepository.markDocumentAsPersisted(customShop.getDocumentId());
|
- |
|
| 538 |
}
|
536 |
}
|
| 539 |
|
- |
|
| - |
|
537 |
shop.setDocumentId(customShop.getDocumentId());
|
| - |
|
538 |
documentRepository.markDocumentAsPersisted(customShop.getDocumentId());
|
| 540 |
}
|
539 |
}
|
| 541 |
if(shop.getAddressId() == null){
|
540 |
if(shop.getAddressId() == null){
|
| 542 |
Address address = null;
|
541 |
Address address = null;
|
| 543 |
if(customShop.isSameAsRetailerAddress()){
|
542 |
if(customShop.isSameAsRetailerAddress()){
|
| 544 |
address = sameAsRetailerAddressValue;
|
543 |
address = sameAsRetailerAddressValue;
|
| Line 569... |
Line 568... |
| 569 |
address.getLine1().equals(customAddress.getLine1()) &&
|
568 |
address.getLine1().equals(customAddress.getLine1()) &&
|
| 570 |
address.getLine2().equals(customAddress.getLine2()) &&
|
569 |
address.getLine2().equals(customAddress.getLine2()) &&
|
| 571 |
address.getCity().equals(customAddress.getCity()) &&
|
570 |
address.getCity().equals(customAddress.getCity()) &&
|
| 572 |
address.getPinCode().equals(customAddress.getPinCode()) &&
|
571 |
address.getPinCode().equals(customAddress.getPinCode()) &&
|
| 573 |
address.getState().equals(customAddress.getState()))){
|
572 |
address.getState().equals(customAddress.getState()))){
|
| 574 |
this.updateAddress(address, customShop.getAddress());
|
- |
|
| 575 |
}else{
|
- |
|
| 576 |
address = new Address();
|
573 |
address = new Address();
|
| 577 |
ShopAddress shopAddress = shopAddressRepository.selectByShopId(shop.getId());
|
574 |
ShopAddress shopAddress = shopAddressRepository.selectByShopId(shop.getId());
|
| 578 |
this.updateAddress(address, customAddress);
|
575 |
this.updateAddress(address, customAddress);
|
| 579 |
shopAddress.setAddressId(address.getId());
|
576 |
shopAddress.setAddressId(address.getId());
|
| 580 |
shopAddressRepository.persist(shopAddress);
|
577 |
shopAddressRepository.persist(shopAddress);
|