diff --git a/.idea/misc.xml b/.idea/misc.xml
index b8dc4d6..b15ecee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index a3a7f99..1faa657 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -129,11 +129,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void deleteTableWithStoreID(String storeid) {
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
- db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
-
- db.delete(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
- db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
- db.delete(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
//Gagan start code
db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, "Store_Id='" + storeid + "'", null);
@@ -149,10 +148,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.delete(CommonString.TABLE_COVERAGE_DATA, null, null);
- db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG_MAIN, null, null);
- db.delete(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY_MAIN, null, null);
- db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG, null, null);
- db.delete(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, null, null);
+ db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, null, null);
//Gagan start code
db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, null, null);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
index d4c10e5..10b63c5 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -102,7 +102,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList empty_list = new ArrayList<>();
String _pathforcheck, _path, str, msg;
private SharedPreferences preferences;
- String store_id, date, intime, img_str, togglevalue = "1", CATEGORY_ID, camera_allow;
+ String store_id, date, intime, img_str, togglevalue = "1", CATEGORY_ID, camera_allow,store_type_id,class_id,key_account_id;
ImageView img_cam, img_clicked;
Button btn_add, btn_close;
EditText Edt_txt;
@@ -132,6 +132,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
preferences = PreferenceManager.getDefaultSharedPreferences(this);
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
+ store_type_id= preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ class_id= preferences.getString(CommonString.KEY_CLASS_ID, "");
+ key_account_id= preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
categoryName = getIntent().getStringExtra("categoryName");
@@ -1005,7 +1008,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
public void showSkuDialog() {
- final ArrayList brandList = db.getBrandT2PData("1", "1", "1");
+ final ArrayList brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
brand.setBRAND(getResources().getString(R.string.select));
brandList.add(0, brand);