Subversion Repositories SmartDukaan

Rev

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

Rev 13490 Rev 13492
Line 921... Line 921...
921 
				}else{
 921 
				}else{
922 
					itemQuantityMap.put(lineitem.getItem_id(), lineitem.getQuantity());
 922 
					itemQuantityMap.put(lineitem.getItem_id(), lineitem.getQuantity());
923 
				}
 923 
				}
924
924
925 
				if(itemTotalAmtMap.containsKey(lineitem.getItem_id())){
 925 
				if(itemTotalAmtMap.containsKey(lineitem.getItem_id())){
926 
					double totalItemAmount = itemTotalAmtMap.get(lineitem.getItem_id()) + (order.getTotal_amount()-order.getGvAmount()-order.getAdvanceAmount()-order.getInsuranceAmount());
 926 
					double totalItemAmount = itemTotalAmtMap.get(lineitem.getItem_id()) + (order.getTotal_amount()-order.getAdvanceAmount()-order.getInsuranceAmount());
927 
					itemTotalAmtMap.put(lineitem.getItem_id(), totalItemAmount);
 927 
					itemTotalAmtMap.put(lineitem.getItem_id(), totalItemAmount);
928 
				}else{
 928 
				}else{
929 
					itemTotalAmtMap.put(lineitem.getItem_id(), (order.getTotal_amount()-order.getGvAmount()-order.getAdvanceAmount()-order.getInsuranceAmount()));
 929 
					itemTotalAmtMap.put(lineitem.getItem_id(), (order.getTotal_amount()-order.getAdvanceAmount()-order.getInsuranceAmount()));
930 
				}
 930 
				}
931 
				if(paymentMode==null || paymentMode.isEmpty()){
 931 
				if(paymentMode==null || paymentMode.isEmpty()){
932 
					if(order.getPickupStoreId() > 0 && order.isCod() == true)
 932 
					if(order.getPickupStoreId() > 0 && order.isCod() == true)
933 
						paymentMode = "In-Store";
 933 
						paymentMode = "In-Store";
934 
					else if (order.isCod())
 934 
					else if (order.isCod())