Merge branch 'v4.0.1'

# Conflicts:
#	app/Classes/Stores/BestBuy.php

Author: Cybrarist

app/Classes/CustomStoreTemplate.php

@@ -5,6 +5,7 @@
 use App\Classes\Crawler\ChromiumCrawler;
 use App\Classes\Crawler\SimpleCrawler;
 use App\Helpers\GeneralHelper;
+use App\Helpers\LinkHelper;
 use App\Models\Link;
 use App\Models\LinkHistory;
 use App\Models\Product;
@@ -58,7 +59,7 @@ public function __construct(
         try {
             $this->link->loadMissing(['store', 'products' => fn ($query) => $query->withoutGlobalScopes()]);
 
-            $this->current_product_url = "https://{$this->link->store->domain}/{$this->link->key}";
+            $this->current_product_url = self::prepare_url($this->link);
 
             $this->crawl_product();
 
@@ -87,6 +88,15 @@ public function __construct(
         }
     }
 
+    public static function prepare_url(Link $link): string
+    {
+        $base_url = "https://{$link->store->domain}/";
+
+        [$link_base, $link_params] = LinkHelper::prepare_base_key_and_params($link);
+
+        return $base_url."{$link_base}?{$link_params}";
+    }
+
     public function crawl_product(): void
     {
         if ($this->link->store->custom_settings['crawling_method'] == "chromium") {

app/Classes/StoreTemplate.php

@@ -131,7 +131,7 @@ public function get_product_pricing(): void
     public function update_product_details(): void
     {
 
-        // update products details that are missing.
+        // update product details that are missing.
         DB::statement("
             UPDATE products
             SET

app/Classes/Stores/Ajio.php

@@ -3,6 +3,7 @@
 namespace App\Classes\Stores;
 
 use App\Classes\StoreTemplate;
+use App\Helpers\LinkHelper;
 use App\Models\Link;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
@@ -33,10 +34,12 @@ public function __construct(Link $link, array $extra_headers = [], ?string $user
 
     public static function prepare_url(Link $link, array $extra = []): string
     {
+        [$link_base, $link_params] = LinkHelper::prepare_base_key_and_params($link);
+
         return Str::replace(
             ["[domain]", "[product_key]"],
-            [$link->store->domain, $link->key],
-            self::MAIN_URL);
+            [$link->store->domain, $link_base],
+            self::MAIN_URL).'?'. $link_params;
     }
 
     public function get_name(): void

app/Classes/Stores/Aliexpress.php

@@ -4,6 +4,7 @@
 
 use App\Classes\StoreTemplate;
 use App\Helpers\GeneralHelper;
+use App\Helpers\LinkHelper;
 use App\Models\Currency;
 use App\Models\Link;
 use Illuminate\Support\Facades\Log;
@@ -21,11 +22,13 @@ public function __construct(Link $link, array $extra_headers = [], ?string $user
 
     public static function prepare_url(Link $link, $extra = []): string
     {
+        [$link_base, $link_params] = LinkHelper::prepare_base_key_and_params($link);
+
         return Str::replace(
             ["[domain]", "[product_key]", "[ref]"],
-            [$link->store->domain, $link->key, $link->store->referral],
+            [$link->store->domain, $link_base, $link->store->referral],
 
-            self::MAIN_URL);
+            self::MAIN_URL)."&{$link_params}";
     }
 
     public function get_name(): void

app/Classes/Stores/Amazon.php

@@ -5,6 +5,7 @@
 use App\Classes\Crawler\SimpleCrawler;
 use App\Classes\StoreTemplate;
 use App\Helpers\GeneralHelper;
+use App\Helpers\LinkHelper;
 use App\Helpers\UserAgentHelper;
 use App\Models\Link;
 use Illuminate\Support\Str;
@@ -29,11 +30,10 @@ public function __construct(Link $link, array $extra_headers = [], ?string $user
 
         if (in_array($link->store->domain, [
             'amazon.de',
-            'amazon.ca'
-        ])){
+            'amazon.ca',
+        ])) {
             $this->chromium_crawler = true;
-        }
-        else{
+        } else {
             $this->extra_headers = $extra_headers + $this->extra_headers;
             $this->user_agent = ($user_agent) ?: UserAgentHelper::get_random_user_agent();
 
@@ -44,6 +44,8 @@ public function __construct(Link $link, array $extra_headers = [], ?string $user
 
     public static function prepare_url(Link $link, $extra = []): string
     {
+        [$link_base, $link_params] = LinkHelper::prepare_base_key_and_params($link);
+
         $template_url = self::MAIN_URL;
 
         if (array_key_exists('alternative', $extra)) {
@@ -52,9 +54,9 @@ public static function prepare_url(Link $link, $extra = []): string
 
         return Str::replace(
             ["[domain]", "[product_key]", "[ref]"],
-            [$link->store->domain, $link->key, $link->store->referral],
+            [$link->store->domain, $link_base, $link->store->referral],
 
-            $template_url);
+            $template_url)."&{$link_params}";
     }
 
     public function get_name(): void
@@ -91,7 +93,6 @@ public function get_image(): void
             }
         }
 
-
     }
 
     public function get_total_reviews(): void

app/Classes/Stores/Argos.php

@@ -5,6 +5,7 @@
 use App\Classes\Crawler\SimpleCrawler;
 use App\Classes\StoreTemplate;
 use App\Helpers\GeneralHelper;
+use App\Helpers\LinkHelper;
 use App\Models\Link;
 use Illuminate\Support\Str;
 
@@ -32,10 +33,12 @@ public function __construct(Link $link, array $extra_headers = [], ?string $user
 
     public static function prepare_url(Link $link, array $extra = []): string
     {
+        [$link_base, $link_params] = LinkHelper::prepare_base_key_and_params($link);
+
         return Str::replace(
             ["[domain]", "[product_key]"],
             [$link->store->domain, $link->key],
-            self::MAIN_URL);
+            self::MAIN_URL)."?{$link_params}";
 
     }