From 3467488060ceebaee770b69a10f1499d31ce86c4 Mon Sep 17 00:00:00 2001 From: Nadiya Syvokonenko Date: Tue, 5 Jul 2016 14:26:01 +0300 Subject: [PATCH] MAGETWO-50026: [Github] SalesInvoiceRepository attributes not correctly type cast #3605 --- .../Sales/Api/Data/CreditmemoInterface.php | 8 +- .../Api/Data/CreditmemoItemInterface.php | 6 +- .../Sales/Api/Data/InvoiceInterface.php | 8 +- .../Sales/Api/Data/InvoiceItemInterface.php | 4 +- .../Magento/Sales/Api/Data/OrderInterface.php | 16 +- .../Sales/Api/Data/OrderItemInterface.php | 14 +- .../Magento/Sales/Api/Data/TotalInterface.php | 4 +- app/code/Magento/Sales/Model/Order.php | 258 +++++++++--------- .../Magento/Sales/Model/Order/Creditmemo.php | 9 +- .../Sales/Model/Order/Creditmemo/Item.php | 56 ++-- .../Magento/Sales/Model/Order/Invoice.php | 82 +++--- .../Sales/Model/Order/Invoice/Item.php | 40 +-- app/code/Magento/Sales/Model/Order/Item.php | 182 ++++++------ 13 files changed, 343 insertions(+), 344 deletions(-) diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php index 6b2548da10559..ecca646c69df9 100644 --- a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php +++ b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php @@ -304,7 +304,7 @@ public function getBaseGrandTotal(); /** * Gets the credit memo base discount tax compensation amount. * - * @return float Credit memo base discount tax compensation amount. + * @return float|null Credit memo base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); @@ -318,7 +318,7 @@ public function getBaseShippingAmount(); /** * Gets the credit memo base shipping discount tax compensation amount. * - * @return float Credit memo base shipping discount tax compensation amount. + * @return float|null Credit memo base shipping discount tax compensation amount. */ public function getBaseShippingDiscountTaxCompensationAmnt(); @@ -453,7 +453,7 @@ public function getGrandTotal(); /** * Gets the credit memo discount tax compensation amount. * - * @return float Credit memo discount tax compensation amount. + * @return float|null Credit memo discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); @@ -501,7 +501,7 @@ public function getShippingAmount(); /** * Gets the credit memo shipping discount tax compensation amount. * - * @return float Credit memo shipping discount tax compensation amount. + * @return float|null Credit memo shipping discount tax compensation amount. */ public function getShippingDiscountTaxCompensationAmount(); diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php index 20c5051ac493a..8481a3426d0d8 100644 --- a/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php +++ b/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php @@ -169,14 +169,14 @@ public function getBaseCost(); /** * Gets the base discount amount for a credit memo item. * - * @return float + * @return float|null */ public function getBaseDiscountAmount(); /** * Gets the base discount tax compensation amount for a credit memo item. * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationAmount(); @@ -275,7 +275,7 @@ public function setEntityId($entityId); /** * Gets the discount tax compensation amount for a credit memo item. * - * @return float Discount tax compensation amount. + * @return float|null Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); diff --git a/app/code/Magento/Sales/Api/Data/InvoiceInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceInterface.php index c2fc2937daddf..77dfed277a262 100644 --- a/app/code/Magento/Sales/Api/Data/InvoiceInterface.php +++ b/app/code/Magento/Sales/Api/Data/InvoiceInterface.php @@ -225,7 +225,7 @@ public function getBaseGrandTotal(); /** * Gets the base discount tax compensation amount for the invoice. * - * @return float Base discount tax compensation amount. + * @return float|null Base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); @@ -239,7 +239,7 @@ public function getBaseShippingAmount(); /** * Gets the base shipping discount tax compensation amount for the invoice. * - * @return float Base shipping discount tax compensation amount. + * @return float|null Base shipping discount tax compensation amount. */ public function getBaseShippingDiscountTaxCompensationAmnt(); @@ -381,7 +381,7 @@ public function getGrandTotal(); /** * Gets the discount tax compensation amount for the invoice. * - * @return float Discount tax compensation amount. + * @return float|null Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); @@ -430,7 +430,7 @@ public function getShippingAmount(); /** * Gets the shipping discount tax compensation amount for the invoice. * - * @return float Shipping discount tax compensation amount. + * @return float|null Shipping discount tax compensation amount. */ public function getShippingDiscountTaxCompensationAmount(); diff --git a/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php index 9e1addbdcae7b..e76f644a8275f 100644 --- a/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php +++ b/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php @@ -140,7 +140,7 @@ public function getBaseDiscountAmount(); /** * Gets the base discount tax compensation amount for the invoice item. * - * @return float Base discount tax compensation amount. + * @return float|null Base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); @@ -211,7 +211,7 @@ public function setEntityId($entityId); /** * Gets the discount tax compensation amount for the invoice item. * - * @return float Discount tax compensation amount. + * @return float|null Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); diff --git a/app/code/Magento/Sales/Api/Data/OrderInterface.php b/app/code/Magento/Sales/Api/Data/OrderInterface.php index d494f869f1dff..67152d152272c 100644 --- a/app/code/Magento/Sales/Api/Data/OrderInterface.php +++ b/app/code/Magento/Sales/Api/Data/OrderInterface.php @@ -643,21 +643,21 @@ public function getBaseGrandTotal(); /** * Gets the base discount tax compensation amount for the order. * - * @return float Base discount tax compensation amount. + * @return float|null Base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); /** * Gets the base discount tax compensation invoiced amount for the order. * - * @return float Base discount tax compensation invoiced. + * @return float|null Base discount tax compensation invoiced. */ public function getBaseDiscountTaxCompensationInvoiced(); /** * Gets the base discount tax compensation refunded amount for the order. * - * @return float Base discount tax compensation refunded. + * @return float|null Base discount tax compensation refunded. */ public function getBaseDiscountTaxCompensationRefunded(); @@ -685,7 +685,7 @@ public function getBaseShippingDiscountAmount(); /** * Gets the base shipping discount tax compensation amount for the order. * - * @return float Base shipping discount tax compensation amount. + * @return float|null Base shipping discount tax compensation amount. */ public function getBaseShippingDiscountTaxCompensationAmnt(); @@ -1107,21 +1107,21 @@ public function getGrandTotal(); /** * Gets the discount tax compensation amount for the order. * - * @return float Discount tax compensation amount. + * @return float|null Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); /** * Gets the discount tax compensation invoiced amount for the order. * - * @return float Discount tax compensation invoiced amount. + * @return float|null Discount tax compensation invoiced amount. */ public function getDiscountTaxCompensationInvoiced(); /** * Gets the discount tax compensation refunded amount for the order. * - * @return float Discount tax compensation refunded amount. + * @return float|null Discount tax compensation refunded amount. */ public function getDiscountTaxCompensationRefunded(); @@ -1268,7 +1268,7 @@ public function getShippingDiscountAmount(); /** * Gets the shipping discount tax compensation amount for the order. * - * @return float Shipping discount tax compensation amount. + * @return float|null Shipping discount tax compensation amount. */ public function getShippingDiscountTaxCompensationAmount(); diff --git a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php index a9efe1f3b15be..298276b7e132a 100644 --- a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php +++ b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php @@ -457,21 +457,21 @@ public function getBaseDiscountRefunded(); /** * Gets the base discount tax compensation amount for the order item. * - * @return float Base discount tax compensation amount. + * @return float|null Base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); /** * Gets the base discount tax compensation invoiced for the order item. * - * @return float Base discount tax compensation invoiced. + * @return float|null Base discount tax compensation invoiced. */ public function getBaseDiscountTaxCompensationInvoiced(); /** * Gets the base discount tax compensation refunded for the order item. * - * @return float Base discount tax compensation refunded. + * @return float|null Base discount tax compensation refunded. */ public function getBaseDiscountTaxCompensationRefunded(); @@ -738,28 +738,28 @@ public function getGwTaxAmountRefunded(); /** * Gets the discount tax compensation amount for the order item. * - * @return float Discount tax compensation amount. + * @return float|null Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); /** * Gets the discount tax compensation canceled for the order item. * - * @return float Discount tax compensation canceled. + * @return float|null Discount tax compensation canceled. */ public function getDiscountTaxCompensationCanceled(); /** * Gets the discount tax compensation invoiced for the order item. * - * @return float Discount tax compensation invoiced. + * @return float|null Discount tax compensation invoiced. */ public function getDiscountTaxCompensationInvoiced(); /** * Gets the discount tax compensation refunded for the order item. * - * @return float Discount tax compensation refunded. + * @return float|null Discount tax compensation refunded. */ public function getDiscountTaxCompensationRefunded(); diff --git a/app/code/Magento/Sales/Api/Data/TotalInterface.php b/app/code/Magento/Sales/Api/Data/TotalInterface.php index 1211b06fa3fed..e83720c7bb472 100644 --- a/app/code/Magento/Sales/Api/Data/TotalInterface.php +++ b/app/code/Magento/Sales/Api/Data/TotalInterface.php @@ -114,7 +114,7 @@ public function getBaseShippingDiscountAmount(); /** * Gets the base shipping discount tax compensation amount. * - * @return float Base shipping discount tax compensation amount. + * @return float|null Base shipping discount tax compensation amount. */ public function getBaseShippingDiscountTaxCompensationAmnt(); @@ -177,7 +177,7 @@ public function getShippingDiscountAmount(); /** * Gets the shipping discount tax compensation amount. * - * @return float Shipping discount tax compensation amount. + * @return float|null Shipping discount tax compensation amount. */ public function getShippingDiscountTaxCompensationAmount(); diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php index 7ed85998bf520..bee30355e69e5 100644 --- a/app/code/Magento/Sales/Model/Order.php +++ b/app/code/Magento/Sales/Model/Order.php @@ -937,7 +937,7 @@ public function setShippingAddress(\Magento\Sales\Api\Data\OrderAddressInterface /** * Retrieve order billing address * - * @return \Magento\Sales\Model\Order\Address|null + * @return \Magento\Sales\Api\Data\OrderAddressInterface|null */ public function getBillingAddress() { @@ -1638,7 +1638,7 @@ public function isCurrencyDifferent() /** * Retrieve order total due value * - * @return float + * @return float|null */ public function getTotalDue() { @@ -1650,7 +1650,7 @@ public function getTotalDue() /** * Retrieve order total due value * - * @return float + * @return float|null */ public function getBaseTotalDue() { @@ -1969,7 +1969,7 @@ public function getAddresses() } /** - * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface[] + * @return \Magento\Sales\Api\Data\OrderStatusHistoryInterface[]|null */ public function getStatusHistories() { @@ -2007,7 +2007,7 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderExtensionInt /** * Returns adjustment_negative * - * @return float + * @return float|null */ public function getAdjustmentNegative() { @@ -2017,7 +2017,7 @@ public function getAdjustmentNegative() /** * Returns adjustment_positive * - * @return float + * @return float|null */ public function getAdjustmentPositive() { @@ -2027,7 +2027,7 @@ public function getAdjustmentPositive() /** * Returns applied_rule_ids * - * @return string + * @return string|null */ public function getAppliedRuleIds() { @@ -2037,7 +2037,7 @@ public function getAppliedRuleIds() /** * Returns base_adjustment_negative * - * @return float + * @return float|null */ public function getBaseAdjustmentNegative() { @@ -2047,7 +2047,7 @@ public function getBaseAdjustmentNegative() /** * Returns base_adjustment_positive * - * @return float + * @return float|null */ public function getBaseAdjustmentPositive() { @@ -2057,7 +2057,7 @@ public function getBaseAdjustmentPositive() /** * Returns base_currency_code * - * @return string + * @return string|null */ public function getBaseCurrencyCode() { @@ -2067,7 +2067,7 @@ public function getBaseCurrencyCode() /** * Returns base_discount_amount * - * @return float + * @return float|null */ public function getBaseDiscountAmount() { @@ -2077,7 +2077,7 @@ public function getBaseDiscountAmount() /** * Returns base_discount_canceled * - * @return float + * @return float|null */ public function getBaseDiscountCanceled() { @@ -2087,7 +2087,7 @@ public function getBaseDiscountCanceled() /** * Returns base_discount_invoiced * - * @return float + * @return float|null */ public function getBaseDiscountInvoiced() { @@ -2097,7 +2097,7 @@ public function getBaseDiscountInvoiced() /** * Returns base_discount_refunded * - * @return float + * @return float|null */ public function getBaseDiscountRefunded() { @@ -2117,7 +2117,7 @@ public function getBaseGrandTotal() /** * Returns base_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationAmount() { @@ -2127,7 +2127,7 @@ public function getBaseDiscountTaxCompensationAmount() /** * Returns base_discount_tax_compensation_invoiced * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationInvoiced() { @@ -2137,7 +2137,7 @@ public function getBaseDiscountTaxCompensationInvoiced() /** * Returns base_discount_tax_compensation_refunded * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationRefunded() { @@ -2147,7 +2147,7 @@ public function getBaseDiscountTaxCompensationRefunded() /** * Returns base_shipping_amount * - * @return float + * @return float|null */ public function getBaseShippingAmount() { @@ -2157,7 +2157,7 @@ public function getBaseShippingAmount() /** * Returns base_shipping_canceled * - * @return float + * @return float|null */ public function getBaseShippingCanceled() { @@ -2167,7 +2167,7 @@ public function getBaseShippingCanceled() /** * Returns base_shipping_discount_amount * - * @return float + * @return float|null */ public function getBaseShippingDiscountAmount() { @@ -2177,7 +2177,7 @@ public function getBaseShippingDiscountAmount() /** * Returns base_shipping_discount_tax_compensation_amnt * - * @return float + * @return float|null */ public function getBaseShippingDiscountTaxCompensationAmnt() { @@ -2187,7 +2187,7 @@ public function getBaseShippingDiscountTaxCompensationAmnt() /** * Returns base_shipping_incl_tax * - * @return float + * @return float|null */ public function getBaseShippingInclTax() { @@ -2197,7 +2197,7 @@ public function getBaseShippingInclTax() /** * Returns base_shipping_invoiced * - * @return float + * @return float|null */ public function getBaseShippingInvoiced() { @@ -2207,7 +2207,7 @@ public function getBaseShippingInvoiced() /** * Returns base_shipping_refunded * - * @return float + * @return float|null */ public function getBaseShippingRefunded() { @@ -2217,7 +2217,7 @@ public function getBaseShippingRefunded() /** * Returns base_shipping_tax_amount * - * @return float + * @return float|null */ public function getBaseShippingTaxAmount() { @@ -2227,7 +2227,7 @@ public function getBaseShippingTaxAmount() /** * Returns base_shipping_tax_refunded * - * @return float + * @return float|null */ public function getBaseShippingTaxRefunded() { @@ -2237,7 +2237,7 @@ public function getBaseShippingTaxRefunded() /** * Returns base_subtotal * - * @return float + * @return float|null */ public function getBaseSubtotal() { @@ -2247,7 +2247,7 @@ public function getBaseSubtotal() /** * Returns base_subtotal_canceled * - * @return float + * @return float|null */ public function getBaseSubtotalCanceled() { @@ -2257,7 +2257,7 @@ public function getBaseSubtotalCanceled() /** * Returns base_subtotal_incl_tax * - * @return float + * @return float|null */ public function getBaseSubtotalInclTax() { @@ -2267,7 +2267,7 @@ public function getBaseSubtotalInclTax() /** * Returns base_subtotal_invoiced * - * @return float + * @return float|null */ public function getBaseSubtotalInvoiced() { @@ -2277,7 +2277,7 @@ public function getBaseSubtotalInvoiced() /** * Returns base_subtotal_refunded * - * @return float + * @return float|null */ public function getBaseSubtotalRefunded() { @@ -2287,7 +2287,7 @@ public function getBaseSubtotalRefunded() /** * Returns base_tax_amount * - * @return float + * @return float|null */ public function getBaseTaxAmount() { @@ -2297,7 +2297,7 @@ public function getBaseTaxAmount() /** * Returns base_tax_canceled * - * @return float + * @return float|null */ public function getBaseTaxCanceled() { @@ -2307,7 +2307,7 @@ public function getBaseTaxCanceled() /** * Returns base_tax_invoiced * - * @return float + * @return float|null */ public function getBaseTaxInvoiced() { @@ -2317,7 +2317,7 @@ public function getBaseTaxInvoiced() /** * Returns base_tax_refunded * - * @return float + * @return float|null */ public function getBaseTaxRefunded() { @@ -2327,7 +2327,7 @@ public function getBaseTaxRefunded() /** * Returns base_total_canceled * - * @return float + * @return float|null */ public function getBaseTotalCanceled() { @@ -2337,7 +2337,7 @@ public function getBaseTotalCanceled() /** * Returns base_total_invoiced * - * @return float + * @return float|null */ public function getBaseTotalInvoiced() { @@ -2347,7 +2347,7 @@ public function getBaseTotalInvoiced() /** * Returns base_total_invoiced_cost * - * @return float + * @return float|null */ public function getBaseTotalInvoicedCost() { @@ -2357,7 +2357,7 @@ public function getBaseTotalInvoicedCost() /** * Returns base_total_offline_refunded * - * @return float + * @return float|null */ public function getBaseTotalOfflineRefunded() { @@ -2367,7 +2367,7 @@ public function getBaseTotalOfflineRefunded() /** * Returns base_total_online_refunded * - * @return float + * @return float|null */ public function getBaseTotalOnlineRefunded() { @@ -2377,7 +2377,7 @@ public function getBaseTotalOnlineRefunded() /** * Returns base_total_paid * - * @return float + * @return float|null */ public function getBaseTotalPaid() { @@ -2387,7 +2387,7 @@ public function getBaseTotalPaid() /** * Returns base_total_qty_ordered * - * @return float + * @return float|null */ public function getBaseTotalQtyOrdered() { @@ -2397,7 +2397,7 @@ public function getBaseTotalQtyOrdered() /** * Returns base_total_refunded * - * @return float + * @return float|null */ public function getBaseTotalRefunded() { @@ -2407,7 +2407,7 @@ public function getBaseTotalRefunded() /** * Returns base_to_global_rate * - * @return float + * @return float|null */ public function getBaseToGlobalRate() { @@ -2417,7 +2417,7 @@ public function getBaseToGlobalRate() /** * Returns base_to_order_rate * - * @return float + * @return float|null */ public function getBaseToOrderRate() { @@ -2427,7 +2427,7 @@ public function getBaseToOrderRate() /** * Returns billing_address_id * - * @return int + * @return int|null */ public function getBillingAddressId() { @@ -2437,7 +2437,7 @@ public function getBillingAddressId() /** * Returns can_ship_partially * - * @return int + * @return int|null */ public function getCanShipPartially() { @@ -2447,7 +2447,7 @@ public function getCanShipPartially() /** * Returns can_ship_partially_item * - * @return int + * @return int|null */ public function getCanShipPartiallyItem() { @@ -2457,7 +2457,7 @@ public function getCanShipPartiallyItem() /** * Returns coupon_code * - * @return string + * @return string|null */ public function getCouponCode() { @@ -2467,7 +2467,7 @@ public function getCouponCode() /** * Returns created_at * - * @return string + * @return string|null */ public function getCreatedAt() { @@ -2485,7 +2485,7 @@ public function setCreatedAt($createdAt) /** * Returns customer_dob * - * @return string + * @return string|null */ public function getCustomerDob() { @@ -2505,7 +2505,7 @@ public function getCustomerEmail() /** * Returns customer_firstname * - * @return string + * @return string|null */ public function getCustomerFirstname() { @@ -2515,7 +2515,7 @@ public function getCustomerFirstname() /** * Returns customer_gender * - * @return int + * @return int|null */ public function getCustomerGender() { @@ -2525,7 +2525,7 @@ public function getCustomerGender() /** * Returns customer_group_id * - * @return int + * @return int|null */ public function getCustomerGroupId() { @@ -2535,7 +2535,7 @@ public function getCustomerGroupId() /** * Returns customer_id * - * @return int + * @return int|null */ public function getCustomerId() { @@ -2545,7 +2545,7 @@ public function getCustomerId() /** * Returns customer_is_guest * - * @return int + * @return int|null */ public function getCustomerIsGuest() { @@ -2555,7 +2555,7 @@ public function getCustomerIsGuest() /** * Returns customer_lastname * - * @return string + * @return string|null */ public function getCustomerLastname() { @@ -2565,7 +2565,7 @@ public function getCustomerLastname() /** * Returns customer_middlename * - * @return string + * @return string|null */ public function getCustomerMiddlename() { @@ -2575,7 +2575,7 @@ public function getCustomerMiddlename() /** * Returns customer_note * - * @return string + * @return string|null */ public function getCustomerNote() { @@ -2585,7 +2585,7 @@ public function getCustomerNote() /** * Returns customer_note_notify * - * @return int + * @return int|null */ public function getCustomerNoteNotify() { @@ -2595,7 +2595,7 @@ public function getCustomerNoteNotify() /** * Returns customer_prefix * - * @return string + * @return string|null */ public function getCustomerPrefix() { @@ -2605,7 +2605,7 @@ public function getCustomerPrefix() /** * Returns customer_suffix * - * @return string + * @return string|null */ public function getCustomerSuffix() { @@ -2615,7 +2615,7 @@ public function getCustomerSuffix() /** * Returns customer_taxvat * - * @return string + * @return string|null */ public function getCustomerTaxvat() { @@ -2625,7 +2625,7 @@ public function getCustomerTaxvat() /** * Returns discount_amount * - * @return float + * @return float|null */ public function getDiscountAmount() { @@ -2635,7 +2635,7 @@ public function getDiscountAmount() /** * Returns discount_canceled * - * @return float + * @return float|null */ public function getDiscountCanceled() { @@ -2645,7 +2645,7 @@ public function getDiscountCanceled() /** * Returns discount_description * - * @return string + * @return string|null */ public function getDiscountDescription() { @@ -2655,7 +2655,7 @@ public function getDiscountDescription() /** * Returns discount_invoiced * - * @return float + * @return float|null */ public function getDiscountInvoiced() { @@ -2665,7 +2665,7 @@ public function getDiscountInvoiced() /** * Returns discount_refunded * - * @return float + * @return float|null */ public function getDiscountRefunded() { @@ -2675,7 +2675,7 @@ public function getDiscountRefunded() /** * Returns edit_increment * - * @return int + * @return int|null */ public function getEditIncrement() { @@ -2685,7 +2685,7 @@ public function getEditIncrement() /** * Returns email_sent * - * @return int + * @return int|null */ public function getEmailSent() { @@ -2695,7 +2695,7 @@ public function getEmailSent() /** * Returns ext_customer_id * - * @return string + * @return string|null */ public function getExtCustomerId() { @@ -2705,7 +2705,7 @@ public function getExtCustomerId() /** * Returns ext_order_id * - * @return string + * @return string|null */ public function getExtOrderId() { @@ -2715,7 +2715,7 @@ public function getExtOrderId() /** * Returns forced_shipment_with_invoice * - * @return int + * @return int|null */ public function getForcedShipmentWithInvoice() { @@ -2725,7 +2725,7 @@ public function getForcedShipmentWithInvoice() /** * Returns global_currency_code * - * @return string + * @return string|null */ public function getGlobalCurrencyCode() { @@ -2745,7 +2745,7 @@ public function getGrandTotal() /** * Returns discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getDiscountTaxCompensationAmount() { @@ -2755,7 +2755,7 @@ public function getDiscountTaxCompensationAmount() /** * Returns discount_tax_compensation_invoiced * - * @return float + * @return float|null */ public function getDiscountTaxCompensationInvoiced() { @@ -2765,7 +2765,7 @@ public function getDiscountTaxCompensationInvoiced() /** * Returns discount_tax_compensation_refunded * - * @return float + * @return float|null */ public function getDiscountTaxCompensationRefunded() { @@ -2775,7 +2775,7 @@ public function getDiscountTaxCompensationRefunded() /** * Returns hold_before_state * - * @return string + * @return string|null */ public function getHoldBeforeState() { @@ -2785,7 +2785,7 @@ public function getHoldBeforeState() /** * Returns hold_before_status * - * @return string + * @return string|null */ public function getHoldBeforeStatus() { @@ -2795,7 +2795,7 @@ public function getHoldBeforeStatus() /** * Returns is_virtual * - * @return int + * @return int|null */ public function getIsVirtual() { @@ -2805,7 +2805,7 @@ public function getIsVirtual() /** * Returns order_currency_code * - * @return string + * @return string|null */ public function getOrderCurrencyCode() { @@ -2815,7 +2815,7 @@ public function getOrderCurrencyCode() /** * Returns original_increment_id * - * @return string + * @return string|null */ public function getOriginalIncrementId() { @@ -2825,7 +2825,7 @@ public function getOriginalIncrementId() /** * Returns payment_authorization_amount * - * @return float + * @return float|null */ public function getPaymentAuthorizationAmount() { @@ -2835,7 +2835,7 @@ public function getPaymentAuthorizationAmount() /** * Returns payment_auth_expiration * - * @return int + * @return int|null */ public function getPaymentAuthExpiration() { @@ -2845,7 +2845,7 @@ public function getPaymentAuthExpiration() /** * Returns protect_code * - * @return string + * @return string|null */ public function getProtectCode() { @@ -2855,7 +2855,7 @@ public function getProtectCode() /** * Returns quote_address_id * - * @return int + * @return int|null */ public function getQuoteAddressId() { @@ -2865,7 +2865,7 @@ public function getQuoteAddressId() /** * Returns quote_id * - * @return int + * @return int|null */ public function getQuoteId() { @@ -2875,7 +2875,7 @@ public function getQuoteId() /** * Returns relation_child_id * - * @return string + * @return string|null */ public function getRelationChildId() { @@ -2885,7 +2885,7 @@ public function getRelationChildId() /** * Returns relation_child_real_id * - * @return string + * @return string|null */ public function getRelationChildRealId() { @@ -2895,7 +2895,7 @@ public function getRelationChildRealId() /** * Returns relation_parent_id * - * @return string + * @return string|null */ public function getRelationParentId() { @@ -2905,7 +2905,7 @@ public function getRelationParentId() /** * Returns relation_parent_real_id * - * @return string + * @return string|null */ public function getRelationParentRealId() { @@ -2915,7 +2915,7 @@ public function getRelationParentRealId() /** * Returns remote_ip * - * @return string + * @return string|null */ public function getRemoteIp() { @@ -2925,7 +2925,7 @@ public function getRemoteIp() /** * Returns shipping_amount * - * @return float + * @return float|null */ public function getShippingAmount() { @@ -2935,7 +2935,7 @@ public function getShippingAmount() /** * Returns shipping_canceled * - * @return float + * @return float|null */ public function getShippingCanceled() { @@ -2945,7 +2945,7 @@ public function getShippingCanceled() /** * Returns shipping_description * - * @return string + * @return string|null */ public function getShippingDescription() { @@ -2955,7 +2955,7 @@ public function getShippingDescription() /** * Returns shipping_discount_amount * - * @return float + * @return float|null */ public function getShippingDiscountAmount() { @@ -2965,7 +2965,7 @@ public function getShippingDiscountAmount() /** * Returns shipping_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getShippingDiscountTaxCompensationAmount() { @@ -2975,7 +2975,7 @@ public function getShippingDiscountTaxCompensationAmount() /** * Returns shipping_incl_tax * - * @return float + * @return float|null */ public function getShippingInclTax() { @@ -2985,7 +2985,7 @@ public function getShippingInclTax() /** * Returns shipping_invoiced * - * @return float + * @return float|null */ public function getShippingInvoiced() { @@ -2995,7 +2995,7 @@ public function getShippingInvoiced() /** * Returns shipping_refunded * - * @return float + * @return float|null */ public function getShippingRefunded() { @@ -3005,7 +3005,7 @@ public function getShippingRefunded() /** * Returns shipping_tax_amount * - * @return float + * @return float|null */ public function getShippingTaxAmount() { @@ -3015,7 +3015,7 @@ public function getShippingTaxAmount() /** * Returns shipping_tax_refunded * - * @return float + * @return float|null */ public function getShippingTaxRefunded() { @@ -3025,7 +3025,7 @@ public function getShippingTaxRefunded() /** * Returns state * - * @return string + * @return string|null */ public function getState() { @@ -3035,7 +3035,7 @@ public function getState() /** * Returns status * - * @return string + * @return string|null */ public function getStatus() { @@ -3045,7 +3045,7 @@ public function getStatus() /** * Returns store_currency_code * - * @return string + * @return string|null */ public function getStoreCurrencyCode() { @@ -3055,7 +3055,7 @@ public function getStoreCurrencyCode() /** * Returns store_id * - * @return int + * @return int|null */ public function getStoreId() { @@ -3065,7 +3065,7 @@ public function getStoreId() /** * Returns store_name * - * @return string + * @return string|null */ public function getStoreName() { @@ -3075,7 +3075,7 @@ public function getStoreName() /** * Returns store_to_base_rate * - * @return float + * @return float|null */ public function getStoreToBaseRate() { @@ -3085,7 +3085,7 @@ public function getStoreToBaseRate() /** * Returns store_to_order_rate * - * @return float + * @return float|null */ public function getStoreToOrderRate() { @@ -3095,7 +3095,7 @@ public function getStoreToOrderRate() /** * Returns subtotal * - * @return float + * @return float|null */ public function getSubtotal() { @@ -3105,7 +3105,7 @@ public function getSubtotal() /** * Returns subtotal_canceled * - * @return float + * @return float|null */ public function getSubtotalCanceled() { @@ -3115,7 +3115,7 @@ public function getSubtotalCanceled() /** * Returns subtotal_incl_tax * - * @return float + * @return float|null */ public function getSubtotalInclTax() { @@ -3125,7 +3125,7 @@ public function getSubtotalInclTax() /** * Returns subtotal_invoiced * - * @return float + * @return float|null */ public function getSubtotalInvoiced() { @@ -3135,7 +3135,7 @@ public function getSubtotalInvoiced() /** * Returns subtotal_refunded * - * @return float + * @return float|null */ public function getSubtotalRefunded() { @@ -3145,7 +3145,7 @@ public function getSubtotalRefunded() /** * Returns tax_amount * - * @return float + * @return float|null */ public function getTaxAmount() { @@ -3155,7 +3155,7 @@ public function getTaxAmount() /** * Returns tax_canceled * - * @return float + * @return float|null */ public function getTaxCanceled() { @@ -3165,7 +3165,7 @@ public function getTaxCanceled() /** * Returns tax_invoiced * - * @return float + * @return float|null */ public function getTaxInvoiced() { @@ -3175,7 +3175,7 @@ public function getTaxInvoiced() /** * Returns tax_refunded * - * @return float + * @return float|null */ public function getTaxRefunded() { @@ -3185,7 +3185,7 @@ public function getTaxRefunded() /** * Returns total_canceled * - * @return float + * @return float|null */ public function getTotalCanceled() { @@ -3195,7 +3195,7 @@ public function getTotalCanceled() /** * Returns total_invoiced * - * @return float + * @return float|null */ public function getTotalInvoiced() { @@ -3205,7 +3205,7 @@ public function getTotalInvoiced() /** * Returns total_item_count * - * @return int + * @return int|null */ public function getTotalItemCount() { @@ -3215,7 +3215,7 @@ public function getTotalItemCount() /** * Returns total_offline_refunded * - * @return float + * @return float|null */ public function getTotalOfflineRefunded() { @@ -3225,7 +3225,7 @@ public function getTotalOfflineRefunded() /** * Returns total_online_refunded * - * @return float + * @return float|null */ public function getTotalOnlineRefunded() { @@ -3235,7 +3235,7 @@ public function getTotalOnlineRefunded() /** * Returns total_paid * - * @return float + * @return float|null */ public function getTotalPaid() { @@ -3245,7 +3245,7 @@ public function getTotalPaid() /** * Returns total_qty_ordered * - * @return float + * @return float|null */ public function getTotalQtyOrdered() { @@ -3255,7 +3255,7 @@ public function getTotalQtyOrdered() /** * Returns total_refunded * - * @return float + * @return float|null */ public function getTotalRefunded() { @@ -3265,7 +3265,7 @@ public function getTotalRefunded() /** * Returns updated_at * - * @return string + * @return string|null */ public function getUpdatedAt() { @@ -3275,7 +3275,7 @@ public function getUpdatedAt() /** * Returns weight * - * @return float + * @return float|null */ public function getWeight() { @@ -3285,7 +3285,7 @@ public function getWeight() /** * Returns x_forwarded_for * - * @return string + * @return string|null */ public function getXForwardedFor() { diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php index 34aedc3d5d705..b40b09a4883d4 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php @@ -9,7 +9,6 @@ namespace Magento\Sales\Model\Order; use Magento\Framework\Api\AttributeValueFactory; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Pricing\PriceCurrencyInterface; use Magento\Sales\Api\Data\CreditmemoInterface; use Magento\Sales\Model\AbstractModel; @@ -787,7 +786,7 @@ public function getBaseGrandTotal() /** * Returns base_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationAmount() { @@ -807,7 +806,7 @@ public function getBaseShippingAmount() /** * Returns base_shipping_discount_tax_compensation_amnt * - * @return float + * @return float|null */ public function getBaseShippingDiscountTaxCompensationAmnt() { @@ -965,7 +964,7 @@ public function getGrandTotal() /** * Returns discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getDiscountTaxCompensationAmount() { @@ -1025,7 +1024,7 @@ public function getShippingAmount() /** * Returns shipping_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getShippingDiscountTaxCompensationAmount() { diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php index 4489655e36af9..1ca534939f0ca 100644 --- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php +++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php @@ -288,7 +288,7 @@ public function isLast() /** * Returns additional_data * - * @return string + * @return string|null */ public function getAdditionalData() { @@ -308,7 +308,7 @@ public function getBaseCost() /** * Returns base_discount_amount * - * @return float + * @return float|null */ public function getBaseDiscountAmount() { @@ -318,7 +318,7 @@ public function getBaseDiscountAmount() /** * Returns base_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationAmount() { @@ -338,7 +338,7 @@ public function getBasePrice() /** * Returns base_price_incl_tax * - * @return float + * @return float|null */ public function getBasePriceInclTax() { @@ -348,7 +348,7 @@ public function getBasePriceInclTax() /** * Returns base_row_total * - * @return float + * @return float|null */ public function getBaseRowTotal() { @@ -358,7 +358,7 @@ public function getBaseRowTotal() /** * Returns base_row_total_incl_tax * - * @return float + * @return float|null */ public function getBaseRowTotalInclTax() { @@ -368,7 +368,7 @@ public function getBaseRowTotalInclTax() /** * Returns base_tax_amount * - * @return float + * @return float|null */ public function getBaseTaxAmount() { @@ -378,7 +378,7 @@ public function getBaseTaxAmount() /** * Returns base_weee_tax_applied_amount * - * @return float + * @return float|null */ public function getBaseWeeeTaxAppliedAmount() { @@ -388,7 +388,7 @@ public function getBaseWeeeTaxAppliedAmount() /** * Returns base_weee_tax_applied_row_amnt * - * @return float + * @return float|null */ public function getBaseWeeeTaxAppliedRowAmnt() { @@ -398,7 +398,7 @@ public function getBaseWeeeTaxAppliedRowAmnt() /** * Returns base_weee_tax_disposition * - * @return float + * @return float|null */ public function getBaseWeeeTaxDisposition() { @@ -408,7 +408,7 @@ public function getBaseWeeeTaxDisposition() /** * Returns base_weee_tax_row_disposition * - * @return float + * @return float|null */ public function getBaseWeeeTaxRowDisposition() { @@ -418,7 +418,7 @@ public function getBaseWeeeTaxRowDisposition() /** * Returns description * - * @return string + * @return string|null */ public function getDescription() { @@ -428,7 +428,7 @@ public function getDescription() /** * Returns discount_amount * - * @return float + * @return float|null */ public function getDiscountAmount() { @@ -438,7 +438,7 @@ public function getDiscountAmount() /** * Returns discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getDiscountTaxCompensationAmount() { @@ -448,7 +448,7 @@ public function getDiscountTaxCompensationAmount() /** * Returns name * - * @return string + * @return string|null */ public function getName() { @@ -468,7 +468,7 @@ public function getOrderItemId() /** * Returns parent_id * - * @return int + * @return int|null */ public function getParentId() { @@ -478,7 +478,7 @@ public function getParentId() /** * Returns price * - * @return float + * @return float|null */ public function getPrice() { @@ -488,7 +488,7 @@ public function getPrice() /** * Returns price_incl_tax * - * @return float + * @return float|null */ public function getPriceInclTax() { @@ -498,7 +498,7 @@ public function getPriceInclTax() /** * Returns product_id * - * @return int + * @return int|null */ public function getProductId() { @@ -518,7 +518,7 @@ public function getQty() /** * Returns row_total * - * @return float + * @return float|null */ public function getRowTotal() { @@ -528,7 +528,7 @@ public function getRowTotal() /** * Returns row_total_incl_tax * - * @return float + * @return float|null */ public function getRowTotalInclTax() { @@ -538,7 +538,7 @@ public function getRowTotalInclTax() /** * Returns sku * - * @return string + * @return string|null */ public function getSku() { @@ -548,7 +548,7 @@ public function getSku() /** * Returns tax_amount * - * @return float + * @return float|null */ public function getTaxAmount() { @@ -558,7 +558,7 @@ public function getTaxAmount() /** * Returns weee_tax_applied * - * @return string + * @return string|null */ public function getWeeeTaxApplied() { @@ -568,7 +568,7 @@ public function getWeeeTaxApplied() /** * Returns weee_tax_applied_amount * - * @return float + * @return float|null */ public function getWeeeTaxAppliedAmount() { @@ -578,7 +578,7 @@ public function getWeeeTaxAppliedAmount() /** * Returns weee_tax_applied_row_amount * - * @return float + * @return float|null */ public function getWeeeTaxAppliedRowAmount() { @@ -588,7 +588,7 @@ public function getWeeeTaxAppliedRowAmount() /** * Returns weee_tax_disposition * - * @return float + * @return float|null */ public function getWeeeTaxDisposition() { @@ -598,7 +598,7 @@ public function getWeeeTaxDisposition() /** * Returns weee_tax_row_disposition * - * @return float + * @return float|null */ public function getWeeeTaxRowDisposition() { diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php index 3df33c0780a27..a977de41c5585 100644 --- a/app/code/Magento/Sales/Model/Order/Invoice.php +++ b/app/code/Magento/Sales/Model/Order/Invoice.php @@ -777,7 +777,7 @@ public function getItems() /** * Return invoice comments * - * @return \Magento\Sales\Api\Data\InvoiceCommentInterface[] + * @return \Magento\Sales\Api\Data\InvoiceCommentInterface[]|null */ public function getComments() { @@ -805,7 +805,7 @@ public function getIncrementId() /** * Returns base_total_refunded * - * @return float + * @return float|null */ public function getBaseTotalRefunded() { @@ -815,7 +815,7 @@ public function getBaseTotalRefunded() /** * Returns discount_description * - * @return string + * @return string|null */ public function getDiscountDescription() { @@ -833,7 +833,7 @@ public function setItems($items) /** * Returns base_currency_code * - * @return string + * @return string|null */ public function getBaseCurrencyCode() { @@ -843,7 +843,7 @@ public function getBaseCurrencyCode() /** * Returns base_discount_amount * - * @return float + * @return float|null */ public function getBaseDiscountAmount() { @@ -853,7 +853,7 @@ public function getBaseDiscountAmount() /** * Returns base_grand_total * - * @return float + * @return float|null */ public function getBaseGrandTotal() { @@ -863,7 +863,7 @@ public function getBaseGrandTotal() /** * Returns base_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationAmount() { @@ -873,7 +873,7 @@ public function getBaseDiscountTaxCompensationAmount() /** * Returns base_shipping_amount * - * @return float + * @return float|null */ public function getBaseShippingAmount() { @@ -883,7 +883,7 @@ public function getBaseShippingAmount() /** * Returns base_shipping_discount_tax_compensation_amnt * - * @return float + * @return float|null */ public function getBaseShippingDiscountTaxCompensationAmnt() { @@ -893,7 +893,7 @@ public function getBaseShippingDiscountTaxCompensationAmnt() /** * Returns base_shipping_incl_tax * - * @return float + * @return float|null */ public function getBaseShippingInclTax() { @@ -903,7 +903,7 @@ public function getBaseShippingInclTax() /** * Returns base_shipping_tax_amount * - * @return float + * @return float|null */ public function getBaseShippingTaxAmount() { @@ -913,7 +913,7 @@ public function getBaseShippingTaxAmount() /** * Returns base_subtotal * - * @return float + * @return float|null */ public function getBaseSubtotal() { @@ -923,7 +923,7 @@ public function getBaseSubtotal() /** * Returns base_subtotal_incl_tax * - * @return float + * @return float|null */ public function getBaseSubtotalInclTax() { @@ -933,7 +933,7 @@ public function getBaseSubtotalInclTax() /** * Returns base_tax_amount * - * @return float + * @return float|null */ public function getBaseTaxAmount() { @@ -943,7 +943,7 @@ public function getBaseTaxAmount() /** * Returns base_to_global_rate * - * @return float + * @return float|null */ public function getBaseToGlobalRate() { @@ -953,7 +953,7 @@ public function getBaseToGlobalRate() /** * Returns base_to_order_rate * - * @return float + * @return float|null */ public function getBaseToOrderRate() { @@ -963,7 +963,7 @@ public function getBaseToOrderRate() /** * Returns billing_address_id * - * @return int + * @return int|null */ public function getBillingAddressId() { @@ -973,7 +973,7 @@ public function getBillingAddressId() /** * Returns can_void_flag * - * @return int + * @return int|null */ public function getCanVoidFlag() { @@ -983,7 +983,7 @@ public function getCanVoidFlag() /** * Returns created_at * - * @return string + * @return string|null */ public function getCreatedAt() { @@ -1001,7 +1001,7 @@ public function setCreatedAt($createdAt) /** * Returns discount_amount * - * @return float + * @return float|null */ public function getDiscountAmount() { @@ -1011,7 +1011,7 @@ public function getDiscountAmount() /** * Returns email_sent * - * @return int + * @return int|null */ public function getEmailSent() { @@ -1021,7 +1021,7 @@ public function getEmailSent() /** * Returns global_currency_code * - * @return string + * @return string|null */ public function getGlobalCurrencyCode() { @@ -1031,7 +1031,7 @@ public function getGlobalCurrencyCode() /** * Returns grand_total * - * @return float + * @return float|null */ public function getGrandTotal() { @@ -1041,7 +1041,7 @@ public function getGrandTotal() /** * Returns discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getDiscountTaxCompensationAmount() { @@ -1051,7 +1051,7 @@ public function getDiscountTaxCompensationAmount() /** * Returns is_used_for_refund * - * @return int + * @return int|null */ public function getIsUsedForRefund() { @@ -1061,7 +1061,7 @@ public function getIsUsedForRefund() /** * Returns order_currency_code * - * @return string + * @return string|null */ public function getOrderCurrencyCode() { @@ -1081,7 +1081,7 @@ public function getOrderId() /** * Returns shipping_address_id * - * @return int + * @return int|null */ public function getShippingAddressId() { @@ -1091,7 +1091,7 @@ public function getShippingAddressId() /** * Returns shipping_amount * - * @return float + * @return float|null */ public function getShippingAmount() { @@ -1101,7 +1101,7 @@ public function getShippingAmount() /** * Returns shipping_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getShippingDiscountTaxCompensationAmount() { @@ -1111,7 +1111,7 @@ public function getShippingDiscountTaxCompensationAmount() /** * Returns shipping_incl_tax * - * @return float + * @return float|null */ public function getShippingInclTax() { @@ -1121,7 +1121,7 @@ public function getShippingInclTax() /** * Returns shipping_tax_amount * - * @return float + * @return float|null */ public function getShippingTaxAmount() { @@ -1131,7 +1131,7 @@ public function getShippingTaxAmount() /** * Returns state * - * @return int + * @return int|null */ public function getState() { @@ -1141,7 +1141,7 @@ public function getState() /** * Returns store_currency_code * - * @return string + * @return string|null */ public function getStoreCurrencyCode() { @@ -1151,7 +1151,7 @@ public function getStoreCurrencyCode() /** * Returns store_id * - * @return int + * @return int|null */ public function getStoreId() { @@ -1161,7 +1161,7 @@ public function getStoreId() /** * Returns store_to_base_rate * - * @return float + * @return float|null */ public function getStoreToBaseRate() { @@ -1171,7 +1171,7 @@ public function getStoreToBaseRate() /** * Returns store_to_order_rate * - * @return float + * @return float|null */ public function getStoreToOrderRate() { @@ -1181,7 +1181,7 @@ public function getStoreToOrderRate() /** * Returns subtotal * - * @return float + * @return float|null */ public function getSubtotal() { @@ -1191,7 +1191,7 @@ public function getSubtotal() /** * Returns subtotal_incl_tax * - * @return float + * @return float|null */ public function getSubtotalInclTax() { @@ -1201,7 +1201,7 @@ public function getSubtotalInclTax() /** * Returns tax_amount * - * @return float + * @return float|null */ public function getTaxAmount() { @@ -1221,7 +1221,7 @@ public function getTotalQty() /** * Returns transaction_id * - * @return string + * @return string|null */ public function getTransactionId() { @@ -1242,7 +1242,7 @@ public function setTransactionId($transactionId) /** * Returns updated_at * - * @return string + * @return string|null */ public function getUpdatedAt() { diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Item.php b/app/code/Magento/Sales/Model/Order/Invoice/Item.php index 2e8b66e891e82..8f0add409086e 100644 --- a/app/code/Magento/Sales/Model/Order/Invoice/Item.php +++ b/app/code/Magento/Sales/Model/Order/Invoice/Item.php @@ -269,7 +269,7 @@ public function isLast() /** * Returns additional_data * - * @return string + * @return string|null */ public function getAdditionalData() { @@ -279,7 +279,7 @@ public function getAdditionalData() /** * Returns base_cost * - * @return float + * @return float|null */ public function getBaseCost() { @@ -289,7 +289,7 @@ public function getBaseCost() /** * Returns base_discount_amount * - * @return float + * @return float|null */ public function getBaseDiscountAmount() { @@ -299,7 +299,7 @@ public function getBaseDiscountAmount() /** * Returns base_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationAmount() { @@ -309,7 +309,7 @@ public function getBaseDiscountTaxCompensationAmount() /** * Returns base_price * - * @return float + * @return float|null */ public function getBasePrice() { @@ -319,7 +319,7 @@ public function getBasePrice() /** * Returns base_price_incl_tax * - * @return float + * @return float|null */ public function getBasePriceInclTax() { @@ -329,7 +329,7 @@ public function getBasePriceInclTax() /** * Returns base_row_total * - * @return float + * @return float|null */ public function getBaseRowTotal() { @@ -339,7 +339,7 @@ public function getBaseRowTotal() /** * Returns base_row_total_incl_tax * - * @return float + * @return float|null */ public function getBaseRowTotalInclTax() { @@ -349,7 +349,7 @@ public function getBaseRowTotalInclTax() /** * Returns base_tax_amount * - * @return float + * @return float|null */ public function getBaseTaxAmount() { @@ -359,7 +359,7 @@ public function getBaseTaxAmount() /** * Returns description * - * @return string + * @return string|null */ public function getDescription() { @@ -369,7 +369,7 @@ public function getDescription() /** * Returns discount_amount * - * @return float + * @return float|null */ public function getDiscountAmount() { @@ -379,7 +379,7 @@ public function getDiscountAmount() /** * Returns discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getDiscountTaxCompensationAmount() { @@ -389,7 +389,7 @@ public function getDiscountTaxCompensationAmount() /** * Returns name * - * @return string + * @return string|null */ public function getName() { @@ -409,7 +409,7 @@ public function getOrderItemId() /** * Returns parent_id * - * @return int + * @return int|null */ public function getParentId() { @@ -419,7 +419,7 @@ public function getParentId() /** * Returns price * - * @return float + * @return float|null */ public function getPrice() { @@ -429,7 +429,7 @@ public function getPrice() /** * Returns price_incl_tax * - * @return float + * @return float|null */ public function getPriceInclTax() { @@ -439,7 +439,7 @@ public function getPriceInclTax() /** * Returns product_id * - * @return int + * @return int|null */ public function getProductId() { @@ -459,7 +459,7 @@ public function getQty() /** * Returns row_total * - * @return float + * @return float|null */ public function getRowTotal() { @@ -469,7 +469,7 @@ public function getRowTotal() /** * Returns row_total_incl_tax * - * @return float + * @return float|null */ public function getRowTotalInclTax() { @@ -489,7 +489,7 @@ public function getSku() /** * Returns tax_amount * - * @return float + * @return float|null */ public function getTaxAmount() { diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php index 911d279f3bca9..7aaa0297472ec 100644 --- a/app/code/Magento/Sales/Model/Order/Item.php +++ b/app/code/Magento/Sales/Model/Order/Item.php @@ -435,7 +435,7 @@ public static function getStatuses() /** * Redeclare getter for back compatibility * - * @return float + * @return float|null */ public function getOriginalPrice() { @@ -692,7 +692,7 @@ public function getStore() /** * Returns additional_data * - * @return string + * @return string|null */ public function getAdditionalData() { @@ -702,7 +702,7 @@ public function getAdditionalData() /** * Returns amount_refunded * - * @return float + * @return float|null */ public function getAmountRefunded() { @@ -712,7 +712,7 @@ public function getAmountRefunded() /** * Returns applied_rule_ids * - * @return string + * @return string|null */ public function getAppliedRuleIds() { @@ -722,7 +722,7 @@ public function getAppliedRuleIds() /** * Returns base_amount_refunded * - * @return float + * @return float|null */ public function getBaseAmountRefunded() { @@ -732,7 +732,7 @@ public function getBaseAmountRefunded() /** * Returns base_cost * - * @return float + * @return float|null */ public function getBaseCost() { @@ -742,7 +742,7 @@ public function getBaseCost() /** * Returns base_discount_amount * - * @return float + * @return float|null */ public function getBaseDiscountAmount() { @@ -752,7 +752,7 @@ public function getBaseDiscountAmount() /** * Returns base_discount_invoiced * - * @return float + * @return float|null */ public function getBaseDiscountInvoiced() { @@ -762,7 +762,7 @@ public function getBaseDiscountInvoiced() /** * Returns base_discount_refunded * - * @return float + * @return float|null */ public function getBaseDiscountRefunded() { @@ -772,7 +772,7 @@ public function getBaseDiscountRefunded() /** * Returns base_discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationAmount() { @@ -782,7 +782,7 @@ public function getBaseDiscountTaxCompensationAmount() /** * Returns base_discount_tax_compensation_invoiced * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationInvoiced() { @@ -792,7 +792,7 @@ public function getBaseDiscountTaxCompensationInvoiced() /** * Returns base_discount_tax_compensation_refunded * - * @return float + * @return float|null */ public function getBaseDiscountTaxCompensationRefunded() { @@ -802,7 +802,7 @@ public function getBaseDiscountTaxCompensationRefunded() /** * Returns base_original_price * - * @return float + * @return float|null */ public function getBaseOriginalPrice() { @@ -812,7 +812,7 @@ public function getBaseOriginalPrice() /** * Returns base_price * - * @return float + * @return float|null */ public function getBasePrice() { @@ -822,7 +822,7 @@ public function getBasePrice() /** * Returns base_price_incl_tax * - * @return float + * @return float|null */ public function getBasePriceInclTax() { @@ -832,7 +832,7 @@ public function getBasePriceInclTax() /** * Returns base_row_invoiced * - * @return float + * @return float|null */ public function getBaseRowInvoiced() { @@ -842,7 +842,7 @@ public function getBaseRowInvoiced() /** * Returns base_row_total * - * @return float + * @return float|null */ public function getBaseRowTotal() { @@ -852,7 +852,7 @@ public function getBaseRowTotal() /** * Returns base_row_total_incl_tax * - * @return float + * @return float|null */ public function getBaseRowTotalInclTax() { @@ -862,7 +862,7 @@ public function getBaseRowTotalInclTax() /** * Returns base_tax_amount * - * @return float + * @return float|null */ public function getBaseTaxAmount() { @@ -872,7 +872,7 @@ public function getBaseTaxAmount() /** * Returns base_tax_before_discount * - * @return float + * @return float|null */ public function getBaseTaxBeforeDiscount() { @@ -882,7 +882,7 @@ public function getBaseTaxBeforeDiscount() /** * Returns base_tax_invoiced * - * @return float + * @return float|null */ public function getBaseTaxInvoiced() { @@ -892,7 +892,7 @@ public function getBaseTaxInvoiced() /** * Returns base_tax_refunded * - * @return float + * @return float|null */ public function getBaseTaxRefunded() { @@ -902,7 +902,7 @@ public function getBaseTaxRefunded() /** * Returns base_weee_tax_applied_amount * - * @return float + * @return float|null */ public function getBaseWeeeTaxAppliedAmount() { @@ -912,7 +912,7 @@ public function getBaseWeeeTaxAppliedAmount() /** * Returns base_weee_tax_applied_row_amnt * - * @return float + * @return float|null */ public function getBaseWeeeTaxAppliedRowAmnt() { @@ -922,7 +922,7 @@ public function getBaseWeeeTaxAppliedRowAmnt() /** * Returns base_weee_tax_disposition * - * @return float + * @return float|null */ public function getBaseWeeeTaxDisposition() { @@ -932,7 +932,7 @@ public function getBaseWeeeTaxDisposition() /** * Returns base_weee_tax_row_disposition * - * @return float + * @return float|null */ public function getBaseWeeeTaxRowDisposition() { @@ -942,7 +942,7 @@ public function getBaseWeeeTaxRowDisposition() /** * Returns created_at * - * @return string + * @return string|null */ public function getCreatedAt() { @@ -960,7 +960,7 @@ public function setCreatedAt($createdAt) /** * Returns description * - * @return string + * @return string|null */ public function getDescription() { @@ -970,7 +970,7 @@ public function getDescription() /** * Returns discount_amount * - * @return float + * @return float|null */ public function getDiscountAmount() { @@ -980,7 +980,7 @@ public function getDiscountAmount() /** * Returns discount_invoiced * - * @return float + * @return float|null */ public function getDiscountInvoiced() { @@ -990,7 +990,7 @@ public function getDiscountInvoiced() /** * Returns discount_percent * - * @return float + * @return float|null */ public function getDiscountPercent() { @@ -1000,7 +1000,7 @@ public function getDiscountPercent() /** * Returns discount_refunded * - * @return float + * @return float|null */ public function getDiscountRefunded() { @@ -1010,7 +1010,7 @@ public function getDiscountRefunded() /** * Returns event_id * - * @return int + * @return int|null */ public function getEventId() { @@ -1020,7 +1020,7 @@ public function getEventId() /** * Returns ext_order_item_id * - * @return string + * @return string|null */ public function getExtOrderItemId() { @@ -1030,7 +1030,7 @@ public function getExtOrderItemId() /** * Returns free_shipping * - * @return int + * @return int|null */ public function getFreeShipping() { @@ -1040,7 +1040,7 @@ public function getFreeShipping() /** * Returns gw_base_price * - * @return float + * @return float|null */ public function getGwBasePrice() { @@ -1050,7 +1050,7 @@ public function getGwBasePrice() /** * Returns gw_base_price_invoiced * - * @return float + * @return float|null */ public function getGwBasePriceInvoiced() { @@ -1060,7 +1060,7 @@ public function getGwBasePriceInvoiced() /** * Returns gw_base_price_refunded * - * @return float + * @return float|null */ public function getGwBasePriceRefunded() { @@ -1070,7 +1070,7 @@ public function getGwBasePriceRefunded() /** * Returns gw_base_tax_amount * - * @return float + * @return float|null */ public function getGwBaseTaxAmount() { @@ -1080,7 +1080,7 @@ public function getGwBaseTaxAmount() /** * Returns gw_base_tax_amount_invoiced * - * @return float + * @return float|null */ public function getGwBaseTaxAmountInvoiced() { @@ -1090,7 +1090,7 @@ public function getGwBaseTaxAmountInvoiced() /** * Returns gw_base_tax_amount_refunded * - * @return float + * @return float|null */ public function getGwBaseTaxAmountRefunded() { @@ -1100,7 +1100,7 @@ public function getGwBaseTaxAmountRefunded() /** * Returns gw_id * - * @return int + * @return int|null */ public function getGwId() { @@ -1110,7 +1110,7 @@ public function getGwId() /** * Returns gw_price * - * @return float + * @return float|null */ public function getGwPrice() { @@ -1120,7 +1120,7 @@ public function getGwPrice() /** * Returns gw_price_invoiced * - * @return float + * @return float|null */ public function getGwPriceInvoiced() { @@ -1130,7 +1130,7 @@ public function getGwPriceInvoiced() /** * Returns gw_price_refunded * - * @return float + * @return float|null */ public function getGwPriceRefunded() { @@ -1140,7 +1140,7 @@ public function getGwPriceRefunded() /** * Returns gw_tax_amount * - * @return float + * @return float|null */ public function getGwTaxAmount() { @@ -1150,7 +1150,7 @@ public function getGwTaxAmount() /** * Returns gw_tax_amount_invoiced * - * @return float + * @return float|null */ public function getGwTaxAmountInvoiced() { @@ -1160,7 +1160,7 @@ public function getGwTaxAmountInvoiced() /** * Returns gw_tax_amount_refunded * - * @return float + * @return float|null */ public function getGwTaxAmountRefunded() { @@ -1170,7 +1170,7 @@ public function getGwTaxAmountRefunded() /** * Returns discount_tax_compensation_amount * - * @return float + * @return float|null */ public function getDiscountTaxCompensationAmount() { @@ -1180,7 +1180,7 @@ public function getDiscountTaxCompensationAmount() /** * Returns discount_tax_compensation_canceled * - * @return float + * @return float|null */ public function getDiscountTaxCompensationCanceled() { @@ -1190,7 +1190,7 @@ public function getDiscountTaxCompensationCanceled() /** * Returns discount_tax_compensation_invoiced * - * @return float + * @return float|null */ public function getDiscountTaxCompensationInvoiced() { @@ -1200,7 +1200,7 @@ public function getDiscountTaxCompensationInvoiced() /** * Returns discount_tax_compensation_refunded * - * @return float + * @return float|null */ public function getDiscountTaxCompensationRefunded() { @@ -1210,7 +1210,7 @@ public function getDiscountTaxCompensationRefunded() /** * Returns is_qty_decimal * - * @return int + * @return int|null */ public function getIsQtyDecimal() { @@ -1220,7 +1220,7 @@ public function getIsQtyDecimal() /** * Returns is_virtual * - * @return int + * @return int|null */ public function getIsVirtual() { @@ -1230,7 +1230,7 @@ public function getIsVirtual() /** * Returns item_id * - * @return int + * @return int|null */ public function getItemId() { @@ -1240,7 +1240,7 @@ public function getItemId() /** * Returns locked_do_invoice * - * @return int + * @return int|null */ public function getLockedDoInvoice() { @@ -1250,7 +1250,7 @@ public function getLockedDoInvoice() /** * Returns locked_do_ship * - * @return int + * @return int|null */ public function getLockedDoShip() { @@ -1260,7 +1260,7 @@ public function getLockedDoShip() /** * Returns name * - * @return string + * @return string|null */ public function getName() { @@ -1270,7 +1270,7 @@ public function getName() /** * Returns no_discount * - * @return int + * @return int|null */ public function getNoDiscount() { @@ -1280,7 +1280,7 @@ public function getNoDiscount() /** * Returns order_id * - * @return int + * @return int|null */ public function getOrderId() { @@ -1290,7 +1290,7 @@ public function getOrderId() /** * Returns parent_item_id * - * @return int + * @return int|null */ public function getParentItemId() { @@ -1300,7 +1300,7 @@ public function getParentItemId() /** * Returns price * - * @return float + * @return float|null */ public function getPrice() { @@ -1310,7 +1310,7 @@ public function getPrice() /** * Returns price_incl_tax * - * @return float + * @return float|null */ public function getPriceInclTax() { @@ -1320,7 +1320,7 @@ public function getPriceInclTax() /** * Returns product_id * - * @return int + * @return int|null */ public function getProductId() { @@ -1330,7 +1330,7 @@ public function getProductId() /** * Returns product_type * - * @return string + * @return string|null */ public function getProductType() { @@ -1340,7 +1340,7 @@ public function getProductType() /** * Returns qty_backordered * - * @return float + * @return float|null */ public function getQtyBackordered() { @@ -1350,7 +1350,7 @@ public function getQtyBackordered() /** * Returns qty_canceled * - * @return float + * @return float|null */ public function getQtyCanceled() { @@ -1360,7 +1360,7 @@ public function getQtyCanceled() /** * Returns qty_invoiced * - * @return float + * @return float|null */ public function getQtyInvoiced() { @@ -1370,7 +1370,7 @@ public function getQtyInvoiced() /** * Returns qty_ordered * - * @return float + * @return float|null */ public function getQtyOrdered() { @@ -1380,7 +1380,7 @@ public function getQtyOrdered() /** * Returns qty_refunded * - * @return float + * @return float|null */ public function getQtyRefunded() { @@ -1390,7 +1390,7 @@ public function getQtyRefunded() /** * Returns qty_returned * - * @return float + * @return float|null */ public function getQtyReturned() { @@ -1400,7 +1400,7 @@ public function getQtyReturned() /** * Returns qty_shipped * - * @return float + * @return float|null */ public function getQtyShipped() { @@ -1410,7 +1410,7 @@ public function getQtyShipped() /** * Returns quote_item_id * - * @return int + * @return int|null */ public function getQuoteItemId() { @@ -1420,7 +1420,7 @@ public function getQuoteItemId() /** * Returns row_invoiced * - * @return float + * @return float|null */ public function getRowInvoiced() { @@ -1430,7 +1430,7 @@ public function getRowInvoiced() /** * Returns row_total * - * @return float + * @return float|null */ public function getRowTotal() { @@ -1440,7 +1440,7 @@ public function getRowTotal() /** * Returns row_total_incl_tax * - * @return float + * @return float|null */ public function getRowTotalInclTax() { @@ -1450,7 +1450,7 @@ public function getRowTotalInclTax() /** * Returns row_weight * - * @return float + * @return float|null */ public function getRowWeight() { @@ -1470,7 +1470,7 @@ public function getSku() /** * Returns store_id * - * @return int + * @return int|null */ public function getStoreId() { @@ -1480,7 +1480,7 @@ public function getStoreId() /** * Returns tax_amount * - * @return float + * @return float|null */ public function getTaxAmount() { @@ -1490,7 +1490,7 @@ public function getTaxAmount() /** * Returns tax_before_discount * - * @return float + * @return float|null */ public function getTaxBeforeDiscount() { @@ -1500,7 +1500,7 @@ public function getTaxBeforeDiscount() /** * Returns tax_canceled * - * @return float + * @return float|null */ public function getTaxCanceled() { @@ -1510,7 +1510,7 @@ public function getTaxCanceled() /** * Returns tax_invoiced * - * @return float + * @return float|null */ public function getTaxInvoiced() { @@ -1520,7 +1520,7 @@ public function getTaxInvoiced() /** * Returns tax_percent * - * @return float + * @return float|null */ public function getTaxPercent() { @@ -1530,7 +1530,7 @@ public function getTaxPercent() /** * Returns tax_refunded * - * @return float + * @return float|null */ public function getTaxRefunded() { @@ -1540,7 +1540,7 @@ public function getTaxRefunded() /** * Returns updated_at * - * @return string + * @return string|null */ public function getUpdatedAt() { @@ -1550,7 +1550,7 @@ public function getUpdatedAt() /** * Returns weee_tax_applied * - * @return string + * @return string|null */ public function getWeeeTaxApplied() { @@ -1560,7 +1560,7 @@ public function getWeeeTaxApplied() /** * Returns weee_tax_applied_amount * - * @return float + * @return float|null */ public function getWeeeTaxAppliedAmount() { @@ -1570,7 +1570,7 @@ public function getWeeeTaxAppliedAmount() /** * Returns weee_tax_applied_row_amount * - * @return float + * @return float|null */ public function getWeeeTaxAppliedRowAmount() { @@ -1580,7 +1580,7 @@ public function getWeeeTaxAppliedRowAmount() /** * Returns weee_tax_disposition * - * @return float + * @return float|null */ public function getWeeeTaxDisposition() { @@ -1590,7 +1590,7 @@ public function getWeeeTaxDisposition() /** * Returns weee_tax_row_disposition * - * @return float + * @return float|null */ public function getWeeeTaxRowDisposition() { @@ -1600,7 +1600,7 @@ public function getWeeeTaxRowDisposition() /** * Returns weight * - * @return float + * @return float|null */ public function getWeight() {