From b5efa3bd7521161458ea0342c7e5a143aeff6ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Kj=C3=A6r=20Rasmussen?= Date: Tue, 9 Jan 2024 10:27:33 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20description=20for=20product?= =?UTF-8?q?=20line?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WoocommerceEconomic.php | 5 ++--- src/woocommerce/OrderService.php | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/WoocommerceEconomic.php b/src/WoocommerceEconomic.php index cb28590..64efbe0 100755 --- a/src/WoocommerceEconomic.php +++ b/src/WoocommerceEconomic.php @@ -15,8 +15,7 @@ public static function init(): void add_action('woocommerce_variation_options', [ProductService::class, 'addEconomicProductField']); add_action('woocommerce_save_product_variation', [ProductService::class, 'saveEconomicProductField'], 10, 2); add_action('woocommerce_process_product_meta', [ProductService::class, 'saveEconomicProductField'], 10, 2); - - add_action(ActionScheduleService::CREATE_INVOICE, [ActionScheduleService::class, 'handleCreateInvoiceJob'], 10, 2); + add_action(ActionScheduleService::CREATE_INVOICE, [ActionScheduleService::class, 'handleCreateInvoiceJob'], 10, 1); } public static function registerGateway($gateways): array @@ -28,6 +27,6 @@ public static function registerGateway($gateways): array public static function requireGateway(): void { - require_once __DIR__.'/woocommerce/WC_Gateway_Economic_Invoice.php'; + require_once __DIR__ . '/woocommerce/WC_Gateway_Economic_Invoice.php'; } } diff --git a/src/woocommerce/OrderService.php b/src/woocommerce/OrderService.php index b9ba06e..afbfe4c 100644 --- a/src/woocommerce/OrderService.php +++ b/src/woocommerce/OrderService.php @@ -107,9 +107,9 @@ private static function getRecipient(\WC_Order $order, ?VatZone $vatZone): Recip } return Recipient::new( - name: $order->get_shipping_first_name().' '.$order->get_shipping_last_name(), + name: $order->get_shipping_first_name() . ' ' . $order->get_shipping_last_name(), vatZone: $vatZone, - address: $order->get_shipping_address_1().' '.$order->get_shipping_address_2(), + address: $order->get_shipping_address_1() . ' ' . $order->get_shipping_address_2(), zip: $order->get_shipping_postcode(), city: $order->get_shipping_city(), country: $order->get_shipping_country(), @@ -147,7 +147,7 @@ private static function addLineItems(\WC_Order $order, DraftInvoice $invoice, \W $product = self::getEconomicProduct($item, $invoice); - if ($product) { + if (! $product) { EconomicLoggerService::critical('Product not found', [ 'product_id' => $item->get_product_id(), 'economic_product_id' => $item->get_meta('economic_product_id'), @@ -160,6 +160,7 @@ private static function addLineItems(\WC_Order $order, DraftInvoice $invoice, \W product: $product->productNumber, quantity: $item->get_quantity(), unitNetPrice: $item->get_total(), + description: $item->get_name(), )); }); @@ -175,6 +176,7 @@ private static function addLineItems(\WC_Order $order, DraftInvoice $invoice, \W product: $paymentMethod->get_option('economic_shipping_product'), quantity: 1, unitNetPrice: $order->get_shipping_total(), + description: __('Fragt', 'mt-wc-economic'), )); return $invoice;