View | Details | Raw Unified | Return to bug 30139
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-15 / +16 lines)
Lines 476-503 Link Here
476
            var newValue = textObj.value;
476
            var newValue = textObj.value;
477
            var decAmount = "";
477
            var decAmount = "";
478
            var dolAmount = "";
478
            var dolAmount = "";
479
            var decFlag   = false;
479
            var dolFlag   = false;
480
            var aChar     = "";
480
            var aChar     = "";
481
481
482
            for(i=0; i < newValue.length; i++) {
482
            for(var i = newValue.length; 0 < i; i--) {
483
                aChar = newValue.substring(i, i+1);
483
                aChar = newValue.substring(i-1, i);
484
                if (aChar >= "0" && aChar <= "9") {
484
                if ("0" <= aChar && aChar <= "9") {
485
                    if(decFlag) {
485
                    if(dolFlag) {
486
                        decAmount = "" + decAmount + aChar;
486
                        dolAmount = "" + aChar + dolAmount;
487
                    }
487
                    }
488
                    else {
488
                    else {
489
                        dolAmount = "" + dolAmount + aChar;
489
                        decAmount = "" + aChar + decAmount;
490
                    }
490
                    }
491
                }
491
                }
492
                if (aChar == ".") {
492
                if (aChar == "." || aChar == ",") {
493
                    if (decFlag) {
493
                    dolFlag = true;
494
                        dolAmount = "";
495
                        break;
496
                    }
497
                    decFlag = true;
498
                }
494
                }
499
            }
495
            }
500
496
497
            if (!dolFlag) {
498
                dolAmount = decAmount;
499
                decAmount = "";
500
            }
501
501
            if (dolAmount == "") {
502
            if (dolAmount == "") {
502
                dolAmount = "0";
503
                dolAmount = "0";
503
            }
504
            }
Lines 512-521 Link Here
512
            }
513
            }
513
        // Pad right side
514
        // Pad right side
514
            if (decAmount.length == 1) {
515
            if (decAmount.length == 1) {
515
               decAmount = decAmount + "0";
516
                decAmount = decAmount + "0";
516
            }
517
            }
517
            if (decAmount.length == 0) {
518
            if (decAmount.length == 0) {
518
               decAmount = decAmount + "00";
519
                decAmount = decAmount + "00";
519
            }
520
            }
520
521
521
            textObj.value = dolAmount + "." + decAmount;
522
            textObj.value = dolAmount + "." + decAmount;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt (-14 / +14 lines)
Lines 203-230 Link Here
203
        var newValue = textObj.value;
203
        var newValue = textObj.value;
204
        var decAmount = "";
204
        var decAmount = "";
205
        var dolAmount = "";
205
        var dolAmount = "";
206
        var decFlag   = false;
206
        var dolFlag   = false;
207
        var aChar     = "";
207
        var aChar     = "";
208
208
209
        for(var i=0; i < newValue.length; i++) {
209
        for(var i = newValue.length; 0 < i; i--) {
210
            aChar = newValue.substring(i, i+1);
210
            aChar = newValue.substring(i-1, i);
211
            if (aChar >= "0" && aChar <= "9") {
211
            if ("0" <= aChar && aChar <= "9") {
212
                if(decFlag) {
212
                if(dolFlag) {
213
                    decAmount = "" + decAmount + aChar;
213
                    dolAmount = "" + aChar + dolAmount;
214
                }
214
                }
215
                else {
215
                else {
216
                    dolAmount = "" + dolAmount + aChar;
216
                    decAmount = "" + aChar + decAmount;
217
                }
217
                }
218
            }
218
            }
219
            if (aChar == ".") {
219
            if (aChar == "." || aChar == ",") {
220
                if (decFlag) {
220
                dolFlag = true;
221
                    dolAmount = "";
222
                    break;
223
                }
224
                decFlag = true;
225
            }
221
            }
226
        }
222
        }
227
223
224
        if (!dolFlag) {
225
            dolAmount = decAmount;
226
            decAmount = "";
227
        }
228
228
        if (dolAmount == "") {
229
        if (dolAmount == "") {
229
            dolAmount = "0";
230
            dolAmount = "0";
230
        }
231
        }
231
- 

Return to bug 30139