Subversion Repositories SmartDukaan

Rev

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

Rev 33556 Rev 33597
Line 119... Line 119...
119
            double totalPayableAmount = 0;
119
            double totalPayableAmount = 0;
120
            for (BulkOrderModel fofoBulkOrderModel : fofoBulkOrderModels) {
120
            for (BulkOrderModel fofoBulkOrderModel : fofoBulkOrderModels) {
121
                CartItem cartItem = new CartItem();
121
                CartItem cartItem = new CartItem();
122
                cartItem.setQuantity(fofoBulkOrderModel.getQuantity());
122
                cartItem.setQuantity(fofoBulkOrderModel.getQuantity());
123
                cartItem.setItemId(fofoBulkOrderModel.getItemId());
123
                cartItem.setItemId(fofoBulkOrderModel.getItemId());
124
                boolean isPriceZero = fofoBulkOrderModel.getItemPrice() == 0d;
-
 
125
                TagListing tagListing = tagListingRepository.selectByItemId(fofoBulkOrderModel.getItemId());
124
                TagListing tagListing = tagListingRepository.selectByItemId(fofoBulkOrderModel.getItemId());
126
                if (tagListing == null) {
125
                if (tagListing == null) {
127
                    String message = "Pricing Does not exist for " + fofoBulkOrderModel.getItemId() + "(" + fofoBulkOrderModel.getDescription() + ")";
126
                    String message = "Pricing Does not exist for " + fofoBulkOrderModel.getItemId() + "(" + fofoBulkOrderModel.getDescription() + ")";
128
                    throw new ProfitMandiBusinessException(message, message, message);
127
                    throw new ProfitMandiBusinessException(message, message, message);
129
                }
128
                }
130
                double itemSellingPrice = tagListing.getSellingPrice();
129
                double itemSellingPrice = tagListing.getSellingPrice();
-
 
130
                boolean isActualPrice = fofoBulkOrderModel.getItemPrice() == itemSellingPrice;
-
 
131
                boolean isPriceZero = fofoBulkOrderModel.getItemPrice() == 0d;
131
                double customSellingPrice = fofoBulkOrderModel.getItemPrice();
132
                double customSellingPrice = fofoBulkOrderModel.getItemPrice();
132
                int itemId = cartItem.getItemId();
133
                int itemId = cartItem.getItemId();
133
                if (isPriceZero) {
134
                if (isPriceZero || isActualPrice) {
134
                    cartItem.setSellingPrice(itemSellingPrice);
135
                    cartItem.setSellingPrice(itemSellingPrice);
135
                } else {
136
                } else {
136
                    if (customSellingPrice <= tagListing.getMrp() || customSellingPrice <= tagListing.getMop()) {
137
                    if (customSellingPrice <= tagListing.getMrp() || customSellingPrice <= tagListing.getMop()) {
137
                        cartItem.setSellingPrice(customSellingPrice);
138
                        cartItem.setSellingPrice(customSellingPrice);
138
                        approvalNotRequired = false;
139
                        approvalNotRequired = false;