Skip to content

Commit

Permalink
Merge pull request #105 from PrestaShopCorp/dev
Browse files Browse the repository at this point in the history
Release v1.2.1
  • Loading branch information
matks authored Sep 28, 2020
2 parents 1609172 + 8e50a85 commit 3b5240b
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 11 deletions.
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
target-branch: dev
- package-ecosystem: composer
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
target-branch: dev
2 changes: 1 addition & 1 deletion psgdpr.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function __construct()
// Settings
$this->name = 'psgdpr';
$this->tab = 'administration';
$this->version = '1.2.0';
$this->version = '1.2.1';
$this->author = 'PrestaShop';
$this->need_instance = 0;

Expand Down
22 changes: 12 additions & 10 deletions views/js/overrideAddress.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@
* International Registered Trademark & Property of PrestaShop SA
*/

$(window).load(function() {
let addressShipping = $('#addressShipping');
addressShipping.empty();
addressShipping.append('<p>'+psgdprNoAddresses+'</p>');
addressShipping.css("visibility", "visible");

let addressInvoice = $('#addressInvoice');
addressInvoice.empty();
addressInvoice.append('<p>'+psgdprNoAddresses+'</p>');
addressInvoice.css("visibility", "visible");
document.addEventListener('DOMContentLoaded', function() {
let addressShipping = document.getElementById('addressShipping');
if (addressShipping) {
addressShipping.innerHTML = '<p>'+psgdprNoAddresses+'</p>';
addressShipping.style.visibility = "visible";
}

let addressInvoice = document.getElementById('addressInvoice');
if (addressInvoice) {
addressInvoice.innerHTML = '<p>'+psgdprNoAddresses+'</p>';
addressInvoice.style.visibility = "visible";
}
});

0 comments on commit 3b5240b

Please sign in to comment.