Merge pull request #53 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ACVisibilityDone

newcode

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'

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 {
 

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

GSKMTOrange/src/main/res/layout/storeviewlist.xml

@@ -62,13 +62,13 @@
 
             <Button
                 android:id="@+id/chkout"
-                android:layout_width="wrap_content"
-                android:layout_height="45dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentTop="true"
                 android:focusable="false"
                 android:background="@mipmap/checkout"
-                android:visibility="invisible" />
+                 />
 
             <ImageView
                 android:id="@+id/imageView2"

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -120,6 +120,45 @@
 
     <string name="select_language_item">Dil Seçimi</string>
 
+    <string name="title_activity_Want_save"> Do You Want To Save</string>
+    <string name="title_activity_Want_add"> Please Add Data</string>
+    <string name="title_activity_Want_to_add">Do You Want To Add</string>
+    <string name="title_activity_Want_to_delete"> Do You Want To Delete Data</string>
+    <string name="store"> store</string>
+    <string name="title_activity_Want_to_delete1"> Do You Want To Delete</string>
+    <string name="title_activity_click_delete">Click Yes To Delete!</string>
+    <string name="title_activity_select_dropdown">Please Select dropdown</string>
+    <string name="title_activity_take_image">Please Take a image</string>
+
+    <string name="title_activity_fill_sku">Please fill sku data</string>
+    <string name="title_activity_enter_quantity">Please enter Quantity</string>
+    <string name="title_activity_save_data">Do you want to save the data</string>
+
+
+    <string name="clickimage">Please click the image</string>
+    <string name="gps">GPS IS DISABLED...</string>
+    <string name="gpsebale">Click ok to enable GPS.</string>
+    <string name="takeimage"> Please Take Image Before Save</string>
+    <string name="notsuppoted">This device is not supported.</string>
+    <string name="uploaddata">Uploading Data</string>
+    <string name="geotagdata">Uploading Geotag Data...</string>
+    <string name="failure">failure</string>
+    <string name="uploadimge">Uploading Geotag Images</string>
+    <string name="success">success</string>
+    <string name="wantcheckout">Are you sure you want to Checkout</string>
+    <string name="nonetwork"> No Network</string>
+
+    <string name="click_image">Please click image</string>
+
+
+
+
+
+
+
+
+
+
 </resources>
 
 

GSKMTOrange/src/main/res/values/strings.xml

@@ -164,7 +164,6 @@
     <string name="title_activity_enter_quantity">Please enter Quantity</string>
     <string name="title_activity_save_data">Do you want to save the data</string>
 
- 
     <string name="clickimage">Please click the image</string>
     <string name="gps">GPS IS DISABLED...</string>
     <string name="gpsebale">Click ok to enable GPS.</string>