diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index f786b43..79406d5 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 24
+ compileSdkVersion 23
buildToolsVersion "24.0.1"
useLibrary 'org.apache.http.legacy'
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
index 5bc62c2..4e4976b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -72,6 +72,7 @@ public class StoreListActivity extends AppCompatActivity {
private Dialog dialog;
boolean result_flag = false, leaveflag = false;
FloatingActionButton fab;
+ String storeid;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -185,7 +186,7 @@ public class StoreListActivity extends AppCompatActivity {
final StoreBean current = data.get(position);
- String storeid = current.getSTORE_ID();
+ storeid = current.getSTORE_ID();
//viewHolder.txt.setText(current.txt);
viewHolder.txt.setText(current.getSTORE_NAME());
@@ -343,6 +344,9 @@ public class StoreListActivity extends AppCompatActivity {
/*Intent i = new Intent(StoreListActivity.this, CheckOutStoreActivity.class);
+
+ intent.putExtra("storeId",store_id );
+
startActivity(i);*/
} else {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
index 0e1bd16..e988000 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -231,7 +231,7 @@ public class UploadActivity extends AppCompatActivity {
storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId());
if (storeData.getSTORE_ID() != null) {
- /*if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) ||
+ /*if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L)|| storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_P) ||
!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) {*/
String camera_allow = storeData.getCAMERA_ALLOW();
diff --git a/GSKMTOrange/src/main/res/drawable/gsklogo.png b/GSKMTOrange/src/main/res/drawable/gsklogo.png
new file mode 100644
index 0000000..c08f6a7
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/gsklogo.png differ
diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml
index df55c67..375bdb7 100644
--- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml
+++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml
@@ -62,13 +62,13 @@
+ />
Dil Seçimi
+ Do You Want To Save
+ Please Add Data
+ Do You Want To Add
+ Do You Want To Delete Data
+ store
+ Do You Want To Delete
+ Click Yes To Delete!
+ Please Select dropdown
+ Please Take a image
+
+ Please fill sku data
+ Please enter Quantity
+ Do you want to save the data
+
+
+ Please click the image
+ GPS IS DISABLED...
+ Click ok to enable GPS.
+ Please Take Image Before Save
+ This device is not supported.
+ Uploading Data
+ Uploading Geotag Data...
+ failure
+ Uploading Geotag Images
+ success
+ Are you sure you want to Checkout
+ No Network
+
+ Please click image
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index ea1ec39..ab6c842 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -114,8 +114,7 @@
Enter the values
- Yes
- No
+
Upload DataNo Data For Upload
@@ -167,7 +166,7 @@
Please enter QuantityDo you want to save the data
- OK
+
Please click the imageGPS IS DISABLED...Click ok to enable GPS.