diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 46c390f..50dd4fc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,28 +24,28 @@
- ",
- "io.flutter.project.isFirstOpen": "true",
- "io.flutter.reload.alreadyRun": "true",
- "kotlin-language-version-configured": "true",
- "last_opened_file_path": "C:/Users/samanwaqar/Documents/GitHub/uco-mobile-poc",
- "project.structure.last.edited": "Project",
- "project.structure.proportion": "0.0",
- "project.structure.side.proportion": "0.2",
- "settings.editor.selected.configurable": "configurable.group.build",
- "show.migrate.to.gradle.popup": "false"
+ {
+ "keyToString": {
+ "Flutter.main.dart.executor": "Run",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "RunOnceActivity.readMode.enableVisualFormatting": "true",
+ "cf.first.check.clang-format": "false",
+ "cidr.known.project.marker": "true",
+ "dart.analysis.tool.window.visible": "false",
+ "git-widget-placeholder": "<unknown>",
+ "io.flutter.project.isFirstOpen": "true",
+ "io.flutter.reload.alreadyRun": "true",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "C:/Users/samanwaqar/Documents/GitHub/uco-mobile-poc",
+ "project.structure.last.edited": "Project",
+ "project.structure.proportion": "0.0",
+ "project.structure.side.proportion": "0.2",
+ "settings.editor.selected.configurable": "configurable.group.build",
+ "show.migrate.to.gradle.popup": "false"
}
-}]]>
+}
diff --git a/lib/app/models/SignupStep3RequestModel.dart b/lib/app/models/SignupStep3RequestModel.dart
index a801b1a..c1101ec 100644
--- a/lib/app/models/SignupStep3RequestModel.dart
+++ b/lib/app/models/SignupStep3RequestModel.dart
@@ -14,6 +14,7 @@ class SignupStep3RequestModel {
String channelCode = "";
String porOrgacode = "";
String dmpProdcode = "";
+ String plcLocacode ="";
SignupStep3RequestModel.empty()
: this.username = "",
@@ -30,7 +31,9 @@ class SignupStep3RequestModel {
this.userRole = "",
this.channelCode = "",
this.porOrgacode = "",
- this.dmpProdcode = "";
+ this.dmpProdcode = "",
+ this.plcLocacode="";
+
SignupStep3RequestModel({
this.username = "",
@@ -48,6 +51,7 @@ class SignupStep3RequestModel {
this.channelCode = "",
this.porOrgacode = "",
this.dmpProdcode = "",
+ this.plcLocacode="",
});
Map toMap() {
@@ -66,7 +70,8 @@ class SignupStep3RequestModel {
'userRole': userRole,
'channelCode': channelCode,
'porOrgacode': porOrgacode,
- "dmpProdcode": dmpProdcode
+ "dmpProdcode": dmpProdcode,
+ "plcLocacode": plcLocacode
};
}
@@ -87,11 +92,12 @@ class SignupStep3RequestModel {
channelCode: map['channelCode'] ?? "",
porOrgacode: map['porOrgacode'] ?? "",
dmpProdcode: map["dmpProdcode"] ?? "",
+ plcLocacode: map["plcLocacode"] ?? "",
);
}
@override
String toString() {
- return 'SignupStep3RequestModel{username: $username, email: $email, phone: $phone, name: $name, address: $address, identificationType: $identificationType, identificationNumber: $identificationNumber, isKycAdded: $isKycAdded, kycType: $kycType, kycDocumentId1: $kycDocumentId1, kycDocumentId2: $kycDocumentId2, userRole: $userRole, channelCode: $channelCode, porOrgacode: $porOrgacode}';
+ return 'SignupStep3RequestModel{username: $username, email: $email, phone: $phone, name: $name, address: $address, identificationType: $identificationType, identificationNumber: $identificationNumber, isKycAdded: $isKycAdded, kycType: $kycType, kycDocumentId1: $kycDocumentId1, kycDocumentId2: $kycDocumentId2, userRole: $userRole, channelCode: $channelCode, porOrgacode: $porOrgacode,plcLocacode: $plcLocacode}';
}
}
diff --git a/lib/app/modules/general_ledger/controllers/general_ledger_controller.dart b/lib/app/modules/general_ledger/controllers/general_ledger_controller.dart
index 694195c..e6a7439 100644
--- a/lib/app/modules/general_ledger/controllers/general_ledger_controller.dart
+++ b/lib/app/modules/general_ledger/controllers/general_ledger_controller.dart
@@ -1,8 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:pin_code_fields/pin_code_fields.dart';
-
-
import '../../../core/config/server_response.dart';
import '../../../core/constants/app_contants.dart';
import '../../../core/constants/translation_keys.dart';
@@ -43,7 +41,6 @@ class GeneralLedgerController extends GetxController {
transactionSubmitRequestModel = (arguments != null ? arguments[AppConstants.SEND_TRANS_STEP1_DATA] ?? GLACCAddMoneyRequestModel.empty() : GLACCAddMoneyRequestModel.empty());
evaluatedCurrencyModel.value = (arguments != null ? arguments[AppConstants.EXCHANGE_RATE] ?? EvaluatedCurrencyModel.empty() : EvaluatedCurrencyModel.empty());
-
fetchAllGlsAccounts();
}
diff --git a/lib/app/modules/general_ledger/views/general_ledger_view.dart b/lib/app/modules/general_ledger/views/general_ledger_view.dart
index b36d5a1..4776ab3 100644
--- a/lib/app/modules/general_ledger/views/general_ledger_view.dart
+++ b/lib/app/modules/general_ledger/views/general_ledger_view.dart
@@ -42,7 +42,7 @@ class GeneralLedgerView extends GetView {
padding: const EdgeInsets.symmetric(horizontal: 15, vertical: 15),
child: Column(
children: [
- // Text(TranslationKeys.makeTranslation(TranslationKeys.textSelectYourGLSAccount), style: Theme.of(context).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500, fontSize: 20)),
+ Text(TranslationKeys.makeTranslation(TranslationKeys.textSelectYourGLSAccount), style: Theme.of(context).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500, fontSize: 20)),
Card(
color: AppColors.colorGrey50,
margin: const EdgeInsets.symmetric(horizontal: 2, vertical: 10),
@@ -54,8 +54,8 @@ class GeneralLedgerView extends GetView {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
- // Text(TranslationKeys.makeTranslation(TranslationKeys.textConformation), style: Theme.of(context).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500, fontSize: 20)),
- // const SizedBox(height: 10),
+ Text(TranslationKeys.makeTranslation(TranslationKeys.textConformation), style: Theme.of(context).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500, fontSize: 20)),
+ const SizedBox(height: 10),
Row(
children: [
Expanded(
diff --git a/lib/app/modules/sign_up/controllers/sign_up_screen_step3_controller.dart b/lib/app/modules/sign_up/controllers/sign_up_screen_step3_controller.dart
index d123eb3..8dff14d 100644
--- a/lib/app/modules/sign_up/controllers/sign_up_screen_step3_controller.dart
+++ b/lib/app/modules/sign_up/controllers/sign_up_screen_step3_controller.dart
@@ -102,7 +102,8 @@ class SignUpScreenStep3Controller extends GetxController {
Future sendRequest() async {
dp("=======sendRequest>>>>>>>", signupStep3RequestModel.toString());
dp("=======sendRequest>>>>>>>", signupStep3RequestModel.porOrgacode + "Rehan");
- signupStep3RequestModel.porOrgacode = "0005";
+ signupStep3RequestModel.porOrgacode = "1962";
+ signupStep3RequestModel.plcLocacode= "0010";
dp("=======sendRequest>>>>>>>", signupStep3RequestModel.porOrgacode + "Rehan");
ServerResponse response = await repository.signupStep3(signupStep3RequestModel);
if (response.isError) {