Merge pull request 'fix_issues' (#3) from api_code_uncomment into pre_developmnet_branch

Reviewed-on: https://ct.mfsys.com.pk/UCO-Projects/uco-mobile-poc/pulls/3

.idea/workspace.xml

@@ -24,28 +24,28 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">{
-  "keyToString": {
+  &quot;keyToString&quot;: {
-    "Flutter.main.dart.executor": "Run",
+    &quot;Flutter.main.dart.executor&quot;: &quot;Run&quot;,
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    "RunOnceActivity.cidr.known.project.marker": "true",
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    "RunOnceActivity.git.unshallow": "true",
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    "cf.first.check.clang-format": "false",
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    "cidr.known.project.marker": "true",
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    "dart.analysis.tool.window.visible": "false",
+    &quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
-    "git-widget-placeholder": "<unknown>",
+    &quot;git-widget-placeholder&quot;: &quot;&lt;unknown&gt;&quot;,
-    "io.flutter.project.isFirstOpen": "true",
+    &quot;io.flutter.project.isFirstOpen&quot;: &quot;true&quot;,
-    "io.flutter.reload.alreadyRun": "true",
+    &quot;io.flutter.reload.alreadyRun&quot;: &quot;true&quot;,
-    "kotlin-language-version-configured": "true",
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    "last_opened_file_path": "C:/Users/samanwaqar/Documents/GitHub/uco-mobile-poc",
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/samanwaqar/Documents/GitHub/uco-mobile-poc&quot;,
-    "project.structure.last.edited": "Project",
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
-    "project.structure.proportion": "0.0",
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    "project.structure.side.proportion": "0.2",
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    "settings.editor.selected.configurable": "configurable.group.build",
+    &quot;settings.editor.selected.configurable&quot;: &quot;configurable.group.build&quot;,
-    "show.migrate.to.gradle.popup": "false"
+    &quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\samanwaqar\Documents\GitHub\uco-mobile-poc" />

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<String, dynamic> 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}';
   }
 }

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();
   }
 

lib/app/modules/general_ledger/views/general_ledger_view.dart

@@ -42,7 +42,7 @@ class GeneralLedgerView extends GetView<GeneralLedgerController> {
         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<GeneralLedgerController> {
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      // Text(TranslationKeys.makeTranslation(TranslationKeys.textConformation), style: Theme.of(context).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500, fontSize: 20)),
+                      Text(TranslationKeys.makeTranslation(TranslationKeys.textConformation), style: Theme.of(context).textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500, fontSize: 20)),
-                      // const SizedBox(height: 10),
+                      const SizedBox(height: 10),
                       Row(
                         children: [
                           Expanded(

lib/app/modules/sign_up/controllers/sign_up_screen_step3_controller.dart

@@ -102,7 +102,8 @@ class SignUpScreenStep3Controller extends GetxController {
   Future<void> 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) {