Compare commits

..

2 Commits

Author SHA1 Message Date
O K
adc581282f update estimator logic 2026-01-21 09:59:16 +02:00
O K
7601859990 extend debug info 2026-01-21 09:55:35 +02:00

View File

@@ -15,7 +15,7 @@ class Usps_Api_Bridge extends Module
{
$this->name = 'usps_api_bridge';
$this->tab = 'shipping_logistics';
$this->version = '1.0.1';
$this->version = '1.0.2';
$this->author = 'Panariga';
$this->need_instance = 0;
$this->bootstrap = true;
@@ -219,8 +219,12 @@ class Usps_Api_Bridge extends Module
if (!empty($params->id_address_delivery)) {
$address = new Address($params->id_address_delivery);
if (Validate::isLoadedObject($address)) {
$destZip = $address->postcode;
$destCountryIso = Country::getIsoById($address->id_country);
if (!empty($address->postcode)) {
$destZip = $address->postcode;
}
if (!empty($address->id_country)) {
$destCountryIso = Country::getIsoById($address->id_country);
}
}
}
@@ -234,10 +238,16 @@ class Usps_Api_Bridge extends Module
}
if (empty($destCountryIso)) {
$this->externalLog([
'destCountryIso' => 'set to default',
]);
$destCountryIso = 'US';
}
if (empty($destZip)) {
$this->externalLog([
'destZip' => 'is empty',
]);
return false;
}
@@ -249,11 +259,25 @@ class Usps_Api_Bridge extends Module
// Map Code
$newApiClass = $this->mapServiceCodeToApiClass($methodCode, $isInternational);
if (!$newApiClass) return false;
if (!$newApiClass) {
$this->externalLog([
'mapServiceCodeToApiClass()' => 'failed',
'methodCode' => $methodCode,
'isInternational' => $isInternational,
]);
return false;
}
// 6. Pack Products
$packedBoxes = $originalModule->getHelper()->getCarrierHelper()->packProducts($products, $params->id);
if (empty($packedBoxes)) return false;
if (empty($packedBoxes)) {
$this->externalLog([
'packProducts()' => 'failed',
'products' => $products,
'params->id' => $params->id,
]);
return false;
}
// 7. Setup Client
$client = new UspsV3Client($token, (bool)\Configuration::get('USPS_BRIDGE_LIVE_MODE'));