← All changes | src/Packetery/Module/Carrier/Repository.php +16 -15 2.3.2 → 2.0.9 View file →

		@@ -33,9 +33,8 @@
33	33	'country',
34	34	'currency',
35	35	'max_weight',
36	36	'deleted',
37		- 'available',
38	37	];
39	38
40	39	/**
41	40	* WpdbAdapter object from global
		@@ -74,9 +73,8 @@
74	73	`disallows_cod` tinyint(1) NOT NULL,
75	74	`country` varchar(255) NOT NULL,
76	75	`currency` varchar(255) NOT NULL,
77	76	`max_weight` float NOT NULL,
78		- `available` tinyint(1) NOT NULL DEFAULT 1,
79	77	`deleted` tinyint(1) NOT NULL,
80	78	PRIMARY KEY (`id`)
81	79	) ' . $this->wpdbAdapter->get_charset_collate();
82	80
		@@ -83,8 +81,15 @@
83	81	return $this->wpdbAdapter->dbDelta( $createTableQuery, $this->wpdbAdapter->packeteryCarrier );
84	82	}
85	83
86	84	/**
	85	+ * Drop table used to store carriers.
	86	+ */
	87	+ public function drop(): void {
	88	+ $this->wpdbAdapter->query( 'DROP TABLE IF EXISTS `' . $this->wpdbAdapter->packeteryCarrier . '`' );
	89	+ }
	90	+
	91	+ /**
87	92	* Gets is_pickup_point attribute of a carrier.
88	93	*
89	94	* @param int $carrierId Carrier id.
90	95	*
		@@ -117,18 +122,16 @@
117	122	/**
118	123	* Gets all active carriers for a country.
119	124	*
120	125	* @param string $country ISO code.
121		- * @param bool $includeUnavailable Include unavailable carriers.
122	126	*
123	127	* @return array|null
124	128	*/
125		- public function getByCountry( string $country, bool $includeUnavailable ): ?array {
	129	+ public function getByCountry( string $country ): ?array {
126	130	return $this->wpdbAdapter->get_results(
127	131	$this->wpdbAdapter->prepare(
128	132	'SELECT `' . implode( '`, `', self::COLUMN_NAMES ) . '`
129		- FROM `' . $this->wpdbAdapter->packeteryCarrier . '` WHERE `country` = %s AND `deleted` = false' .
130		- ( $includeUnavailable ? '' : ' AND `available` = true' ),
	133	+ FROM `' . $this->wpdbAdapter->packeteryCarrier . '` WHERE `country` = %s AND `deleted` = false',
131	134	$country
132	135	),
133	136	ARRAY_A
134	137	);
		@@ -141,9 +144,9 @@
141	144	*/
142	145	public function getActiveCarriers(): ?array {
143	146	return $this->wpdbAdapter->get_results(
144	147	'SELECT `' . implode( '`, `', self::COLUMN_NAMES ) . '`
145		- FROM `' . $this->wpdbAdapter->packeteryCarrier . '` WHERE `deleted` = false AND `available` = true',
	148	+ FROM `' . $this->wpdbAdapter->packeteryCarrier . '` WHERE `deleted` = false',
146	149	ARRAY_A
147	150	);
148	151	}
149	152
		@@ -167,9 +170,9 @@
167	170	*
168	171	* @return bool
169	172	*/
170	173	public function hasAnyActiveFeedCarrier(): bool {
171		- return (bool) $this->wpdbAdapter->get_var( 'SELECT 1 FROM `' . $this->wpdbAdapter->packeteryCarrier . '` WHERE `deleted` = false AND `available` = true LIMIT 1' );
	174	+ return (bool) $this->wpdbAdapter->get_var( 'SELECT 1 FROM `' . $this->wpdbAdapter->packeteryCarrier . '` WHERE `deleted` = false LIMIT 1' );
172	175	}
173	176
174	177	/**
175	178	* Gets all active countries.
		@@ -175,9 +178,9 @@
175	178	* Gets all active countries.
176	179	*
177	180	* @return array
178	181	*/
179		- public function getCountriesWithUnavailable(): array {
	182	+ public function getCountries(): array {
180	183	return $this->wpdbAdapter->get_col( 'SELECT `country` FROM `' . $this->wpdbAdapter->packeteryCarrier . '` WHERE `deleted` = false GROUP BY `country` ORDER BY `country`' );
181	184	}
182	185
183	186	/**
		@@ -195,12 +198,11 @@
195	198	/**
196	199	* Inserts carrier data to db.
197	200	*
198	201	* @param array $data Carrier data.
199		- * @return int|false The number of rows inserted, or false on error.
200	202	*/
201		- public function insert( array $data ) {
202		- return $this->wpdbAdapter->insert( $this->wpdbAdapter->packeteryCarrier, $data );
	203	+ public function insert( array $data ): void {
	204	+ $this->wpdbAdapter->insert( $this->wpdbAdapter->packeteryCarrier, $data );
203	205	}
204	206
205	207	/**
206	208	* Updates carrier data in db.
		@@ -206,10 +208,9 @@
206	208	* Updates carrier data in db.
207	209	*
208	210	* @param array $data Carrier data.
209	211	* @param int $carrierId Carrier id.
210		- * @return int|false The number of rows updated, or false on error.
211	212	*/
212		- public function update( array $data, int $carrierId ) {
213		- return $this->wpdbAdapter->update( $this->wpdbAdapter->packeteryCarrier, $data, [ 'id' => $carrierId ] );
	213	+ public function update( array $data, int $carrierId ): void {
	214	+ $this->wpdbAdapter->update( $this->wpdbAdapter->packeteryCarrier, $data, [ 'id' => $carrierId ] );
214	215	}
215	216	}