Subversion Repositories SmartDukaan

Rev

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

Rev 23558 Rev 23566
Line 64... Line 64...
64
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
64
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
65
import com.spice.profitmandi.dao.entity.fofo.InvoiceNumberGenerationSequence;
65
import com.spice.profitmandi.dao.entity.fofo.InvoiceNumberGenerationSequence;
66
import com.spice.profitmandi.dao.entity.fofo.PrebookingListing;
66
import com.spice.profitmandi.dao.entity.fofo.PrebookingListing;
67
import com.spice.profitmandi.dao.entity.fofo.PrebookingOrder;
67
import com.spice.profitmandi.dao.entity.fofo.PrebookingOrder;
68
import com.spice.profitmandi.dao.entity.fofo.PrebookingOrderItem;
68
import com.spice.profitmandi.dao.entity.fofo.PrebookingOrderItem;
-
 
69
import com.spice.profitmandi.dao.entity.fofo.PurchaseReturnItem;
69
import com.spice.profitmandi.dao.entity.fofo.ScanRecord;
70
import com.spice.profitmandi.dao.entity.fofo.ScanRecord;
70
import com.spice.profitmandi.dao.entity.user.Address;
71
import com.spice.profitmandi.dao.entity.user.Address;
71
import com.spice.profitmandi.dao.entity.user.Counter;
72
import com.spice.profitmandi.dao.entity.user.Counter;
72
import com.spice.profitmandi.dao.entity.user.PrivateDealUser;
73
import com.spice.profitmandi.dao.entity.user.PrivateDealUser;
73
import com.spice.profitmandi.dao.enumuration.dtr.OtpType;
74
import com.spice.profitmandi.dao.enumuration.dtr.OtpType;
Line 94... Line 95...
94
import com.spice.profitmandi.dao.repository.fofo.InvoiceNumberGenerationSequenceRepository;
95
import com.spice.profitmandi.dao.repository.fofo.InvoiceNumberGenerationSequenceRepository;
95
import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
96
import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
96
import com.spice.profitmandi.dao.repository.fofo.PrebookingListingRepository;
97
import com.spice.profitmandi.dao.repository.fofo.PrebookingListingRepository;
97
import com.spice.profitmandi.dao.repository.fofo.PrebookingOrderItemRepository;
98
import com.spice.profitmandi.dao.repository.fofo.PrebookingOrderItemRepository;
98
import com.spice.profitmandi.dao.repository.fofo.PrebookingOrderRepository;
99
import com.spice.profitmandi.dao.repository.fofo.PrebookingOrderRepository;
-
 
100
import com.spice.profitmandi.dao.repository.fofo.PurchaseReturnItemRepository;
99
import com.spice.profitmandi.dao.repository.fofo.ScanRecordRepository;
101
import com.spice.profitmandi.dao.repository.fofo.ScanRecordRepository;
100
import com.spice.profitmandi.dao.repository.user.AddressRepository;
102
import com.spice.profitmandi.dao.repository.user.AddressRepository;
101
import com.spice.profitmandi.dao.repository.user.CounterRepository;
103
import com.spice.profitmandi.dao.repository.user.CounterRepository;
102
import com.spice.profitmandi.dao.repository.user.PrivateDealUserRepository;
104
import com.spice.profitmandi.dao.repository.user.PrivateDealUserRepository;
103
import com.spice.profitmandi.service.inventory.InventoryService;
105
import com.spice.profitmandi.service.inventory.InventoryService;
Line 125... Line 127...
125
	@Autowired
127
	@Autowired
126
	private InvoiceNumberGenerationSequenceRepository invoiceNumberGenerationSequenceRepository;
128
	private InvoiceNumberGenerationSequenceRepository invoiceNumberGenerationSequenceRepository;
127
 
129
 
128
	@Autowired
130
	@Autowired
129
	private CustomerRepository customerRepository;
131
	private CustomerRepository customerRepository;
-
 
132
	
-
 
133
	@Autowired
-
 
134
	private PurchaseReturnItemRepository purchaseReturnItemRepository;
130
 
135
 
131
	@Autowired
136
	@Autowired
132
	private AddressRepository addressRepository;
137
	private AddressRepository addressRepository;
133
 
138
 
134
	@Autowired
139
	@Autowired
Line 1030... Line 1035...
1030
			scanRecord.setFofoId(fofoId);
1035
			scanRecord.setFofoId(fofoId);
1031
			//correct this
1036
			//correct this
1032
			scanRecord.setQuantity(inventoryItemQuantityUsed.get(inventoryItem.getId()));
1037
			scanRecord.setQuantity(inventoryItemQuantityUsed.get(inventoryItem.getId()));
1033
			scanRecord.setType(ScanType.SALE);
1038
			scanRecord.setType(ScanType.SALE);
1034
			scanRecordRepository.persist(scanRecord);
1039
			scanRecordRepository.persist(scanRecord);
-
 
1040
			purchaseReturnItemRepository.deleteById(inventoryItem.getId());
-
 
1041
			
1035
		}
1042
		}
1036
	}
1043
	}
1037
	
1044
	
1038
	private void createFofoLineItem(int fofoOrderItemId, Set<InventoryItem> inventoryItems, Map<Integer, Integer> inventoryItemIdQuantityUsed){
1045
	private void createFofoLineItem(int fofoOrderItemId, Set<InventoryItem> inventoryItems, Map<Integer, Integer> inventoryItemIdQuantityUsed){
1039
		for(InventoryItem inventoryItem : inventoryItems){
1046
		for(InventoryItem inventoryItem : inventoryItems){