bibweb.git

@@ -15,7 +15,9 @@ $kunde = [];

 if (isset($_SESSION['lname']) && !isset($_SESSION['kundennr'])) {

     $kunde = suche_kunde($_SESSION['lname'], $_SESSION['phone']);

     if ($kunde) {

-        $_SESSION['kundennr'] = $kunde['id'];

+        $_SESSION['kundennr'] = $kunde['uuid'];

+        $_SESSION['phonenumbers'] = $kunde['phone'];

+        $_SESSION['emailaddrs'] = $kunde['email'];

         // Vorname in den Auftragsdaten

         if (!(isset($_SESSION['fname']) && $_SESSION['fname']) && isset($kunde['firstname']) && $kunde['firstname']) {

             $_SESSION['fname'] = $kunde['firstname'];

@@ -32,14 +34,14 @@ if (isset($_REQUEST['error'])) {

 $headline = 'Adresse eingeben';

-if (isset($_SESSION['kundennr']) && $_SESSION['kundennr'] && kunde_hat_adresse($_SESSION['kundennr'])) {

+if (isset($_SESSION['kundennr']) && $_SESSION['kundennr'] && isset($kunde['missing']) && !in_array('city', $kunde['missing'])) {

     $headline = 'Willkommen zurück!';

     $content .= '

         <p>Schön, wir kennen uns ja schon! Aus Datenschutzgründen wird Ihre Adresse hier nicht angezeigt. Sofern Sie Änderungen an Ihren Kundendaten wünschen, sprechen Sie uns bitte vor Ort darauf an.</p>';

     $content .= '

         <form class="form" action="save.php" method="post">

         <input type="hidden" name="form" value="address">';

-    if (!kunde_hat_email($_SESSION['kundennr'])) {

+    if (isset($kunde['missing']) && in_array('email', $kunde['missing'])) {

         $content .= '<p><strong>Dürfen wir Sie per E-Mail benachrichtigen?</strong><br>Wir kennen bisher noch keine E-Mail-Adresse von Ihnen. Wenn Sie uns eine E-Mail-Adresse angeben, können wir Sie auch per E-Mail über die Fertigstellung Ihres Auftrags benachrichtigen.</p>

         <div class="form-group form-group-lg row mb-3">

             <div class="col-sm-12"><input class="form-control" id="email" name="email" type="email" placeholder="E-Mail-Adresse" autocomplete="email"></div>

@@ -70,12 +72,11 @@ if (isset($_SESSION['kundennr']) && $_SESSION['kundennr'] && kunde_hat_adresse($

         "plz" => "PLZ",

         "ort" => "Ort");

     $placeholders = $fields;

-    $contents = $kunde;

+    $contents = [];

     foreach ($fields as $field => $label) {

-        if (isset($kunde[$field]) && $kunde[$field] == 'bekannt') {

-            $placeholders[$field] = $label.' wie beim letzten Besuch';

-            $contents[$field] = '';

-        } elseif (!isset($contents[$field])) {

+        if (isset($_SESSION[$field])) {

+            $contents[$field] = $_SESSION[$field];

+        } else {

             $contents[$field] = '';

         }

@@ -18,6 +18,9 @@ $(function () {

     $('#modal-frischsaft').on('shown.bs.modal', function () {

         // Setzt den Fokus auf das Eingabefeld mit der ID 'frischsaft'

         $('#frischsaft').focus();

+        if ($('#frischsaft').val() != '') {

+            $('#submit').prop('disabled', false);

+        }

     });

     $('#frischsaft').on('input', function () {

@@ -6,79 +6,6 @@ use GuzzleHttp\Psr7\Request;

 require_once("config.php");

 $base_url = $config['api_url'];

-$TOKEN_FILE = '../jwt-token.json';

-$jwt = [

-    "token" => null,

-    "refresh_token" => null,

-    "exp" => time()

-];

-

-if (file_exists($TOKEN_FILE)) {

-    $jwt = json_decode(file_get_contents($TOKEN_FILE), true);

-}

-

-if ($jwt['refresh_token'] && $jwt['exp'] < time()+5) {

-    // refresh token

-    $url = $base_url . 'token/refresh';

-    $data = ["refresh_token" => $jwt['refresh_token']];

-    $options = array(

-      'http' => array(

-        'method'  => 'POST',

-        'content' => json_encode( $data ),

-        'header'=>  "Content-Type: application/json\r\n" .

-                    "Accept: application/json\r\n"

-        )

-    );

-

-    $context = stream_context_create( $options );

-    $result = @file_get_contents( $url, false, $context );

-    if (!$result) {

-        print('Es gibt gerade ein technisches Problem.');

-        die();

-    }

-    $response = json_decode( $result, true);

-

-    $jwt['token'] = $response["token"];

-    $jwt['refresh_token'] = $response["refresh_token"];

-    $fields = explode('.', $jwt['token']);

-    $data = json_decode(base64_decode($fields[1]), true);

-    $jwt['exp'] = $data['exp'];

-}

-

-if (!$jwt['token'] || $jwt['exp'] < time()+5) {

-    // get new token

-    # init API

-    $url = $base_url . 'login';

-    $data = [

-        "username" => $config['api_username'],

-        "password" => $config['api_password']

-    ];

-    $options = array(

-      'http' => array(

-        'method'  => 'POST',

-        'content' => json_encode( $data ),

-        'header'=>  "Content-Type: application/json\r\n" .

-                    "Accept: application/json\r\n"

-        )

-    );

-

-    $context = stream_context_create( $options );

-    $result = @file_get_contents( $url, false, $context );

-    if (!$result) {

-        print('Es gibt gerade ein technisches Problem.');

-        die();

-    }

-    $response = json_decode( $result, true);

-

-    $jwt['token'] = $response["token"];

-    $jwt['refresh_token'] = $response["refresh_token"];

-    $fields = explode('.', $jwt['token']);

-    $data = json_decode(base64_decode($fields[1]), true);

-    $jwt['exp'] = $data['exp'];

-}

-

-file_put_contents($TOKEN_FILE, json_encode($jwt));

-

 function api_call($method, $url, $content = []) 

 {

@@ -89,8 +16,7 @@ function api_call($method, $url, $content = [])

     $headers = [

         "Content-Type" => "application/json",

-        "Accept" => "application/json",

-        "Authorization" => "Bearer ".$jwt['token']

+        "Accept" => "application/json"

         ];

     $body = json_encode( $content );

     $client = new Client(["http_errors" => false]);

@@ -2,162 +2,25 @@

 require_once('api.php');

-function phonetisch_reduzieren($word)

-{

-    $original = $word;

-    $word=strtolower($word);

-    $substitution=array(

-            "ä"=>"ae",

-            "ö"=>"oe",

-            "ü"=>"ue",

-            "ß"=>"ss",

-            "ph"=>"f",

-            "dr." => "",

-            "dr " => "",

-            "prof." => "",

-            "prof " => ""

-            );

-

-    foreach ($substitution as $letter=>$substitution) {

-        $word=str_replace($letter,$substitution,$word);

-    }

-    $result = trim($word);

-    return $result;

-}

-

-

 function suche_kunde($name, $number) {

         global $content;

         if (! $number) {

             return NULL;

         }

-        $ret = api_call('GET', 'customerContacts/search/'.format_number_api($number));

-        if ($ret['status_code'] >= 400) {

-            foreach ($ret['data']['validation_errors'] as $item) {

-                $_SESSION['warning'][] = $item['message'];

-            }

-            return null;

-        }

-        $ret = $ret['data'];

-        if (count($ret) > 0) {

-            $name = strtolower($name);

-            foreach ($ret as $item) {

-                $cust = $item['customer'];

-                if ((isset($cust['lastname']) && phonetisch_reduzieren($name) == phonetisch_reduzieren($cust['lastname'])) ||

-                    (isset($cust['firstname']) && phonetisch_reduzieren($name) == phonetisch_reduzieren($cust['firstname'])) ||

-                    (isset($cust['firstname']) && isset($cust['lastname']) && phonetisch_reduzieren($name) == phonetisch_reduzieren($cust['firstname'] .' '. $cust['lastname'])) ||

-                    (isset($cust['firstname']) && isset($cust['lastname']) && phonetisch_reduzieren($name) == phonetisch_reduzieren($cust['lastname'] .' '. $cust['firstname'])) ||

-                    (isset($cust['firstname']) && isset($cust['lastname']) && phonetisch_reduzieren($name) == phonetisch_reduzieren($cust['lastname'] .', '. $cust['firstname']))

-                    ) {

-                    return $cust;

-                }

-            }

-        }

-        return null;

-

-        /*

-        $kundenliste = json_decode(file_get_contents('../kunden.json'), TRUE);

-        foreach ($kundenliste as $k) {

-                foreach ($k['kontakt'] as $kon) {

-                        if ($kon['wert'] == $number) {

-                                return $k;

-                        }

-                }

-        }

-        */

-}

-

-function kunde_erste_kontakte($customerno) {

-    $ret = api_call('GET', 'customers/'.(int) $customerno);

-    if ($ret['status_code'] >= 400) {

-        // Fehler. Belästige den Kunden nicht damit

-        return [];

-    }

-    $ret = $ret['data'];

-    $kontakte = [];

-    if (isset($ret['phone']) && str_starts_with($ret['phone'], '+491')) {

-        $kontakte['mobil'] = $ret['phone'];

-    }

-    if (isset($ret['email']) && $ret['email']) {

-        $kontakte['email'] = $ret['email'];

-    }

-    foreach ($ret['contacts'] as $c) {

-        if (!isset($kontakte['mobil']) && isset($c['phone']) && str_starts_with($c['phone'], '+491')) {

-            $kontakte['mobil'] = $c['phone'];

-        }

-        if (!isset($kontakte['email']) && isset($c['email']) && $c['email']) {

-            $kontakte['email'] = $c['email'];

-        }

-    }

-    return $kontakte;

-}

-

-

-function kunde_hat_adresse($customerno) {

-    $ret = api_call('GET', 'customers/'.(int) $customerno);

-    if ($ret['status_code'] >= 400) {

-        // Fehler. Belästige den Kunden nicht damit

-        return true;

-    }

-    $ret = $ret['data'];

-    if (isset($ret['city']) && trim($ret['city']) != '') {

-        return true;

-    }

-    return false;

-}

-

-

-

-function kunde_hat_email($customerno) {

-    $ret = api_call('GET', 'customers/'.(int) $customerno);

-    if ($ret['status_code'] >= 400) {

-        // Fehler. Belästige den Kunden nicht damit

-        return true;

-    }

-    $ret = $ret['data'];

-    if (isset($ret['email']) && $ret['email']) {

-        return true;

-    }

-    foreach ($ret['contacts'] as $c) {

-        if (isset($c['email']) && $c['email']) {

-            return true;

-        }

-    }

-    return false;

-}

-

-

-

-function update_kunde($customerno, $daten) {

-    $ret = api_call('GET', 'customers/'.(int) $customerno);

-    if ($ret['status_code'] >= 400) {

-        // Fehler. Erstelle Neukunde

-        erstelle_kunde($daten);

-        return;

-    }

-    $customer = $ret['data'];

-

-    foreach ($daten as $field => $value) {

-        if ($value) {

-            $customer[$field] = $value;

-        }

-    }

+        $searchdata = array(

+            "name" => $name,

+            "phone" => $number

+        );

-    $filename = '../data/'.date('Y').'/'.time().'-kunde-'.$customerno.'.json';

-    @file_put_contents($filename, json_encode($customer));

-    $ret = api_call('PUT', 'customers/'.(int) $customerno, $customer);

-    if ($ret['status_code'] >= 400) {

-        foreach ($ret['data']['validation_errors'] as $item) {

-            $_SESSION['warnings'][] = $item['key'].': '.$item['message'];

-        }

+        $ret = api_call('POST', 'anonymous/identify', $searchdata);

+        if ($ret['status_code'] == 404) {

             return null;

         }

-    $ret = $ret['data'];

-    if (isset($ret['id'])) {

-        return $ret['id'];

-    } else {

+        if ($ret['status_code'] != 200) {

+            // Fehler

             return null;

         }

+        return $ret["data"];

 }

@@ -173,7 +36,7 @@ function erstelle_kunde($daten) {

         "contacts" => []];

     $filename = '../data/'.date('Y').'/'.time().'-neukunde.json';

     @file_put_contents($filename, json_encode($json));

-    $ret = api_call('POST', 'customers', $json);

+    $ret = api_call('POST', 'anonymous/newcustomer', $json);

     if ($ret['status_code'] >= 400) {

         foreach ($ret['data']['validation_errors'] as $item) {

             $_SESSION['warnings'][] = $item['key'].': '.$item['message'];

@@ -181,8 +44,8 @@ function erstelle_kunde($daten) {

         return null;

     }

     $ret = $ret['data'];

-    if (isset($ret['id'])) {

-        return $ret['id'];

+    if (isset($ret['uuid'])) {

+        return $ret['uuid'];

     } else {

         return null;

     }

@@ -9,7 +9,7 @@ function namen_korrigieren($name) {

     // Wenn CAPS-Lock an war, korrigieren wir das

     // Wir entfernen nicht-alphab. Zeichen, um nur die Buchstaben zu prüfen.

     // Wir verwenden mb_strtoupper() und mb_strtolower() für Multibyte-Sicherheit.

-    $nur_buchstaben = preg_replace('/[^a-zA-ZäöüÄÖÜß]/', '', $name);

+    $nur_buchstaben = preg_replace('/[^a-zA-ZÄäÖöÜüßÁáÀàÂâÃãÅåÇçÉéÈèÊêëÍíÌìÎîÏïÑñÓóÒòÔôÕõØøŒœŚśŞşÚúÙùÛûÝýŸÿŽž]/', '', $name);

     if (!empty($nur_buchstaben) && $nur_buchstaben === mb_strtoupper($nur_buchstaben, 'UTF-8')) {

         // Wenn alle Buchstaben Großbuchstaben sind (Caps-Lock aktiv),

@@ -17,35 +17,26 @@ $content = '<p>Wie möchten Sie bevorzugt kontaktiert werden, wenn Ihr Auftrag e

     <div class="row mb-1 g-3">';

 $num = 0;

-$kontakte = kunde_erste_kontakte($_SESSION['kundennr']);

+$phonenumbers = array_filter($_SESSION['phonenumbers'], function($v) {

+    return str_starts_with($v, '+491');

+});

+$emailaddrs = $_SESSION['emailaddrs'];

-if (isset($kontakte['mobil'])) {

-    $num+=2;

-}

-if (isset($kontakte['email'])) {

-    $num++;

-}

+$num = count($phonenumbers) * 2 + count($emailaddrs);

 if ($num < 2) {

     // Nichts zum aussuchen!

     header('Location: gitterbox.php');

 }

-if (isset($kontakte['mobil'])) {

-    $phone = format_number_national($_SESSION['phone']);

-    if (!str_starts_with($phone, '01')) {

-        $phone = format_number_national($kontakte['mobil']);

-    }

+foreach ($phonenumbers as $phone) {

+    $phone = format_number_national($phone);

     $content .= '

         <div class="col-sm-6"><a href="#" class="btn btn-lg btn-light w-100" id="btn-whatsapp">Whatsapp an<br> '.$phone.'</a></div>';

     $content .= '

         <div class="col-sm-6"><a href="#" class="btn btn-lg btn-light w-100" id="btn-sms">SMS an<br> '.$phone.'</a></div>';

 }

-if (isset($kontakte['email'])) {

-    $email = $kontakte['email'];

-    if ($_SESSION['email'] != $kontakte['email']) {

-        $email = $kontakte['email'];

-    }

+foreach ($emailaddrs as $email) {

     $content .= '

         </div>

         <div class="row">

@@ -90,7 +90,7 @@ if (isset($_REQUEST['form'])) {

             if (isset($_REQUEST['phone']) && trim($_REQUEST['phone']) != '') {

                 $number = trim($_REQUEST['phone']);

             }

-            if (substr($number, 0, 1) != 0 && substr($number, 0, 3) != '+49') {

+            if (substr($number, 0, 1) != "0" && substr($number, 0, 3) != '+49') {

                 $number = '07192'.$number;

             }

@@ -133,12 +133,18 @@ if (isset($_REQUEST['form'])) {

             }

             if (!isset($_SESSION['kundennr']) || !$_SESSION['kundennr']) {

                 $_SESSION['kundennr'] = erstelle_kunde($_SESSION);

+                $_SESSION['phonenumbers'] = [$_SESSION['phone']];

+                $_SESSION['emailaddrs'] = [];

+                if ($_SESSION['email'] != '') {

+                    $_SESSION['emailaddrs'][] = $_SESSION['email'];

+                }

                 if (!$_SESSION['kundennr']) {

                     showError();

                     }

             } else {

                 if (isset($_SESSION['email']) && $_SESSION['email']) {

-                    update_kunde($_SESSION['kundennr'], ['email' => $_SESSION['email']]);

+                    // Not implemented

+                    //update_kunde($_SESSION['kundennr'], ['email' => $_SESSION['email']]);

                 }

             }

@@ -269,18 +275,11 @@ if (isset($_SESSION['neue'])) {

     // customer

     if (isset($_SESSION['kundennr'])) {

         $auftrag['customer'] = $_SESSION['kundennr'];

-        $auftrag['notificationName'] = $_SESSION['name'];

-        $auftrag['notificationPhone'] = $_SESSION['phone'];

-        $auftrag['notificationEmail'] = isset($_SESSION['email']) ? $_SESSION['email'] : null;

+        $auftrag['name'] = $_SESSION['name'];

+        $auftrag['phone'] = $_SESSION['phone'];

+        $auftrag['email'] = isset($_SESSION['email']) ? $_SESSION['email'] : null;

         $auftrag['notificationPreference'] = $_SESSION['notificationPreference'];

-    }

-    // fruitType

-    $ret = api_call('GET', 'fruitTypes');

-    $ret = $ret['data'];

-    foreach ($ret as $fruit) {

-        if ($_SESSION['obstart'] == $fruit['label']) {

-            $auftrag['fruitType'] = $fruit['id'];

-        }

+        $auftrag['fruitTypeName'] = $_SESSION['obstart'];

     }

     // containers

     if (isset($_SESSION['lieferart']) && $_SESSION['lieferart'] == 'gitterbox' && isset($_SESSION['gbcount']) && $_SESSION['gbcount'] > 0) {

@@ -298,36 +297,34 @@ if (isset($_SESSION['neue'])) {

     }

     // usedPackages

     if (isset($_SESSION['kartons'])) {

-        $auftrag['usedPackages'] = (bool) $_SESSION['kartons'];

+        $auftrag['haveUsed'] = (bool) $_SESSION['kartons'];

     }

     // plannedPackagings

     if (isset($_SESSION['neue'])) {

+        $plan = [];

         if ($_SESSION['neue'] == 'sonstiges') {

             $auftrag['notes'] = (isset($_SESSION['anmerkungen']) ? $_SESSION['anmerkungen'] . "\n\n" : '') . $_SESSION["sonstiges"];

+        } else {

+            $plan[] = [

+                "packageType" => $_SESSION['neue'],

+                "wish" => "rest"

+            ];

         }

-        $plan = [];

-        $ret = api_call('GET', 'packageTypes');

-        $ret = $ret['data'];

-        foreach ($ret as $pt) {

-            if ($pt['label'] == $_SESSION['neue']) {

-                $plan[] = [ "packageType" => $pt['id'],

-                            "rest" => true ];

-            }

-            if ($pt['label'] == 'frischsaft' && isset($_SESSION['frischsaft']) && $_SESSION['frischsaft'] > 0) {

-                $plan[] = [ "packageType" => $pt['id'],

-                            "count" => $_SESSION['frischsaft']];

-            }

+        if (isset($_SESSION['frischsaft']) && $_SESSION['frischsaft'] > 0) {

+            $plan[] = [

+                "packageType" => "frischsaft",

+                "wish" => $_SESSION['frischsaft']

+            ];

         }

-        $auftrag['plannedPackagings'] = $plan;

+

+        $auftrag['wishes'] = $plan;

     }

     // notes

-    if (!isset($auftrag['notes'])) {

     $auftrag['notes'] = '';

-    }

     if (isset($_SESSION['anmerkungen']) && $_SESSION['anmerkungen'] != '') {

         $auftrag['notes'] = $_SESSION['anmerkungen'] . (isset($_SESSION["sonstiges"]) ? "\n\n" . $_SESSION["sonstiges"] : '');

     }

@@ -346,10 +343,10 @@ if (isset($_SESSION['neue'])) {

     @file_put_contents($filename, json_encode($auftrag));

      if (isset($_SESSION['orderid']) && $_SESSION['orderid']) {

         // update

-        $ret = api_call('PUT', 'orders/'.$_SESSION['orderid'], $auftrag);

+        $ret = api_call('PUT', 'anonymous/updateorder/'.$_SESSION['orderid'], $auftrag);

     } else {

         // neu

-        $ret = api_call('POST', 'orders', $auftrag);

+        $ret = api_call('POST', 'anonymous/neworder', $auftrag);

     }

     if ($ret['status_code'] >= 400) {

         foreach ($ret['data']['validation_errors'] as $item) {

@@ -358,7 +355,7 @@ if (isset($_SESSION['neue'])) {

         return showError();

     }

     $ret = $ret['data'];

-    $_SESSION['orderid'] = $ret['id'];

+    $_SESSION['orderid'] = $ret['uuid'];

     if (!isset($ret['id'])) {

         echo "Es gabe einen Fehler beim Abspeichern des Auftrags. Wir bitten dies zu entschuldigen und einen Papierauftrag auszufüllen.";