Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev 20231012 #2204

Merged
merged 3 commits into from
Oct 12, 2023
Merged

Dev 20231012 #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9022d7
feat: remove unused custom config
AutisticShark Oct 8, 2023
a606a0e
chore: update bug report template
AutisticShark Oct 11, 2023
5fbf13c
fix: null product content in order view page
AutisticShark Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ labels: bug-user-report

**Environment 环境**

OS:
OS:
HTTPS enabled:
PHP version:
DB version:
DB version:
Redis version:
Commit:

**Bug Info**
Expand Down
77 changes: 38 additions & 39 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 22 additions & 16 deletions resources/views/tabler/admin/order/view.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</div>
<div class="datagrid-item">
<div class="datagrid-title">商品类型</div>
<div class="datagrid-content">{$order->product_type}</div>
<div class="datagrid-content">{$order->product_type_text}</div>
</div>
<div class="datagrid-item">
<div class="datagrid-title">商品名称</div>
Expand Down Expand Up @@ -87,46 +87,52 @@
</div>
<div class="card-body">
<div class="datagrid">
{if $order->product_type === 'tabp' || $order->product_type === 'time'}
<div class="datagrid-item">
<div class="datagrid-title">商品时长 (天)</div>
<div class="datagrid-content">{$product_content->time}</div>
<div class="datagrid-content">{$order->content->time}</div>
</div>
<div class="datagrid-item">
<div class="datagrid-title">可用流量 (GB)</div>
<div class="datagrid-content">{$product_content->bandwidth}</div>
<div class="datagrid-title">等级时长 (天)</div>
<div class="datagrid-content">{$order->content->class_time}</div>
</div>
<div class="datagrid-item">
<div class="datagrid-title">等级</div>
<div class="datagrid-content">{$product_content->class}</div>
<div class="datagrid-content">{$order->content->class}</div>
</div>
{/if}
{if $order->product_type === 'tabp' || $order->product_type === 'bandwidth'}
<div class="datagrid-item">
<div class="datagrid-title">等级时长 (天)</div>
<div class="datagrid-content">{$product_content->class_time}</div>
<div class="datagrid-title">可用流量 (GB)</div>
<div class="datagrid-content">{$order->content->bandwidth}</div>
</div>
{/if}
{if $order->product_type === 'tabp' || $order->product_type === 'time'}
<div class="datagrid-item">
<div class="datagrid-title">用户分组</div>
<div class="datagrid-content">{$product_content->node_group}</div>
<div class="datagrid-content">{$order->content->node_group}</div>
</div>
<div class="datagrid-item">
<div class="datagrid-title">速率限制 (Mbps)</div>
<div class="datagrid-content">
{if $product_content->ip_limit === '0'}
{if $order->content->ip_limit === '0'}
不限制
{else}
{$product_content->speed_limit}
{$order->content->speed_limit}
{/if}
</div>
</div>
<div class="datagrid-item">
<div class="datagrid-title">同时连接IP限制</div>
<div class="datagrid-content">
{if $product_content->ip_limit === '0'}
{if $order->content->ip_limit === '0'}
不限制
{else}
{$product_content->ip_limit}
{$order->content->ip_limit}
{/if}
</div>
</div>
{/if}
</div>
</div>
</div>
Expand All @@ -148,10 +154,10 @@
</tr>
</thead>
<tbody>
{foreach $invoice_content as $invoice_content_detail}
{foreach $invoice->content as $invoice_content}
<tr>
<td>{$invoice_content_detail->name}</td>
<td>{$invoice_content_detail->price}</td>
<td>{$invoice_content->name}</td>
<td>{$invoice_content->price}</td>
</tr>
{/foreach}
</tbody>
Expand Down Expand Up @@ -226,4 +232,4 @@
});
</script>

{include file='admin/footer.tpl'}
{include file='admin/footer.tpl'}
8 changes: 1 addition & 7 deletions resources/views/tabler/user/order/create.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@
</tr>
<tr>
<td>商品类型</td>
{if $product->type === 'tabp'}
<td class="text-end">时间流量包</td>
{elseif $product->type === 'time'}
<td class="text-end">时间包</td>
{elseif $product->type === 'bandwidth'}
<td class="text-end">流量包</td>
{/if}
<td class="text-end">{$product->type_text}</td>
</tr>
{if $product->type === 'tabp' || $product->type === 'time'}
<tr>
Expand Down
Loading