PES-2318: undefined array key (#637)

* PES-2318: Add additional packet status codes

* PES-2318: Add resolver for packet status

* fixup! PES-2318: Remove unnecessary method and update phpdocs

* fixup! PES-2318: Add additional packet status codes

* PES-2318: Rename variable

* PES-2318: Release 1.8.5

* fixup! PES-2318: Rename variable

* fixup! PES-2318: Release 1.8.5

* fixup! PES-2318: Missing dots in readMe

---------

Co-authored-by: Adam Karpita <[email protected]>

Author: Adam Karpita

changelog.txt

@@ -1,4 +1,9 @@
 == Changelog ==
+= 1.8.5 =
+Updated: Users now have the option in the Packeta pick-up point carrier settings to choose whether to deliver to Z-Boxes, pick-up points, or both.
+Updated: Added more packet statuses.
+Fixed: Fixed a bug that caused the plugin to crash when there is an unexpected or invalid packet status in the database.
+
 = 1.8.4 =
 Fixed: Incorrect usage of a helper class causing an error when order with stored API error message is in the order list.
 

languages/packeta.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the GNU General Public License v3.0.
 msgid ""
 msgstr ""
-"Project-Id-Version: Packeta 1.8.4\n"
+"Project-Id-Version: Packeta 1.8.5\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/packeta\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-10-31T16:33:27+01:00\n"
+"POT-Creation-Date: 2024-11-01T16:56:35+01:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: packeta\n"
@@ -31,7 +31,7 @@ msgstr ""
 #: src/Packetery/Module/Options/Page.php:132
 #: src/Packetery/Module/Options/Page.php:133
 #: src/Packetery/Module/Options/Page.php:787
-#: src/Packetery/Module/Order/GridExtender.php:395
+#: src/Packetery/Module/Order/GridExtender.php:394
 #: src/Packetery/Module/Order/LabelPrint.php:204
 #: src/Packetery/Module/Order/Metabox.php:217
 #: src/Packetery/Module/Plugin.php:667
@@ -507,7 +507,7 @@ msgid "maximum weight (kg)"
 msgstr ""
 
 #: src/Packetery/Module/Checkout.php:405
-#: src/Packetery/Module/Order/Metabox.php:682
+#: src/Packetery/Module/Order/Metabox.php:681
 msgid "Choose pickup point"
 msgstr ""
 
@@ -529,7 +529,7 @@ msgid "Address validation is out of order"
 msgstr ""
 
 #: src/Packetery/Module/Checkout.php:410
-#: src/Packetery/Module/Order/Metabox.php:636
+#: src/Packetery/Module/Order/Metabox.php:635
 msgid "The selected country does not correspond to the destination country."
 msgstr ""
 
@@ -1175,7 +1175,7 @@ msgid "C.O.D."
 msgstr ""
 
 #: src/Packetery/Module/Order/CollectionPrint.php:197
-#: src/Packetery/Module/Order/GridExtender.php:398
+#: src/Packetery/Module/Order/GridExtender.php:397
 msgid "Pickup point or carrier"
 msgstr ""
 
@@ -1355,8 +1355,8 @@ msgid "Packeta pickup points packets"
 msgstr ""
 
 #: src/Packetery/Module/Order/GridExtender.php:292
-#: src/Packetery/Module/Order/Metabox.php:363
-#: src/Packetery/Module/Order/Metabox.php:486
+#: src/Packetery/Module/Order/Metabox.php:362
+#: src/Packetery/Module/Order/Metabox.php:485
 msgid "Packet claim tracking"
 msgstr ""
 
@@ -1369,48 +1369,48 @@ msgid "Set additional packet information"
 msgstr ""
 
 #: src/Packetery/Module/Order/GridExtender.php:360
-#: src/Packetery/Module/Order/Metabox.php:482
+#: src/Packetery/Module/Order/Metabox.php:481
 #: src/Packetery/Module/Plugin.php:934
 msgid "It is not possible to submit the shipment because all the information required for this shipment is not filled."
 msgstr ""
 
 #: src/Packetery/Module/Order/GridExtender.php:361
-#: src/Packetery/Module/Order/Metabox.php:485
+#: src/Packetery/Module/Order/Metabox.php:484
 msgid "Submit to Packeta"
 msgstr ""
 
 #. translators: %s: Order number.
 #: src/Packetery/Module/Order/GridExtender.php:363
-#: src/Packetery/Module/Order/Metabox.php:366
-#: src/Packetery/Module/Order/Metabox.php:492
+#: src/Packetery/Module/Order/Metabox.php:365
+#: src/Packetery/Module/Order/Metabox.php:491
 #: src/Packetery/Module/Order/Modal.php:82
 msgid "Order #%s"
 msgstr ""
 
 #. translators: %s: Packet number.
 #: src/Packetery/Module/Order/GridExtender.php:365
-#: src/Packetery/Module/Order/Metabox.php:368
+#: src/Packetery/Module/Order/Metabox.php:367
 msgid "Do you really wish to cancel parcel number %s?"
 msgstr ""
 
 #: src/Packetery/Module/Order/GridExtender.php:367
-#: src/Packetery/Module/Order/Metabox.php:372
+#: src/Packetery/Module/Order/Metabox.php:371
 msgid "Cancel packet"
 msgstr ""
 
 #: src/Packetery/Module/Order/GridExtender.php:368
 msgid "Last error from Packeta API"
 msgstr ""
 
-#: src/Packetery/Module/Order/GridExtender.php:394
+#: src/Packetery/Module/Order/GridExtender.php:393
 msgid "Weight"
 msgstr ""
 
-#: src/Packetery/Module/Order/GridExtender.php:396
+#: src/Packetery/Module/Order/GridExtender.php:395
 msgid "Tracking No."
 msgstr ""
 
-#: src/Packetery/Module/Order/GridExtender.php:397
+#: src/Packetery/Module/Order/GridExtender.php:396
 msgid "Packeta packet status"
 msgstr ""
 
@@ -1496,90 +1496,90 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:362
+#: src/Packetery/Module/Order/Metabox.php:361
 #: src/Packetery/Module/Plugin.php:703
 #: src/Packetery/Module/Plugin.php:750
 msgid "Packet tracking online"
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:364
-#: src/Packetery/Module/Order/Metabox.php:483
+#: src/Packetery/Module/Order/Metabox.php:363
+#: src/Packetery/Module/Order/Metabox.php:482
 msgid "Show logs"
 msgstr ""
 
 #. translators: %s: Packet claim number.
-#: src/Packetery/Module/Order/Metabox.php:370
-#: src/Packetery/Module/Order/Metabox.php:494
+#: src/Packetery/Module/Order/Metabox.php:369
+#: src/Packetery/Module/Order/Metabox.php:493
 msgid "Do you really wish to cancel packet claim number %s?"
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:373
+#: src/Packetery/Module/Order/Metabox.php:372
 msgid "Create packet claim"
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:374
+#: src/Packetery/Module/Order/Metabox.php:373
 msgid "Print packet label"
 msgstr ""
 
+#: src/Packetery/Module/Order/Metabox.php:374
+#: src/Packetery/Module/Order/Metabox.php:486
+msgid "Print packet claim label"
+msgstr ""
+
 #: src/Packetery/Module/Order/Metabox.php:375
 #: src/Packetery/Module/Order/Metabox.php:487
-msgid "Print packet claim label"
+msgid "Cancel packet claim"
 msgstr ""
 
 #: src/Packetery/Module/Order/Metabox.php:376
 #: src/Packetery/Module/Order/Metabox.php:488
-msgid "Cancel packet claim"
+msgid "Packet claim password"
 msgstr ""
 
 #: src/Packetery/Module/Order/Metabox.php:377
 #: src/Packetery/Module/Order/Metabox.php:489
-msgid "Packet claim password"
-msgstr ""
-
-#: src/Packetery/Module/Order/Metabox.php:378
-#: src/Packetery/Module/Order/Metabox.php:490
 msgid "submission password"
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:422
+#: src/Packetery/Module/Order/Metabox.php:421
 msgid "The pickup point cannot be changed because the shipping address has no country set. First, change the country of delivery in the shipping address."
 msgstr ""
 
 #. translators: %s is country code.
-#: src/Packetery/Module/Order/Metabox.php:429
+#: src/Packetery/Module/Order/Metabox.php:428
 msgid "The pickup point cannot be changed because the selected carrier does not deliver to country \"%s\". First, change the country of delivery in the shipping address."
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:439
+#: src/Packetery/Module/Order/Metabox.php:438
 msgid "The address cannot be validated because the shipping address has no country set. First, change the country of delivery in the shipping address."
 msgstr ""
 
 #. translators: %s is country code.
-#: src/Packetery/Module/Order/Metabox.php:446
+#: src/Packetery/Module/Order/Metabox.php:445
 msgid "The address cannot be validated because the selected carrier does not deliver to country \"%s\". First, change the country of delivery in the shipping address."
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:484
+#: src/Packetery/Module/Order/Metabox.php:483
 msgid "Weight is manually set. To calculate weight remove field content and save."
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:526
+#: src/Packetery/Module/Order/Metabox.php:525
 msgid "Packeta: entered data is not valid!"
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:534
+#: src/Packetery/Module/Order/Metabox.php:533
 msgid "Session has expired! Please try again."
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:540
+#: src/Packetery/Module/Order/Metabox.php:539
 msgid "You do not have sufficient rights to make changes!"
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:635
+#: src/Packetery/Module/Order/Metabox.php:634
 msgid "Address validation is out of order."
 msgstr ""
 
-#: src/Packetery/Module/Order/Metabox.php:683
+#: src/Packetery/Module/Order/Metabox.php:682
 msgid "Check shipping address"
 msgstr ""
 
@@ -1782,6 +1782,22 @@ msgid "Parcel has been collected"
 msgstr ""
 
 #: src/Packetery/Module/Order/PacketSynchronizer.php:180
+msgid "Customs declaration process"
+msgstr ""
+
+#: src/Packetery/Module/Order/PacketSynchronizer.php:182
+msgid "Reverse parcel has been accepted at our pick up point"
+msgstr ""
+
+#: src/Packetery/Module/Order/PacketSynchronizer.php:184
+msgid "Unsuccessful delivery attempt of parcel"
+msgstr ""
+
+#: src/Packetery/Module/Order/PacketSynchronizer.php:186
+msgid "Rejected by recipient response"
+msgstr ""
+
+#: src/Packetery/Module/Order/PacketSynchronizer.php:188
 msgid "Unknown parcel status"
 msgstr ""
 

packeta.php

@@ -8,7 +8,7 @@
  *
  * Plugin Name: Packeta
  * Description: This is the official plugin, that allows you to choose pickup points of Packeta and its external carriers in all of Europe, or utilize address delivery to 25 countries in the European Union, straight from the cart in your e-shop. Furthermore, you can also submit all your orders to Packeta with just one click.
- * Version: 1.8.4
+ * Version: 1.8.5
  * Author: Zásilkovna s.r.o.
  * Author URI: https://www.zasilkovna.cz/
  * Text Domain: packeta

readme.txt

@@ -3,7 +3,7 @@ Contributors: packeta
 Tags: WooCommerce, shipping
 Requires at least: 5.5
 Tested up to: 6.6.2
-Stable tag: 1.8.4
+Stable tag: 1.8.5
 Requires PHP: 7.2
 WC requires at least: 4.5
 WC tested up to: 9.3.3
@@ -64,6 +64,11 @@ We are constantly working on adding new features. You can find a list of feature
 Please contact us at [email protected] .
 
 == Changelog ==
+= 1.8.5 =
+Updated: Users now have the option in the Packeta pick-up point carrier settings to choose whether to deliver to Z-Boxes, pick-up points, or both.
+Updated: Added more packet statuses.
+Fixed: Fixed a bug that caused the plugin to crash when there is an unexpected or invalid packet status in the database.
+
 = 1.8.4 =
 Fixed: Incorrect usage of a helper class causing an error when order with stored API error message is in the order list.
 

src/Packetery/Core/Entity/PacketStatus.php

@@ -27,6 +27,10 @@ class PacketStatus {
 	public const PREPARED_FOR_DEPARTURE = 'prepared for departure';
 	public const HANDED_TO_CARRIER      = 'handed to carrier';
 	public const RETURNED               = 'returned';
+	public const CUSTOMS                = 'customs';
+	public const REVERSE_PACKET_ARRIVED = 'reverse packet arrived';
+	public const DELIVERY_ATTEMPT       = 'delivery attempt';
+	public const REJECTED_BY_RECIPIENT  = 'rejected by recipient';
 	public const UNKNOWN                = 'unknown';
 
 	/**

src/Packetery/Module/Order/GridExtender.php

@@ -371,8 +371,7 @@ public function fillCustomOrderListColumns( $column, $wcOrder ): void {
 				);
 				break;
 			case 'packetery_packet_status':
-				$statuses = PacketSynchronizer::getPacketStatuses();
-				echo esc_html( isset( $statuses[ $order->getPacketStatus() ] ) ? $statuses[ $order->getPacketStatus() ]->getTranslatedName() : $order->getPacketStatus() );
+				echo esc_html( PacketStatusResolver::getTranslatedName( $order->getPacketStatus() ) );
 				break;
 		}
 	}

src/Packetery/Module/Order/Metabox.php

@@ -325,8 +325,7 @@ private function prepareMetaboxParts(): array {
 				]
 			);
 
-			$statuses    = PacketSynchronizer::getPacketStatuses();
-			$orderStatus = $statuses[ $order->getPacketStatus() ]->getTranslatedName();
+			$packetStatusTranslatedName = PacketStatusResolver::getTranslatedName( $order->getPacketStatus() );
 
 			$statusClasses = [
 				'received data'         => 'received-data',
@@ -338,7 +337,7 @@ private function prepareMetaboxParts(): array {
 			];
 
 			$statusClass = 'delivery-status';
-			$statusType  = $statuses[ $order->getPacketStatus() ]->getName();
+			$statusType  = $order->getPacketStatus();
 
 			if ( isset( $statusClasses[ $statusType ] ) ) {
 				$statusClass = $statusClasses[ $statusType ];
@@ -348,7 +347,7 @@ private function prepareMetaboxParts(): array {
 				PACKETERY_PLUGIN_DIR . '/template/order/metabox-common.latte',
 				[
 					'order'                      => $order,
-					'orderStatus'                => $orderStatus,
+					'packetStatusTranslatedName' => $packetStatusTranslatedName,
 					'statusClass'                => $statusClass,
 					'isPacketSubmissionPossible' => false,
 					'orderWarningFields'         => [],
@@ -465,7 +464,7 @@ private function prepareMetaboxParts(): array {
 				'orderWarningFields'         => Form::getInvalidFieldsFromValidationResult( $this->orderValidator->validate( $order ) ),
 				'packetCancelLink'           => null,
 				'packetTrackingUrl'          => null,
-				'orderStatus'                => null,
+				'packetStatusTranslatedName' => null,
 				'packetSubmitUrl'            => $packetSubmitUrl,
 				'packetClaimTrackingUrl'     => $packetClaimTrackingUrl,
 				'packetClaimUrl'             => $packetClaimUrl,

src/Packetery/Module/Order/PacketStatusResolver.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Class PacketeryStatusResolver
+ *
+ * @package Packetery\Module\Order
+ */
+
+declare(strict_types=1);
+
+namespace Packetery\Module\Order;
+
+/**
+ * Class PacketeryStatusResolver
+ *
+ * @package Packetery\Module\Order
+ */
+class PacketStatusResolver {
+
+	/**
+	 * Gets translated name of packet status.
+	 *
+	 * @param string|null $status Status code.
+	 *
+	 * @return string|null
+	 */
+	public static function getTranslatedName( ?string $status ): ?string {
+		$statuses = PacketSynchronizer::getPacketStatuses();
+		return isset( $statuses[ $status ] ) ? $statuses[ $status ]->getTranslatedName() : $status;
+	}
+}