fix: empty tariff get answer

cdek-it · Nov 20, 2024 · 2860a0a · 2860a0a
1 parent 58ae2b1
commit 2860a0a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/src/Actions/CalculateDeliveryAction.php b/src/Actions/CalculateDeliveryAction.php
@@ -50,6 +50,7 @@ public function __invoke(array $package, int $instanceID, bool $addTariffsToOffi
                     'address'      => trim($package['destination']['city']),
                     'country_code' => trim($package['destination']['country']),
                 ],
+                'packages' => $this->getPackagesData($package['contents']),
             ];
 
             try {
@@ -59,9 +60,6 @@ public function __invoke(array $package, int $instanceID, bool $addTariffsToOffi
                 // do nothing
             }
 
-            $deliveryParam['packages'] = $this->getPackagesData($package['contents']);
-            unset($deliveryParam['packages']['weight_orig_unit']);
-
             if ($this->method->insurance) {
                 $deliveryParam['services'][] = [
                     'code'      => 'INSURANCE',
@@ -192,13 +190,7 @@ function_exists('wcml_get_woocommerce_currency_option') ?
                     $deliveryParam['services'] = array_merge($serviceList, $deliveryParam['services'] ?? []);
                 }
 
-                $tariffInfo = $api->calculateGet($deliveryParam);
-
-                if (empty($tariffInfo)) {
-                    return $tariff;
-                }
-
-                $cost = $tariffInfo['total_sum'];
+                $cost = $api->calculateGet($deliveryParam) ?? $tariff['cost'];
 
                 if (isset($rule['type'])) {
                     if ($rule['type'] === 'amount') {

diff --git a/src/CdekApi.php b/src/CdekApi.php
@@ -83,7 +83,7 @@ public function barcodeGet(string $uuid): ?array
          * @throws ApiException
          * @throws LegacyAuthException
          */
-        public function calculateGet(array $deliveryParam): array
+        public function calculateGet(array $deliveryParam): ?float
         {
             $request = [
                 'type'          => $deliveryParam['type'],
@@ -94,12 +94,18 @@ public function calculateGet(array $deliveryParam): array
                 'services'      => array_key_exists('services', $deliveryParam) ? $deliveryParam['services'] : [],
             ];
 
-            return HttpClient::sendJsonRequest(
+            $resp = HttpClient::sendJsonRequest(
                 "{$this->apiUrl}calculator/tariff",
                 'POST',
                 $this->tokenStorage->getToken(),
                 $request,
             )->json();
+
+            if (empty($resp['total_sum'])) {
+                return null;
+            }
+
+            return (float)$resp['total_sum'];
         }
 
         /**
@@ -210,8 +216,8 @@ public function citySuggest(string $q, string $country): array
                 'GET',
                 $this->tokenStorage->getToken(),
                 [
-                    'name'          => $q,
-                    'country_code'   => $country,
+                    'name'         => $q,
+                    'country_code' => $country,
                 ],
             )->json();
         }