Subversion Repositories SmartDukaan

Rev

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

Rev 30960 Rev 30969
Line 437... Line 437...
437
						createOfferRequest.getCreatedOn(), customRetailer.getPartnerId(), customRetailer.getBusinessName(),
437
						createOfferRequest.getCreatedOn(), customRetailer.getPartnerId(), customRetailer.getBusinessName(),
438
						customRetailer.getCode(),
438
						customRetailer.getCode(),
439
 
439
 
440
						offerRowModel.getTotalSale(),
440
						offerRowModel.getTotalSale(),
441
						offerRowModel.getEligibleSale(),
441
						offerRowModel.getEligibleSale(),
442
						offerRowModel.getTotalBasePurchaseValue(),
-
 
443
						offerRowModel.getCurrentPayoutTarget(),
-
 
444
						offerRowModel.getPayoutTargetAchieved(),
442
						offerRowModel.getPayoutTargetAchieved(),
445
						offerRowModel.getPayoutValue(),
443
						offerRowModel.getPayoutValue(),
446
						offerRowModel.getPayoutType(),
444
						offerRowModel.getPayoutType(),
447
						offerRowModel.getPayoutValueDp(), offerRowModel.getFinalPayout(),
445
						offerRowModel.getPayoutValueDp(), offerRowModel.getFinalPayout(),
448
						String.join(", ", offerRowModel.getPendingImeis())));
446
						String.join(", ", offerRowModel.getPendingImeis())));
Line 451... Line 449...
451
					Arrays.asList("Id", "Name", "Target Type", "Scheme Type", "Brand %", "Sellin %", "Partner Criteria",
449
					Arrays.asList("Id", "Name", "Target Type", "Scheme Type", "Brand %", "Sellin %", "Partner Criteria",
452
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
450
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
453
 
451
 
454
							"Total Value",
452
							"Total Value",
455
							"Eligible Value",
453
							"Eligible Value",
456
							//"Achieved Target",
-
 
457
							//"Next Target",
-
 
458
							//"Eligible Sale DP",
-
 
459
							"Total Purchase", "Current Payout Target", "Payout Target Achieved", "Payout Amount", "Payout Amount Type",
454
							"Payout Target Achieved", "Payout Amount", "Payout Amount Type",
460
							"Payout Value DP", "Amount to be credited", "IMEIs pending for Activation"
455
							"Payout Value DP", "Amount to be credited", "IMEIs pending for Activation"
461
							// "Payout Sale Qty", "Activated Value", "Activated Qty",
456
							// "Payout Sale Qty", "Activated Value", "Activated Qty",
462
					), listOfRows);
457
					), listOfRows);
463
		}
458
		}
464
		final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
459
		final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());