Skip to content

Commit 0a8c7c5

Browse files
author
Mike Weis
committed
Merge branch 'MAGETWO-28549-typo' into develop
2 parents 735b936 + 375d189 commit 0a8c7c5

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct,
313313

314314
/** @var Store $store */
315315
$store = $bundleProduct->getStore();
316-
$roundingMethod = $this->taxHelper->getCalculationAgorithm($store);
316+
$roundingMethod = $this->taxHelper->getCalculationAlgorithm($store);
317317
foreach ($amountList as $amountInfo) {
318318
/** @var \Magento\Framework\Pricing\Amount\AmountInterface $itemAmount */
319319
$itemAmount = $amountInfo['amount'];

‎app/code/Magento/Tax/Helper/Data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ public function getCalculationSequence($store = null)
628628
* @param null|string|bool|int|Store $store
629629
* @return string
630630
*/
631-
public function getCalculationAgorithm($store = null)
631+
public function getCalculationAlgorithm($store = null)
632632
{
633633
return $this->_config->getAlgorithm($store);
634634
}

‎app/code/Magento/Tax/Model/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public function getNeedUseShippingExcludeTax()
269269
}
270270

271271
/**
272-
* Get defined tax calculation agorithm
272+
* Get defined tax calculation algorithm
273273
*
274274
* @param null|string|bool|int|Store $store
275275
* @return string

‎app/code/Magento/Tax/Model/Observer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ public function updateProductOptions(\Magento\Framework\Event\Observer $observer
299299
return $this;
300300
}
301301

302-
$algorithm = $this->_taxData->getCalculationAgorithm();
302+
$algorithm = $this->_taxData->getCalculationAlgorithm();
303303
$options['calculationAlgorithm'] = $algorithm;
304304
// prepare correct template for options render
305305
if ($this->_taxData->displayBothPrices()) {

‎dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public function collectDataProvider()
278278
$data['price_incl_tax_weee_taxable_unit_included_in_subtotal'] = [
279279
'tax_config' => [
280280
'priceIncludesTax' => true,
281-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
281+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
282282
],
283283
'weee_config' => [
284284
'isEnabled' => true,
@@ -322,7 +322,7 @@ public function collectDataProvider()
322322
$data['price_incl_tax_weee_taxable_unit_not_included_in_subtotal'] = [
323323
'tax_config' => [
324324
'priceIncludesTax' => true,
325-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
325+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
326326
],
327327
'weee_config' => [
328328
'isEnabled' => true,
@@ -366,7 +366,7 @@ public function collectDataProvider()
366366
$data['price_excl_tax_weee_taxable_unit_included_in_subtotal'] = [
367367
'tax_config' => [
368368
'priceIncludesTax' => false,
369-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
369+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
370370
],
371371
'weee_config' => [
372372
'isEnabled' => true,
@@ -410,7 +410,7 @@ public function collectDataProvider()
410410
$data['price_incl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
411411
'tax_config' => [
412412
'priceIncludesTax' => true,
413-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
413+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
414414
],
415415
'weee_config' => [
416416
'isEnabled' => true,
@@ -448,7 +448,7 @@ public function collectDataProvider()
448448
$data['price_excl_tax_weee_non_taxable_unit_include_in_subtotal'] = [
449449
'tax_config' => [
450450
'priceIncludesTax' => false,
451-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
451+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
452452
],
453453
'weee_config' => [
454454
'isEnabled' => true,
@@ -486,7 +486,7 @@ public function collectDataProvider()
486486
$data['price_incl_tax_weee_taxable_row_include_in_subtotal'] = [
487487
'tax_config' => [
488488
'priceIncludesTax' => true,
489-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
489+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
490490
],
491491
'weee_config' => [
492492
'isEnabled' => true,
@@ -530,7 +530,7 @@ public function collectDataProvider()
530530
$data['price_excl_tax_weee_taxable_row_include_in_subtotal'] = [
531531
'tax_config' => [
532532
'priceIncludesTax' => false,
533-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
533+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
534534
],
535535
'weee_config' => [
536536
'isEnabled' => true,
@@ -574,7 +574,7 @@ public function collectDataProvider()
574574
$data['price_incl_tax_weee_non_taxable_row_include_in_subtotal'] = [
575575
'tax_config' => [
576576
'priceIncludesTax' => true,
577-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
577+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
578578
],
579579
'weee_config' => [
580580
'isEnabled' => true,
@@ -612,7 +612,7 @@ public function collectDataProvider()
612612
$data['price_excl_tax_weee_non_taxable_row_not_included_in_subtotal'] = [
613613
'tax_config' => [
614614
'priceIncludesTax' => false,
615-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
615+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
616616
],
617617
'weee_config' => [
618618
'isEnabled' => true,

‎dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public function collectDataProvider()
220220
$data['price_incl_tax_weee_taxable_unit_included_in_subtotal'] = [
221221
'tax_config' => [
222222
'priceIncludesTax' => true,
223-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
223+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
224224
],
225225
'weee_config' => [
226226
'isEnabled' => true,
@@ -260,7 +260,7 @@ public function collectDataProvider()
260260
$data['price_incl_tax_weee_taxable_unit_not_included_in_subtotal'] = [
261261
'tax_config' => [
262262
'priceIncludesTax' => true,
263-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
263+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
264264
],
265265
'weee_config' => [
266266
'isEnabled' => true,
@@ -300,7 +300,7 @@ public function collectDataProvider()
300300
$data['price_excl_tax_weee_taxable_unit_included_in_subtotal'] = [
301301
'tax_config' => [
302302
'priceIncludesTax' => false,
303-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
303+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
304304
],
305305
'weee_config' => [
306306
'isEnabled' => true,
@@ -340,7 +340,7 @@ public function collectDataProvider()
340340
$data['price_incl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
341341
'tax_config' => [
342342
'priceIncludesTax' => true,
343-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
343+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
344344
],
345345
'weee_config' => [
346346
'isEnabled' => true,
@@ -382,7 +382,7 @@ public function collectDataProvider()
382382
$data['price_excl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
383383
'tax_config' => [
384384
'priceIncludesTax' => false,
385-
'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
385+
'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
386386
],
387387
'weee_config' => [
388388
'isEnabled' => true,
@@ -424,7 +424,7 @@ public function collectDataProvider()
424424
$data['price_incl_tax_weee_taxable_row_included_in_subtotal'] = [
425425
'tax_config' => [
426426
'priceIncludesTax' => true,
427-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
427+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
428428
],
429429
'weee_config' => [
430430
'isEnabled' => true,
@@ -464,7 +464,7 @@ public function collectDataProvider()
464464
$data['price_excl_tax_weee_taxable_row_included_in_subtotal'] = [
465465
'tax_config' => [
466466
'priceIncludesTax' => false,
467-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
467+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
468468
],
469469
'weee_config' => [
470470
'isEnabled' => true,
@@ -504,7 +504,7 @@ public function collectDataProvider()
504504
$data['price_incl_tax_weee_non_taxable_row_included_in_subtotal'] = [
505505
'tax_config' => [
506506
'priceIncludesTax' => true,
507-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
507+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
508508
],
509509
'weee_config' => [
510510
'isEnabled' => true,
@@ -546,7 +546,7 @@ public function collectDataProvider()
546546
$data['price_excl_tax_weee_non_taxable_row_included_in_subtotal'] = [
547547
'tax_config' => [
548548
'priceIncludesTax' => false,
549-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
549+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
550550
],
551551
'weee_config' => [
552552
'isEnabled' => true,
@@ -588,7 +588,7 @@ public function collectDataProvider()
588588
$data['price_excl_tax_weee_non_taxable_row_not_included_in_subtotal'] = [
589589
'tax_config' => [
590590
'priceIncludesTax' => false,
591-
'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
591+
'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
592592
],
593593
'weee_config' => [
594594
'isEnabled' => true,

0 commit comments

Comments
 (0)