|
@@ -137,7 +137,7 @@ discard block |
|
|
block discarded – undo |
|
137
|
137
|
} |
|
138
|
138
|
|
|
139
|
139
|
if (!empty($options->ticketType)) { |
|
140
|
|
- $priceOptions[] = self::loadTicketType($options->ticketType); |
|
|
140
|
+ $priceOptions[] = self::loadTicketType($options->ticketType); |
|
141
|
141
|
} |
|
142
|
142
|
|
|
143
|
143
|
if (!empty($options->taxes)) { |
|
@@ -239,7 +239,7 @@ discard block |
|
|
block discarded – undo |
|
239
|
239
|
|
|
240
|
240
|
//Support for legacy fareBasisPrimaryCode to be removed when breaking BC: |
|
241
|
241
|
$po->optionDetail->criteriaDetails[] = new CriteriaDetails( |
|
242
|
|
- $pricingFareBasis->fareBasisPrimaryCode . $pricingFareBasis->fareBasisCode |
|
|
242
|
+ $pricingFareBasis->fareBasisPrimaryCode.$pricingFareBasis->fareBasisCode |
|
243
|
243
|
); |
|
244
|
244
|
|
|
245
|
245
|
//Support for legacy segmentReference to be removed when breaking BC: |
|
@@ -345,8 +345,7 @@ discard block |
|
|
block discarded – undo |
|
345
|
345
|
|
|
346
|
346
|
foreach ($obFees as $obFee) { |
|
347
|
347
|
$amountType = (!empty($obFee->amount)) ? |
|
348
|
|
- DiscountPenaltyDetails::AMOUNTTYPE_FIXED_WHOLE_AMOUNT : |
|
349
|
|
- DiscountPenaltyDetails::AMOUNTTYPE_PERCENTAGE; |
|
|
348
|
+ DiscountPenaltyDetails::AMOUNTTYPE_FIXED_WHOLE_AMOUNT : DiscountPenaltyDetails::AMOUNTTYPE_PERCENTAGE; |
|
350
|
349
|
|
|
351
|
350
|
$rate = (!empty($obFee->amount)) ? $obFee->amount : $obFee->percentage; |
|
352
|
351
|
|
Please login to merge, or discard this patch.