From 9ebad062051bc33e741d7ff98dff055f2c0ab321 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Sun, 7 Jan 2024 16:25:15 +0100 Subject: [PATCH] New customer_numbers now begin with 10 again --- application/Address/AddressModel.php | 10 ++++++---- scripts/{ => adb-rimo-import}/rimo-import-test.php | 0 2 files changed, 6 insertions(+), 4 deletions(-) rename scripts/{ => adb-rimo-import}/rimo-import-test.php (100%) diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php index 4bc868620..62f80f9c0 100644 --- a/application/Address/AddressModel.php +++ b/application/Address/AddressModel.php @@ -111,13 +111,15 @@ class AddressModel { public static function getLastCustomerNumber() { $db = FronkDB::singleton(); - $res = $db->select("Address","customer_number", "customer_number > 0 ORDER BY customer_number DESC LIMIT 1"); - if(!$db->num_rows($res)) { - return false; - } + $res = $db->select("Address","customer_number", "customer_number > 0 AND customer_number < 200000 ORDER BY customer_number DESC LIMIT 1"); if($db->num_rows($res)) { $data = $db->fetch_object($res); + if($data->customer_number + 1 >= 200000) { + $res = $db->select("Address","customer_number", "customer_number > 0 ORDER BY customer_number DESC LIMIT 1"); + $data = $db->fetch_object($res); + return $data->customer_number; + } return $data->customer_number; } diff --git a/scripts/rimo-import-test.php b/scripts/adb-rimo-import/rimo-import-test.php similarity index 100% rename from scripts/rimo-import-test.php rename to scripts/adb-rimo-import/rimo-import-test.php