Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SW-448: fixed automatic form filling for new control center #516

Merged
merged 3 commits into from
Mar 20, 2024
+142 −134
Merged

SW-448: fixed automatic form filling for new control center #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
464eb3b
SW-448: fixed automatic form filling for new control center
fatchip-Stefan Feb 20, 2024
ea44ac6
SW-447: fixed regexp patterns and applepay file uploads in new contro…
Mar 13, 2024
3eb9e38
SW-447: fixed regexp patterns and applepay file uploads in new contro…
Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Frontend/MoptPaymentPayone/Controllers/Backend/FcPayone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,14 +961,14 @@ public function ajaxgeneralconfigAction()

public function ajaxgetGeneralConfigAction()
{
$data = array();
$this->Front()->Plugins()->Json()->setRenderer(true);

$paymentid = $this->Request()->getParam('paymentid');
$data['data'] = $this->get('MoptPayoneMain')->getPayoneConfig($paymentid, true);
$data['status'] = 'success';
$encoded = json_encode($data);
echo $encoded;
exit(0); /** @phpstan-ignore-line */
}

public function ajaxriskcheckAction()
Expand Down Expand Up @@ -1075,6 +1075,7 @@ public function ajaxsavetextblocksAction()

$encoded = json_encode($data);
echo $encoded;
exit(0); /** @phpstan-ignore-line */
}

public function ajaxSavePaymentConfigAction()
Expand All @@ -1086,6 +1087,7 @@ public function ajaxSavePaymentConfigAction()
$data['message'] = 'Zahlungsart erfolgreich gespeichert!';
$encoded = json_encode($data);
echo $encoded;
exit(0); /** @phpstan-ignore-line */
}

public function ajaxSavePayoneConfigAction()
Expand All @@ -1098,6 +1100,7 @@ public function ajaxSavePayoneConfigAction()
$this->createPayoneCreditcardConfig($paymentData);
$encoded = json_encode($data);
echo $encoded;
exit(0); /** @phpstan-ignore-line */
}

public function ajaxSaveIframeConfigAction()
Expand All @@ -1109,6 +1112,7 @@ public function ajaxSaveIframeConfigAction()
$this->createIframeConfig($paymentData);
$encoded = json_encode($data);
echo $encoded;
exit(0); /** @phpstan-ignore-line */
}

public function ajaxSavePaypalConfigAction()
Expand Down Expand Up @@ -1140,6 +1144,7 @@ public function ajaxSavePaypalConfigAction()
}
$encoded = json_encode($data);
echo $encoded;
exit(0); /** @phpstan-ignore-line */
}

public function ajaxSaveApplepayCertAction()
Expand Down Expand Up @@ -1175,6 +1180,7 @@ public function ajaxSaveApplepayCertAction()

}
echo $response;
exit(0); /** @phpstan-ignore-line */
}

public function ajaxSaveApplepayKeyAction()
Expand Down Expand Up @@ -1211,6 +1217,7 @@ public function ajaxSaveApplepayKeyAction()

}
echo $response;
exit(0); /** @phpstan-ignore-line */
}

public function updateSnippet($options)
Expand Down
42 changes: 21 additions & 21 deletions Frontend/MoptPaymentPayone/Views/backend/fc_payone/ajaxaddresscheck.tpl
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions Frontend/MoptPaymentPayone/Views/backend/fc_payone/ajaxconfig.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<img src="{link file='backend/_resources/images/information.png'}" data-toggle="popover" title="PAYONE Hilfe" data-content="Schlüssel des zu verwendenden Zahlungsportal">
<label for="apiKey" class="text-left col-md-3 control-label">{s name="fieldlabel/apiKey"}Schlüssel{/s}</label>
<div class="col-md-6">
<input type="text" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="40" id="apiKey" name="apiKey" aria-describedby="apiKey-status" >
<input type="text" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="40" id="apiKey" name="apiKey" aria-describedby="apiKey-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="apiKey-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand Down Expand Up @@ -168,13 +168,14 @@
});

$("#startTest").on('click', function () {
var mid = document.getElementById('merchantId').value;
var aid = document.getElementById('subaccountId').value;
var pid = document.getElementById('portalId').value;
var apikey = document.getElementById('apiKey').value;
var mid = encodeURIComponent(document.getElementById('merchantId').value);
var aid = encodeURIComponent(document.getElementById('subaccountId').value);
var pid = encodeURIComponent(document.getElementById('portalId').value);
var apikey = encodeURIComponent(document.getElementById('apiKey').value);
var myurl = testurl + '?mid=' + mid + '&aid=' + aid + '&pid=' + pid + '&apikey=' + apikey;
alert(myurl)
$.ajax({
url: myurl,
url: myurl,
type: 'get',
dataType: 'json',

Expand Down
12 changes: 6 additions & 6 deletions Frontend/MoptPaymentPayone/Views/backend/fc_payone/ajaxcreditcard.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<label for="description" class="text-left col-md-3 control-label">{s name="formpanel_description_label"}Bezeichnung{/s}</label>
<div class="col-md-6">
<input type="text" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" name="description" aria-describedby="description-status" >
<input type="text" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" name="description" aria-describedby="description-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="description-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand All @@ -48,7 +48,7 @@

<label for="additionalDescription" class="text-left col-md-3 control-label">{s name="formpanel_additional-description_label"}Zusätzliche Beschreibung{/s}</label>
<div class="col-md-6">
<textarea rows="3" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="additionalDescription" name="additionalDescription" aria-describedby="additionalDescription-status" >
<textarea rows="3" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="additionalDescription" name="additionalDescription" aria-describedby="additionalDescription-status" >
</textarea>
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="additionalDescription-status" class="sr-only">(success)</span>
Expand Down Expand Up @@ -89,7 +89,7 @@

<label for="active" class="text-left col-md-3 control-label">{s name="formpanel_active_label"}Aktiv{/s}</label>
<div class="col-md-6">
<input type="checkbox" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="active" name="active" aria-describedby="active-status" >
<input type="checkbox" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="active" name="active" aria-describedby="active-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="active-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand All @@ -99,7 +99,7 @@

<label for="esdActive" class="text-left col-md-3 control-label">{s name="formpanel_esdActive_label"}Aktiv für ESD-Produkte{/s}</label>
<div class="col-md-6">
<input type="checkbox" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="esdActive" name="esdActive" aria-describedby="esdActive-status" >
<input type="checkbox" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="esdActive" name="esdActive" aria-describedby="esdActive-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="esdActive-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand All @@ -109,7 +109,7 @@

<label for="mobileInactive" class="text-left col-md-3 control-label">{s name="formpanel_mobileInactive_label"}Inaktiv für Smartphone{/s}</label>
<div class="col-md-6">
<input type="checkbox" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="mobileInactive" name="mobileInactive" aria-describedby="mobileInactive-status" >
<input type="checkbox" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="mobileInactive" name="mobileInactive" aria-describedby="mobileInactive-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="mobileInactive-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand All @@ -119,7 +119,7 @@

<label for="checkCc" class="text-left col-md-3 control-label">{s name="fieldlabel/checkCc"}Abfrage Kreditkartenprüfziffer<br>(nur global konfigurierbar){/s}</label>
<div class="col-md-6">
<select class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="checkCc" name="checkCc" aria-describedby="checkCc-status" >
<select class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="0" maxlength="200" id="checkCc" name="checkCc" aria-describedby="checkCc-status" >
<option value="true">Ja</option>
<option value="false">Nein</option>
</select>
Expand Down
18 changes: 9 additions & 9 deletions Frontend/MoptPaymentPayone/Views/backend/fc_payone/ajaxdebit.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<label for="description" class="text-left col-md-3 control-label">{s name="formpanel_description_label"}Bezeichnung{/s}</label>
<div class="col-md-6">
<input type="text" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="description" name="description" aria-describedby="description-status" >
<input type="text" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="description" name="description" aria-describedby="description-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="description-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand All @@ -48,7 +48,7 @@

<label for="additionalDescription" class="text-left col-md-3 control-label">{s name="formpanel_additional-description_label"}Zusätzliche Beschreibung{/s}</label>
<div class="col-md-6">
<textarea rows="3" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="additionalDescription" name="additionalDescription" aria-describedby="additionalDescription-status" >
<textarea rows="3" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="additionalDescription" name="additionalDescription" aria-describedby="additionalDescription-status" >
</textarea>
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="additionalDescription-status" class="sr-only">(success)</span>
Expand Down Expand Up @@ -89,7 +89,7 @@

<label for="active" class="text-left col-md-3 control-label">{s name="formpanel_active_label"}Aktiv{/s}</label>
<div class="col-md-6">
<input type="checkbox" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="active" name="active" aria-describedby="active-status" >
<input type="checkbox" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="active" name="active" aria-describedby="active-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="active-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand All @@ -99,7 +99,7 @@

<label for="esdActive" class="text-left col-md-3 control-label">{s name="formpanel_esdActive_label"}Aktiv für ESD-Produkte{/s}</label>
<div class="col-md-6">
<input type="checkbox" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="esdActive" name="esdActive" aria-describedby="esdActive-status" >
<input type="checkbox" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="esdActive" name="esdActive" aria-describedby="esdActive-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="esdActive-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand All @@ -109,7 +109,7 @@

<label for="mobileInactive" class="text-left col-md-3 control-label">{s name="formpanel_mobileInactive_label"}Inaktiv für Smartphone{/s}</label>
<div class="col-md-6">
<input type="checkbox" class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="mobileInactive" name="mobileInactive" aria-describedby="mobileInactive-status" >
<input type="checkbox" class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="mobileInactive" name="mobileInactive" aria-describedby="mobileInactive-status" >
<span class="glyphicon form-control-feedback glyphicon-remove" aria-hidden="true"></span>
<span id="mobileInactive-status" class="sr-only">(success)</span>
<div class="help-block with-errors"></div>
Expand All @@ -119,7 +119,7 @@

<label for="showAccountnumber" class="text-left col-md-3 control-label">{s name="fieldlabel/showAccountnumber"}Zusätzlich Kontonummer/Bankleitzahl anzeigen?{/s}</label>
<div class="col-md-6">
<select class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="showAccountnumber" name="showAccountnumber" aria-describedby="showAccountnumber-status" >
<select class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="showAccountnumber" name="showAccountnumber" aria-describedby="showAccountnumber-status" >
<option value="true">Ja</option>
<option value="false">Nein</option>
</select>
Expand All @@ -132,7 +132,7 @@

<label for="showBic" class="text-left col-md-3 control-label">{s name="fieldlabel/showBic"}Zusätzlich zur IBAN auch BIC abfragen?{/s}</label>
<div class="col-md-6">
<select class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="showBic" name="showBic" aria-describedby="showBic-status" >
<select class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="showBic" name="showBic" aria-describedby="showBic-status" >
<option value="true">Ja</option>
<option value="false">Nein</option>
</select>
Expand All @@ -145,7 +145,7 @@

<label for="mandateActive" class="text-left col-md-3 control-label">{s name="fieldlabel/mandateActive"}Mandatserteilung aktivieren?{/s}</label>
<div class="col-md-6">
<select class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="mandateActive" name="mandateActive" aria-describedby="mandateActive-status" >
<select class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="mandateActive" name="mandateActive" aria-describedby="mandateActive-status" >
<option value="true">Ja</option>
<option value="false">Nein</option>
</select>
Expand All @@ -158,7 +158,7 @@

<label for="mandateDownloadEnabled" class="text-left col-md-3 control-label">{s name="fieldlabel/mandateDownloadEnabled"}Download Mandat als PDF?{/s}</label>
<div class="col-md-6">
<select class="form-control " pattern='^[_ .()+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="mandateDownloadEnabled" name="mandateDownloadEnabled" aria-describedby="mandateDownloadEnabled-status" >
<select class="form-control " pattern='^[_ .+-?,:;"!@#$%^&*ÄÖÜäöüa-zA-Z0-9]*' minlength="1" maxlength="200" id="mandateDownloadEnabled" name="mandateDownloadEnabled" aria-describedby="mandateDownloadEnabled-status" >
<option value="true">Ja</option>
<option value="false">Nein</option>
</select>
Expand Down
Loading
Loading