diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index 1e7dd18..4bb0473 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -21,24 +21,24 @@ android {
targetSdkVersion 26
//For Egypt
- /*versionCode 23
- versionName "3.5"*/
+ /*versionCode 26
+ versionName "3.8"*/
//For UAE
- /*versionCode 21
- versionName "3.3"*/
+ versionCode 24
+ versionName "3.6"
//For Turkey
- /*versionCode 21
- versionName "3.3"*/
+ /*versionCode 23
+ versionName "3.5"*/
//For KSA
/*versionCode 25
versionName "3.7"*/
//For SA
- versionCode 26
- versionName "3.7"
+ /*versionCode 26
+ versionName "3.7"*/
multiDexEnabled true
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index ba7cbfd..6d7d3fc 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -24,12 +24,21 @@
android:largeHeap="true"
android:supportsRtl="true"
android:theme="@style/AppTheme">
+
+
+ android:theme="@style/AppTheme.NoActionBar" />
question_list = new ArrayList<>(), childListData;
HashMap> hashMapAnsListChildData;
@@ -95,6 +95,7 @@ public class AuditActivity extends AppCompatActivity {
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
toolbar.setTitle(getResources().getString(R.string.audit));
@@ -361,6 +362,9 @@ public class AuditActivity extends AppCompatActivity {
holder.edt_answer.setVisibility(View.GONE);
} else if(holder.data.getANSWER_TYPE().equalsIgnoreCase("TEXTBOX")){
holder.edt_answer.setVisibility(View.VISIBLE);
+ if(country_id.equals("4")){
+ holder.edt_answer.setHint(R.string.pls_fill_stock_count);
+ }
holder.sp_auditAnswer.setVisibility(View.GONE);
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitIndicatorWebActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitIndicatorWebActivity.java
new file mode 100644
index 0000000..afd1ed5
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitIndicatorWebActivity.java
@@ -0,0 +1,108 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+import android.view.View;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+
+public class CounterfeitIndicatorWebActivity extends AppCompatActivity {
+
+ WebView webView;
+ String url = "https://gskme.parinaam.in/res/eg/fake.html";
+ private SharedPreferences preferences;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_counterfeit_indicator_web);
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ toolbar.setTitle(getResources().getString(R.string.title_activity_counterfeit_indicator_web));
+
+ webView = (WebView) findViewById(R.id.webview);
+
+ webView.setWebViewClient(new MyWebViewClient());
+
+ webView.getSettings().setJavaScriptEnabled(true);
+
+ if (!url.equals("")) {
+
+ webView.loadUrl(url);
+
+ }
+
+ FloatingActionButton fab = findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+ }
+ });
+ }
+
+ private class MyWebViewClient extends WebViewClient {
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ view.loadUrl(url);
+ return true;
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ /* progress.setVisibility(View.GONE);
+ WebViewActivity.this.progress.setProgress(100);*/
+ //imageView.setVisibility(View.INVISIBLE);
+ webView.setVisibility(View.VISIBLE);
+ super.onPageFinished(view, url);
+ view.clearCache(true);
+ }
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+ /* progress.setVisibility(View.VISIBLE);
+ WebViewActivity.this.progress.setProgress(0);*/
+ super.onPageStarted(view, url, favicon);
+ }
+
+ }
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onBackPressed() {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
index 7a83cee..9ece39d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -156,6 +156,10 @@ public class NonWorkingReason extends AppCompatActivity implements
else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL)){
//Additional Journey Plan - Egypt
storelist = database.getStoreData(visit_date,CommonString.KEY_JOURNEY_PLAN_ADDITIONAL);
+ }else if(store_flag_str.equals(CommonString.FROM_PHARMA)){
+ //Additional Journey Plan - Egypt
+
+ storelist = database.getStoreData(visit_date,CommonString.KEY_JOURNEY_PLAN_PHARMA);
}
coverage = database.getCoverageData(visit_date, CommonString.FROM_JCP);
@@ -707,7 +711,10 @@ public class NonWorkingReason extends AppCompatActivity implements
if(coverage.get(0).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){
service = CommonString.METHOD_UPLOAD_CURRENT_DATA_ADDITIONAL;
}
- else {
+ else if(coverage.get(0).getFlag_from().equals(CommonString.FROM_PHARMA)){
+ service = CommonString.METHOD_UPLOAD_CURRENT_DATA_PHARMA;
+ }
+ else{
service = CommonString.METHOD_UPLOAD_CURRENT_DATA;
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
index c2bf56a..b5a5873 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
@@ -270,7 +270,13 @@ public class StockDataActivity extends AppCompatActivity implements DialogCallba
//childDataList = new ArrayList<>();
childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) {
- childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK);
+
+ if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK_ADHOC);
+ }
+ else {
+ childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK);
+ }
}
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java
new file mode 100644
index 0000000..3a93bce
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java
@@ -0,0 +1,435 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.Toolbar;
+import android.text.InputFilter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AbsListView;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.ExpandableListView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.ToggleButton;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+
+public class StockPricingActivity extends AppCompatActivity {
+
+ ExpandableListView expandableListView;
+ private SharedPreferences preferences;
+
+ String categoryName, categoryId, Error_Message = "";
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str;
+ GSKOrangeDB db;
+
+ ArrayList headerDataList;
+ ArrayList childDataList= new ArrayList<>();
+ List hashMapListHeaderData;
+ HashMap> hashMapListChildData;
+ ExpandableListAdapter adapter;
+
+ List checkHeaderArray = new ArrayList<>();
+ boolean checkflag = true;
+
+ FloatingActionButton fab;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_stock_pricing);
+ Toolbar toolbar = findViewById(R.id.toolbar);
+
+ expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
+
+ db = new GSKOrangeDB(this);
+ db.open();
+
+
+ //preference data
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ username = preferences.getString(CommonString.KEY_USERNAME, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+ store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+
+ //Intent data
+ categoryName = getIntent().getStringExtra("categoryName");
+ categoryId = getIntent().getStringExtra("categoryId");
+
+ //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
+ toolbar.setTitle(getResources().getString(R.string.title_activity_stock_pricing));
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ fab = findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+ }
+ });
+
+ prepareList();
+ }
+
+ private void prepareList() {
+ try {
+ hashMapListHeaderData = new ArrayList<>();
+ hashMapListChildData = new HashMap<>();
+
+ //Header
+ headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET);
+
+ if (headerDataList.size() > 0) {
+ for (int i = 0; i < headerDataList.size(); i++) {
+ hashMapListHeaderData.add(headerDataList.get(i));
+
+ childDataList = new ArrayList<>();
+ //childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
+ if (childDataList.size() == 0) {
+ childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
+ }
+
+ hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
+ }
+ }
+
+ adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
+ expandableListView.setAdapter(adapter);
+
+ //expand all
+ for (int i = 0; i < adapter.getGroupCount(); i++)
+ expandableListView.expandGroup(i);
+
+ expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+ @Override
+ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+
+ expandableListView.invalidate();
+
+ int lastItem = firstVisibleItem + visibleItemCount;
+
+ if (firstVisibleItem == 0) {
+ fab.show();//.setVisibility(View.VISIBLE);
+ } else if (lastItem == totalItemCount) {
+ fab.hide();//setVisibility(View.INVISIBLE);
+ } else {
+ fab.show();//setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(AbsListView arg0, int arg1) {
+ InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+
+ expandableListView.invalidateViews();
+ }
+ });
+
+ // Listview Group click listener
+ expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+ @Override
+ public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
+ return false;
+ }
+ });
+
+ // Listview Group expanded listener
+ expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
+ @Override
+ public void onGroupExpand(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview Group collasped listener
+ expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
+ @Override
+ public void onGroupCollapse(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+ getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview on child click listener
+ expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+ @Override
+ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
+ int childPosition, long id) {
+ return false;
+ }
+ });
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+
+ }
+
+ public class ExpandableListAdapter extends BaseExpandableListAdapter {
+ private Context _context;
+ private List _listDataHeader;
+ private HashMap> _listDataChild;
+
+ public ExpandableListAdapter(Context context, List listDataHeader,
+ HashMap> listChildData) {
+ this._context = context;
+ this._listDataHeader = listDataHeader;
+ this._listDataChild = listChildData;
+ }
+
+ @Override
+ public Object getGroup(int groupPosition) {
+ return this._listDataHeader.get(groupPosition);
+ }
+
+ @Override
+ public int getGroupCount() {
+ return this._listDataHeader.size();
+ }
+
+ @Override
+ public long getGroupId(int groupPosition) {
+ return groupPosition;
+ }
+
+ @Override
+ public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+ MSL_AvailabilityStockFacingGetterSetter headerTitle = (MSL_AvailabilityStockFacingGetterSetter) getGroup(groupPosition);
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_msl_availability_stock_facing_header, null, false);
+ }
+
+ TextView txt_categoryHeader = (TextView) convertView.findViewById(R.id.txt_categoryHeader);
+ RelativeLayout rel_header = (RelativeLayout) convertView.findViewById(R.id.rel_categoryHeader);
+ ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera);
+ CardView card_view = (CardView) convertView.findViewById(R.id.card_view);
+
+ txt_categoryHeader.setTypeface(null, Typeface.BOLD);
+
+ if (headerTitle.getCompany_id().equals("1")) {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
+ }
+ txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
+
+
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
+ }
+ }
+
+ //empty check color change
+ /*if (headerTitle.getCompany_id().equals("1")) {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ //card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ }
+ }
+ } else {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
+ }
+ }
+ }*/
+
+ return convertView;
+ }
+
+ @Override
+ public Object getChild(int groupPosition, int childPosititon) {
+ return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon);
+ }
+
+ @Override
+ public int getChildrenCount(int groupPosition) {
+ return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size();
+ }
+
+ @Override
+ public long getChildId(int groupPosition, int childPosition) {
+ return childPosition;
+ }
+
+ @Override
+ public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
+ View convertView, ViewGroup parent) {
+
+ final MSL_AvailabilityStockFacingGetterSetter childData =
+ (MSL_AvailabilityStockFacingGetterSetter) getChild(groupPosition, childPosition);
+ ViewHolder holder = null;
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_stock_pricing, null, false);
+
+ holder = new ViewHolder();
+ holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
+ holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
+
+ holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
+ holder.et_price = (EditText) convertView.findViewById(R.id.et_price);
+
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ holder.txt_skuName.setText(childData.getSku());
+
+ if (childData.getCompany_id().equals("1")) {
+
+ if (childData.getMust_have().equals("1")) {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
+ } else {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.blue));
+ }
+
+ } else {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
+ }
+
+ final ViewHolder finalHolder = holder;
+
+ holder.et_price.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ if(!hasFocus){
+ final EditText caption = (EditText) v;
+ String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+
+ if (!edStock.equals("")) {
+ String stock = edStock;
+
+ childData.setStock(stock);
+ } else {
+ childData.setStock("");
+ }
+ }
+ }
+ });
+ holder.et_price.setText(childData.getStock());
+
+ //empty check color change
+ if (!checkflag) {
+ boolean tempflag = false;
+
+ if (childData.getCompany_id().equals("1")) {
+
+ if (tempflag) {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ } else {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ } else {
+ if (holder.et_price.getText().toString().equals("")) {
+ holder.et_price.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.et_price.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.et_price.setHint(getString(R.string.empty));
+ tempflag = true;
+ }
+
+
+ if (tempflag) {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ } else {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ }
+ }
+
+ return convertView;
+ }
+
+ @Override
+ public boolean hasStableIds() {
+ return false;
+ }
+
+ @Override
+ public boolean isChildSelectable(int groupPosition, int childPosition) {
+ return true;
+ }
+ }
+
+ public class ViewHolder {
+ CardView cardView;
+ TextView txt_skuName;
+ LinearLayout lin_category;
+ EditText et_price;
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
index f23c24f..5ff1d6c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -496,7 +496,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN_ADDITIONAL);
}
else if(store_flag_str.equals(CommonString.FROM_PHARMA)){
- //Additional Journey Plan - Egypt
+ //Pharma stores - Turkey
toolbar.setTitle(getString(R.string.title_activity_store_list));
storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN_PHARMA);
}
@@ -811,7 +811,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
Snackbar.make(v, getString(R.string.title_store_list_checkout_current) + " - " + from_checkedIn, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
}
else {
- if (!setcheckedmenthod(store_id)) {
+ if (!setCheckedMethod(store_id)) {
boolean enteryflag = true;
if (coverage.size() > 0) {
int i;
@@ -837,7 +837,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current);
}
else {
- if(country_id.equalsIgnoreCase("5")){
+ if(country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")){
if (!current.getGEO_TAG().equalsIgnoreCase("N")) {
@@ -1329,7 +1329,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
}
- public boolean setcheckedmenthod(String store_cd) {
+ public boolean setCheckedMethod(String store_cd) {
boolean result_flag = false;
for (int i = 0; i < coverage.size(); i++) {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
index 751f30a..fa415f2 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
@@ -503,7 +503,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
String status;
- if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5")
+ if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")
|| store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) {
status = CommonString.KEY_INVALID;
} else {
@@ -935,7 +935,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
dialog.dismiss();
- if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")|| store_flag_str.equals(CommonString.FROM_ADDITIONAL)) {
+ if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")|| store_flag_str.equals(CommonString.FROM_ADDITIONAL)
+ || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")) {
Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class);
startActivity(in);
finish();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
index 17c067a..0cfbbd2 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -35,6 +35,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.AdapterView;
@@ -139,6 +140,8 @@ public class T2PComplianceActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
+ rec_t2p.clearFocus();
+
if (isValid()) {
db.InsertT2PData(t2PGetterSetters, store_id, categoryId);
@@ -288,6 +291,19 @@ public class T2PComplianceActivity extends AppCompatActivity {
select.setAns_id(2);
ans_list.add(select);
+ holder.edtallow_qty.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+ holder.edtallow_qty.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ if (!hasFocus) {
+
+ mItem.setQty(((EditText) v).getText().toString().replaceAll("[&^<>{}'$]", ""));
+ }
+ }
+ });
+ holder.edtallow_qty.setText(mItem.getQty());
+
CustomSpinnerAdapter skuadapter = new CustomSpinnerAdapter(T2PComplianceActivity.this, R.layout.custom_t2p_spinner_item, ans_list);
holder.spinner.setAdapter(skuadapter);
@@ -564,6 +580,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
});
+
if (camera_allow.equals("1")) {
//Camera
@@ -699,6 +716,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
holder.img_cam2.setEnabled(is_enabled);
holder.btn_gaps.setEnabled(is_enabled);
+ if (is_enabled && mItem.getAllowQty().equals("1")){
+ holder.ly_allowqty.setVisibility(View.VISIBLE);
+ }else {
+ holder.ly_allowqty.setVisibility(View.GONE);
+ }
+
if (mItem.getPresent() == 0) {
holder.layout_t2p_non_reason.setVisibility(View.VISIBLE);
} else {
@@ -766,6 +789,9 @@ public class T2PComplianceActivity extends AppCompatActivity {
public final Button btn_gaps, btn_sku, btn_ref_img;
public final ToggleButton toggle_btn;
public final Spinner spinner, spinner_t2p_non_reason;
+ public EditText edtallow_qty;
+ public LinearLayout ly_allowqty;
+
public ViewHolder(View view) {
super(view);
@@ -785,6 +811,8 @@ public class T2PComplianceActivity extends AppCompatActivity {
toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn);
spinner = (Spinner) mView.findViewById(R.id.spinner);
spinner_t2p_non_reason = (Spinner) mView.findViewById(R.id.spinner_t2p_non_reason);
+ edtallow_qty = (EditText) mView.findViewById(R.id.edtallow_qty);
+ ly_allowqty = (LinearLayout) mView.findViewById(R.id.ly_allowqty);
}
}
}
@@ -1215,6 +1243,11 @@ public class T2PComplianceActivity extends AppCompatActivity {
flag = false;
error_msg = getResources().getString(R.string.title_activity_fill_sku);
break;
+ }else if(t2PGetterSetters.get(i).getAllowQty().equals("1") && t2PGetterSetters.get(i).getQty().equals("")){
+ //added for UAE 04.07.2019
+ flag = false;
+ error_msg = getResources().getString(R.string.title_activity_enter_quantity);
+ break;
}
} else if (t2PGetterSetters.get(i).getPresent() == 0) {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
index 14a520c..e8b7752 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
@@ -41,6 +41,7 @@ import cpm.com.gskmtorange.dailyentry.CreateSelfActivity;
import cpm.com.gskmtorange.dailyentry.POGQuestionsActivity;
import cpm.com.gskmtorange.dailyentry.StockActivity;
import cpm.com.gskmtorange.dailyentry.StockDataActivity;
+import cpm.com.gskmtorange.dailyentry.StockPricingActivity;
import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DailyDataMenuGetterSetter;
@@ -340,6 +341,22 @@ public class DailyDataMenuActivity extends AppCompatActivity {
data.setCategory_name(getString(R.string.title_activity_counterfeit_products));
categoryList.add(data);
}
+
+ //Stock Pricing Option - Turkey
+ /*if(country_id.equals("4")){
+ data = new DailyDataMenuGetterSetter();
+
+ *//* if (db.getCounterfeitProductExistsAfterData(store_id, categoryId).size() > 0) {
+ data.setCategory_img(R.mipmap.counterfeit_done);
+ } else {
+ data.setCategory_img(R.mipmap.counterfeit);
+ }*//*
+
+ data.setCategory_img(R.mipmap.analgesics);
+
+ data.setCategory_name(getString(R.string.title_activity_stock_pricing));
+ categoryList.add(data);
+ }*/
}
@@ -701,6 +718,15 @@ public class DailyDataMenuActivity extends AppCompatActivity {
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
+ }else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_stock_pricing))) {
+ /*if (isMappingStockData()) {
+
+ }*/
+ Intent intent = new Intent(DailyDataMenuActivity.this, StockPricingActivity.class);
+ intent.putExtra("categoryName", dailyData.getCategory_name());
+ intent.putExtra("categoryId", categoryId);
+ startActivity(intent);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java
index 3e3fb82..2ed9472 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java
@@ -794,7 +794,7 @@ public class MPinActivity extends AppCompatActivity implements
if (result.equals(CommonString.KEY_SUCCESS)) {
//set true for South Africa
- boolean forSA = true;
+ boolean forSA = false;
if(forSA){
//For SA Only
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
index 3282c84..bddaff6 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
@@ -50,10 +50,14 @@ import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ImageGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PharmaMSLInsertedGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PharmaSOSGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.PromoComplianceSkuwiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
@@ -372,750 +376,917 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
}
mid = Integer.parseInt((words[1]));
+ if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)) {
- //MSL_Availability
- /*String mslAvailability_xml = "";
- onXML = "";
- msl_availabilityList = db.getMSL_AvailabilityUploadServerData(coverageList.get(i).getStoreId());
+ //MSL_Availability_StockFacing
+ String mslAvailability_stockFacing_xml = "";
+ onXML = "";
+ db.open();
+ msl_availabilityStockFacingList = db.getStockUploadServerData(coverageList.get(i).getStoreId());
- if (msl_availabilityList.size() > 0) {
- for (int j = 0; j < msl_availabilityList.size(); j++) {
- if (!msl_availabilityList.get(j).getSku_id().equals("0")) {
+ if (msl_availabilityStockFacingList.size() > 0) {
+ for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
+ if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
- onXML = "[MSL_AVAILABILITY_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityList.get(j).getCategory_id()) + "[/CATEGORY_ID]"
- + "[BRAND_ID]" + Integer.parseInt(msl_availabilityList.get(j).getBrand_id()) + "[/BRAND_ID]"
- + "[SKU_ID]" + Integer.parseInt(msl_availabilityList.get(j).getSku_id()) + "[/SKU_ID]"
- + "[MBQ]" + Integer.parseInt(msl_availabilityList.get(j).getMbq()) + "[/MBQ]"
- //+ "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]"
- + "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
- + "[/MSL_AVAILABILITY_DATA]";
+ String stock;
+ if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
+ stock = msl_availabilityStockFacingList.get(j).getStock();
+ } else {
+ stock = "0";
+ }
+ onXML = "[ST]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USERID]" + userId + "[/USERID]"
+ + "[SKUID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKUID]"
+ + "[STK]" + Integer.parseInt(stock) + "[/STK]"
+ + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ + "[MSL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MSL]" +
- mslAvailability_xml = mslAvailability_xml + onXML;
- }
- }
+ "[/ST]";
- final String sos_xml = "[DATA]" + mslAvailability_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "MSL_AVAILABILITY_DATA");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
-
- if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }
-
- if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }
-
- if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }
- }
- data.value = 10;
- data.name = getString(R.string.availability_data_uploading);
- publishProgress(data);*/
-
-
- //Stock and Facing
- /*String stock_facing_xml = "";
- onXML = "";
- stock_facingHeaderList = db.getStockAndFacingHeaderServerUploadData(coverageList.get(i).getStoreId());
-
- if (stock_facingHeaderList.size() > 0) {
-
- for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
- onXML = "[STOCK_FACING_DATA_NEW]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]"
- //+ "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]"
- //+ "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]"
- + "[SKU_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSku_id()) + "[/SKU_ID]"
- + "[STOCK]" + Integer.parseInt(stock_facingHeaderList.get(i1).getStock()) + "[/STOCK]"
- + "[FACEUP]" + Integer.parseInt(stock_facingHeaderList.get(i1).getFacing()) + "[/FACEUP]"
- + "[/STOCK_FACING_DATA_NEW]";
-
- stock_facing_xml = stock_facing_xml + onXML;
- }
-
- final String sos_xml = "[DATA]" + stock_facing_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "STOCK_FACING_DATA_NEW");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
-
- if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }
-
- if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }
-
- if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }
- }
- data.value = 20;
- data.name = getString(R.string.stock_data_uploading);
- publishProgress(data);*/
-
-
- //MSL_Availability_StockFacing
- String mslAvailability_stockFacing_xml = "";
- onXML = "";
- db.open();
- msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId());
-
- if (msl_availabilityStockFacingList.size() > 0) {
- for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
- if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
-
- String stock;
- if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
- stock = msl_availabilityStockFacingList.get(j).getStock();
- } else {
- stock = "0";
+ mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
}
+ }
+
+ final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "STOCK_ADDITIONAL_STORE");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }*/
+ }
+ data.value = 15;
+ data.name = getString(R.string.availability_data_uploading);
+ publishProgress(data);
+ } else if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_PHARMA)) {
+
+ //Pharmacy store data
+
+ //Store detail
+ String store_detail_xml = "";
+ onXML = "";
+ db.open();
+ ImageGetterSetter imageGetterSetter = db.getStoreDetailPharmaImageInsertedData(coverageList.get(i).getStoreId());
+ String image_xml = "";
+
+ image_xml = "[IMG_L]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USERID]" + userId + "[/USERID]"
+ + "[IMG1]" + imageGetterSetter.getImage1() + "[/IMG1]"
+ + "[IMG2]" + imageGetterSetter.getImage2() + "[/IMG2]"
+ + "[IMG3]" + imageGetterSetter.getImage3() + "[/IMG3]"
+ + "[IMG4]" + imageGetterSetter.getImage4() + "[/IMG4]" +
+ "[/IMG_L]";
+ ArrayList pharmaStoreDetail = db.getStoreDetailPharmaAnswerInsertedData(coverageList.get(i).getStoreId(), null);
+
+ if (pharmaStoreDetail.size() > 0) {
+ for (int j = 0; j < pharmaStoreDetail.size(); j++) {
+
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
- //+ "[USERID]" + userId + "[/USERID]"
- + "[SKID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKID]"
- + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
- + "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
- + "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
- + "[SK]" + Integer.parseInt(stock) + "[/SK]"
- + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
+ + "[USERID]" + userId + "[/USERID]"
+ + "[QID]" + Integer.parseInt(pharmaStoreDetail.get(j).getQUESTION_ID().get(0)) + "[/QID]"
+ + "[BID]" + Integer.parseInt(pharmaStoreDetail.get(j).getBRAND_ID().get(0)) + "[/BID]"
+ + "[SCID]" + Integer.parseInt(pharmaStoreDetail.get(j).getSUB_CATEGORY_ID().get(0)) + "[/SCID]"
+ + "[PRESENT]" + pharmaStoreDetail.get(j).getIsChecked() + "[/PRESENT]"
+ + "[IMG]" + pharmaStoreDetail.get(j).getImgPath() + "[/IMG]" +
+
"[/ST]";
- mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
+ store_detail_xml = store_detail_xml + onXML;
}
- }
- final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]";
+ final String sos_xml = "[DATA]" + image_xml+ store_detail_xml + "[/DATA]";
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "PHARMA_STORE_DETAIL");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
- }
- data.value = 15;
- data.name = getString(R.string.availability_data_uploading);
- publishProgress(data);
+ }
+ data.value = 15;
+ data.name = getString(R.string.availability_data_uploading);
+ publishProgress(data);
- //Promo Compliance - Promotion Data
- String promoition_data_xml = "";
- onXML = "";
- db.open();
- promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId());
+ String pharma_sos_xml = "";
+ onXML = "";
- if (promotionSkuList.size() > 0) {
- for (int i1 = 0; i1 < promotionSkuList.size(); i1++) {
- if (!promotionSkuList.get(i1).getCategory_id().equals("0")) {
+ ArrayList pharmaSOSList = db.getStoreDetailPharmaForSOSData(coverageList.get(i).getStoreId(), "1");
- onXML = "[PROMOTION_DATA_NEW]"
+ if (pharmaSOSList.size() > 0) {
+ for (int j = 0; j < pharmaSOSList.size(); j++) {
+
+ onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]"
- //+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]"
- + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]"
- + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]"
- + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
- + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
- + "[PROMO_IMAGE]" + promotionSkuList.get(i1).getImage_promotion() + "[/PROMO_IMAGE]"
- + "[/PROMOTION_DATA_NEW]";
+ + "[USERID]" + userId + "[/USERID]"
+ + "[QID]" + Integer.parseInt(pharmaSOSList.get(j).getQUESTION_ID()) + "[/QID]"
+ + "[BID]" + Integer.parseInt(pharmaSOSList.get(j).getBRAND_ID()) + "[/BID]"
+ + "[SCID]" + Integer.parseInt(pharmaSOSList.get(j).getSUB_CATEGORY_ID()) + "[/SCID]"
+ + "[G_FAC]" + pharmaSOSList.get(j).getGskFacing() + "[/G_FAC]"
+ + "[C_FAC]" + pharmaSOSList.get(j).getCompetitorFacing() + "[/C_FAC]" +
+ "[/ST]";
- promoition_data_xml = promoition_data_xml + onXML;
+ pharma_sos_xml = pharma_sos_xml + onXML;
}
- }
- final String sos_xml = "[DATA]" + promoition_data_xml + "[/DATA]";
+ final String sos_xml = "[DATA]" + pharma_sos_xml + "[/DATA]";
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "PROMOTION_DATA_NEW");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "PHARMA_SOS");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
- }
- data.value = 30;
- data.name = getString(R.string.promo_data_uploading);
- publishProgress(data);
+ }
- //Promo Compliance - Country Id - 7 (SA) Promotion Data
- String promotion_sku_wise_data_xml = "", add_promotion_data_xml = "", exists_xml = "", add_xml = "";
+ data.value = 15;
+ data.name = getString(R.string.availability_data_uploading);
+ publishProgress(data);
- db.open();
- promoComplianceSkuwiseExistsGetterSetters = db.getPromoComplianceSkuwiseExistsAfterData(coverageList.get(i).getStoreId(), null);
- if (promoComplianceSkuwiseExistsGetterSetters.size() > 0) {
+ String pharma_msl_xml = "";
+ onXML = "";
- for (int l = 0; l < promoComplianceSkuwiseExistsGetterSetters.size(); l++) {
+ ArrayList pharmaMSLList = db.getPharmaMSLInsertedData(coverageList.get(i).getStoreId());
- promoComplianceSkuwiseGetterSetters = db.getPromoComplianceSkuwiseAfterData(promoComplianceSkuwiseExistsGetterSetters.get(l).get_id(), null);
+ if (pharmaMSLList.size() > 0) {
+ for (int j = 0; j < pharmaMSLList.size(); j++) {
- for (int i1 = 0; i1 < promoComplianceSkuwiseGetterSetters.size(); i1++) {
- if (!promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id().equals("0")) {
+ onXML = "[ST]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USERID]" + userId + "[/USERID]"
+ + "[BID]" + Integer.parseInt(pharmaMSLList.get(j).getBrandId()) + "[/BID]"
+ + "[SKID]" + Integer.parseInt(pharmaMSLList.get(j).getSkuId()) + "[/SKID]"
+ + "[PRESENT]" + pharmaMSLList.get(j).getPresent() + "[/PRESENT]"+
+ "[/ST]";
- String discount_val = promoComplianceSkuwiseGetterSetters.get(i1).getDiscount_value();
- if(discount_val.equals("")){
- discount_val = "0";
+ pharma_msl_xml = pharma_msl_xml + onXML;
+ }
+
+ final String sos_xml = "[DATA]" + pharma_msl_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "PHARMA_MSL");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }*/
+ }
+
+ data.value = 15;
+ data.name = getString(R.string.availability_data_uploading);
+ publishProgress(data);
+
+ } else {
+ //MSL_Availability_StockFacing
+ String mslAvailability_stockFacing_xml = "";
+ onXML = "";
+ db.open();
+ msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId());
+
+ if (msl_availabilityStockFacingList.size() > 0) {
+ for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
+ if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
+
+ String stock;
+ if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
+ stock = msl_availabilityStockFacingList.get(j).getStock();
+ } else {
+ stock = "0";
}
-
- add_xml = "[PROMOTION_DATA]"
+ onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[SUB_CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]"
- + "[SKU_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSku_id()) + "[/SKU_ID]"
- + "[BRAND_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
- + "[DISCOUNT_VALUE]" + discount_val + "[/DISCOUNT_VALUE]"
- + "[PRICE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice() + "[/PRICE]"
- + "[PROMO_IMAGE]" + promoComplianceSkuwiseGetterSetters.get(i1).getImg() + "[/PROMO_IMAGE]"
- + "[PRICE_FLASHER_AVAILABLE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice_flasher() + "[/PRICE_FLASHER_AVAILABLE]"
- + "[/PROMOTION_DATA]";
+ //+ "[USERID]" + userId + "[/USERID]"
+ + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
+ + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ + "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
+ + "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
+ + "[SK]" + Integer.parseInt(stock) + "[/SK]"
+ + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
+ "[/ST]";
- add_promotion_data_xml = add_promotion_data_xml + add_xml;
+ mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
}
}
- int exists = 0;
- if (promoComplianceSkuwiseExistsGetterSetters.get(l).isExists()) {
- exists = 1;
- }
+ final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]";
- exists_xml = "[ADDITIONAL_PROMOTION_SKUWISE_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
- + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
- + "[ADDITIONAL_PROMOTION_DATA]" + add_promotion_data_xml + "[/ADDITIONAL_PROMOTION_DATA]"
- + "[/ADDITIONAL_PROMOTION_SKUWISE_DATA]";
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- promotion_sku_wise_data_xml = promotion_sku_wise_data_xml + exists_xml;
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
- }
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- final String sos_xml = "[DATA]" + promotion_sku_wise_data_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "ADDITIONAL_PROMOTION_SKUWISE_DATA");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
- }
+ }
+ data.value = 15;
+ data.name = getString(R.string.availability_data_uploading);
+ publishProgress(data);
- //Promo Compliance -Additional Promotion Data
- String additional_promoition_data_xml = "";
- onXML = "";
- db.open();
- additionalPromotionList = db.getAdditionalPromotionServerUploadData(coverageList.get(i).getStoreId());
+ //Promo Compliance - Promotion Data
+ String promoition_data_xml = "";
+ onXML = "";
+ db.open();
+ promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId());
- if (additionalPromotionList.size() > 0) {
- for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) {
- if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) {
+ if (promotionSkuList.size() > 0) {
+ for (int i1 = 0; i1 < promotionSkuList.size(); i1++) {
+ if (!promotionSkuList.get(i1).getCategory_id().equals("0")) {
- onXML = "[ADDITIONAL_PROMOTION_DATA_NEW]"
+ onXML = "[PROMOTION_DATA_NEW]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]"
+ //+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]"
+ + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]"
+ + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+ + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
+ + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
+ + "[PROMO_IMAGE]" + promotionSkuList.get(i1).getImage_promotion() + "[/PROMO_IMAGE]"
+ + "[/PROMOTION_DATA_NEW]";
+
+ promoition_data_xml = promoition_data_xml + onXML;
+ }
+ }
+
+ final String sos_xml = "[DATA]" + promoition_data_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "PROMOTION_DATA_NEW");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }*/
+ }
+ data.value = 30;
+ data.name = getString(R.string.promo_data_uploading);
+ publishProgress(data);
+
+ //Promo Compliance - Country Id - 7 (SA) Promotion Data
+ String promotion_sku_wise_data_xml = "", add_promotion_data_xml = "", exists_xml = "", add_xml = "";
+
+ db.open();
+ promoComplianceSkuwiseExistsGetterSetters = db.getPromoComplianceSkuwiseExistsAfterData(coverageList.get(i).getStoreId(), null);
+ if (promoComplianceSkuwiseExistsGetterSetters.size() > 0) {
+
+ for (int l = 0; l < promoComplianceSkuwiseExistsGetterSetters.size(); l++) {
+
+ promoComplianceSkuwiseGetterSetters = db.getPromoComplianceSkuwiseAfterData(promoComplianceSkuwiseExistsGetterSetters.get(l).get_id(), null);
+
+ for (int i1 = 0; i1 < promoComplianceSkuwiseGetterSetters.size(); i1++) {
+ if (!promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id().equals("0")) {
+
+ String discount_val = promoComplianceSkuwiseGetterSetters.get(i1).getDiscount_value();
+ if (discount_val.equals("")) {
+ discount_val = "0";
+ }
+
+ add_xml = "[PROMOTION_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[SUB_CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]"
+ + "[SKU_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSku_id()) + "[/SKU_ID]"
+ + "[BRAND_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ + "[DISCOUNT_VALUE]" + discount_val + "[/DISCOUNT_VALUE]"
+ + "[PRICE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice() + "[/PRICE]"
+ + "[PROMO_IMAGE]" + promoComplianceSkuwiseGetterSetters.get(i1).getImg() + "[/PROMO_IMAGE]"
+ + "[PRICE_FLASHER_AVAILABLE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice_flasher() + "[/PRICE_FLASHER_AVAILABLE]"
+ + "[/PROMOTION_DATA]";
+
+ add_promotion_data_xml = add_promotion_data_xml + add_xml;
+ }
+ }
+
+ int exists = 0;
+ if (promoComplianceSkuwiseExistsGetterSetters.get(l).isExists()) {
+ exists = 1;
+ }
+
+ exists_xml = "[ADDITIONAL_PROMOTION_SKUWISE_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[PROMO_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_id()) + "[/PROMO_ID]"
- + "[SKU_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getSku_id()) + "[/SKU_ID]"
- //+ "[SKU]" + additionalPromotionList.get(i1).getSku() + "[/SKU]"
- + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]"
- + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
- + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
- + "[ADD_PROMO_IMAGE]" + additionalPromotionList.get(i1).getImage_promotion() + "[/ADD_PROMO_IMAGE]"
- + "[/ADDITIONAL_PROMOTION_DATA_NEW]";
+ + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
+ + "[ADDITIONAL_PROMOTION_DATA]" + add_promotion_data_xml + "[/ADDITIONAL_PROMOTION_DATA]"
+ + "[/ADDITIONAL_PROMOTION_SKUWISE_DATA]";
+
+ promotion_sku_wise_data_xml = promotion_sku_wise_data_xml + exists_xml;
- additional_promoition_data_xml = additional_promoition_data_xml + onXML;
}
- }
- final String sos_xml = "[DATA]" + additional_promoition_data_xml + "[/DATA]";
+ final String sos_xml = "[DATA]" + promotion_sku_wise_data_xml + "[/DATA]";
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA_NEW");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "ADDITIONAL_PROMOTION_SKUWISE_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
- }
- data.value = 35;
- data.name = getString(R.string.additional_data_uploading);
- publishProgress(data);
+ }
- //Additional Visibility Data
- String additional_visibility_data_xml = "";
- String additional_visibility_dialog_xml = "";
- onXML = "";
- String onXMLdIALOG = "";
- String imageV1, imageV2, imageV3;
+ data.value = 30;
+ data.name = getString(R.string.promo_data_uploading);
+ publishProgress(data);
- db.open();
- additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId());
- if (additionalVisibilityList.size() > 0) {
- for (int J = 0; J < additionalVisibilityList.size(); J++) {
+ //Promo Compliance -Additional Promotion Data
+ String additional_promoition_data_xml = "";
+ onXML = "";
+ db.open();
+ additionalPromotionList = db.getAdditionalPromotionServerUploadData(coverageList.get(i).getStoreId());
- if (additionalVisibilityList.get(J).getImage() == null) {
- imageV1 = "";
- } else {
- imageV1 = additionalVisibilityList.get(J).getImage();
- }
+ if (additionalPromotionList.size() > 0) {
+ for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) {
+ if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) {
- if (additionalVisibilityList.get(J).getImage2() == null) {
- imageV2 = "";
- } else {
- imageV2 = additionalVisibilityList.get(J).getImage2();
- }
-
- if (additionalVisibilityList.get(J).getImage3() == null) {
- imageV3 = "";
- } else {
- imageV3 = additionalVisibilityList.get(J).getImage3();
- }
-
- String KeyID = additionalVisibilityList.get(J).getKey_id();
-
- additionalVisibilitySkuList = db.getDialogStockUpload(KeyID);
- //additionalVisibilitySkuList = additionalVisibilityList.get(J).getSkuDialogList();
-
- if (additionalVisibilitySkuList.size() > 0) {
- for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
-
- onXMLdIALOG = "[VISIBILITY_DAILOG]"
+ onXML = "[ADDITIONAL_PROMOTION_DATA_NEW]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
- + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]"
- + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_ID]"
- + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]"
- + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]"
- + "[/VISIBILITY_DAILOG]";
+ + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[PROMO_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_id()) + "[/PROMO_ID]"
+ + "[SKU_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getSku_id()) + "[/SKU_ID]"
+ //+ "[SKU]" + additionalPromotionList.get(i1).getSku() + "[/SKU]"
+ + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+ + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
+ + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
+ + "[ADD_PROMO_IMAGE]" + additionalPromotionList.get(i1).getImage_promotion() + "[/ADD_PROMO_IMAGE]"
+ + "[/ADDITIONAL_PROMOTION_DATA_NEW]";
- additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
+ additional_promoition_data_xml = additional_promoition_data_xml + onXML;
}
}
- onXML = "[ADDITIONAL_VISIBILITY_NEW]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]"
- + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]"
- + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]"
- //+ "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]"
- + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]"
- + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]"
- + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]"
- + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]"
- + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]"
- + "[/ADDITIONAL_VISIBILITY_NEW]";
- //Here getSku_id gives display_id
+ final String sos_xml = "[DATA]" + additional_promoition_data_xml + "[/DATA]";
- additional_visibility_data_xml = additional_visibility_data_xml + onXML;
- KeyID = "";
- additionalVisibilitySkuList.clear();
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA_NEW");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- additional_visibility_dialog_xml = "";
- }
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
- final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]";
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_NEW");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
- }
- data.value = 45;
- data.name = getString(R.string.additional_data_uploading);
- publishProgress(data);
+ }
+ data.value = 35;
+ data.name = getString(R.string.additional_data_uploading);
+ publishProgress(data);
- //T2p Upload Data
- String t2p_data_xml = "";
- onXML = "";
- db.open();
- t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
+ //Additional Visibility Data
+ String additional_visibility_data_xml = "";
+ String additional_visibility_dialog_xml = "";
+ onXML = "";
+ String onXMLdIALOG = "";
+ String imageV1, imageV2, imageV3;
- if (t2PGetterSetters.size() > 0) {
- for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
+ db.open();
+ additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId());
- ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i1).getKey_id());
- ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i1).getKey_id());
- ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i1).getKey_id());
- String gaps_xml = "";
- String gaps_child;
+ if (additionalVisibilityList.size() > 0) {
+ for (int J = 0; J < additionalVisibilityList.size(); J++) {
- for (int l = 0; l < gapsList.size(); l++) {
- String present = "";
- if (gapsList.get(l).isPresent()) {
- present = "1";
+ if (additionalVisibilityList.get(J).getImage() == null) {
+ imageV1 = "";
} else {
- present = "0";
+ imageV1 = additionalVisibilityList.get(J).getImage();
}
- gaps_child = "[GAPS]"
+
+ if (additionalVisibilityList.get(J).getImage2() == null) {
+ imageV2 = "";
+ } else {
+ imageV2 = additionalVisibilityList.get(J).getImage2();
+ }
+
+ if (additionalVisibilityList.get(J).getImage3() == null) {
+ imageV3 = "";
+ } else {
+ imageV3 = additionalVisibilityList.get(J).getImage3();
+ }
+
+ String KeyID = additionalVisibilityList.get(J).getKey_id();
+
+ additionalVisibilitySkuList = db.getDialogStockUpload(KeyID);
+ //additionalVisibilitySkuList = additionalVisibilityList.get(J).getSkuDialogList();
+
+ if (additionalVisibilitySkuList.size() > 0) {
+ for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
+
+ onXMLdIALOG = "[VISIBILITY_DAILOG]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]"
+ + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_ID]"
+ + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]"
+ + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]"
+ + "[/VISIBILITY_DAILOG]";
+
+ additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
+ }
+ }
+
+ onXML = "[ADDITIONAL_VISIBILITY_NEW]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
- + "[CHECK_LIST_ID]" + gapsList.get(l).getChecklist_id() + "[/CHECK_LIST_ID]"
- + "[DISPLAY_ID]" + gapsList.get(l).getDisplay_id() + "[/DISPLAY_ID]"
- + "[PRESENT]" + present + "[/PRESENT]"
- + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
- + "[/GAPS]";
- gaps_xml = gaps_xml + gaps_child;
+ + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]"
+ + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]"
+ + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]"
+ //+ "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]"
+ + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]"
+ + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]"
+ + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]"
+ + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]"
+ + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]"
+ + "[/ADDITIONAL_VISIBILITY_NEW]";
+ //Here getSku_id gives display_id
+
+ additional_visibility_data_xml = additional_visibility_data_xml + onXML;
+ KeyID = "";
+ additionalVisibilitySkuList.clear();
+
+ additional_visibility_dialog_xml = "";
}
- String sku_xml = "";
- String sku_child;
+ final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]";
- for (int k = 0; k < skuList.size(); k++) {
- sku_child = "[SKU]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[SKU_ID]" + skuList.get(k).getSKU_ID() + "[/SKU_ID]"
- + "[BRAND_ID]" + skuList.get(k).getBRAND_ID() + "[/BRAND_ID]"
- + "[STOCK]" + skuList.get(k).getSTOCK() + "[/STOCK]"
- + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
- + "[/SKU]";
- sku_xml = sku_xml + sku_child;
- }
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_NEW");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }*/
+ }
+ data.value = 45;
+ data.name = getString(R.string.additional_data_uploading);
+ publishProgress(data);
- String brandxml = "";
- String brandchild;
+ //T2p Upload Data
+ String t2p_data_xml = "";
+ onXML = "";
+ db.open();
+ t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
- if (brandList.size() > 0) {
+ if (t2PGetterSetters.size() > 0) {
+ for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
- for (int M = 0; M < brandList.size(); M++) {
- brandchild = "[BRAND]"
+ ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i1).getKey_id());
+ ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i1).getKey_id());
+ ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i1).getKey_id());
+ String gaps_xml = "";
+ String gaps_child;
+
+ for (int l = 0; l < gapsList.size(); l++) {
+ String present = "";
+ if (gapsList.get(l).isPresent()) {
+ present = "1";
+ } else {
+ present = "0";
+ }
+ gaps_child = "[GAPS]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
- + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]"
- // + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"
+ + "[CHECK_LIST_ID]" + gapsList.get(l).getChecklist_id() + "[/CHECK_LIST_ID]"
+ + "[DISPLAY_ID]" + gapsList.get(l).getDisplay_id() + "[/DISPLAY_ID]"
+ + "[PRESENT]" + present + "[/PRESENT]"
+ "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
- + "[/BRAND]";
- brandxml = brandxml + brandchild;
+ + "[/GAPS]";
+ gaps_xml = gaps_xml + gaps_child;
+ }
+
+ String sku_xml = "";
+ String sku_child;
+
+ for (int k = 0; k < skuList.size(); k++) {
+ sku_child = "[SKU]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[SKU_ID]" + skuList.get(k).getSKU_ID() + "[/SKU_ID]"
+ + "[BRAND_ID]" + skuList.get(k).getBRAND_ID() + "[/BRAND_ID]"
+ + "[STOCK]" + skuList.get(k).getSTOCK() + "[/STOCK]"
+ + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
+ + "[/SKU]";
+ sku_xml = sku_xml + sku_child;
+ }
+
+
+ String brandxml = "";
+ String brandchild;
+
+ if (brandList.size() > 0) {
+
+ for (int M = 0; M < brandList.size(); M++) {
+ brandchild = "[BRAND]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]"
+ // + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"
+ + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
+ + "[/BRAND]";
+ brandxml = brandxml + brandchild;
+ }
}
- }
/* String present = "";
if (t2PGetterSetters.get(i1).isPresent()) {
present = "1";
} else {
present = "0";
- }*/
-
- onXML = "[T2P_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[BRAND_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
- + "[DISPLAY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) + "[/DISPLAY_ID]"
- + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
- + "[IMAGE]" + t2PGetterSetters.get(i1).getImage() + "[/IMAGE]"
- + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]"
- + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]"
- + "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]"
- + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]"
- + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]"
- + "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]"
- + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]"
- + "[/T2P_DATA]";
-
- t2p_data_xml = t2p_data_xml + onXML;
- }
-
- final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", t2p_final_xml);
- request.addProperty("KEYS", "T2P_DATA_FIXTURE");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
-
- /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }*/
- }
- data.value = 50;
- data.name = getString(R.string.t2p_data_uploading);
- publishProgress(data);
-
-
- //Stock Facing Planogram Tracker
- String stock_facing_planogram_xml = "";
- onXML = "";
- db.open();
- stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId());
-
- if (stockFacingPlanogramDataList.size() > 0) {
-
- for (int i1 = 0; i1 < stockFacingPlanogramDataList.size(); i1++) {
- onXML = "[STOCK_FACING_PLANOGRAM_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]"
- //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]"
- //+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
- + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]"
- + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]"
- //+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
- + "[/STOCK_FACING_PLANOGRAM_DATA]";
-
- stock_facing_planogram_xml = stock_facing_planogram_xml + onXML;
- }
-
- final String sos_xml = "[DATA]" + stock_facing_planogram_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "STOCK_FACING_PLANOGRAM_DATA");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
-
- /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }*/
- }
- data.value = 55;
- data.name = getString(R.string.stock_planogram_data_uploading);
- publishProgress(data);
-
-
- //Category Picture Data
- String Category_xml = "";
- onXML = "";
- String onCategoryList = "";
- String CategoryLISTDATA = "";
- String image1, image2, image3, image4;
-
- db.open();
- adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId());
-
- if (adddata.size() > 0) {
- for (int J = 0; J < adddata.size(); J++) {
- if (adddata.get(J).getCategoryImage1() == null) {
- image1 = "";
- } else {
- image1 = adddata.get(J).getCategoryImage1();
- }
-
- if (adddata.get(J).getCategoryImage2() == null) {
- image2 = "";
- } else {
- image2 = adddata.get(J).getCategoryImage2();
- }
-
- if (adddata.get(J).getCategoryImage3() == null) {
- image3 = "";
- } else {
- image3 = adddata.get(J).getCategoryImage3();
- }
-
- if (adddata.get(J).getCategoryImage4() == null) {
- image4 = "";
- } else {
- image4 = adddata.get(J).getCategoryImage4();
- }
-
- String KeyID = adddata.get(J).getKEY_ID();
-
- listdat = db.getCategoryPictureListUploaded(KeyID);
-
- if (listdat.size() > 0) {
- for (int k = 0; k < listdat.size(); k++) {
- onCategoryList = "[SUB_CATEGORY_LIST]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[KEY_ID]" + listdat.get(k).getCOMMON_ID() + "[/KEY_ID]"
- + "[SUB_CATEGORY_ID]" + listdat.get(k).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
- + "[SUB_CategoryImage1]" + listdat.get(k).getSubCategoryCamera1() + "[/SUB_CategoryImage1]"
- + "[SUB_CategoryImage2]" + listdat.get(k).getSubCategoryCamera2() + "[/SUB_CategoryImage2]"
- + "[/SUB_CATEGORY_LIST]";
-
- CategoryLISTDATA = CategoryLISTDATA + onCategoryList;
+ }*/String qty = t2PGetterSetters.get(i1).getQty();
+ if(qty.equals("")){
+ qty = "0";
}
- }
- onXML = "[CATEGORY_LIST]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[KEY_ID]" + adddata.get(J).getKEY_ID() + "[/KEY_ID]"
- + "[CATEGORY_ID]" + adddata.get(J).getCategoryId() + "[/CATEGORY_ID]"
- + "[CAMERA_ALLOW]" + adddata.get(J).getCamera_allow() + "[/CAMERA_ALLOW]"
- + "[IMAGE_URL_1]" + image1 /*adddata.get(J).getCategoryImage1()*/ + "[/IMAGE_URL_1]"
- + "[IMAGE_URL_2]" + image2 /*adddata.get(J).getCategoryImage2()*/ + "[/IMAGE_URL_2]"
- + "[IMAGE_URL_3]" + image3 /*adddata.get(J).getCategoryImage3()*/ + "[/IMAGE_URL_3]"
- + "[IMAGE_URL_4]" + image4 /*adddata.get(J).getCategoryImage4()*/ + "[/IMAGE_URL_4]"
- + "[SUB_LIST]" + CategoryLISTDATA + "[/SUB_LIST]"
- + "[/CATEGORY_LIST]";
-
- Category_xml = Category_xml + onXML;
- CategoryLISTDATA = "";
- }
-
- final String sos_xml = "[DATA]" + Category_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "CATEGORY_PICTURE");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
-
- /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
- return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
- }*/
- } else {
-
- db.open();
- ArrayList nocamera_data_list = db.getNoCameraCategoryStoreWiseDataInserted(coverageList.get(i).getStoreId());
-
- if (nocamera_data_list.size() > 0) {
-
- String onXml_nodata = "", No_camera_data = "";
- for (int n = 0; n < nocamera_data_list.size(); n++) {
-
- onXml_nodata = "[NO_CAMERA_POG_DATA]"
+ onXML = "[T2P_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + nocamera_data_list.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
- + "[SUB_CATEGORY_ID]" + nocamera_data_list.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
- + "[SKU_GROUP_ID]" + nocamera_data_list.get(n).getSKUGROUP_ID() + "[/SKU_GROUP_ID]"
- + "[ROW_NO]" + nocamera_data_list.get(n).getRow_no() + "[/ROW_NO]"
- + "[COLUMN_NO]" + nocamera_data_list.get(n).getColumn_no() + "[/COLUMN_NO]"
- + "[FACING]" + nocamera_data_list.get(n).getFacing() + "[/FACING]"
- + "[/NO_CAMERA_POG_DATA]";
+ + "[CATEGORY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[BRAND_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ + "[DISPLAY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) + "[/DISPLAY_ID]"
+ + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
+ + "[IMAGE]" + t2PGetterSetters.get(i1).getImage() + "[/IMAGE]"
+ + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]"
+ + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]"
+ + "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]"
- No_camera_data = No_camera_data + onXml_nodata;
+ //Quantity visibility added for UAE 04.07.2019
+ + "[Quantity]" + qty + "[/Quantity]"
+
+ //Non t2p reason id added - 21-6-2018
+ + "[TREASON_ID]" + t2PGetterSetters.get(i1).getNon_t2p_reason_id() + "[/TREASON_ID]"
+
+ + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]"
+ + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]"
+ + "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]"
+ + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]"
+ + "[/T2P_DATA]";
+
+ t2p_data_xml = t2p_data_xml + onXML;
}
- final String sos_xml = "[DATA]" + No_camera_data + "[/DATA]";
+ final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", t2p_final_xml);
+ request.addProperty("KEYS", "T2P_DATA_FIXTURE_NEW");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }*/
+ }
+ data.value = 50;
+ data.name = getString(R.string.t2p_data_uploading);
+ publishProgress(data);
+
+
+ //Stock Facing Planogram Tracker
+ String stock_facing_planogram_xml = "";
+ onXML = "";
+ db.open();
+ stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId());
+
+ if (stockFacingPlanogramDataList.size() > 0) {
+
+ for (int i1 = 0; i1 < stockFacingPlanogramDataList.size(); i1++) {
+ onXML = "[STOCK_FACING_PLANOGRAM_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]"
+ //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]"
+ //+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]"
+ + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]"
+ //+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
+ + "[/STOCK_FACING_PLANOGRAM_DATA]";
+
+ stock_facing_planogram_xml = stock_facing_planogram_xml + onXML;
+ }
+
+ final String sos_xml = "[DATA]" + stock_facing_planogram_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "NO_CAMERA_POG");
+ request.addProperty("KEYS", "STOCK_FACING_PLANOGRAM_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }*/
+ }
+ data.value = 55;
+ data.name = getString(R.string.stock_planogram_data_uploading);
+ publishProgress(data);
+
+
+ //Category Picture Data
+ String Category_xml = "";
+ onXML = "";
+ String onCategoryList = "";
+ String CategoryLISTDATA = "";
+ String image1, image2, image3, image4;
+
+ db.open();
+ adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId());
+
+ if (adddata.size() > 0) {
+ for (int J = 0; J < adddata.size(); J++) {
+ if (adddata.get(J).getCategoryImage1() == null) {
+ image1 = "";
+ } else {
+ image1 = adddata.get(J).getCategoryImage1();
+ }
+
+ if (adddata.get(J).getCategoryImage2() == null) {
+ image2 = "";
+ } else {
+ image2 = adddata.get(J).getCategoryImage2();
+ }
+
+ if (adddata.get(J).getCategoryImage3() == null) {
+ image3 = "";
+ } else {
+ image3 = adddata.get(J).getCategoryImage3();
+ }
+
+ if (adddata.get(J).getCategoryImage4() == null) {
+ image4 = "";
+ } else {
+ image4 = adddata.get(J).getCategoryImage4();
+ }
+
+ String KeyID = adddata.get(J).getKEY_ID();
+
+ listdat = db.getCategoryPictureListUploaded(KeyID);
+
+ if (listdat.size() > 0) {
+ for (int k = 0; k < listdat.size(); k++) {
+ onCategoryList = "[SUB_CATEGORY_LIST]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[KEY_ID]" + listdat.get(k).getCOMMON_ID() + "[/KEY_ID]"
+ + "[SUB_CATEGORY_ID]" + listdat.get(k).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
+ + "[SUB_CategoryImage1]" + listdat.get(k).getSubCategoryCamera1() + "[/SUB_CategoryImage1]"
+ + "[SUB_CategoryImage2]" + listdat.get(k).getSubCategoryCamera2() + "[/SUB_CategoryImage2]"
+ + "[/SUB_CATEGORY_LIST]";
+
+ CategoryLISTDATA = CategoryLISTDATA + onCategoryList;
+ }
+ }
+
+ onXML = "[CATEGORY_LIST]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[KEY_ID]" + adddata.get(J).getKEY_ID() + "[/KEY_ID]"
+ + "[CATEGORY_ID]" + adddata.get(J).getCategoryId() + "[/CATEGORY_ID]"
+ + "[CAMERA_ALLOW]" + adddata.get(J).getCamera_allow() + "[/CAMERA_ALLOW]"
+ + "[IMAGE_URL_1]" + image1 /*adddata.get(J).getCategoryImage1()*/ + "[/IMAGE_URL_1]"
+ + "[IMAGE_URL_2]" + image2 /*adddata.get(J).getCategoryImage2()*/ + "[/IMAGE_URL_2]"
+ + "[IMAGE_URL_3]" + image3 /*adddata.get(J).getCategoryImage3()*/ + "[/IMAGE_URL_3]"
+ + "[IMAGE_URL_4]" + image4 /*adddata.get(J).getCategoryImage4()*/ + "[/IMAGE_URL_4]"
+ + "[SUB_LIST]" + CategoryLISTDATA + "[/SUB_LIST]"
+ + "[/CATEGORY_LIST]";
+
+ Category_xml = Category_xml + onXML;
+ CategoryLISTDATA = "";
+ }
+
+ final String sos_xml = "[DATA]" + Category_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "CATEGORY_PICTURE");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }*/
+ } else {
+
+ db.open();
+ ArrayList nocamera_data_list = db.getNoCameraCategoryStoreWiseDataInserted(coverageList.get(i).getStoreId());
+
+ if (nocamera_data_list.size() > 0) {
+
+ String onXml_nodata = "", No_camera_data = "";
+ for (int n = 0; n < nocamera_data_list.size(); n++) {
+
+ int vertical;
+ if (nocamera_data_list.get(n).isVertical()) {
+ vertical = 1;
+ } else {
+ vertical = 0;
+ }
+
+ onXml_nodata = "[NO_CAMERA_POG_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + nocamera_data_list.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
+ + "[SUB_CATEGORY_ID]" + nocamera_data_list.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
+ + "[SKU_GROUP_ID]" + nocamera_data_list.get(n).getSKUGROUP_ID() + "[/SKU_GROUP_ID]"
+ + "[ROW_NO]" + nocamera_data_list.get(n).getRow_no() + "[/ROW_NO]"
+ + "[COLUMN_NO]" + nocamera_data_list.get(n).getColumn_no() + "[/COLUMN_NO]"
+ + "[FACING]" + nocamera_data_list.get(n).getFacing() + "[/FACING]"
+ + "[IS_VERTICAL]" + vertical + "[/IS_VERTICAL]"
+ + "[/NO_CAMERA_POG_DATA]";
+
+ No_camera_data = No_camera_data + onXml_nodata;
+ }
+
+ final String sos_xml = "[DATA]" + No_camera_data + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "NO_CAMERA_POG");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+ }
+
+ }
+ data.value = 60;
+ data.name = getString(R.string.additional_data_uploading);
+ publishProgress(data);
+
+ //Audit data
+ db.open();
+ ArrayList audit_data = db.getAuditDataForUpload(coverageList.get(i).getStoreId());
+
+ if (audit_data.size() > 0) {
+
+ String onXml_audit_data = "", Audit_data = "";
+ for (int n = 0; n < audit_data.size(); n++) {
+
+ onXml_audit_data = "[AUDIT_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + audit_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
+ + "[QUESTION_ID]" + audit_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
+ + "[ANSWER_ID]" + audit_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
+ + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]"
+ + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]"
+ + "[ANSWER]" + audit_data.get(n).getANSWER() + "[/ANSWER]"
+ + "[/AUDIT_DATA]";
+
+ Audit_data = Audit_data + onXml_audit_data;
+ }
+
+ final String sos_xml = "[DATA]" + Audit_data + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "AUDIT_DATA_LATEST");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
@@ -1129,221 +1300,177 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
result = envelope.getResponse();
}
- }
- data.value = 60;
- data.name = getString(R.string.additional_data_uploading);
- publishProgress(data);
-
- //Audit data
- db.open();
- ArrayList audit_data = db.getAuditDataForUpload(coverageList.get(i).getStoreId());
-
- if (audit_data.size() > 0) {
-
- String onXml_audit_data = "", Audit_data = "";
- for (int n = 0; n < audit_data.size(); n++) {
-
- onXml_audit_data = "[AUDIT_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + audit_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
- + "[QUESTION_ID]" + audit_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
- + "[ANSWER_ID]" + audit_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
- + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]"
- + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]"
- + "[ANSWER]" + audit_data.get(n).getANSWER() + "[/ANSWER]"
- + "[/AUDIT_DATA]";
-
- Audit_data = Audit_data + onXml_audit_data;
- }
-
- final String sos_xml = "[DATA]" + Audit_data + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "AUDIT_DATA_LATEST");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
- }
-
- data.value = 62;
- data.name = getString(R.string.audit);
- publishProgress(data);
-
- //POG data
- db.open();
- ArrayList pog_data = db.getAfterSavePOGForUploadData(coverageList.get(i).getStoreId());
-
- if (pog_data.size() > 0) {
-
- String onXml_pog_data = "", POG_data = "";
- for (int n = 0; n < pog_data.size(); n++) {
-
- onXml_pog_data = "[POG_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + pog_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
- + "[SUB_CATEGORY_ID]" + pog_data.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
- + "[QUESTION_ID]" + pog_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
- + "[ANSWER_ID]" + pog_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
- + "[/POG_DATA]";
-
- POG_data = POG_data + onXml_pog_data;
- }
-
- final String sos_xml = "[DATA]" + POG_data + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "POG_DATA");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
- }
-
- data.value = 63;
- data.name = getString(R.string.pog);
- publishProgress(data);
-
- //Coaching visit data----------------------------------------
- db.open();
- coachingVisitData = db.getCoachingVisitData(coverageList.get(i).getStoreId());
-
- if (coachingVisitData.size()>0) {
-
- String onXml_coaching_data = "", coaching_xml="";
- for(int j=0;j pog_data = db.getAfterSavePOGForUploadData(coverageList.get(i).getStoreId());
- db.open();
- counterfeitProductExistsGetterSetters = db.getCounterfeitProductExistsAfterData(coverageList.get(i).getStoreId(), null);
- if (counterfeitProductExistsGetterSetters.size() > 0) {
+ if (pog_data.size() > 0) {
- for (int l = 0; l < counterfeitProductExistsGetterSetters.size(); l++) {
+ String onXml_pog_data = "", POG_data = "";
+ for (int n = 0; n < pog_data.size(); n++) {
- counterfeitProductGetterSetters = db.getCounterfeitProductAfterData(counterfeitProductExistsGetterSetters.get(l).get_id(), null);
+ onXml_pog_data = "[POG_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + pog_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
+ + "[SUB_CATEGORY_ID]" + pog_data.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
+ + "[QUESTION_ID]" + pog_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
+ + "[ANSWER_ID]" + pog_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
+ + "[/POG_DATA]";
- for (int i1 = 0; i1 < counterfeitProductGetterSetters.size(); i1++) {
- if (!counterfeitProductGetterSetters.get(i1).getCategory_id().equals("0")) {
-
- product_add_xml = "[PRODUCT_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[SKU_NAME]" + counterfeitProductGetterSetters.get(i1).getSkuName() + "[/SKU_NAME]"
- + "[BRAND_ID]" + counterfeitProductGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]"
- + "[STOCK]" + counterfeitProductGetterSetters.get(i1).getStock() + "[/STOCK]"
- + "[IMAGE]" + counterfeitProductGetterSetters.get(i1).getImgStr() + "[/IMAGE]"
- + "[IMAGE1]" + counterfeitProductGetterSetters.get(i1).getImgStr1() + "[/IMAGE1]"
- + "[IMAGE2]" + counterfeitProductGetterSetters.get(i1).getImgStr2() + "[/IMAGE2]"
- + "[/PRODUCT_DATA]";
-
- add_product_data_xml = add_product_data_xml + product_add_xml;
- }
+ POG_data = POG_data + onXml_pog_data;
}
- int exists = 0;
- if (counterfeitProductExistsGetterSetters.get(l).isExists()) {
- exists = 1;
- }
+ final String sos_xml = "[DATA]" + POG_data + "[/DATA]";
- product_exists_xml = "[COUNTERFEIT_PRODUCT_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
- + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
- + "[COUNTERFEIT_DATA]" + add_product_data_xml + "[/COUNTERFEIT_DATA]"
- + "[/COUNTERFEIT_PRODUCT_DATA]";
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "POG_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- counterfeit_product_data_xml = counterfeit_product_data_xml + product_exists_xml;
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
}
- final String sos_xml = "[DATA]" + counterfeit_product_data_xml + "[/DATA]";
+ data.value = 63;
+ data.name = getString(R.string.pog);
+ publishProgress(data);
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "COUNTERFEIT_PRODUCT_DATA");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
+ //Coaching visit data
+ db.open();
+ coachingVisitData = db.getCoachingVisitData(coverageList.get(i).getStoreId());
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
+ if (coachingVisitData.size() > 0) {
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+ String onXml_coaching_data = "", coaching_xml = "";
+ for (int j = 0; j < coachingVisitData.size(); j++) {
- result = envelope.getResponse();
+ String exist;
+
+ if (coachingVisitData.get(j).isExists()) {
+ exist = "1";
+ } else {
+ exist = "0";
+ }
+
+ coaching_xml = "[COACHING_VISIT_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]"
+ + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]"
+ + "[IS_EXIST]" + exist + "[/IS_EXIST]"
+ + "[/COACHING_VISIT_DATA]";
+ onXml_coaching_data = onXml_coaching_data + coaching_xml;
+ }
+
+ final String sos_xml = "[DATA]" + onXml_coaching_data + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "COACHING_VISIT_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ data.value = 64;
+ data.name = getString(R.string.coaching_visit);
+ publishProgress(data);
+ }
+
+ //Counterfeit Product - Country Id - 6 (UAE)
+ String counterfeit_product_data_xml = "", add_product_data_xml = "", product_exists_xml = "", product_add_xml = "";
+
+ db.open();
+ counterfeitProductExistsGetterSetters = db.getCounterfeitProductExistsAfterData(coverageList.get(i).getStoreId(), null);
+ if (counterfeitProductExistsGetterSetters.size() > 0) {
+
+ for (int l = 0; l < counterfeitProductExistsGetterSetters.size(); l++) {
+
+ add_product_data_xml = "";
+
+ counterfeitProductGetterSetters = db.getCounterfeitProductAfterData(counterfeitProductExistsGetterSetters.get(l).get_id(), null);
+
+ for (int i1 = 0; i1 < counterfeitProductGetterSetters.size(); i1++) {
+ if (!counterfeitProductGetterSetters.get(i1).getCategory_id().equals("0")) {
+
+ product_add_xml = "[PRODUCT_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[SKU_NAME]" + counterfeitProductGetterSetters.get(i1).getSkuName() + "[/SKU_NAME]"
+ + "[BRAND_ID]" + counterfeitProductGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]"
+ + "[STOCK]" + counterfeitProductGetterSetters.get(i1).getStock() + "[/STOCK]"
+ + "[IMAGE]" + counterfeitProductGetterSetters.get(i1).getImgStr() + "[/IMAGE]"
+ + "[IMAGE1]" + counterfeitProductGetterSetters.get(i1).getImgStr1() + "[/IMAGE1]"
+ + "[IMAGE2]" + counterfeitProductGetterSetters.get(i1).getImgStr2() + "[/IMAGE2]"
+ + "[/PRODUCT_DATA]";
+
+ add_product_data_xml = add_product_data_xml + product_add_xml;
+ }
+ }
+
+ int exists = 0;
+ if (counterfeitProductExistsGetterSetters.get(l).isExists()) {
+ exists = 1;
+ }
+
+ product_exists_xml = "[COUNTERFEIT_PRODUCT_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
+ + "[COUNTERFEIT_DATA]" + add_product_data_xml + "[/COUNTERFEIT_DATA]"
+ + "[/COUNTERFEIT_PRODUCT_DATA]";
+
+ counterfeit_product_data_xml = counterfeit_product_data_xml + product_exists_xml;
+
+ }
+
+ final String sos_xml = "[DATA]" + counterfeit_product_data_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "COUNTERFEIT_PRODUCT_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
- }
+ }
- data.value = 65;
- data.name = getString(R.string.title_activity_counterfeit_products);
- publishProgress(data);
+ data.value = 65;
+ data.name = getString(R.string.title_activity_counterfeit_products);
+ publishProgress(data);
+ }
//-----------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
index 370e474..d546af8 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -589,6 +589,8 @@ public class UploadActivity extends AppCompatActivity {
String image_xml = "";
image_xml = "[IMG_L]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USERID]" + userId + "[/USERID]"
+ "[IMG1]" + imageGetterSetter.getImage1() + "[/IMG1]"
+ "[IMG2]" + imageGetterSetter.getImage2() + "[/IMG2]"
+ "[IMG3]" + imageGetterSetter.getImage3() + "[/IMG3]"
@@ -751,7 +753,7 @@ public class UploadActivity extends AppCompatActivity {
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
//+ "[USERID]" + userId + "[/USERID]"
- + "[SKID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKID]"
+ + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
+ "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
+ "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
@@ -1147,6 +1149,10 @@ public class UploadActivity extends AppCompatActivity {
} else {
present = "0";
}*/
+ String qty = t2PGetterSetters.get(i1).getQty();
+ if(qty.equals("")){
+ qty = "0";
+ }
onXML = "[T2P_DATA]"
+ "[MID]" + mid + "[/MID]"
@@ -1160,6 +1166,9 @@ public class UploadActivity extends AppCompatActivity {
+ "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]"
+ "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]"
+ //Quantity visibility added for UAE 04.07.2019
+ + "[Quantity]" + qty + "[/Quantity]"
+
//Non t2p reason id added - 21-6-2018
+ "[TREASON_ID]" + t2PGetterSetters.get(i1).getNon_t2p_reason_id() + "[/TREASON_ID]"
@@ -1176,7 +1185,7 @@ public class UploadActivity extends AppCompatActivity {
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", t2p_final_xml);
- request.addProperty("KEYS", "T2P_DATA_FIXTURE_NEW");
+ request.addProperty("KEYS", "T2P_DATA_FIXTURE_QUANTITY");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
index 3aee28a..172f365 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
@@ -648,7 +648,7 @@ public class UploadImageWithRetrofit {
}
db.updateCoverageStatus(storeListPharma.get(i).getSTORE_ID(), uploadStatus);
- db.updateStoreStatusOnLeave(storeListPharma.get(i).getSTORE_ID(), storeList.get(i).getVISIT_DATE(),
+ db.updateStoreStatusOnLeave(storeListPharma.get(i).getSTORE_ID(), storeListPharma.get(i).getVISIT_DATE(),
uploadStatus, CommonString.FROM_PHARMA);
db.deleteTableWithStoreID(storeListPharma.get(i).getSTORE_ID());
@@ -703,7 +703,7 @@ public class UploadImageWithRetrofit {
}
db.updateCoverageStatus(storeListAdditional.get(i).getSTORE_ID(), uploadStatus);
- db.updateStoreStatusOnLeave(storeListAdditional.get(i).getSTORE_ID(), storeList.get(i).getVISIT_DATE(),
+ db.updateStoreStatusOnLeave(storeListAdditional.get(i).getSTORE_ID(), storeListAdditional.get(i).getVISIT_DATE(),
uploadStatus, CommonString.FROM_ADDITIONAL);
db.deleteTableWithStoreID(storeListAdditional.get(i).getSTORE_ID());
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java
index 92ca1ac..600fa20 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java
@@ -14,6 +14,15 @@ public class MAPPINGT2PGetterSetter {
ArrayList BRAND_ID = new ArrayList<>();
ArrayList DISPLAY_ID = new ArrayList<>();
ArrayList CATEGORY_FIXTURE = new ArrayList<>();
+ ArrayList ALLOW_QTY = new ArrayList<>();
+
+ public ArrayList getALLOW_QTY() {
+ return ALLOW_QTY;
+ }
+
+ public void setALLOW_QTY(String ALLOW_QTY) {
+ this.ALLOW_QTY.add(ALLOW_QTY);
+ }
public String getTable_MAPPING_T2P() {
return table_MAPPING_T2P;
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
index ce4680f..a2a32e0 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
@@ -13,7 +13,24 @@ public class T2PGetterSetter {
String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path, image1, image2, category_fixture, non_t2p_reason_id="0";
boolean isPresent;
int present = -1;
+ String allowQty ="";
+ String qty="";
+ public String getQty() {
+ return qty;
+ }
+
+ public void setQty(String qty) {
+ this.qty = qty;
+ }
+
+ public String getAllowQty() {
+ return allowQty;
+ }
+
+ public void setAllowQty(String allowQty) {
+ this.allowQty = allowQty;
+ }
ArrayList gapsChecklist = new ArrayList<>();
ArrayList skulist = new ArrayList<>();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
index 1631c33..d35864f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -537,6 +537,8 @@ public class XMLHandlers {
}
if (xpp.getName().equals("CATEGORY_FIXTURE")) {
t2p.setCATEGORY_FIXTURE(xpp.nextText());
+ } if (xpp.getName().equals("ALLOW_QTY")) {
+ t2p.setALLOW_QTY(xpp.nextText());
}
}
xpp.next();
diff --git a/GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml b/GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml
new file mode 100644
index 0000000..eb08ddd
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/activity_stock_pricing.xml b/GSKMTOrange/src/main/res/layout/activity_stock_pricing.xml
new file mode 100644
index 0000000..8180973
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_stock_pricing.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/content_counterfeit_indicator_web.xml b/GSKMTOrange/src/main/res/layout/content_counterfeit_indicator_web.xml
new file mode 100644
index 0000000..59a4fdd
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_counterfeit_indicator_web.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/content_stock_pricing.xml b/GSKMTOrange/src/main/res/layout/content_stock_pricing.xml
new file mode 100644
index 0000000..bdbedc8
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_stock_pricing.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/item_stock_pricing.xml b/GSKMTOrange/src/main/res/layout/item_stock_pricing.xml
new file mode 100644
index 0000000..7c6aa8d
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/item_stock_pricing.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml
index 6fc6070..e1dcd08 100644
--- a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml
+++ b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml
@@ -64,6 +64,7 @@
+
+
+
+
+
+
+
+
+ - الرقم السري غير صحيح, تم بلوغ الحد لإدخال الرقم السري
تحتاج إلى إعادة تعيين الرقم السري
+
+ هل نسيت الرقم السري
+ الرجاء إدخال 4 رموز للرقم السري
+ تعيين الرقم السري
+ الرجاء تعيين 4 رموز للرقم السري
+ محاولة متبيقة
+ إعادة تعيين
+ مسح
+
+ إضافي محل
+ الأدوية او المنتجات المقلدة
+
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 1eeba75..094dacc 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -387,7 +387,6 @@
Select Coach
AdditionalPromoSKUwiseActivity
Discount Percentage
- Price
Please select Sub category
Please select Brand
Please select SKU
@@ -427,6 +426,7 @@
Please enter SKU name
Please enter Stock
+
Forgot MPin
Please Enter Four Digit MPin
Set MPin
@@ -444,5 +444,12 @@
GSK
Competitor
SOS Detail
+ Stock Pricing
+
+
+ Price
+
+ Please fill Stock Count
+ Counterfeit Indicators
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5679984..c5a25c6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Jan 15 10:04:42 IST 2019
+#Tue May 28 18:51:36 IST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME