From c28ac84f092651edcf50756f7d4e0fd28c3135ba Mon Sep 17 00:00:00 2001
From: Dhiraj Nagar <119936391+Dhiraj1405@users.noreply.github.com>
Date: Tue, 28 Mar 2023 11:00:22 +0530
Subject: [PATCH 1/5] Update Settings.vue

---
 src/views/Settings.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 457183d7a..ebd937859 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -176,15 +176,15 @@
         <ion-card>
           <ion-card-header>
             <ion-card-title>
-              {{ $t("Configure Picker") }}
+              {{ $t("Track Pickers") }}
             </ion-card-title>
           </ion-card-header>
           <ion-card-content>
-            {{ $t('Configuration to assign picker to orders.') }}
+            {{ $t('Track who picked orders by entering picker IDs when packing an order.') }}
           </ion-card-content>
           <ion-item lines="none">
-            <ion-label>{{ $t("Configure Picker") }}</ion-label>
-            <ion-toggle :checked="configurePicker" @ionChange="setConfigurePickerPreference($event)" slot="end" />
+            <ion-label>{{ $t("Track Pickers") }}</ion-label>
+            <ion-toggle :checked="trackPicker" @ionChange="settrackPickerPreference($event)" slot="end" />
           </ion-item>
         </ion-card>
       </section>

From a32c782176ea501dbc0886f3e3bf0252e740d09e Mon Sep 17 00:00:00 2001
From: Dhiraj Nagar <119936391+Dhiraj1405@users.noreply.github.com>
Date: Tue, 28 Mar 2023 11:02:58 +0530
Subject: [PATCH 2/5] Update en.json

---
 src/locales/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 1d788b218..ce904f791 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -17,8 +17,8 @@
   "Colors": "Colors",
   "Completed": "Completed",
   "Configuration updated": "Configuration updated",
-  "Configure Picker": "Configure Picker",
-  "Configuration to assign picker to orders.": "Configuration to assign picker to orders.",
+  "Track Pickers": "Track Pickers",
+  "Track who picked orders by entering picker IDs when packing an order.": "Track who picked orders by entering picker IDs when packing an order.",
   "Confirm": "Confirm",
   "Copied": "Copied { text }",
   "Copy": "Copy",
@@ -127,4 +127,4 @@
   "View shipping orders along with pickup orders.": "View shipping orders along with pickup orders.",
   "You do not have permission to access this page": "You do not have permission to access this page",
   "Zipcode": "Zipcode"
-}
\ No newline at end of file
+}

From 23e86dad5288f2bf814f2002f56eb12e32ef8b4b Mon Sep 17 00:00:00 2001
From: Dhiraj Nagar <119936391+Dhiraj1405@users.noreply.github.com>
Date: Tue, 28 Mar 2023 11:05:31 +0530
Subject: [PATCH 3/5] Update Settings.vue

---
 src/views/Settings.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index ebd937859..bbc0dd93d 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -183,8 +183,8 @@
             {{ $t('Track who picked orders by entering picker IDs when packing an order.') }}
           </ion-card-content>
           <ion-item lines="none">
-            <ion-label>{{ $t("Track Pickers") }}</ion-label>
-            <ion-toggle :checked="trackPicker" @ionChange="settrackPickerPreference($event)" slot="end" />
+            <ion-label>{{ $t("Enable tracking") }}</ion-label>
+            <ion-toggle :checked="enableTracking" @ionChange="setenableTrackingPreference($event)" slot="end" />
           </ion-item>
         </ion-card>
       </section>

From 041b7fe564d1f22080d1ff5898332c88566f26f1 Mon Sep 17 00:00:00 2001
From: Dhiraj Nagar <119936391+Dhiraj1405@users.noreply.github.com>
Date: Tue, 28 Mar 2023 11:09:11 +0530
Subject: [PATCH 4/5] Update en.json

---
 src/locales/en.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index ce904f791..f41fe292a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -17,8 +17,6 @@
   "Colors": "Colors",
   "Completed": "Completed",
   "Configuration updated": "Configuration updated",
-  "Track Pickers": "Track Pickers",
-  "Track who picked orders by entering picker IDs when packing an order.": "Track who picked orders by entering picker IDs when packing an order.",
   "Confirm": "Confirm",
   "Copied": "Copied { text }",
   "Copy": "Copy",
@@ -27,6 +25,7 @@
   "Delivery method": "Delivery method",
   "Dismiss": "Dismiss",
   "eCom Store": "eCom Store",
+  "Enable tracking": "Enable tracking",
   "Facility": "Facility",
   "Failed to load packing slip": "Failed to load packing slip",
   "Failed to update configuration": "Failed to update configuration",
@@ -117,6 +116,8 @@
   "Selected variant not available": "Selected variant not available",
   "This order cannot be split. If you cannot fulfill any item, will be sent an email with alternate fulfillment options and this order will be removed from your dashboard.": "This order cannot be split. If you cannot fulfill any item, { customerName } will be sent an email with alternate fulfillment options and this order will be removed from your dashboard.",
   "This order will be rejected from this store with the selected reason and shipped to the address that has been inputed.Please make sure the address you have entered is correct.": "This order will be rejected from this store with the selected reason and shipped to the address that has been inputed. { space } Please make sure the address you have entered is correct.",
+  "Track Pickers": "Track Pickers",
+  "Track who picked orders by entering picker IDs when packing an order.": "Track who picked orders by entering picker IDs when packing an order.",
   "Unfillable Items": "Unfillable Items",
   "Update Order": "Update Order",
   "Update time zone": "Update time zone",

From 5748b96a3866f1edc1d69540402b57893868f436 Mon Sep 17 00:00:00 2001
From: Dhiraj Nagar <119936391+Dhiraj1405@users.noreply.github.com>
Date: Tue, 28 Mar 2023 11:22:47 +0530
Subject: [PATCH 5/5] Update Settings.vue

---
 src/views/Settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index bbc0dd93d..2e309836f 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -184,7 +184,7 @@
           </ion-card-content>
           <ion-item lines="none">
             <ion-label>{{ $t("Enable tracking") }}</ion-label>
-            <ion-toggle :checked="enableTracking" @ionChange="setenableTrackingPreference($event)" slot="end" />
+            <ion-toggle :checked="configurePicker" @ionChange="setConfigurePickerPreference($event)" slot="end" />
           </ion-item>
         </ion-card>
       </section>