v3.0.4.0 => v3.0.4.1

ocmod-space · Dec 5, 2024 · ab570fb · ab570fb
1 parent a978a54
commit ab570fb
Show file tree

Hide file tree

Showing 17 changed files with 235 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change log (3.0.x.x)
 
+## 2024.12.06
+### Updated
+  - symfony/deprecation-contracts (v2.5.3 => v2.5.4)
+  - twig/twig (v3.11.1 => v3.11.3)
+  - Basic version (v3.0.4.0 => v3.0.4.1).
+### Added
+  - Added whatismyipaddress to customer_search_info report [#14244](https://github.com/opencart/opencart/pull/14244/commits/1d0bdb1ce0dcb391e6dd904018b1aa384e136d86)
+### Fixed
+  - Whitespaces.
+
 ## 2024.11.15
 ### Updated
   - JQuery 3.7.1

diff --git a/admin/index.php b/admin/index.php
@@ -1,7 +1,7 @@
 <?php
 
 // Version
-define('VERSION', '3.0.4.0.20241115');
+define('VERSION', '3.0.4.1.20241206');
 
 // Configuration
 if (is_file('config.php')) {

diff --git a/admin/view/javascript/common.js b/admin/view/javascript/common.js
@@ -53,7 +53,7 @@ $(document).ready(function() {
 			}
 		}
 	}
-	
+
 	// tooltip remove
 	$('[data-toggle=\'tooltip\']').on('remove', function() {
 		$(this).tooltip('destroy');
@@ -63,10 +63,10 @@ $(document).ready(function() {
 	$(document).on('click', '[data-toggle=\'tooltip\']', function(e) {
 		$('body > .tooltip').remove();
 	});
-	
+
 	$('#button-menu').on('click', function(e) {
 		e.preventDefault();
-		
+
 		$('#column-left').toggleClass('active');
 	});
 
@@ -81,13 +81,13 @@ $(document).ready(function() {
 		// Sets active and open to selected page in the left column menu.
 		$('#menu a[href=\'' + sessionStorage.getItem('menu') + '\']').parent().addClass('active');
 	}
-	
+
 	$('#menu a[href=\'' + sessionStorage.getItem('menu') + '\']').parents('li > a').removeClass('collapsed');
-	
+
 	$('#menu a[href=\'' + sessionStorage.getItem('menu') + '\']').parents('ul').addClass('in');
-	
+
 	$('#menu a[href=\'' + sessionStorage.getItem('menu') + '\']').parents('li').addClass('active');
-	
+
 	// Image Manager
 	$(document).on('click', 'a[data-toggle=\'image\']', function(e) {
 		var $element = $(this);
@@ -115,11 +115,11 @@ $(document).ready(function() {
 
 		$element.popover('show');
 
-		setTimeout(function(){ // fix bind events on new popover when 
+		setTimeout(function() { // fix bind events on new popover when 
 
 			$('#button-image').on('click', function() {
 				var $button = $(this);
-				var $icon   = $button.find('> i');
+				var $icon = $button.find('> i');
 
 				$('#modal-image').remove();
 
@@ -156,9 +156,9 @@ $(document).ready(function() {
 
 				$element.popover('destroy');
 			});
-			
+
 		}, 250); // end timeout fix
-			
+
 	});
 });
 
@@ -190,7 +190,7 @@ $(document).ready(function() {
 
 			// Keydown
 			$this.on('keydown', function(event) {
-				switch(event.keyCode) {
+				switch (event.keyCode) {
 					case 27: // escape
 						this.hide();
 						break;

diff --git a/admin/view/template/extension/report/customer_search_info.twig b/admin/view/template/extension/report/customer_search_info.twig
@@ -58,15 +58,15 @@
               </tr>
             </thead>
             <tbody>
-            
+
             {% if searches %}
             {% for search in searches %}
             <tr>
               <td class="text-left">{{ search.keyword }}</td>
               <td class="text-left">{{ search.products }}</td>
               <td class="text-left">{{ search.category }}</td>
               <td class="text-left">{{ search.customer }}</td>
-              <td class="text-left">{{ search.ip }}</td>
+              <td class="text-left"><a href="https://whatismyipaddress.com/ip/{{ search.ip }}" target="_blank">{{ search.ip }}</a></td>
               <td class="text-left">{{ search.date_added }}</td>
             </tr>
             {% endfor %}
@@ -76,7 +76,7 @@
             </tr>
             {% endif %}
             </tbody>
-            
+
           </table>
         </div>
         <div class="row">
@@ -90,46 +90,46 @@
 <script type="text/javascript"><!--
 $('#button-filter').on('click', function() {
 	var url = '';
-	
+
 	var filter_date_start = $('input[name=\'filter_date_start\']').val();
-	
+
 	if (filter_date_start) {
 		url += '&filter_date_start=' + encodeURIComponent(filter_date_start);
 	}
-	
+
 	var filter_date_end = $('input[name=\'filter_date_end\']').val();
-	
+
 	if (filter_date_end) {
 		url += '&filter_date_end=' + encodeURIComponent(filter_date_end);
 	}
-	
+
 	var filter_keyword = $('input[name=\'filter_keyword\']').val();
-	
+
 	if (filter_keyword) {
 		url += '&filter_keyword=' + encodeURIComponent(filter_keyword);
 	}
-	
+
 	var filter_customer = $('input[name=\'filter_customer\']').val();
-	
+
 	if (filter_customer) {
 		url += '&filter_customer=' + encodeURIComponent(filter_customer);
 	}
-	
+
 	var filter_ip = $('input[name=\'filter_ip\']').val();
-	
+
 	if (filter_ip) {
 		url += '&filter_ip=' + encodeURIComponent(filter_ip);
 	}
-	
+
 	location = 'index.php?route=report/report&code=customer_search&user_token={{ user_token }}' + url;
 });
-//--></script> 
+//--></script>
 <script type="text/javascript"><!--
 $('.date').datetimepicker({
 	language: '{{ datepicker }}',
 	pickTime: false
 });
-//--></script> 
+//--></script>
 <script type="text/javascript"><!--
 $('input[name=\'filter_customer\']').autocomplete({
 	'source': function(request, response) {
@@ -150,4 +150,4 @@ $('input[name=\'filter_customer\']').autocomplete({
 		$('input[name=\'filter_customer\']').val(item['label']);
 	}
 });
-//--></script>
+//--></script>
diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -1,7 +1,7 @@
 <?php
 
 // Version
-define('VERSION', '3.0.4.0.20241115');
+define('VERSION', '3.0.4.1.20241206');
 
 // Configuration
 if (is_file('config.php')) {

diff --git a/system/storage/vendor/bin/pscss b/system/storage/vendor/bin/pscss
diff --git a/system/storage/vendor/composer/installed.json b/system/storage/vendor/composer/installed.json
@@ -85,23 +85,23 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.3",
-            "version_normalized": "2.5.3.0",
+            "version": "v2.5.4",
+            "version_normalized": "2.5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "80d075412b557d41002320b96a096ca65aa2c98d"
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d",
-                "reference": "80d075412b557d41002320b96a096ca65aa2c98d",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/605389f2a7e5625f273b53960dc46aeaf9c62918",
+                "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
-            "time": "2023-01-24T14:02:46+00:00",
+            "time": "2024-09-25T14:11:13+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -135,7 +135,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.4"
             },
             "funding": [
                 {
@@ -482,17 +482,17 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.11.1",
-            "version_normalized": "3.11.1.0",
+            "version": "v3.11.3",
+            "version_normalized": "3.11.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "ff063afc691e1cfda6714f1915ed766cb108d188"
+                "reference": "3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/ff063afc691e1cfda6714f1915ed766cb108d188",
-                "reference": "ff063afc691e1cfda6714f1915ed766cb108d188",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e",
+                "reference": "3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e",
                 "shasum": ""
             },
             "require": {
@@ -507,7 +507,7 @@
                 "psr/container": "^1.0|^2.0",
                 "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
             },
-            "time": "2024-09-10T10:40:14+00:00",
+            "time": "2024-11-07T12:34:41+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -549,7 +549,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.11.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.11.3"
             },
             "funding": [
                 {