uae_store_type_id_add

GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java

@@ -204,6 +204,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
         //UAE
       /*  museridView.setText("testuae");
         mPasswordView.setText("cpm123");*/
+       /* museridView.setText("testuae1");
+        mPasswordView.setText("cpm123");*/
 
         //KSA
       /*  museridView.setText("Esmail.d");
@@ -217,7 +219,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
 
         //turkey
-    /*    museridView.setText("testmer");
+     /*   museridView.setText("testmer");
         mPasswordView.setText("cpm123");*/
         //sa
       /*  museridView.setText("testsa");

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java

@@ -152,7 +152,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
             }
         });
 
-        if (country_id.equals("2") && (storeType_id.equals("9") || storeType_id.equals("15"))) {
+        if (country_id.equals("2") && (storeType_id.equals("9") || storeType_id.equals("15")||storeType_id.equals("47"))) {
             linPlanogramType.setVisibility(View.VISIBLE);
             final ArrayAdapter planogramTypeAdapter = new ArrayAdapter<CharSequence>(this,
                     android.R.layout.simple_spinner_item);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java

@@ -306,7 +306,6 @@ public class UploadImageWithRetrofit {
 
     }
 
-/*
    public File saveBitmapToFileSmaller(File file) {
        File file2 = file;
        try {
@@ -334,7 +333,8 @@ public class UploadImageWithRetrofit {
        }
        return file2;
    }
-*/
+
+/*
    public File saveBitmapToFileSmaller(File file) {
        File file2 = file;
        try {
@@ -380,6 +380,7 @@ public class UploadImageWithRetrofit {
        }
        return file2;
    }
+*/
 
 
     public void showAlert(final Context context, String str, final boolean flag) {