← All changes | src/Packetery/Module/Log/Page.php +34 -16 1.5.4 → 2.1 View file →

		@@ -6,15 +6,17 @@
6	6	*/
7	7
8	8	declare( strict_types=1 );
9	9
10		-
11	10	namespace Packetery\Module\Log;
12	11
13	12	use Packetery\Core\Log\ILogger;
14	13	use Packetery\Core\Log\Record;
15		-use PacketeryLatte\Engine;
16		-use PacketeryNette\Http\Request;
	14	+use Packetery\Latte\Engine;
	15	+use Packetery\Module\Dashboard\DashboardPage;
	16	+use Packetery\Module\ModuleHelper;
	17	+use Packetery\Module\Views\UrlBuilder;
	18	+use Packetery\Nette\Http\Request;
17	19
18	20	/**
19	21	* Class Page
20	22	*
		@@ -50,18 +52,29 @@
50	52	*/
51	53	private $request;
52	54
53	55	/**
54		- * Page constructor.
55		- *
56		- * @param Engine $latteEngine Engine.
57		- * @param ILogger $manager Manager.
58		- * @param Request $request Request.
	56	+ * @var ModuleHelper
59	57	*/
60		- public function __construct( Engine $latteEngine, ILogger $manager, Request $request ) {
61		- $this->latteEngine = $latteEngine;
62		- $this->logger = $manager;
63		- $this->request = $request;
	58	+ private $moduleHelper;
	59	+
	60	+ /**
	61	+ * @var UrlBuilder
	62	+ */
	63	+ private $urlBuilder;
	64	+
	65	+ public function __construct(
	66	+ Engine $latteEngine,
	67	+ ILogger $manager,
	68	+ Request $request,
	69	+ ModuleHelper $moduleHelper,
	70	+ UrlBuilder $urlBuilder
	71	+ ) {
	72	+ $this->latteEngine = $latteEngine;
	73	+ $this->logger = $manager;
	74	+ $this->request = $request;
	75	+ $this->moduleHelper = $moduleHelper;
	76	+ $this->urlBuilder = $urlBuilder;
64	77	}
65	78
66	79	/**
67	80	* Registers Page.
		@@ -67,9 +80,9 @@
67	80	* Registers Page.
68	81	*/
69	82	public function register(): void {
70	83	add_submenu_page(
71		- \Packetery\Module\Options\Page::SLUG,
	84	+ DashboardPage::SLUG,
72	85	__( 'Log', 'packeta' ),
73	86	__( 'Log', 'packeta' ),
74	87	'manage_woocommerce',
75	88	self::SLUG,
		@@ -82,8 +95,9 @@
82	95	*/
83	96	public function render(): void {
84	97	$translatedActions = [
85	98	Record::ACTION_PACKET_SENDING => __( 'Packet sending', 'packeta' ),
	99	+ Record::ACTION_PACKET_CLAIM_SENDING => __( 'Packet claim sending', 'packeta' ),
86	100	Record::ACTION_CARRIER_LABEL_PRINT => __( 'Carrier label print', 'packeta' ),
87	101	Record::ACTION_LABEL_PRINT => __( 'Label print', 'packeta' ),
88	102	Record::ACTION_CARRIER_LIST_UPDATE => __( 'Carrier list update', 'packeta' ),
89	103	Record::ACTION_CARRIER_NUMBER_RETRIEVING => __( 'Getting external carrier tracking number', 'packeta' ),
		@@ -92,8 +106,9 @@
92	106	Record::ACTION_SENDER_VALIDATION => __( 'Sender validation', 'packeta' ),
93	107	Record::ACTION_PACKET_STATUS_SYNC => __( 'Packet status synchronization', 'packeta' ),
94	108	Record::ACTION_PACKET_CANCEL => __( 'Packet cancel', 'packeta' ),
95	109	Record::ACTION_PICKUP_POINT_VALIDATE => __( 'Pickup point validation', 'packeta' ),
	110	+ Record::ACTION_ORDER_STATUS_CHANGE => __( 'Order status change', 'packeta' ),
96	111	];
97	112
98	113	$translatedStatuses = [
99	114	Record::STATUS_ERROR => __( 'Error', 'packeta' ),
		@@ -111,8 +126,11 @@
111	126	'rows' => $rows,
112	127	'maxRowsExceeded' => $totalCount > self::MAX_ROWS,
113	128	'translatedActions' => $translatedActions,
114	129	'translatedStatuses' => $translatedStatuses,
	130	+ 'isCzechLocale' => $this->moduleHelper->isCzechLocale(),
	131	+ 'logoZasilkovna' => $this->urlBuilder->buildAssetUrl( 'public/images/logo-zasilkovna.svg' ),
	132	+ 'logoPacketa' => $this->urlBuilder->buildAssetUrl( 'public/images/logo-packeta.svg' ),
115	133	'translations' => [
116	134	'packeta' => __( 'Packeta', 'packeta' ),
117	135	'title' => __( 'Log', 'packeta' ),
118	136	'status' => __( 'Status', 'packeta' ),
		@@ -147,9 +165,9 @@
147	165	* @return string|null
148	166	*/
149	167	private function getAction(): ?string {
150	168	$action = $this->request->getQuery( self::PARAM_ACTION );
151		- if ( ! empty( $action ) ) {
	169	+ if ( $action !== null ) {
152	170	return (string) $action;
153	171	}
154	172
155	173	return null;
		@@ -190,12 +208,12 @@
190	208	$params = [
191	209	'page' => self::SLUG,
192	210	];
193	211
194		- if ( null !== $orderId ) {
	212	+ if ( $orderId !== null ) {
195	213	$params[ self::PARAM_ORDER_ID ] = $orderId;
196	214	}
197		- if ( null !== $action ) {
	215	+ if ( $action !== null ) {
198	216	$params[ self::PARAM_ACTION ] = $action;
199	217	}
200	218
201	219	return add_query_arg(