Created
April 29, 2014 10:52
-
-
Save bekzod/11396742 to your computer and use it in GitHub Desktop.
diff
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# wip | |
# fixes | |
# wip | |
# returned old widget | |
# wip | |
# -------------- | |
# Please enter the commit message for your changes. Everything below | |
# this paragraph is ignored, and an empty message aborts the commit. | |
# Just close the window to accept your message. | |
diff --git a/src/site/js/passengerSelect.js b/src/site/js/passengerSelect.js | |
index 4e757ac..053d0af 100644 | |
--- a/src/site/js/passengerSelect.js | |
+++ b/src/site/js/passengerSelect.js | |
@@ -512,8 +512,9 @@ PassengerSelect.prototype.setAmount = function(){ | |
var cnnCount = this.$table[1].tBodies[0].rows.length; | |
var infCount = this.$table[2].tBodies[0].rows.length; | |
- var amount = convertCurrency(adtCount * this.fare.amt + this.fare.prcInf.ccFee , this.fare.cur) ; | |
- var lowCostDuty = convertCurrency(this.fare.prcInf.ccFee, this.fare.cur); | |
+ var ccFee = this.fare.prcInf.ccFee || 0; | |
+ var amount = convertCurrency(adtCount * this.fare.amt + ccFee , this.fare.cur) ; | |
+ var lowCostDuty = convertCurrency(ccFee, this.fare.cur); | |
if (this.fare.childPrices) { | |
if(this.fare.childPrices.cnnPriceInfo){ | |
@@ -564,10 +565,8 @@ PassengerSelect.prototype.setAmount = function(){ | |
amount = Math.ceil(amount); | |
lowCostDuty = Math.ceil(lowCostDuty); | |
} | |
- | |
this.amountToPay = amount; | |
$(this.elToPay).html(l10n.searchResult.passengers.priceToPay + "<span class=\"money\">" + formatMoney(this.amountToPay) + " " + l10n.currency[tw.currency].Symbol + "</span>"); | |
- | |
if(this.fare.isLowcost){ | |
$('.vsmall ',this.elForm).text( | |
l10n.makeorder.lowcost.duty + " " + formatMoney(lowCostDuty) + " " + l10n.currency[tw.currency].Symbol |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment