Merge branch 'dev-xpy' into dev

app/common/repositories/store/product/ProductRepository.php

@@ -465,6 +465,7 @@ class ProductRepository extends BaseRepository
                         "share_num"     => 0,
                         "stock_num"     => 0,
                         "shares_num"    => 0,
+                        "is_usable"     => isset($value['is_usable']) ? (int)$value['is_usable'] : 0,
                         'gong_mer_profit' => $value['gong_mer_profit'] ?? 0.00,
                         'gong_market_price' => $value['gong_market_price'] ?? 0.00,
                         'plate_mer_profit' => $value['plate_mer_profit'] ?? 0.00,
@@ -492,6 +493,7 @@ class ProductRepository extends BaseRepository
                         "share_num"     => (isset($value['share_num']) && $value['share_num'] !== '') ? $value['share_num'] : 0,
                         "stock_num"     => (isset($value['stock_num']) && $value['stock_num'] !== '') ? $value['stock_num'] : 0,
                         "shares_num"    => (isset($value['shares_num']) && $value['shares_num'] !== '') ? $value['shares_num'] : 0,
+                        "is_usable"     => isset($value['is_usable']) ? (int)$value['is_usable'] : 0,
                         'gong_mer_profit' => $value['gong_mer_profit'] ?? 0.00,
                         'gong_market_price' => $value['gong_market_price'] ?? 0.00,
                         'plate_mer_profit' => $value['plate_mer_profit'] ?? 0.00,