phone number + country

src/controllers/checkout.rs

@@ -21,6 +21,8 @@ const PAYMENT_METHODS: [&str; 2] = ["cod", "bank_transfer"];
 #[derive(Debug, Deserialize)]
 struct CheckoutForm {
     email: String,
+    phone_prefix: String,
+    phone: String,
     customer_name: String,
     address: String,
     city: String,
@@ -111,6 +113,25 @@ async fn place_order(
     }
     let email =
         trimmed(&form.email).ok_or_else(|| Error::BadRequest("email is required".to_string()))?;
+    // Combine the dialling-code prefix with the local number into one E.164-ish
+    // value (e.g. "+421 900123456").
+    let number =
+        trimmed(&form.phone).ok_or_else(|| Error::BadRequest("phone is required".to_string()))?;
+    let phone = match trimmed(&form.phone_prefix) {
+        Some(prefix) => format!("{prefix} {number}"),
+        None => number,
+    };
+
+    // Contact and shipping-address fields are mandatory (also enforced in the
+    // browser via `required`).
+    let require = |value: &str, field: &str| -> Result<String> {
+        trimmed(value).ok_or_else(|| Error::BadRequest(format!("{field} is required")))
+    };
+    let customer_name = require(&form.customer_name, "name")?;
+    let address = require(&form.address, "address")?;
+    let city = require(&form.city, "city")?;
+    let zip = require(&form.zip, "zip")?;
+    let country = require(&form.country, "country")?;
 
     if !PAYMENT_METHODS.contains(&form.payment_method.as_str()) {
         return Err(Error::BadRequest("invalid payment method".to_string()));
@@ -141,11 +162,12 @@ async fn place_order(
         &valid,
         orders::Checkout {
             email,
-            customer_name: trimmed(&form.customer_name),
-            address: trimmed(&form.address),
-            city: trimmed(&form.city),
-            zip: trimmed(&form.zip),
-            country: trimmed(&form.country),
+            phone,
+            customer_name: Some(customer_name),
+            address: Some(address),
+            city: Some(city),
+            zip: Some(zip),
+            country: Some(country),
             note: form.note.as_deref().and_then(trimmed),
             payment_method: form.payment_method,
             method,