1
0
Эх сурвалжийг харах

feat: mark required items when create product

M1Screw 2 жил өмнө
parent
commit
e52e96fb5d

+ 3 - 3
resources/views/tabler/admin/node/create.tpl

@@ -61,11 +61,11 @@
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
-                                <label class="form-label col-3 col-form-label required">接入类型</label>
+                                <label class="form-label col-3 col-form-label">接入类型</label>
                                 <div class="col">
                                     <select id="sort" class="col form-select">
-                                        <option value="11">V2Ray</option>
                                         <option value="14">Trojan</option>
+                                        <option value="11">V2Ray</option>
                                         <option value="0">Shadowsocks</option>
                                     </select>
                                 </div>
@@ -81,7 +81,7 @@
                                 <div class="divide-y">
                                     <div>
                                         <label class="row">
-                                            <span class="col required">显示此节点</span>
+                                            <span class="col">显示此节点</span>
                                             <span class="col-auto">
                                                 <label class="form-check form-check-single form-switch">
                                                     <input id="type" class="form-check-input" type="checkbox"

+ 3 - 3
resources/views/tabler/admin/product/create.tpl

@@ -33,19 +33,19 @@
                         </div>
                         <div class="card-body">
                             <div class="form-group mb-3 row">
-                                <label class="form-label col-3 col-form-label">名称</label>
+                                <label class="form-label col-3 col-form-label required">名称</label>
                                 <div class="col">
                                     <input id="name" type="text" class="form-control" value="">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
-                                <label class="form-label col-3 col-form-label">价格</label>
+                                <label class="form-label col-3 col-form-label required">价格</label>
                                 <div class="col">
                                     <input id="price" type="text" class="form-control" value="">
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
-                                <label class="form-label col-3 col-form-label">库存</label>
+                                <label class="form-label col-3 col-form-label required">库存(小于0时不限制)</label>
                                 <div class="col">
                                     <input id="stock" type="text" class="form-control" value="">
                                 </div>

+ 1 - 1
resources/views/tabler/admin/product/edit.tpl

@@ -47,7 +47,7 @@
                                 </div>
                             </div>
                             <div class="form-group mb-3 row">
-                                <label class="form-label col-3 col-form-label">库存</label>
+                                <label class="form-label col-3 col-form-label">库存(小于0时不限制)</label>
                                 <div class="col">
                                     <input id="stock" type="text" class="form-control" 
                                         value="{$product->stock}">

+ 5 - 2
src/Controllers/Admin/NodeController.php

@@ -206,6 +206,9 @@ final class NodeController extends BaseController
     {
         $id = $args['id'];
         $node = Node::find($id);
+
+        $custom_config = $request->getParam('custom_config') ?? '{}';
+
         $node->name = $request->getParam('name');
         $node->node_group = $request->getParam('node_group');
         $node->server = trim($request->getParam('server'));
@@ -215,8 +218,8 @@ final class NodeController extends BaseController
         $node->type = $request->getParam('type') === 'true' ? 1 : 0;
         $node->sort = $request->getParam('sort');
 
-        if ($request->getParam('custom_config') !== null && $request->getParam('custom_config') !== '') {
-            $node->custom_config = $request->getParam('custom_config');
+        if ($custom_config !== '') {
+            $node->custom_config = $custom_config;
         } else {
             $node->custom_config = '{}';
         }

+ 3 - 3
src/Controllers/User/OrderController.php

@@ -196,14 +196,14 @@ final class OrderController extends BaseController
 
         $product_limit = json_decode($product->limit);
 
-        if ($product_limit->class_required !== '' && $user->class < $product_limit->class_required) {
+        if ($product_limit->class_required !== '' && (int) $user->class < (int) $product_limit->class_required) {
             return $response->withJson([
                 'ret' => 0,
                 'msg' => '账户不满足购买条件',
             ]);
         }
 
-        if ($product_limit->node_group_required !== '' && $user->node_group !== $product_limit->node_group_required) {
+        if ($product_limit->node_group_required !== '' && (int) $user->node_group !== (int) $product_limit->node_group_required) {
             return $response->withJson([
                 'ret' => 0,
                 'msg' => '账户不满足购买条件',
@@ -260,7 +260,7 @@ final class OrderController extends BaseController
         $invoice->pay_time = 0;
         $invoice->save();
 
-        if ($product->stock !== -1) {
+        if ($product->stock > 0) {
             $product->stock -= 1;
         }
         $product->sale_count += 1;