Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV2 into GG_StoreCheckoutImage

.idea/misc.xml

@@ -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/dailyentry/AdditionalVisibility.java

@@ -449,6 +449,17 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                                     sku_list_id = "";
                                     defdata.clear();
 
+                                    if(defdata.size()>0)
+                                    {
+                                        // btn_add.setBackgroundResource(Color);
+                                        btnsku.setBackgroundResource(R.color.green);
+
+                                    }else{
+                                        btnsku.setBackgroundResource(R.color.colorPrimary);
+                                    }
+
+
+
                                     if (camera_allow.equals("1")) {
                                         btnimage.setBackgroundResource(R.mipmap.camera_orange);
 
@@ -1126,6 +1137,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
                     SKU_name = sku_list.get(position).getSKU();
 
+                    listview.invalidateViews();
                 }
             }
 
@@ -1140,6 +1152,17 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             public void onClick(View v) {
 
                 dialog.cancel();
+
+                if(defdata.size()>0)
+                {
+                    // btn_add.setBackgroundResource(Color);
+                    btnsku.setBackgroundResource(R.color.green);
+
+                }else{
+                    btnsku.setBackgroundResource(R.color.colorPrimary);
+                }
+
+
             }
         });
 
@@ -1171,6 +1194,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                     // spinner_brand.setSelection(0);
                     spinner_sku.setSelection(0);
                     Edt_txt.setText("");
+                    SKU_ID="";
+                    SKU_name="";
 
                     // list = db.getDialogStock(store_id);
                     linearlay.setVisibility(View.VISIBLE);
@@ -1221,6 +1246,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                     spinner_sku.setAdapter(skuadapter);
 
                     spinner_sku.setSelection(0);
+                    SKU_ID="";
 
                 }
             }
@@ -1232,6 +1258,16 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
         });
 
 
+        if(defdata.size()>0)
+        {
+            // btn_add.setBackgroundResource(Color);
+            btnsku.setBackgroundResource(R.color.green);
+
+        }else{
+            btnsku.setBackgroundResource(R.color.colorPrimary);
+        }
+
+
         spinner_sku.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -1243,6 +1279,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
                     SKU_name = sku_list.get(position).getSKU();
 
                 }
+                else{
+                    SKU_ID="";
+                    SKU_name="";
+                }
             }
 
             @Override
@@ -1610,6 +1650,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
         String brandid = data.getBrand_id();
         String displayid = data.getSku_id();
+        String skuname = data.getSku_name();
         String QTy = data.getQuantity();
 
 
@@ -1617,7 +1658,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             flag = false;
 
             msg = getResources().getString(R.string.title_activity_select_dropdown);
-        } else if (displayid == null || displayid.equalsIgnoreCase("")) {
+        } else if (displayid == null || displayid.equalsIgnoreCase("") || skuname.equalsIgnoreCase("select")) {
             flag = false;
             msg = getResources().getString(R.string.title_activity_select_dropdown);
         } else if (QTy.equalsIgnoreCase("") || QTy == null) {
@@ -1635,6 +1676,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
     protected void onResume() {
         super.onResume();
         updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+
+
+
+
     }