Merge pull request #63 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_uae_update_url

Ysy uae update url

GSKMTOrange/build.gradle

@@ -21,24 +21,24 @@ android {
         targetSdkVersion 26
 
         //For Egypt
-        /*versionCode 23
+        /*versionCode 26
-        versionName "3.5"*/
+        versionName "3.8"*/
 
         //For UAE
-        /*versionCode 21
+        versionCode 24
-        versionName "3.3"*/
+        versionName "3.6"
 
         //For Turkey
-        /*versionCode 21
+        /*versionCode 23
-        versionName "3.3"*/
+        versionName "3.5"*/
 
         //For KSA
         /*versionCode 25
         versionName "3.7"*/
 
         //For SA
-        versionCode 26
+        /*versionCode 26
-        versionName "3.7"
+        versionName "3.7"*/
 
         multiDexEnabled true
 

GSKMTOrange/src/main/AndroidManifest.xml

@@ -24,12 +24,21 @@
         android:largeHeap="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity
+            android:name=".dailyentry.CounterfeitIndicatorWebActivity"
+            android:label="@string/title_activity_counterfeit_indicator_web"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".dailyentry.StockPricingActivity"
+            android:label="@string/title_activity_stock_pricing"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".pharma_stores.PharmaActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_paharma"
             android:screenOrientation="portrait"
-            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:theme="@style/AppTheme.NoActionBar" />
-            android:theme="@style/AppTheme.NoActionBar"></activity>
         <activity
             android:name=".dailyentry.StockActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -92,7 +92,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB57";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB59";
     public static final int DATABASE_VERSION = 15;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -287,9 +287,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT_EXISTS, "STORE_ID" + "='" + storeid + "'", null);
         db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT, "STORE_ID" + "='" + storeid + "'", null);
         db.delete(CommonString.TABLE_INSERT_STOCK, "Store_Id" + "='" + storeid + "'", null);
-        db.delete(CommonString.TABLE_INSERT_PHARMA_MSL_DATA, "Store_Id" + "='" + storeid + "'", null);
+
-        db.delete(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, "Store_Id" + "='" + storeid + "'", null);
+        //Pharma store data
-        db.delete(CommonString.TABLE_INSERT_STORE_PROFILE_DATA, "Store_Id" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_PHARMA_IMAGE_DATA, "STORE_ID" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_STORE_PROFILE_DATA, "STORE_ID" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, "STORE_ID" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_PHARMA_MSL_DATA, "STORE_ID" + "='" + storeid + "'", null);
 
     }
 
@@ -393,7 +396,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
             dbcursor = db.rawQuery("Select DISTINCT BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, " +
                     "DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH, " +
-                    "T.CATEGORY_FIXTURE As CATEGORY_FIXTURE from BRAND_MASTER BM INNER JOIN "+ tableName +" T " +
+                    "T.CATEGORY_FIXTURE As CATEGORY_FIXTURE,T.ALLOW_QTY As ALLOW_QTY from BRAND_MASTER BM INNER JOIN "+ tableName +" T " +
                     "ON BM.BRAND_ID = T.BRAND_ID INNER JOIN  DISPLAY_MASTER DM  " +
                     "ON T.DISPLAY_ID= DM.DISPLAY_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON  BM.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID " +
                     "WHERE T.STORE_ID = '" + store_id + "' AND SCM.CATEGORY_ID ='" + category_id + "'", null);
@@ -424,6 +427,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     t2p.setCategory_fixture(dbcursor.getString(dbcursor
                             .getColumnIndexOrThrow("CATEGORY_FIXTURE")));
 
+                    t2p.setAllowQty(dbcursor.getString(dbcursor
+                            .getColumnIndexOrThrow("ALLOW_QTY")));
+
                     t2p.setImage("");
                     t2p.setImage1("");
                     t2p.setImage2("");
@@ -1073,6 +1079,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("BRAND_ID", data.getBRAND_ID().get(i));
                 values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
                 values.put("CATEGORY_FIXTURE", data.getCATEGORY_FIXTURE().get(i));
+                values.put("ALLOW_QTY", data.getALLOW_QTY().get(i));
 
                 db.insert(tableName, null, values);
             }
@@ -2877,6 +2884,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put(CommonString.KEY_PRESENT, data.get(i).getPresent());
                 values.put(CommonString.KEY_CATEGORY_FIXTURE, data.get(i).getCategory_fixture());
                 values.put(CommonString.KEY_NON_T2P_REASON_ID, data.get(i).getNon_t2p_reason_id());
+                values.put(CommonString.KEY_QTY, data.get(i).getQty());
+                values.put(CommonString.KEY_FLAG_QUANTITY, data.get(i).getAllowQty());
 
                 l = db.insert(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, values);
 
@@ -3199,6 +3208,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     tp.setPresent(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT))));
                     tp.setCategory_fixture(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_FIXTURE)));
                     tp.setNon_t2p_reason_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_NON_T2P_REASON_ID)));
+                    tp.setQty(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_QTY)));
+                    tp.setAllowQty(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_FLAG_QUANTITY)));
 
                     list.add(tp);
                     dbcursor.moveToNext();

GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java

@@ -686,7 +686,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
             if (result.equals(CommonString.KEY_SUCCESS)) {
 
                 //set true for South Africa
-                boolean forSA = true;
+                boolean forSA = false;
 
 //				database.open();
                 if(forSA){

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -42,6 +42,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean;
 import cpm.com.gskmtorange.GetterSetter.StoreBean;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.CounterfeitIndicatorWebActivity;
 import cpm.com.gskmtorange.dailyentry.DeliveryCallActivity;
 import cpm.com.gskmtorange.dailyentry.FutureJCPActivity;
 import cpm.com.gskmtorange.dailyentry.PlanogramPDFActivity;
@@ -225,6 +226,13 @@ public class MainActivity extends AppCompatActivity
                     nav_Menu.findItem(R.id.nav_pharmacy_stores).setVisible(true);
                 }
 
+
+                if (configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("COUNTERFEIT INDICATORS") &&
+                        configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")) {
+                    Menu nav_Menu = navigationView.getMenu();
+                    nav_Menu.findItem(R.id.nav_counterfeit_indicator).setVisible(true);
+                }
+
             }
         }
 
@@ -484,6 +492,13 @@ public class MainActivity extends AppCompatActivity
 
                 overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
             }
+        }else if (id == R.id.nav_counterfeit_indicator) {
+
+            Intent intent = new Intent(this, CounterfeitIndicatorWebActivity.class);
+            startActivity(intent);
+
+            overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -75,6 +75,8 @@ public class CommonString {
     public static final String KEY_DISPLAY = "DISPLAY";
     public static final String KEY_REMARK = "REMARK";
     public static final String KEY_PRESENT = "PRESENT";
+    public static final String KEY_QTY = "QTY";
+    public static final String KEY_FLAG_QUANTITY = "FLAG_QUANTITY";
     public static final String KEY_COMMON_ID = "COMMON_ID";
     public static final String KEY_CHECKLIST_ID = "CHECKLIST_ID";
     public static final String KEY_CHECKLIST = "CHECKLIST";
@@ -144,7 +146,8 @@ public class CommonString {
     public static String URL = "http://gskme.parinaam.in/Gskwebservice.asmx";
 
     //temp remove
-    //public static String URL = "http://gskmetest.parinaam.in/gskwebservice.asmx";
+    //public static String URL = "http://gskmetest.parinaam.in/Gskwebservice.asmx";
+
 
     public static final String NAMESPACE = "http://tempuri.org/";
     public static final String METHOD_LOGIN = "UserLoginDetail";
@@ -704,6 +707,8 @@ public class CommonString {
             + KEY_IMAGE2 + " VARCHAR,"
             + KEY_REMARK + " VARCHAR,"
             + KEY_PRESENT + " VARCHAR,"
+            + KEY_QTY + " VARCHAR,"
+            + KEY_FLAG_QUANTITY + " INTEGER,"
             + KEY_NON_T2P_REASON_ID + " INTEGER,"
             + KEY_CATEGORY_FIXTURE + " INTEGER"
             + ")";

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java

@@ -59,7 +59,7 @@ public class AuditActivity extends AppCompatActivity {
     boolean checkflag = true;
     private SharedPreferences preferences;
     String categoryName, categoryId, Error_Message = "", pathforcheck = "", _path = "", str, img_str = "", img_str2 = "";
-    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, store_flag_str;
+    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, store_flag_str, country_id="";
     GSKOrangeDB db;
     ArrayList<AuditDataGetterSetter> question_list = new ArrayList<>(), childListData;
     HashMap<AuditDataGetterSetter, ArrayList<AuditDataGetterSetter>> 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);
             }
 

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);
+    }
+}

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;
 
                 }

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

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<MSL_AvailabilityStockFacingGetterSetter> headerDataList;
+    ArrayList<MSL_AvailabilityStockFacingGetterSetter> childDataList= new ArrayList<>();
+    List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData;
+    HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> hashMapListChildData;
+    ExpandableListAdapter adapter;
+
+    List<Integer> 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<MSL_AvailabilityStockFacingGetterSetter> _listDataHeader;
+        private HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> _listDataChild;
+
+        public ExpandableListAdapter(Context context, List<MSL_AvailabilityStockFacingGetterSetter> listDataHeader,
+                                     HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> 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;
+    }
+}

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++) {

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

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) {

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

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

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

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

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java

@@ -14,6 +14,15 @@ public class MAPPINGT2PGetterSetter {
     ArrayList<String> BRAND_ID = new ArrayList<>();
     ArrayList<String> DISPLAY_ID = new ArrayList<>();
     ArrayList<String> CATEGORY_FIXTURE = new ArrayList<>();
+    ArrayList<String> ALLOW_QTY = new ArrayList<>();
+
+    public ArrayList<String> 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;

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<GapsChecklistGetterSetter> gapsChecklist = new ArrayList<>();
     ArrayList<SkuGetterSetter> skulist = new ArrayList<>();

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

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".dailyentry.CounterfeitIndicatorWebActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_counterfeit_indicator_web" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@android:drawable/ic_dialog_email"
+        android:visibility="gone"/>
+
+</android.support.design.widget.CoordinatorLayout>

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".dailyentry.StockPricingActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_stock_pricing" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@mipmap/save_icon"/>
+
+</android.support.design.widget.CoordinatorLayout>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".dailyentry.CounterfeitIndicatorWebActivity"
+    tools:showIn="@layout/activity_counterfeit_indicator_web">
+    <WebView
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible"></WebView>
+
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".dailyentry.StockPricingActivity"
+    tools:showIn="@layout/activity_stock_pricing"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/lin_category"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="5dp"
+        android:weightSum="1">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight=".5"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingBottom="5dp"
+                android:paddingTop="5dp"
+                android:text="@string/msl_availability_mbq"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="#222" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight=".5"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingBottom="5dp"
+                android:paddingTop="5dp"
+                android:text="@string/price"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="#222" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <ExpandableListView
+        android:id="@+id/expandableListView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:cacheColorHint="#00000000"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:scrollingCache="false" />
+</LinearLayout>
+

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/card_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        card_view:cardCornerRadius="5dp"
+        android:elevation="4dp">
+
+        <LinearLayout
+            android:id="@+id/lin_category"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="5dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:weightSum="5">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:weightSum="1">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight=".7"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/txt_skuName"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:text="SKU Name Value "
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="#222"
+                        android:textColorHint="#666"
+                        />
+                </LinearLayout>
+
+
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_weight=".3"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <EditText
+                        android:id="@+id/et_price"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@null"
+                        android:gravity="center"
+                        android:inputType="numberDecimal"
+                        android:maxLength="6"
+                        android:paddingBottom="5dp"
+                        android:paddingTop="5dp"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="#222"
+                        android:textColorHint="#666" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@color/black" />
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+</LinearLayout>

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

@@ -64,6 +64,7 @@
             </LinearLayout>
 
 
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -117,6 +118,33 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/ly_allowqty"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:orientation="horizontal"
+                android:weightSum="3">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="@dimen/custom_margin"
+                    android:text="@string/quantity"
+                    android:textStyle="bold" />
+
+                <EditText
+                    android:id="@+id/edtallow_qty"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:inputType="number"
+                    android:maxLength="3"
+                    android:padding="@dimen/custom_margin"
+                    android:text="@string/quantity" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/layout_t2p_non_reason"
                 android:layout_width="match_parent"

GSKMTOrange/src/main/res/menu/activity_main_drawer.xml

@@ -62,6 +62,13 @@
             android:visible="false"
             />
 
+        <item
+            android:id="@+id/nav_counterfeit_indicator"
+            android:icon="@mipmap/outline_report_black_48"
+            android:title="@string/title_activity_counterfeit_indicator_web"
+            android:visible="false"
+            />
+
         <item
             android:id="@+id/nav_exit"
             android:icon="@mipmap/exit_grey"

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

@@ -321,4 +321,16 @@
     <string name="incorrect_mpin_limit_reached">الرقم السري غير صحيح,  تم بلوغ الحد لإدخال الرقم السري</string>
     <string name="need_to_reset_mpin">تحتاج إلى إعادة تعيين الرقم السري</string>
 
+    <!--MPin-->
+    <string name="forget_mpin">هل نسيت الرقم السري</string>
+    <string name="pls_enter_four_digit_mpin"> الرجاء إدخال 4 رموز للرقم السري</string>
+    <string name="set_mpin"> تعيين الرقم السري</string>
+    <string name="pls_set_four_digit_mpin"> الرجاء تعيين 4 رموز للرقم السري</string>
+    <string name="attempt_left"> محاولة متبيقة</string>
+    <string name="reset"> إعادة تعيين </string>
+    <string name="clear">مسح</string>
+
+    <string name="additional_stores">إضافي محل</string>
+    <string name="title_activity_counterfeit_indicator_web">الأدوية او المنتجات المقلدة</string>
+
 </resources>

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

@@ -387,7 +387,6 @@
     <string name="select_coach">Select Coach</string>
     <string name="title_activity_additional_promo_skuwise">AdditionalPromoSKUwiseActivity</string>
     <string name="discount_value">Discount Percentage</string>
-    <string name="price">Price</string>
     <string name="pls_select_sub_category">Please select Sub category</string>
     <string name="pls_select_brand">Please select Brand</string>
     <string name="pls_select_sku">Please select SKU</string>
@@ -427,6 +426,7 @@
     <string name="pls_enter_sku">Please enter SKU name</string>
     <string name="pls_enter_stock">Please enter Stock</string>
 
+    <!--MPin-->
     <string name="forget_mpin">Forgot MPin</string>
     <string name="pls_enter_four_digit_mpin">Please Enter Four Digit MPin</string>
     <string name="set_mpin">Set MPin</string>
@@ -444,5 +444,12 @@
     <string name="gsk">GSK</string>
     <string name="competitor">Competitor</string>
     <string name="sos_detail">SOS Detail</string>
+    <string name="title_activity_stock_pricing">Stock Pricing</string>
+
+    <!--Stock Pricing-->
+    <string name="price">Price</string>
+    <!--Audit Turkey Number Input-->
+    <string name="pls_fill_stock_count">Please fill Stock Count</string>
+    <string name="title_activity_counterfeit_indicator_web">Counterfeit Indicators</string>
 
 </resources>

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