woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 18:16:38 +08:00
Code Issues Projects Packages Wiki Activity Actions

Revert "Validate info only for new shipments"

Browse source 
This reverts commit e936c0070b.
This commit is contained in:
Narek Zakarian 2023-09-25 19:31:18 +04:00
parent e936c0070b
commit fc22796ae4
No known key found for this signature in database
GPG key ID: 07AFD7E7A9C164A7
1 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/ppcp-order-tracking/src/Endpoint/OrderTrackingEndpoint.php
View file

@ -136,7 +136,6 @@ class OrderTrackingEndpoint {
$order_id = (int) $data['order_id']; $order_id = (int) $data['order_id'];
$action = $data['action'] ?? ''; $action = $data['action'] ?? '';
$this->validate_tracking_info( $data );
$shipment = $this->create_shipment( $order_id, $data ); $shipment = $this->create_shipment( $order_id, $data );
$action === 'update' $action === 'update'
@ -386,49 +385,41 @@ class OrderTrackingEndpoint {
'status' => $data['status'] ?? '', 'status' => $data['status'] ?? '',
'tracking_number' => $data['tracking_number'] ?? '', 'tracking_number' => $data['tracking_number'] ?? '',
'carrier' => $carrier, 'carrier' => $carrier,
'carrier_name_other' => $data['carrier_name_other'] ?? '',
); );
if ( ! empty( $data['items'] ) ) { if ( ! empty( $data['items'] ) ) {
$tracking_info['items'] = array_map( 'intval', $data['items'] ); $tracking_info['items'] = array_map( 'intval', $data['items'] );
} }
if ( $carrier === 'OTHER' ) {
$tracking_info['carrier_name_other'] = $data['carrier_name_other'] ?? '';
}
$this->validate_tracking_info( $tracking_info );
return $this->shipment_factory->create_shipment( return $this->shipment_factory->create_shipment(
$wc_order_id, $wc_order_id,
$tracking_info['transaction_id'], $tracking_info['transaction_id'],
$tracking_info['tracking_number'], $tracking_info['tracking_number'],
$tracking_info['status'], $tracking_info['status'],
$tracking_info['carrier'], $tracking_info['carrier'],
$tracking_info['carrier_name_other'], $tracking_info['carrier_name_other'] ?? '',
$tracking_info['items'] ?? array() $tracking_info['items'] ?? array()
); );
} }
/** /**
* Validates tracking info for given request values. * Validates the requested tracking info.
* *
* @param array<string, mixed> $request_values A map of request keys to values. * @param array<string, mixed> $tracking_info A map of tracking information keys to values.
* @return void * @return void
* @throws RuntimeException If validation failed. * @throws RuntimeException If validation failed.
*/ */
protected function validate_tracking_info( array $request_values ): void { protected function validate_tracking_info( array $tracking_info ): void {
$error_message = __( 'Missing required information: ', 'woocommerce-paypal-payments' ); $error_message = __( 'Missing required information: ', 'woocommerce-paypal-payments' );
$empty_keys = array(); $empty_keys = array();
$carrier = $request_values['carrier'] ?? ''; foreach ( $tracking_info as $key => $value ) {
$data_to_check = array(
'transaction_id' => $request_values['transaction_id'] ?? '',
'status' => $request_values['status'] ?? '',
'tracking_number' => $request_values['tracking_number'] ?? '',
'carrier' => $carrier,
);
if ( $carrier === 'OTHER' ) {
$data_to_check['carrier_name_other'] = $request_values['carrier_name_other'] ?? '';
}
foreach ( $data_to_check as $key => $value ) {
if ( ! empty( $value ) ) { if ( ! empty( $value ) ) {
continue; continue;
} }