AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Upload_T2P

Browse Source 
msl_availability and additional
This commit is contained in:
gagangoel290
2017-03-29 12:13:15 +05:30
committed by GitHub
parent 52f3ef9cab 8122f07c39
commit 9a6b2c8d05
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -41,7 +41,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+4 -3
View File
@@ -720,7 +720,7 @@ public class UploadActivity extends AppCompatActivity {
}
String brandxml = "";
/*String brandxml = "";
String brandchild;
if (brandList.size() > 0) {
@@ -735,7 +735,8 @@ public class UploadActivity extends AppCompatActivity {
+ "[/BRAND]";
brandxml = brandxml + brandchild;
}
}
}*/
String present = "";
if (t2PGetterSetters.get(i1).isPresent()) {
present = "1";
@@ -756,7 +757,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[PRESENT]" + present + "[/PRESENT]"
+ "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]"
+ "[SKU_DATA]" + sku_xml + "[/SKU_DATA]"
+ "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]"
//+ "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]"
+ "[/T2P_DATA]";
t2p_data_xml = t2p_data_xml + onXML;