From 0d2b9aac4ece65ba89656fb03fb78d1de5d1301c Mon Sep 17 00:00:00 2001 From: "pieterjan.eilers" Date: Fri, 30 Aug 2024 13:59:10 +0200 Subject: [PATCH 1/6] all tools added --- modules/registrars/realtimeregister/hooks.php | 21 ++- .../src/Assets/Css/actions.css | 7 + .../src/Assets/Css/autorenew.css | 45 +++++++ .../src/Assets/Css/general.css | 53 ++++++++ .../src/Assets/Css/importdomains.css | 42 +++++- .../src/Assets/Js/importDomains.js | 30 ----- .../realtimeregister/src/Assets/Js/util.js | 25 ++++ .../src/Assets/Tpl/actions.tpl | 53 ++++++++ .../src/Assets/Tpl/autoRenew.tpl | 83 ++++++++++++ .../src/Assets/Tpl/content.tpl | 10 ++ .../src/Assets/Tpl/importDomains.tpl | 39 ++++-- .../src/Assets/Tpl/importDomainsStepThree.tpl | 41 +++--- .../src/Assets/Tpl/importDomainsStepTwo.tpl | 37 ++--- .../src/Assets/Tpl/syncDomains.tpl | 105 +++++++++++++++ .../realtimeregister/src/ConfigArray.php | 5 - .../src/Hooks/AutoRenewStatus.php | 63 +++++++++ .../src/Hooks/ImportDomains.php | 126 +++--------------- .../realtimeregister/src/Hooks/SyncExpiry.php | 53 ++++++++ .../src/Hooks/Widgets/ToolsWidget.php | 13 ++ .../realtimeregister/src/Services/Assets.php | 5 +- .../src/Services/TemplateService.php | 4 +- .../src/Widget/ToolsWidget.php | 26 ++++ 22 files changed, 672 insertions(+), 214 deletions(-) create mode 100644 modules/registrars/realtimeregister/src/Assets/Css/actions.css create mode 100644 modules/registrars/realtimeregister/src/Assets/Css/autorenew.css create mode 100644 modules/registrars/realtimeregister/src/Assets/Css/general.css delete mode 100644 modules/registrars/realtimeregister/src/Assets/Js/importDomains.js create mode 100644 modules/registrars/realtimeregister/src/Assets/Js/util.js create mode 100644 modules/registrars/realtimeregister/src/Assets/Tpl/actions.tpl create mode 100644 modules/registrars/realtimeregister/src/Assets/Tpl/autoRenew.tpl create mode 100644 modules/registrars/realtimeregister/src/Assets/Tpl/content.tpl create mode 100644 modules/registrars/realtimeregister/src/Assets/Tpl/syncDomains.tpl create mode 100644 modules/registrars/realtimeregister/src/Hooks/AutoRenewStatus.php create mode 100644 modules/registrars/realtimeregister/src/Hooks/SyncExpiry.php create mode 100644 modules/registrars/realtimeregister/src/Hooks/Widgets/ToolsWidget.php create mode 100644 modules/registrars/realtimeregister/src/Widget/ToolsWidget.php diff --git a/modules/registrars/realtimeregister/hooks.php b/modules/registrars/realtimeregister/hooks.php index 84026c7..84e1ddb 100644 --- a/modules/registrars/realtimeregister/hooks.php +++ b/modules/registrars/realtimeregister/hooks.php @@ -7,19 +7,30 @@ App::boot(); +// Utils +add_hook("AdminHomepage", 1, function() { + App::assets()->addScript("util.js"); + App::assets()->addStyle("general.css"); + App::assets()->addStyle("actions.css"); +}); + App::hook(Hooks\PreRegistrarGetContactDetails::class); -App::hook(Hooks\AdminAreaPage::class, 10); -App::hook("AdminAreaHeadOutput", Hooks\CheckCredentials::class, 1); +App::hook(Hooks\AdminAreaPage::class, null, 10); +App::hook("AdminAreaHeadOutput", Hooks\CheckCredentials::class); +App::hook("AdminHomepage", Hooks\SyncExpiry::class, 2); +App::hook("AdminHomepage", Hooks\ImportDomains::class, 2); +App::hook("AdminHomepage", Hooks\AutoRenewStatus::class ,2); + App::hook(Hooks\AdminAreaHeadOutput::class, null, 100); App::hook(Hooks\AdminAreaFooterOutput::class, null, 100); App::hook(Hooks\ClientAreaPage::class); App::hook(Hooks\ContactEdit::class); -App::hook("AdminAreaHeadOutput", Hooks\ImportDomains::class); -App::hook('AdminHomeWidgets', Hooks\Widgets\BalanceWidget::class); -App::hook('AdminHomeWidgets', Hooks\Widgets\DomainOverviewWidget::class); + +App::hook('AdminHomeWidgets', Hooks\Widgets\ToolsWidget::class); +//App::hook('AdminHomeWidgets', Hooks\Widgets\DomainOverviewWidget::class); App::hook('ClientAreaHeadOutput', Hooks\HeadAssets::class, 100); App::hook('ClientAreaFooterOutput', Hooks\FooterAssets::class, 100); diff --git a/modules/registrars/realtimeregister/src/Assets/Css/actions.css b/modules/registrars/realtimeregister/src/Assets/Css/actions.css new file mode 100644 index 0000000..c0bb3d9 --- /dev/null +++ b/modules/registrars/realtimeregister/src/Assets/Css/actions.css @@ -0,0 +1,7 @@ + + +.action-group { + display: flex; + flex-direction: column; + gap: 1rem; +} \ No newline at end of file diff --git a/modules/registrars/realtimeregister/src/Assets/Css/autorenew.css b/modules/registrars/realtimeregister/src/Assets/Css/autorenew.css new file mode 100644 index 0000000..74e30a2 --- /dev/null +++ b/modules/registrars/realtimeregister/src/Assets/Css/autorenew.css @@ -0,0 +1,45 @@ +.autorenew .failed_updates, +.autorenew .failed_domains, +.autorenew .processed_updates { + display: none; +} + +.autorenew .processed_updates { + font-weight: bold; +} + +.autorenew .failed_updates { + margin-top: 10px; + color: red; + font-weight: bold; +} + +.autorenew .failed_domains { + max-height: 170px; + overflow-y: scroll; + margin-top: 15px; + background-color: #f7e9e9; + padding: 15px; + border-radius: 3px; +} + +.autorenew .failed_domains p { + margin-top: 10px; + margin-bottom: 0; +} + +.autorenew .failed_domains p:first-child { + margin-top: 0; +} + +.autorenew .amount { + font-weight: bold; +} + +#renew_form .submit { + margin: 1rem 0; +} + +.autorenew .is-active { + display: block; +} \ No newline at end of file diff --git a/modules/registrars/realtimeregister/src/Assets/Css/general.css b/modules/registrars/realtimeregister/src/Assets/Css/general.css new file mode 100644 index 0000000..ee50008 --- /dev/null +++ b/modules/registrars/realtimeregister/src/Assets/Css/general.css @@ -0,0 +1,53 @@ +@keyframes move { + 0% { + background-position: 0 0; + } + 100% { + background-position: 50px 50px; + } +} + +.rtr-progress-bar { + display: none; + background-color: #f1f0e8; + position: relative; + height: 30px; + overflow: hidden; + border-radius: 3px; +} + +.rtr-progress-bar .progress-label { + color: white; + text-align: center; + height: 30px; + background-color: #2261a3; + width: 5%; + line-height: 30px; + position: relative; +} + +.rtr-progress-bar .progress-label .complete:after { + display: none; +} + +.rtr-progress-bar .progress-label:after { + content: ""; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + z-index: 1; + background-size: 50px 50px; + background-image: linear-gradient( + 45deg, + rgba(255, 255, 255, 0.2) 25%, + transparent 25%, + transparent 50%, + rgba(255, 255, 255, 0.2) 50%, + rgba(255, 255, 255, 0.2) 75%, + transparent 75%, + transparent + ); + animation: move 2s linear infinite; +} \ No newline at end of file diff --git a/modules/registrars/realtimeregister/src/Assets/Css/importdomains.css b/modules/registrars/realtimeregister/src/Assets/Css/importdomains.css index d7754d8..81be0a9 100644 --- a/modules/registrars/realtimeregister/src/Assets/Css/importdomains.css +++ b/modules/registrars/realtimeregister/src/Assets/Css/importdomains.css @@ -1,29 +1,53 @@ .stepwizard-row { + position: relative; display: flex; flex-direction: row; align-items: center; - gap: 1rem + justify-content: space-between; } .stepwizard-step { display: flex; align-items: center; - flex-direction: row; - gap: 0.75rem + flex-direction: column; + gap: 0.5rem; + z-index: 2; +} + +.stepwizard-row:before { + top: 14px; + bottom: 0; + position: absolute; + content: " "; + width: 100%; + height: 2px; + background-color: #ccc; } .btn-circle { width: 30px; height: 30px; - text-align: center; - padding: 6px 0; + padding: 0 0; font-size: 12px; line-height: 1.428571429; border-radius: 15px; } -.btn-circle:not(.btn-current) { - background: #79a8d0 !important; +.btn-circle:not(.btn-current):not(:disabled) { + color: #333333; + opacity: 1 !important; + background: #fff +} + +.btn-circle:disabled { + background-color: lightgrey; + border-color: grey; + opacity: 1 !important; +} + +.btn-circle:disabled:hover { + background-color: lightgrey; + border-color: grey; } .failed-domains { @@ -34,6 +58,10 @@ color: red; } +.rtr-progress-bar { + margin-top: 2rem; +} + .brand_overview, .failed_domains, .warning_domains { diff --git a/modules/registrars/realtimeregister/src/Assets/Js/importDomains.js b/modules/registrars/realtimeregister/src/Assets/Js/importDomains.js deleted file mode 100644 index 62f8e26..0000000 --- a/modules/registrars/realtimeregister/src/Assets/Js/importDomains.js +++ /dev/null @@ -1,30 +0,0 @@ -$(document).ready( - function () { - const moduleName = 'realtimeregister'; - const configContainer = $('#' + moduleName + 'config'); - - configContainer.on( - 'click', '.import-wizard', function (e) { - e.preventDefault(); - - const contentArea = $('#contentarea'); - - $.post( - window.location.href, - { - action: 'importWizard', - module: moduleName, - }, - function (response) { - contentArea.html(response); - window.scrollTo(0,0); - }, - "html" - ).fail( - function (e) { - } - ); - } - ); - } -); \ No newline at end of file diff --git a/modules/registrars/realtimeregister/src/Assets/Js/util.js b/modules/registrars/realtimeregister/src/Assets/Js/util.js new file mode 100644 index 0000000..ed9fbd7 --- /dev/null +++ b/modules/registrars/realtimeregister/src/Assets/Js/util.js @@ -0,0 +1,25 @@ +function setProgress(total, current) { + progress = (100 / total * current); + if (progress < 100) { + $(".rtr-progress-bar .progress-label").text(Math.floor(progress) + '%') + .stop(true, true) + .animate({ + width: Math.floor(progress) + '%' + }, 200); + } else { + progressComplete(); + } +} + +function showProgressBar() { + $(".rtr-progress-bar").show(); +} + +function progressComplete() { + $('.rtr-progress-bar .progress-label').addClass('complete'); + $(".rtr-progress-bar .progress-label").text('Complete!') + .stop(true, true) + .animate({ + width: '100%' + }, 200); +} \ No newline at end of file diff --git a/modules/registrars/realtimeregister/src/Assets/Tpl/actions.tpl b/modules/registrars/realtimeregister/src/Assets/Tpl/actions.tpl new file mode 100644 index 0000000..c41e464 --- /dev/null +++ b/modules/registrars/realtimeregister/src/Assets/Tpl/actions.tpl @@ -0,0 +1,53 @@ +
+ +
+ + + +
+ +
+
+
+
+ +

Action

+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/modules/registrars/realtimeregister/src/Assets/Tpl/autoRenew.tpl b/modules/registrars/realtimeregister/src/Assets/Tpl/autoRenew.tpl new file mode 100644 index 0000000..b00b763 --- /dev/null +++ b/modules/registrars/realtimeregister/src/Assets/Tpl/autoRenew.tpl @@ -0,0 +1,83 @@ +
+

+ Set the renewal for {count($domains)} domains to false +

+ +

Processed updates: 0/{count($domains)}

+ +
+
Processing...
+
+ +

Failed updates: 0

+
+ +
+ + +
+ +

+ NOTE: if you have .NL and .DE domains with a period shorter than 12 months, the auto-renew + status will not be changed.
+ .NL/.DE --> periods 1 and 3 months must be on AUTO_RENEW TRUE at Realtime Register.
+

+
+ + diff --git a/modules/registrars/realtimeregister/src/Assets/Tpl/content.tpl b/modules/registrars/realtimeregister/src/Assets/Tpl/content.tpl new file mode 100644 index 0000000..e1f2082 --- /dev/null +++ b/modules/registrars/realtimeregister/src/Assets/Tpl/content.tpl @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/modules/registrars/realtimeregister/src/Assets/Tpl/importDomains.tpl b/modules/registrars/realtimeregister/src/Assets/Tpl/importDomains.tpl index fe628a5..14ef299 100644 --- a/modules/registrars/realtimeregister/src/Assets/Tpl/importDomains.tpl +++ b/modules/registrars/realtimeregister/src/Assets/Tpl/importDomains.tpl @@ -1,4 +1,4 @@ -
+

This wizard will import domains from your Realtime Register account into WHMCS. Domain attributes like expiry date and status will be copied automatically. The importer will match up domain @@ -11,11 +11,11 @@ Setup

- + Confirm
- + Import
@@ -29,8 +29,7 @@ {/if}
-
-
+

Setup

@@ -68,7 +67,7 @@ import.
-
+
@@ -131,7 +130,7 @@
-
@@ -218,18 +218,20 @@ function setBrandSelection(type) { brandSelectionMethod = type; if (type === 'list') { - $('.brand-selection-list').removeClass('hidden'); + $('.brand-selection-list').show(); } else { - $('.brand-selection-list').addClass('hidden'); + $('.brand-selection-list').hide(); } } function setDomainSelection(type) { domainSelectionMethod = type; if (type === 'list') { - $('.domain-selection-list').removeClass('hidden'); + $('.domain-selection-list').show(); + $('.warning_domains').hide(); } else { - $('.domain-selection-list').addClass('hidden'); + $('.domain-selection-list').hide(); + $('.warning_domains').show(); } } @@ -276,6 +278,15 @@ $(function () { if (domainSelectionMethod === 'list') { $('.domain-selection-list textarea').val((fields.selectedDomains || []).join("\n")); + $('.warning_domains').hide(); + } else { + $('.domain-selection-list').hide(); + } + + if (brandSelectionMethod === 'list') { + $('.brand-selection-list').show(); + } else { + $('.brand-selection-list').hide(); } $('.step-one-form').on("submit", event => { @@ -284,7 +295,7 @@ return; } - const contentArea = $('#contentarea'); + const contentArea = $('.modal-body'); $.post( window.location.href, { diff --git a/modules/registrars/realtimeregister/src/Assets/Tpl/importDomainsStepThree.tpl b/modules/registrars/realtimeregister/src/Assets/Tpl/importDomainsStepThree.tpl index 9fb822a..3ddbdaa 100644 --- a/modules/registrars/realtimeregister/src/Assets/Tpl/importDomainsStepThree.tpl +++ b/modules/registrars/realtimeregister/src/Assets/Tpl/importDomainsStepThree.tpl @@ -6,7 +6,7 @@ Setup
- + Confirm
@@ -15,32 +15,28 @@
-