From 9ee6dea980a71744622042ccea5e86ede293cccb Mon Sep 17 00:00:00 2001
From: Nurmuhammet Allanov <nurmuhammet@mail.com>
Date: Tue, 8 Jul 2025 17:15:09 +0500
Subject: [PATCH] loans done

---
 src/screens/Loan/CreateLoanOrderScreen.js  |  8 +++----
 src/screens/Loan/LoanOrderDetailsScreen.js | 25 +++++++++-------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/screens/Loan/CreateLoanOrderScreen.js b/src/screens/Loan/CreateLoanOrderScreen.js
index b5bf3d4..862fc22 100644
--- a/src/screens/Loan/CreateLoanOrderScreen.js
+++ b/src/screens/Loan/CreateLoanOrderScreen.js
@@ -300,9 +300,9 @@ const CreateLoanOrderScreen = () => {
     }
     setLoading(false);
     if (res.success) {
-      Alert.alert('Success', res.message || 'Order created', [{ text: 'OK', onPress: () => navigation.goBack() }]);
+      Alert.alert('Üstünlik', res.message || 'Order created', [{ text: 'OK', onPress: () => navigation.goBack() }]);
     } else {
-      Alert.alert('Error', res.error || 'Could not create');
+      Alert.alert('Ýalňyşlyk', res.error || 'Could not create');
     }
   };
 
@@ -350,10 +350,10 @@ const CreateLoanOrderScreen = () => {
 
         <Input label={req('Telefon (+9936...)')} value={phone} onChangeText={setPhone} keyboardType="numeric" error={submitted && !phone} />
         <Input label="Telefon goşmaça" value={phoneAdditional} onChangeText={setPhoneAdditional} keyboardType="numeric" />
-        <Input label={req('Öý telefony')} value={phoneHome} onChangeText={setPhoneHome} error={submitted && !phoneHome} />
+        <Input label={req('Öý telefony')} value={phoneHome} onChangeText={setPhoneHome} keyboardType="numeric" error={submitted && !phoneHome} />
 
         <Input label={req('Işleýän edaranyň/kärhananyň ady')} value={workCompany} onChangeText={setWorkCompany} error={submitted && !workCompany} />
-        <Input label={req('Işgärler bölüminiň iş belgisi')} value={workCompanyAccNum} onChangeText={setWorkCompanyAccNum} error={submitted && !workCompanyAccNum} />
+        <Input label={req('Işgärler bölüminiň iş belgisi')} value={workCompanyAccNum} onChangeText={setWorkCompanyAccNum} keyboardType="numeric" error={submitted && !workCompanyAccNum} />
         <SelectInput label={req('Işleýän welaýatyňyz')} value={workRegion} options={regionOptions} onValueChange={(val)=>{setWorkRegion(val); setWorkProvinceId('');}} placeholder="Saýla" error={submitted && !workRegion} />
         <SelectInput label={req('Işleýän etrabyňyz')} value={workProvinceId} options={workRegion && branchesByRegion[workRegion] ? branchesByRegion[workRegion].map(b=>({label:b.name,value:b.id})) : []} onValueChange={setWorkProvinceId} placeholder="Saýla" disabled={!workRegion} error={submitted && !workProvinceId} />
         <Input label={req('Wezipe')} value={workPosition} onChangeText={setWorkPosition} error={submitted && !workPosition} />
diff --git a/src/screens/Loan/LoanOrderDetailsScreen.js b/src/screens/Loan/LoanOrderDetailsScreen.js
index cb72455..e24a409 100644
--- a/src/screens/Loan/LoanOrderDetailsScreen.js
+++ b/src/screens/Loan/LoanOrderDetailsScreen.js
@@ -173,12 +173,11 @@ const LoanOrderDetailsScreen = () => {
         {/* Applicant card info */}
         {order.card_number && (
           <>
-            <Text style={styles.sectionTitle}>Kartanyň maglumatlary (Arza beriji)</Text>
+            <Text style={styles.sectionTitle}>Kart maglumatlary (Arza beriji)</Text>
             <View style={styles.detailCard}>
-              {order.card_name && <DetailRow label="Kartanyň ady" value={order.card_name} />}
-              <DetailRow label="Kartanyň belgisi" value={order.card_number} />
-              {order.card_month && <DetailRow label="Karta – aý" value={order.card_month} />}
-              {order.card_year && <DetailRow label="Karta – ýyl" value={order.card_year} showBorder={false} />}
+              {order.card_name && <DetailRow label="Kartdaky ady" value={order.card_name} />}
+              <DetailRow label="Kart belgisi" value={order.card_number} />
+              {order.card_month && order.card_year && <DetailRow label="Kart möhleti" value={`${order.card_month}/${order.card_year}`} showBorder={false} />}
             </View>
           </>
         )}
@@ -189,11 +188,9 @@ const LoanOrderDetailsScreen = () => {
             <Text style={styles.sectionTitle}>Zamun (1)</Text>
             <View style={styles.detailCard}>
               <DetailRow label="Doly ady" value={guarantorFullName} />
-              {order.guarantor_card_name && <DetailRow label="Kartanyň ady" value={order.guarantor_card_name} />}
-              {order.guarantor_card_number && <DetailRow label="Kartanyň belgisi" value={order.guarantor_card_number} />}
-              {order.guarantor_card_month && <DetailRow label="Karta – aý" value={order.guarantor_card_month} />}
-              {order.guarantor_card_year && <DetailRow label="Karta – ýyl" value={order.guarantor_card_year} />}
-              {order.guarantor_note && <DetailRow label="Bellik" value={order.guarantor_note} showBorder={false} />}
+              {order.guarantor_card_name && <DetailRow label="Kartdaky ady" value={order.guarantor_card_name} />}
+              {order.guarantor_card_number && <DetailRow label="Kart belgisi" value={order.guarantor_card_number} />}
+              {order.guarantor_card_month && order.guarantor_card_year && <DetailRow label="Kart möhleti" value={`${order.guarantor_card_month}/${order.guarantor_card_year}`} showBorder={false} />}
             </View>
           </>
         )}
@@ -204,11 +201,9 @@ const LoanOrderDetailsScreen = () => {
             <Text style={styles.sectionTitle}>Zamun (2)</Text>
             <View style={styles.detailCard}>
               <DetailRow label="Doly ady" value={guarantor2FullName} />
-              {order.guarantor_2_card_name && <DetailRow label="Kartanyň ady" value={order.guarantor_2_card_name} />}
-              {order.guarantor_2_card_number && <DetailRow label="Kartanyň belgisi" value={order.guarantor_2_card_number} />}
-              {order.guarantor_2_card_month && <DetailRow label="Karta – aý" value={order.guarantor_2_card_month} />}
-              {order.guarantor_2_card_year && <DetailRow label="Karta – ýyl" value={order.guarantor_2_card_year} />}
-              {order.guarantor_2_note && <DetailRow label="Bellik" value={order.guarantor_2_note} showBorder={false} />}
+              {order.guarantor_2_card_name && <DetailRow label="Kartdaky ady" value={order.guarantor_2_card_name} />}
+              {order.guarantor_2_card_number && <DetailRow label="Kart belgisi" value={order.guarantor_2_card_number} />}
+              {order.guarantor_2_card_month && order.guarantor_2_card_year && <DetailRow label="Kart möhleti" value={`${order.guarantor_2_card_month}/${order.guarantor_2_card_year}`} showBorder={false} />}
             </View>
           </>
         )}