Skip to content

Commit 989af63

Browse files
authored
Merge pull request #149 from magento-firedrakes/bugfixes
[Firedrakes] Bugfix
2 parents 71c58ad + f0f2ef5 commit 989af63

17 files changed

+366
-344
lines changed

app/code/Magento/Sales/Api/Data/CreditmemoInterface.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public function getBaseGrandTotal();
304304
/**
305305
* Gets the credit memo base discount tax compensation amount.
306306
*
307-
* @return float Credit memo base discount tax compensation amount.
307+
* @return float|null Credit memo base discount tax compensation amount.
308308
*/
309309
public function getBaseDiscountTaxCompensationAmount();
310310

@@ -318,7 +318,7 @@ public function getBaseShippingAmount();
318318
/**
319319
* Gets the credit memo base shipping discount tax compensation amount.
320320
*
321-
* @return float Credit memo base shipping discount tax compensation amount.
321+
* @return float|null Credit memo base shipping discount tax compensation amount.
322322
*/
323323
public function getBaseShippingDiscountTaxCompensationAmnt();
324324

@@ -453,7 +453,7 @@ public function getGrandTotal();
453453
/**
454454
* Gets the credit memo discount tax compensation amount.
455455
*
456-
* @return float Credit memo discount tax compensation amount.
456+
* @return float|null Credit memo discount tax compensation amount.
457457
*/
458458
public function getDiscountTaxCompensationAmount();
459459

@@ -501,7 +501,7 @@ public function getShippingAmount();
501501
/**
502502
* Gets the credit memo shipping discount tax compensation amount.
503503
*
504-
* @return float Credit memo shipping discount tax compensation amount.
504+
* @return float|null Credit memo shipping discount tax compensation amount.
505505
*/
506506
public function getShippingDiscountTaxCompensationAmount();
507507

app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,14 @@ public function getBaseCost();
169169
/**
170170
* Gets the base discount amount for a credit memo item.
171171
*
172-
* @return float
172+
* @return float|null
173173
*/
174174
public function getBaseDiscountAmount();
175175

176176
/**
177177
* Gets the base discount tax compensation amount for a credit memo item.
178178
*
179-
* @return float
179+
* @return float|null
180180
*/
181181
public function getBaseDiscountTaxCompensationAmount();
182182

@@ -275,7 +275,7 @@ public function setEntityId($entityId);
275275
/**
276276
* Gets the discount tax compensation amount for a credit memo item.
277277
*
278-
* @return float Discount tax compensation amount.
278+
* @return float|null Discount tax compensation amount.
279279
*/
280280
public function getDiscountTaxCompensationAmount();
281281

app/code/Magento/Sales/Api/Data/InvoiceInterface.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public function getBaseGrandTotal();
225225
/**
226226
* Gets the base discount tax compensation amount for the invoice.
227227
*
228-
* @return float Base discount tax compensation amount.
228+
* @return float|null Base discount tax compensation amount.
229229
*/
230230
public function getBaseDiscountTaxCompensationAmount();
231231

@@ -239,7 +239,7 @@ public function getBaseShippingAmount();
239239
/**
240240
* Gets the base shipping discount tax compensation amount for the invoice.
241241
*
242-
* @return float Base shipping discount tax compensation amount.
242+
* @return float|null Base shipping discount tax compensation amount.
243243
*/
244244
public function getBaseShippingDiscountTaxCompensationAmnt();
245245

@@ -381,7 +381,7 @@ public function getGrandTotal();
381381
/**
382382
* Gets the discount tax compensation amount for the invoice.
383383
*
384-
* @return float Discount tax compensation amount.
384+
* @return float|null Discount tax compensation amount.
385385
*/
386386
public function getDiscountTaxCompensationAmount();
387387

@@ -430,7 +430,7 @@ public function getShippingAmount();
430430
/**
431431
* Gets the shipping discount tax compensation amount for the invoice.
432432
*
433-
* @return float Shipping discount tax compensation amount.
433+
* @return float|null Shipping discount tax compensation amount.
434434
*/
435435
public function getShippingDiscountTaxCompensationAmount();
436436

app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function getBaseDiscountAmount();
140140
/**
141141
* Gets the base discount tax compensation amount for the invoice item.
142142
*
143-
* @return float Base discount tax compensation amount.
143+
* @return float|null Base discount tax compensation amount.
144144
*/
145145
public function getBaseDiscountTaxCompensationAmount();
146146

@@ -211,7 +211,7 @@ public function setEntityId($entityId);
211211
/**
212212
* Gets the discount tax compensation amount for the invoice item.
213213
*
214-
* @return float Discount tax compensation amount.
214+
* @return float|null Discount tax compensation amount.
215215
*/
216216
public function getDiscountTaxCompensationAmount();
217217

app/code/Magento/Sales/Api/Data/OrderInterface.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -643,21 +643,21 @@ public function getBaseGrandTotal();
643643
/**
644644
* Gets the base discount tax compensation amount for the order.
645645
*
646-
* @return float Base discount tax compensation amount.
646+
* @return float|null Base discount tax compensation amount.
647647
*/
648648
public function getBaseDiscountTaxCompensationAmount();
649649

650650
/**
651651
* Gets the base discount tax compensation invoiced amount for the order.
652652
*
653-
* @return float Base discount tax compensation invoiced.
653+
* @return float|null Base discount tax compensation invoiced.
654654
*/
655655
public function getBaseDiscountTaxCompensationInvoiced();
656656

657657
/**
658658
* Gets the base discount tax compensation refunded amount for the order.
659659
*
660-
* @return float Base discount tax compensation refunded.
660+
* @return float|null Base discount tax compensation refunded.
661661
*/
662662
public function getBaseDiscountTaxCompensationRefunded();
663663

@@ -685,7 +685,7 @@ public function getBaseShippingDiscountAmount();
685685
/**
686686
* Gets the base shipping discount tax compensation amount for the order.
687687
*
688-
* @return float Base shipping discount tax compensation amount.
688+
* @return float|null Base shipping discount tax compensation amount.
689689
*/
690690
public function getBaseShippingDiscountTaxCompensationAmnt();
691691

@@ -1107,21 +1107,21 @@ public function getGrandTotal();
11071107
/**
11081108
* Gets the discount tax compensation amount for the order.
11091109
*
1110-
* @return float Discount tax compensation amount.
1110+
* @return float|null Discount tax compensation amount.
11111111
*/
11121112
public function getDiscountTaxCompensationAmount();
11131113

11141114
/**
11151115
* Gets the discount tax compensation invoiced amount for the order.
11161116
*
1117-
* @return float Discount tax compensation invoiced amount.
1117+
* @return float|null Discount tax compensation invoiced amount.
11181118
*/
11191119
public function getDiscountTaxCompensationInvoiced();
11201120

11211121
/**
11221122
* Gets the discount tax compensation refunded amount for the order.
11231123
*
1124-
* @return float Discount tax compensation refunded amount.
1124+
* @return float|null Discount tax compensation refunded amount.
11251125
*/
11261126
public function getDiscountTaxCompensationRefunded();
11271127

@@ -1268,7 +1268,7 @@ public function getShippingDiscountAmount();
12681268
/**
12691269
* Gets the shipping discount tax compensation amount for the order.
12701270
*
1271-
* @return float Shipping discount tax compensation amount.
1271+
* @return float|null Shipping discount tax compensation amount.
12721272
*/
12731273
public function getShippingDiscountTaxCompensationAmount();
12741274

app/code/Magento/Sales/Api/Data/OrderItemInterface.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -457,21 +457,21 @@ public function getBaseDiscountRefunded();
457457
/**
458458
* Gets the base discount tax compensation amount for the order item.
459459
*
460-
* @return float Base discount tax compensation amount.
460+
* @return float|null Base discount tax compensation amount.
461461
*/
462462
public function getBaseDiscountTaxCompensationAmount();
463463

464464
/**
465465
* Gets the base discount tax compensation invoiced for the order item.
466466
*
467-
* @return float Base discount tax compensation invoiced.
467+
* @return float|null Base discount tax compensation invoiced.
468468
*/
469469
public function getBaseDiscountTaxCompensationInvoiced();
470470

471471
/**
472472
* Gets the base discount tax compensation refunded for the order item.
473473
*
474-
* @return float Base discount tax compensation refunded.
474+
* @return float|null Base discount tax compensation refunded.
475475
*/
476476
public function getBaseDiscountTaxCompensationRefunded();
477477

@@ -738,28 +738,28 @@ public function getGwTaxAmountRefunded();
738738
/**
739739
* Gets the discount tax compensation amount for the order item.
740740
*
741-
* @return float Discount tax compensation amount.
741+
* @return float|null Discount tax compensation amount.
742742
*/
743743
public function getDiscountTaxCompensationAmount();
744744

745745
/**
746746
* Gets the discount tax compensation canceled for the order item.
747747
*
748-
* @return float Discount tax compensation canceled.
748+
* @return float|null Discount tax compensation canceled.
749749
*/
750750
public function getDiscountTaxCompensationCanceled();
751751

752752
/**
753753
* Gets the discount tax compensation invoiced for the order item.
754754
*
755-
* @return float Discount tax compensation invoiced.
755+
* @return float|null Discount tax compensation invoiced.
756756
*/
757757
public function getDiscountTaxCompensationInvoiced();
758758

759759
/**
760760
* Gets the discount tax compensation refunded for the order item.
761761
*
762-
* @return float Discount tax compensation refunded.
762+
* @return float|null Discount tax compensation refunded.
763763
*/
764764
public function getDiscountTaxCompensationRefunded();
765765

app/code/Magento/Sales/Api/Data/TotalInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function getBaseShippingDiscountAmount();
114114
/**
115115
* Gets the base shipping discount tax compensation amount.
116116
*
117-
* @return float Base shipping discount tax compensation amount.
117+
* @return float|null Base shipping discount tax compensation amount.
118118
*/
119119
public function getBaseShippingDiscountTaxCompensationAmnt();
120120

@@ -177,7 +177,7 @@ public function getShippingDiscountAmount();
177177
/**
178178
* Gets the shipping discount tax compensation amount.
179179
*
180-
* @return float Shipping discount tax compensation amount.
180+
* @return float|null Shipping discount tax compensation amount.
181181
*/
182182
public function getShippingDiscountTaxCompensationAmount();
183183

0 commit comments

Comments
 (0)