diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts
index 9c9e62d0..2ee80bf6 100644
--- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts
+++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts
@@ -242,7 +242,7 @@ export class ConfirmLoginComponent implements OnInit {
const request = new SendActivationByType();
this.authService.setPublicFields(request);
request.OTP_SendType = type;
- request.MobileNumber = '0593233758';//this.loginData.MobileNumber;
+ request.MobileNumber = this.loginData.MobileNumber;
request.smsSignature = this.signature;
request.IsMobileFingerPrint = 0;
diff --git a/Mohem/src/app/itemforsale/home/home.component.html b/Mohem/src/app/itemforsale/home/home.component.html
index bab5694f..31f9008e 100644
--- a/Mohem/src/app/itemforsale/home/home.component.html
+++ b/Mohem/src/app/itemforsale/home/home.component.html
@@ -22,7 +22,7 @@
{{ts.trPK('itemforsale','select-category')}}
{{ts.trPK('itemforsale','completed')}}
-
+
@@ -34,7 +34,7 @@
{{ts.trPK('itemforsale','add-details')}}
- {{step >2 ? "Completed" : "Locked"}}
+ {{step >2 ? ts.trPK('itemforsale','completed') :ts.trPK('itemforsale','locked')}}
@@ -42,9 +42,9 @@
=3" style="content: url(/assets/imgs/check-white.svg)">
{{ts.trPK('itemforsale','review-sell')}}
- {{step >3 ? "Completed" : "Locked"}}
+ {{step >3 ? ts.trPK('itemforsale','completed') : ts.trPK('itemforsale','locked')}}
-
+
diff --git a/Mohem/src/app/itemforsale/home/home.component.scss b/Mohem/src/app/itemforsale/home/home.component.scss
index f01790d6..4d2ce583 100644
--- a/Mohem/src/app/itemforsale/home/home.component.scss
+++ b/Mohem/src/app/itemforsale/home/home.component.scss
@@ -117,6 +117,10 @@ margin-left:0px
margin-right: 0px;
left: 40%;
}
+.md-stepper-horizontal .md-step .md-step-bar-right {
+ margin-right: 0px;
+ right: 40%;
+}
.orange .md-step-bar-left {
background:#CC9B14 !important;
font-weight: bold;
diff --git a/Mohem/src/app/itemforsale/item-details/item-details.component.html b/Mohem/src/app/itemforsale/item-details/item-details.component.html
index 016dbdb3..00a52680 100644
--- a/Mohem/src/app/itemforsale/item-details/item-details.component.html
+++ b/Mohem/src/app/itemforsale/item-details/item-details.component.html
@@ -59,12 +59,12 @@
diff --git a/Mohem/src/app/itemforsale/item-details/item-details.component.scss b/Mohem/src/app/itemforsale/item-details/item-details.component.scss
index bcd3e47a..6bcb6c6e 100644
--- a/Mohem/src/app/itemforsale/item-details/item-details.component.scss
+++ b/Mohem/src/app/itemforsale/item-details/item-details.component.scss
@@ -76,4 +76,9 @@ ion-footer{
margin: 0px;
position: relative;
left: -10px;
+}
+.icon-footer-ar{
+ margin: 0px;
+ position: relative;
+ left: 5px;
}
\ No newline at end of file
diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html
index 0862eebb..9fe58466 100644
--- a/Mohem/src/app/itemforsale/items/items.component.html
+++ b/Mohem/src/app/itemforsale/items/items.component.html
@@ -129,7 +129,7 @@
-
+
diff --git a/Mohem/src/app/itemforsale/items/items.component.scss b/Mohem/src/app/itemforsale/items/items.component.scss
index f98ef940..941a4b51 100644
--- a/Mohem/src/app/itemforsale/items/items.component.scss
+++ b/Mohem/src/app/itemforsale/items/items.component.scss
@@ -160,6 +160,10 @@ ion-item .icon{
position: absolute;
right: 0px;
}
+.edit-ar{
+ position: absolute;
+ left: 0px;
+}
.fab-button{
position: fixed;
bottom: 5%;
diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html
index ca16c02d..9e43f968 100644
--- a/Mohem/src/app/profile/home/home.component.html
+++ b/Mohem/src/app/profile/home/home.component.html
@@ -169,7 +169,7 @@
-
+
{{ts.trPK('general','basic-details')}}
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index 76791853..6d6e196d 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -1967,17 +1967,17 @@
"en": "Team Statistics",
"ar": "إحصائيات الفريق"
},
- "subordinate-leave":{
- "en":"Subordinate Leave",
- "ar":"إجازة التابعيين"
+ "subordinate-leave": {
+ "en": "Subordinate Leave",
+ "ar": "إجازة التابعيين"
},
- "select-duration":{
- "en":"Select Duration",
- "ar":"اختر الفترة"
+ "select-duration": {
+ "en": "Select Duration",
+ "ar": "اختر الفترة"
},
- "no-of-days":{
- "en":"No. of days",
- "ar":"عدد الايام"
+ "no-of-days": {
+ "en": "No. of days",
+ "ar": "عدد الايام"
}
},
"searchForReplacment": {
@@ -2083,9 +2083,9 @@
"en": "Are you sure you want to submit?",
"ar": "هل انت متاكد من ارسال الطلب؟"
},
- "cei":{
- "en":"child Education",
- "ar":"تعليم الطفل"
+ "cei": {
+ "en": "child Education",
+ "ar": "تعليم الطفل"
}
},
"submitAbsence": {
@@ -3193,6 +3193,10 @@
"en": "This ad will be valid for 2 week after approval",
"ar": "هذا الإعلان ساري المفعول لمدة أسبوعين بعد الموافقة"
},
+ "locked": {
+ "en": "Locked",
+ "ar": "مقفل"
+ },
"title": {
"en": "Item for sale",
"ar": "سلعه للبيع"