Subversion Repositories SmartDukaan

Rev

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

Rev 31903 Rev 32022
Line 193... Line 193...
193 
            let percentageMargin = 0;
 193 
            let percentageMargin = 0;
194 
            $(trContainer).find('.margin').each(function (i, ele) {
 194 
            $(trContainer).find('.margin').each(function (i, ele) {
195 
                let amountModel = $(ele).data('value');
 195 
                let amountModel = $(ele).data('value');
196 
                //console.log(amountModel);
 196 
                //console.log(amountModel);
197 
                if (amountModel.amountType == 'FIXED') {
 197 
                if (amountModel.amountType == 'FIXED') {
- 
 
 198 
                    if (!amountModel.discount)
198 
                    fixedMargin += amountModel.amount;
 199 
                        fixedMargin += amountModel.amount;
199 
                } else if (amountModel.amountType == 'PERCENTAGE') {
 200 
                } else if (amountModel.amountType == 'PERCENTAGE') {
200 
                    percentageMargin += amountModel.amount;
 201 
                    percentageMargin += amountModel.amount;
201 
                }
 202 
                }
202 
            });
 203 
            });
203 
            let effectiveDp = dp - fixedMargin;
 204 
            let effectiveDp = dp - fixedMargin;