Update sidebar script (#2)

* Update sidebar script

* Use dashboard domain

* Update domain names

* Change WWK_DOMAIN back to APP_DOMAIN

* Fix release file naming

Co-authored-by: tsanko <tsankohadzhiev@gmail.com>

Author: apeschar

bin/package

@@ -9,7 +9,7 @@ mkdir -p dist
 
 pathspec="README.txt upload"
 version="$(git describe --tags --match 'v*')"
-out="$PWD/dist/opencart3-webwinkelkeur-$version.zip"
+out="$PWD/dist/opencart3-webwinkelkeur-$version.ocmod.zip"
 
 echo "Packaging version $version" >&2
 

upload/catalog/controller/extension/module/webwinkelkeur.php

@@ -112,8 +112,7 @@ private function getScript() {
         }
 
         return
-            '<script>_webwinkelkeur_id=' . (int) $this->settings['shop_id'] . '</script>' .
-            '<script async src="https://' . $this->msg['APP_DOMAIN'] . '/js/sidebar.js"></script>';
+            sprintf("<script>(function(url,id){var script=document.createElement('script');script.async=true;script.src=url+'/sidebar.js?id='+id+'&c='+cachebuster(10,id);var ref=document.getElementsByTagName('script')[0];ref.parentNode.insertBefore(script,ref);function cachebuster(refreshMinutes,id){var now=Date.now();var interval=refreshMinutes*60e3;var shift=(Math.sin(id)||0)*interval;return Math.floor((now+shift)/interval);}})('https://%s',%d);</script>", $this->msg['DASHBOARD_DOMAIN'], (int) $this->settings['shop_id']);
 
         return $o;
     }

upload/catalog/model/extension/module/webwinkelkeur.php

@@ -82,7 +82,7 @@ public function sendInvites($debug = false) {
                 $post['order_data'] = json_encode($this->getOrderData($order));
             }
 
-            $url = 'https://' . $msg['API_DOMAIN'] . '/api/1.0/invitations.json?' . http_build_query($parameters);
+            $url = 'https://' . $msg['DASHBOARD_DOMAIN'] . '/api/1.0/invitations.json?' . http_build_query($parameters);
             $retriever = new Peschar_URLRetriever();
             $response = $retriever->retrieve($url, $post);
             if($this->isInviteSent($response)) {

upload/system/library/webwinkelkeur-messages.php

@@ -32,6 +32,6 @@
 'INVITE_GENERIC_ERROR' => 'De Webwinkelkeur-server kon niet worden bereikt.',
 
 // catalog
-'API_DOMAIN' => 'dashboard.webwinkelkeur.nl',
+'DASHBOARD_DOMAIN' => 'dashboard.webwinkelkeur.nl',
 'APP_DOMAIN' => 'www.webwinkelkeur.nl'
 );