diff --git a/app/src/General/java/com/unibuy/smartdevice/ui/SaleFlowHandler.java b/app/src/General/java/com/unibuy/smartdevice/ui/SaleFlowHandler.java
index 59a5b10..f1b6307 100644
--- a/app/src/General/java/com/unibuy/smartdevice/ui/SaleFlowHandler.java
+++ b/app/src/General/java/com/unibuy/smartdevice/ui/SaleFlowHandler.java
@@ -6,6 +6,7 @@ import com.unibuy.smartdevice.R;
 import com.unibuy.smartdevice.structure.SlotStructure;
 import com.unibuy.smartdevice.tools.HandlerMain;
 import com.unibuy.smartdevice.ui.dialog.BuyDialog;
+import com.unibuy.smartdevice.ui.dialog.FontendPickupCodeDialog;
 import com.unibuy.v2.UnibuyHelper;
 import com.unibuy.v2.ui.ShoppingCartFragment;
 
@@ -71,6 +72,7 @@ public class SaleFlowHandler {
     }
 
     public void onPickupRequested() {
-        // 通用版不處理取貨碼
+        // 通用版取貨碼：開啟取貨碼輸入 Dialog
+        new FontendPickupCodeDialog(context, handlerMain).show();
     }
 }
diff --git a/app/src/General/res/values/devset_defaults.xml b/app/src/General/res/values/devset_defaults.xml
index 981f2d5..9baeef4 100644
--- a/app/src/General/res/values/devset_defaults.xml
+++ b/app/src/General/res/values/devset_defaults.xml
@@ -8,4 +8,6 @@
     <bool name="devset_default_shopping_cart">true</bool>
     <bool name="devset_default_cash">true</bool>
     <bool name="devset_default_line_pay">true</bool>
+    <!-- General 顯示前台取貨碼浮鈕 -->
+    <bool name="show_pickup_code_button">true</bool>
 </resources>
diff --git a/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java
index eef9021..8281f24 100644
--- a/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java
+++ b/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java
@@ -713,7 +713,9 @@ public class FontendActivity extends AppCompatActivityAbstract implements SaleFl
             }
         });
 
-        binding.floatButtonPickupCode.setVisibility(View.GONE);
+        // 前台取貨碼浮鈕：由 flavor 設定決定是否顯示（General 顯示，其餘維持隱藏）
+        binding.floatButtonPickupCode.setVisibility(
+                getResources().getBoolean(R.bool.show_pickup_code_button) ? VISIBLE : View.GONE);
 
         binding.floatButtonShoppingCart.setOnClickListener(view -> {
             // 改由 flavor 的 SaleFlowHandler 決定：General 開多品項購物車 Fragment，
diff --git a/app/src/main/res/values/devset_defaults.xml b/app/src/main/res/values/devset_defaults.xml
index 6081e21..6c7400d 100644
--- a/app/src/main/res/values/devset_defaults.xml
+++ b/app/src/main/res/values/devset_defaults.xml
@@ -19,4 +19,7 @@
     <bool name="devset_default_tap_pay_32">true</bool>
     <bool name="devset_default_tap_pay_33">true</bool>
     <bool name="devset_default_tap_pay_34">true</bool>
+
+    <!-- 前台「取貨碼」浮鈕是否顯示（各 flavor 可覆寫；main 預設隱藏，維持原行為） -->
+    <bool name="show_pickup_code_button">false</bool>
 </resources>