Merge remote-tracking branch 'origin/master'

ui/src/pages/OrderPriceList.vue

@@ -104,6 +104,13 @@
               :disable="pageBusy"
               @click="leftDetailsExpanded = !leftDetailsExpanded"
             />
+            <q-toggle
+              v-model="showInStockOnly"
+              dense
+              color="primary"
+              label="Sadece stogu olanlar"
+              :disable="pageBusy"
+            />
           </div>
 
           <div class="toolbar-group">
@@ -641,6 +648,7 @@ const columnFilters = ref({})
 const columnFilterSearch = ref({})
 const selectedPriceOptions = ref(['usd5', 'try5'])
 const leftDetailsExpanded = ref(true)
+const showInStockOnly = ref(false)
 
 const rows = ref([])
 const loading = ref(false)
@@ -1262,6 +1270,9 @@ const filteredRows = computed(() => {
   const variantSet = selectedVariantCodeSet.value
   const localFilters = columnFilters.value || {}
   let list = rows.value || []
+  if (showInStockOnly.value) {
+    list = list.filter((row) => Number(row?.stockQty ?? 0) > 0)
+  }
   if (campaignSet.size > 0) {
     list = list.filter((row) => campaignSet.has(toText(row?.campaignLabel)))
   }

ui/src/pages/ProductPricing.vue

@@ -106,6 +106,13 @@
                 </q-item>
               </q-list>
             </q-btn-dropdown>
+            <q-toggle
+              v-model="showInStockOnly"
+              dense
+              color="primary"
+              label="Sadece stogu olanlar"
+              :disable="pageBusy"
+            />
           </div>
 
           <div class="toolbar-group">
@@ -1245,6 +1252,7 @@ const selectedCurrencies = ref(['USD', 'EUR', 'TRY'])
 const exportAllLoading = ref(false)
 const showSelectedOnly = ref(false)
 const leftDetailsExpanded = ref(true)
+const showInStockOnly = ref(false)
 const calcLoadingMap = ref({})
 const bulkCalcLoading = ref(false)
 const saving = ref(false)
@@ -1528,6 +1536,7 @@ function rowSelectionKey (row) {
 const filteredRows = computed(() => {
   return rows.value.filter((row) => {
     if (showSelectedOnly.value && !selectedMap.value[rowSelectionKey(row)]) return false
+    if (showInStockOnly.value && Number(row?.stockQty ?? 0) <= 0) return false
     for (const { field } of multiFilterColumns) {
       // Server-backed filters already reload full dataset (all pages) from backend.
       // Keep only non-server multi filters (e.g. brandGroupSelection) as local page filter.

ui/src/pages/WholesaleCampaigns.vue

@@ -106,6 +106,13 @@
                 </q-item>
               </q-list>
             </q-btn-dropdown>
+            <q-toggle
+              v-model="showInStockOnly"
+              dense
+              color="primary"
+              label="Sadece stogu olanlar"
+              :disable="pageBusy"
+            />
 
             <div class="row items-center q-gutter-xs">
               <q-chip
@@ -1302,6 +1309,7 @@ const selectedPriceOptions = ref(priceOptionOptions.map((x) => x.value))
 const exportAllLoading = ref(false)
 const showSelectedOnly = ref(false)
 const leftDetailsExpanded = ref(true)
+const showInStockOnly = ref(false)
 // Keep the old calc state around (not used on this screen) to avoid touching shared helpers.
 const calcLoadingMap = ref({})
 
@@ -1602,6 +1610,7 @@ function rowSelectionKey (row) {
 const filteredRows = computed(() => {
   return rows.value.filter((row) => {
     if (showSelectedOnly.value && !selectedMap.value[rowSelectionKey(row)]) return false
+    if (showInStockOnly.value && Number(row?.stockQty ?? 0) <= 0) return false
     for (const { field } of multiFilterColumns) {
       // Server-backed filters already reload full dataset (all pages) from backend.
       // Keep only non-server multi filters (e.g. brandGroupSelection) as local page filter.