Subversion Repositories SmartDukaan

Rev

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

Rev 31916 Rev 31919
Line 1258... Line 1258...
1258 
                InventoryPayoutModel inventoryPayoutModel = this.getPayouts(ii);
 1258 
                InventoryPayoutModel inventoryPayoutModel = this.getPayouts(ii);
1259 
                AmountModel amountModel = new AmountModel();
 1259 
                AmountModel amountModel = new AmountModel();
1260 
                amountModel.setAmount(scheme.getAmount());
 1260 
                amountModel.setAmount(scheme.getAmount());
1261 
                amountModel.setAmountType(scheme.getAmountType());
 1261 
                amountModel.setAmountType(scheme.getAmountType());
1262 
                double amountToRollout = this.getAmount(inventoryPayoutModel, amountModel);
 1262 
                double amountToRollout = this.getAmount(inventoryPayoutModel, amountModel);
- 
 
 1263 
                pendingPayout.setAmount((float)amountToRollout);
1263 
                if (scheme.getType().equals(SchemeType.ACTIVATION)) {
 1264 
                if (scheme.getType().equals(SchemeType.ACTIVATION)) {
1264 
                    walletService.addAmountToWallet(fofoId, orderId, WalletReferenceType.ACTIVATION_SCHEME,
 1265 
                    walletService.addAmountToWallet(fofoId, orderId, WalletReferenceType.ACTIVATION_SCHEME,
1265 
                            "Activation margin for " + ii.getItem().getItemDescriptionNoColor() + ", Imei - " + serialNumber, (float) amountToRollout,
 1266 
                            "Activation margin for " + ii.getItem().getItemDescriptionNoColor() + ", Imei - " + serialNumber, (float) amountToRollout,
1266 
                            fofoOrder.getCreateTimestamp());
 1267 
                            fofoOrder.getCreateTimestamp());
1267 
                    pendingPayout.setStatusDescription("Activation margin credited, activated on " + FormattingUtils.formatDate(activatedImei.getActivationTimestamp()));
 1268 
                    pendingPayout.setStatusDescription("Activation margin credited, activated on " + FormattingUtils.formatDate(activatedImei.getActivationTimestamp()));