Compare commits
4 Commits
5828269a70
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5345b86a25 | ||
|
|
f458be3293 | ||
|
|
a08d0527b4 | ||
|
|
458c216fea |
41
admin.php
41
admin.php
@@ -38,8 +38,9 @@ function generate_admin_page()
|
|||||||
<div class="info">
|
<div class="info">
|
||||||
<p class="info">Vul hier de lokale postcodereeksen in.</p>
|
<p class="info">Vul hier de lokale postcodereeksen in.</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Het formaat voor een reeks is #### | #### (voorbeeld: 5000 | 5199).</li>
|
<li>Het formaat voor een reeks is #### - #### (voorbeeld: 5000 - 5199).</li>
|
||||||
<li>Plaats één reeks op één regel.</li>
|
<li>Plaats één reeks op één regel.</li>
|
||||||
|
<li>Een reeks van 1 is geldig. (voorbeeld: 5000 - 5000)</li>
|
||||||
<li>Om een reeks te verwijderen. Wis de reeks en sla vervolgens de wijzigen op.</li>
|
<li>Om een reeks te verwijderen. Wis de reeks en sla vervolgens de wijzigen op.</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@@ -86,6 +87,7 @@ function local_postcodes_admin_css()
|
|||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
height: 50vh !important;
|
height: 50vh !important;
|
||||||
font-size: 1.1rem;
|
font-size: 1.1rem;
|
||||||
|
font-family: "Consolas", "Monaco", "Courier New", monospace;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -101,13 +103,13 @@ function local_postcodes_input_validate($input)
|
|||||||
{
|
{
|
||||||
$valid_input = "";
|
$valid_input = "";
|
||||||
$lines = preg_split("/\R/", $input, -1, PREG_SPLIT_NO_EMPTY);
|
$lines = preg_split("/\R/", $input, -1, PREG_SPLIT_NO_EMPTY);
|
||||||
$pattern = '/^\d{4}\s*\|\s*\d{4}$/';
|
$pattern = '/^\d{4}\s*\-\s*\d{4}$/';
|
||||||
$pc_arr = [];
|
$pc_arr = [];
|
||||||
|
|
||||||
foreach ($lines as $line) {
|
foreach ($lines as $line) {
|
||||||
$line = trim($line);
|
$line = trim($line);
|
||||||
if (preg_match($pattern, $line)) {
|
if (preg_match($pattern, $line)) {
|
||||||
$parts = explode("|", $line);
|
$parts = explode("-", $line);
|
||||||
$first = (int) $parts[0];
|
$first = (int) $parts[0];
|
||||||
$second = (int) $parts[1];
|
$second = (int) $parts[1];
|
||||||
|
|
||||||
@@ -120,22 +122,45 @@ function local_postcodes_input_validate($input)
|
|||||||
add_settings_error(
|
add_settings_error(
|
||||||
"local_postcodes_error_messages",
|
"local_postcodes_error_messages",
|
||||||
"invalid_postcode_" . md5($line),
|
"invalid_postcode_" . md5($line),
|
||||||
'Ongeldige regel: "' .
|
'❌️ Ongeldige regel: "' .
|
||||||
esc_html($line) .
|
esc_html($line) .
|
||||||
'". Gebruik het formaat #### | ####.(bijvoorbeeld: 5000 | 5199)',
|
'". Gebruik het formaat #### - ####.(bijvoorbeeld: 5000 - 5199)',
|
||||||
"error",
|
"error",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sorteer de VOLLEDIGE array NA de foreach-lus
|
|
||||||
usort($pc_arr, function ($a, $b) {
|
usort($pc_arr, function ($a, $b) {
|
||||||
return $a[0] <=> $b[0];
|
return $a[0] <=> $b[0];
|
||||||
});
|
});
|
||||||
|
|
||||||
// Bouw $valid_input op uit de gesorteerde $pc_arr
|
$old_pc_arr_len = count($pc_arr);
|
||||||
|
$pc_arr = array_map(
|
||||||
|
"unserialize",
|
||||||
|
array_unique(array_map("serialize", $pc_arr)),
|
||||||
|
);
|
||||||
|
$new_pc_arr_len = count($pc_arr);
|
||||||
|
|
||||||
|
if ($new_pc_arr_len < $old_pc_arr_len) {
|
||||||
|
add_settings_error(
|
||||||
|
"local_postcodes_error_messages",
|
||||||
|
"Duplicaten",
|
||||||
|
// @formatter:off
|
||||||
|
"⚠️ " .
|
||||||
|
$old_pc_arr_len -
|
||||||
|
$new_pc_arr_len .
|
||||||
|
" " .
|
||||||
|
($old_pc_arr_len - $new_pc_arr_len > 1
|
||||||
|
? "duplicaten"
|
||||||
|
: "duplicaat") .
|
||||||
|
" verwijderd.",
|
||||||
|
// @formatter:on
|
||||||
|
"warning",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($pc_arr as $range) {
|
foreach ($pc_arr as $range) {
|
||||||
$valid_input .= $range[0] . " | " . $range[1] . "\n";
|
$valid_input .= $range[0] . " - " . $range[1] . "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
return $valid_input;
|
return $valid_input;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ require_once plugin_dir_path(__FILE__) . "admin.php";
|
|||||||
* Plugin Name: prijzen per poscode range
|
* Plugin Name: prijzen per poscode range
|
||||||
* Description: posctcodes in de 5000-5800 range krijgen een lokaal tarief aangeboden.
|
* Description: posctcodes in de 5000-5800 range krijgen een lokaal tarief aangeboden.
|
||||||
* Author: Remo Zaros
|
* Author: Remo Zaros
|
||||||
* Version: 0.9.4
|
* Version: 0.9.5
|
||||||
* Text Domeain: prijs-per-postcode
|
* Text Domeain: prijs-per-postcode
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
session_start();
|
|
||||||
function init_postcode_handlers($uri)
|
function init_postcode_handlers($uri)
|
||||||
{
|
{
|
||||||
if (strpos($uri, "/winkel/") !== false) {
|
if (strpos($uri, "/winkel/") !== false) {
|
||||||
@@ -72,14 +71,14 @@ function send_postcode_data()
|
|||||||
console.log("Data returnd", data);
|
console.log("Data returnd", data);
|
||||||
|
|
||||||
if (data.status === "error"){
|
if (data.status === "error"){
|
||||||
const err = data.message;
|
const err = data.code;
|
||||||
let errmsg
|
let errmsg
|
||||||
|
|
||||||
switch (err) {
|
switch (err) {
|
||||||
case "Huisnummer not found":
|
case "HUISNUMMER_NOT_FOUND":
|
||||||
errmsg = "Adres niet gevonden.";
|
errmsg = "Adres niet gevonden.";
|
||||||
break;
|
break;
|
||||||
case "Multiple addresses match this huisnummer; add huisletter and/or huisnummertoevoeging":
|
case "HUISNUMMER_AMBIGUOUS":
|
||||||
errmsg = "Huisnummertovoeging mist.";
|
errmsg = "Huisnummertovoeging mist.";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -278,7 +277,7 @@ function postcode_in_range($postcode)
|
|||||||
|
|
||||||
foreach ($rows as $row) {
|
foreach ($rows as $row) {
|
||||||
$row = trim($row);
|
$row = trim($row);
|
||||||
$postcode_range = explode("|", $row);
|
$postcode_range = explode("-", $row);
|
||||||
$pc_arr[] = [(int) $postcode_range[0], (int) $postcode_range[1]];
|
$pc_arr[] = [(int) $postcode_range[0], (int) $postcode_range[1]];
|
||||||
}
|
}
|
||||||
$cleanPostcode = strtoupper(preg_replace("/\s+/", "", $postcode));
|
$cleanPostcode = strtoupper(preg_replace("/\s+/", "", $postcode));
|
||||||
@@ -326,7 +325,7 @@ function modify_checkout_with_js()
|
|||||||
if (typeof wp !== 'undefined' && wp.data && wp.data.dispatch) {
|
if (typeof wp !== 'undefined' && wp.data && wp.data.dispatch) {
|
||||||
const store = 'wc/store/cart';
|
const store = 'wc/store/cart';
|
||||||
|
|
||||||
wp.data.dispatch(store).setShippingAddress({
|
wp.data.dispatch(store).setBillingAddress({
|
||||||
first_name: '',
|
first_name: '',
|
||||||
last_name: '',
|
last_name: '',
|
||||||
address_1: '<?php echo esc_js($address); ?>',
|
address_1: '<?php echo esc_js($address); ?>',
|
||||||
@@ -342,7 +341,7 @@ function modify_checkout_with_js()
|
|||||||
//make fields READONLY and ppstcode reset.
|
//make fields READONLY and ppstcode reset.
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
// make prefilled fiields readonly.
|
// make prefilled fiields readonly.
|
||||||
$('#shipping-postcode, #shipping-city, #shipping-address_1')
|
$('#billing-postcode, #billing-city, #billing-address_1')
|
||||||
.prop('readonly', true)
|
.prop('readonly', true)
|
||||||
.css('background', '#f9f9f9');
|
.css('background', '#f9f9f9');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user