AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #75 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/NewChanges

Browse Source 
New changes
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-20 12:26:43 +05:30
committed by GitHub
parent fb69370193 8602ac7a62
commit dc2d5a4b31
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -41,7 +41,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<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"> <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">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+8 -9
View File
@@ -129,11 +129,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void deleteTableWithStoreID(String storeid) { public void deleteTableWithStoreID(String storeid) {
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); 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.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.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
//Gagan start code //Gagan start code
db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, "Store_Id='" + storeid + "'", null); 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.TABLE_COVERAGE_DATA, null, null);
db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG_MAIN, null, null); db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, null, null);
db.delete(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY_MAIN, null, null); db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, null);
db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG, null, null); db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, null, null);
db.delete(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA, null, null); db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, null, null);
//Gagan start code //Gagan start code
db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, null, null); db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, null, null);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+5 -2
View File
@@ -102,7 +102,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList<SkuGetterSetter> empty_list = new ArrayList<>(); ArrayList<SkuGetterSetter> empty_list = new ArrayList<>();
String _pathforcheck, _path, str, msg; String _pathforcheck, _path, str, msg;
private SharedPreferences preferences; 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; ImageView img_cam, img_clicked;
Button btn_add, btn_close; Button btn_add, btn_close;
EditText Edt_txt; EditText Edt_txt;
@@ -132,6 +132,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences = PreferenceManager.getDefaultSharedPreferences(this);
store_id = preferences.getString(CommonString.KEY_STORE_ID, null); store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, ""); 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, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
categoryName = getIntent().getStringExtra("categoryName"); categoryName = getIntent().getStringExtra("categoryName");
@@ -1005,7 +1008,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
public void showSkuDialog() { public void showSkuDialog() {
final ArrayList<BrandMasterGetterSetter> brandList = db.getBrandT2PData("1", "1", "1"); final ArrayList<BrandMasterGetterSetter> brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
brand.setBRAND(getResources().getString(R.string.select)); brand.setBRAND(getResources().getString(R.string.select));
brandList.add(0, brand); brandList.add(0, brand);