jaro/ikea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small Fixes

Browse Source
This commit is contained in:
Jaroslav Drzik
2024-02-13 19:12:52 +01:00
parent 4a51269712
commit c36aef9819
1 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/CountryCompareController.php
View File

@@ -37,7 +37,8 @@ class CountryCompareController extends Controller
return $this->processResponse($requests, $ta_codes[0]); return $this->processResponse($requests, $ta_codes[0]);
} }
public function compare($countries, $cHash, $aCodes){ public function compare($countries, $cHash, $aCodes)
{
$requests = $this->makeRequests($aCodes); $requests = $this->makeRequests($aCodes);
return $this->processResponse($requests, $aCodes); return $this->processResponse($requests, $aCodes);
} }
@@ -85,7 +86,7 @@ class CountryCompareController extends Controller
$prices[$country] = $this->parseJson_IS($code, (string) $response, $country); $prices[$country] = $this->parseJson_IS($code, (string) $response, $country);
break; break;
case "TR": case "TR":
$prices[$country] = $this->parseJson_TR((string) $response, $country); $prices[$country] = $this->parseJson_TR($code, (string) $response, $country);
break; break;
case "EE": case "EE":
case "LT": case "LT":
@@ -93,7 +94,7 @@ class CountryCompareController extends Controller
$prices[$country] = $this->parseJson_EE_LT_LV($code, (string) $response, $country); $prices[$country] = $this->parseJson_EE_LT_LV($code, (string) $response, $country);
break; break;
default: default:
$prices[$country] = $this->parseJson((string) $response, $country); $prices[$country] = $this->parseJson($code, (string) $response, $country);
} }
} }
} }
@@ -106,7 +107,7 @@ class CountryCompareController extends Controller
return collect($products); return collect($products);
} }
public function parseJson($json_raw, $country) public function parseJson($code, $json_raw, $country)
{ {
$json_values = array(); $json_values = array();
Log::info('{json_raw} {country}', [$json_raw, $country]); Log::info('{json_raw} {country}', [$json_raw, $country]);
@@ -124,6 +125,7 @@ class CountryCompareController extends Controller
$numeral = $salesPrice["numeral"]; $numeral = $salesPrice["numeral"];
$json_values = array( $json_values = array(
'code' => $code,
'url' => $product['pipUrl'], 'url' => $product['pipUrl'],
'tag' => $product['tag'], 'tag' => $product['tag'],
'country' => $country, 'country' => $country,
@@ -135,7 +137,7 @@ class CountryCompareController extends Controller
return $json_values; return $json_values;
} }
public function parseJson_TR($body,$country) public function parseJson_TR($code, $body, $country)
{ {
//echo "country: " . $country . ", code: " . $code . "<br>"; //echo "country: " . $country . ", code: " . $code . "<br>";
@@ -153,6 +155,7 @@ class CountryCompareController extends Controller
$price = floatval(trim(str_replace('.', '', $price))); $price = floatval(trim(str_replace('.', '', $price)));
$json_values = array( $json_values = array(
'code' => $code,
'url' => $url_product, 'url' => $url_product,
'tag' => null, 'tag' => null,
'salesPrice' => floatval($price), 'salesPrice' => floatval($price),
@@ -183,7 +186,8 @@ class CountryCompareController extends Controller
$json_values = array( $json_values = array(
'url_product' => $url_product, 'code' => $code,
'url' => $url_product,
'tag' => null, 'tag' => null,
'salesPrice' => floatval($price), 'salesPrice' => floatval($price),
'country' => $country, 'country' => $country,
@@ -231,6 +235,7 @@ class CountryCompareController extends Controller
$price = floatval(trim(str_replace(' ', '', str_replace(',', '.', str_replace(array('€'), '', $price))))); $price = floatval(trim(str_replace(' ', '', str_replace(',', '.', str_replace(array('€'), '', $price)))));
$json_values = array( $json_values = array(
'code' => $code,
'url' => $url_product, 'url' => $url_product,
'tag' => null, 'tag' => null,
'salesPrice' => $price, 'salesPrice' => $price,
@@ -253,7 +258,6 @@ class CountryCompareController extends Controller
$c = ltrim($code, "0"); $c = ltrim($code, "0");
$json_values = array(); $json_values = array();
// try {
@$price = $xpath->query('//*/div[(@class="itemPriceBox")]//p[@class="itemNormalPrice revamp_price price"]/span/span')->item(0)->nodeValue; @$price = $xpath->query('//*/div[(@class="itemPriceBox")]//p[@class="itemNormalPrice revamp_price price"]/span/span')->item(0)->nodeValue;
if (is_null($price) || empty($price)) { if (is_null($price) || empty($price)) {
@@ -268,12 +272,10 @@ class CountryCompareController extends Controller
$url_product = null; $url_product = null;
} }
//} catch (\Exception $e) {
// return [];
//}
$price = floatval(trim(str_replace(' ', '', str_replace(',', '.', str_replace('.', '', str_replace(array('€'), '', $price)))))); $price = floatval(trim(str_replace(' ', '', str_replace(',', '.', str_replace('.', '', str_replace(array('€'), '', $price))))));
$json_values = array( $json_values = array(
'code' => $code,
'url' => $url_product, 'url' => $url_product,
'tag' => null, 'tag' => null,
'salesPrice' => $price, 'salesPrice' => $price,
@@ -282,7 +284,5 @@ class CountryCompareController extends Controller
return $json_values; return $json_values;
} }
} }
// { "country": "AT", "code": "50161321", "url": "https://www.ikea.com/at/de/p/hol-aufbewahrungstisch-akazie-50161321/", "name": "HOL", "typeName": "Aufbewahrungstisch", "mainImageUrl": "https://www.ikea.com/at/de/images/products/hol-aufbewahrungstisch-akazie__0104310_pe251255_s5.jpg", "itemNoGlobal": "50161321", "salesPrice": "80.99", "tag": "FAMILY_PRICE", "last_mod": "2023-12-03 16:44:24" }, // { "country": "AT", "code": "50161321", "url": "https://www.ikea.com/at/de/p/hol-aufbewahrungstisch-akazie-50161321/", "name": "HOL", "typeName": "Aufbewahrungstisch", "mainImageUrl": "https://www.ikea.com/at/de/images/products/hol-aufbewahrungstisch-akazie__0104310_pe251255_s5.jpg", "itemNoGlobal": "50161321", "salesPrice": "80.99", "tag": "FAMILY_PRICE", "last_mod": "2023-12-03 16:44:24" },