Netsyms/data.netsyms.net
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add carrier barcode regex for USPS DataMatrix

Browse Source
This commit is contained in:
Skylar Ittner 2023-01-14 23:47:56 -07:00
parent 5d0958b5d0
commit 3d142dc51f
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Carriers.lib.php
View File

@ -47,6 +47,14 @@ class Carriers {
"carrier" => "usps", "carrier" => "usps",
"pattern" => "/^420[0-9]{5}[0-9]+$/" "pattern" => "/^420[0-9]{5}[0-9]+$/"
], ],
[
"carrier" => "usps",
"pattern" => "/^\\x1D420[0-9]{5,11}\\x1D[0-9]{10,}\\x1D?$/"
],
[
"carrier" => "usps",
"pattern" => "/^420[0-9]{5,11}\\x1D[0-9]{10,}\\x1D?$/"
],
[ [
"carrier" => "fedex", "carrier" => "fedex",
"pattern" => "/^[0-9]{15}$/" "pattern" => "/^[0-9]{15}$/"

2
lib/TrackingBarcode.lib.php
View File

@ -16,8 +16,8 @@ class TrackingBarcode {
*/ */
public function getSanitized(): string { public function getSanitized(): string {
$code = strtoupper($this->code); $code = strtoupper($this->code);
$code = trim($code);
$code = preg_replace("/[^0-9A-Z]/", "", $code); $code = preg_replace("/[^0-9A-Z]/", "", $code);
$code = trim($code);
return $code; return $code;
} }

4
lib/Tracking_UPS_MailInnovations_DataMatrix.lib.php
View File

@ -34,7 +34,7 @@ class Tracking_UPS_MailInnovations_DataMatrix {
} else { } else {
$realcode = $codeparts[13]; $realcode = $codeparts[13];
$info = Tracking::track($realcode); $info = Tracking::track($realcode, "usps");
// Set detailed destination address from code data // Set detailed destination address from code data
$to = $info->getTo(); $to = $info->getTo();
@ -48,7 +48,7 @@ class Tracking_UPS_MailInnovations_DataMatrix {
$to->country = (new League\ISO3166\ISO3166)->numeric($codeparts[9])['alpha2']; $to->country = (new League\ISO3166\ISO3166)->numeric($codeparts[9])['alpha2'];
$info->setTo($to); $info->setTo($to);
$info->setService(new Service("", "UPS Mail Innovations")); $info->setService(new Service("", "Parcel Select/UPS Mail Innovations"));
} }
return $info; return $info;