Skip to content

朱继来 / 后台订单管理

Go to a project
Commit da6afce7 by 朱继来
Options

Merge branch 'zjl_add_invoice' into 'master' 

调整支付时间显示

See merge request !1
parents b9335bfd 82bd60e4
Inline Side-by-side
Showing with 38 additions and 13 deletions
public/js/order.js
......@@ -756,6 +756,18 @@
changeInvoice:function() {
var order_id = $('input[name=order_id]').val();
$('#inv_type').click(function(){
var val = $(this).val();
if (val == 2) {
$('.add_tax').hide();
$('.invoice_title').attr('colspan', 3);
} else{
$('.add_tax').show();
$('.invoice_title').attr('colspan', 0);
}
})
$('form').on('submit', function(){
$(this).ajaxSubmit({
data: {order_id: order_id},
......
resources/views/changeInvoice/content.blade.php
......@@ -16,16 +16,16 @@
<table class="table table-bordered table-hover order-invoice">
<caption><h3>订单发票信息</h3></caption>
<tr>
<td>发票类型</td>
<td>
<td width="10%">发票类型</td>
<td width="40%">
<select name="inv_type" id="inv_type" style="width:164px;">
<option value="1">不开发票</option>
<!-- <option value="2">普通发票</option> -->
<option value="2">普通发票</option>
<option value="3">增值税发票</option>
</select>
</td>
<td>开票状态</td>
<td>
<td width="10%">开票状态</td>
<td width="40%">
<input type="hidden" name="invoice_status" value="{{$detail['invoice_status']}}">
<?php
switch ($detail['invoice_status']) {
......@@ -40,16 +40,16 @@
<tr>
<td>发票抬头</td>
<td>
<td class="invoice_title">
<input type="text" name="tax_title" value="{{$detail['tax_title']}}">
</td>
<td>税务登记号</td>
<td>
<td class="add_tax">税务登记号</td>
<td class="add_tax">
<input type="text" name="tax_no" value="{{$detail['tax_no']}}">
</td>
</tr>
<tr>
<tr class="add_tax">
<td>开户银行</td>
<td>
<input type="text" name="bank_name" value="{{$detail['bank_name']}}">
......@@ -60,7 +60,7 @@
</td>
</tr>
<tr>
<tr class="add_tax">
<td>公司电话</td>
<td>
<input type="text" name="company_phone" value="{{$detail['company_phone']}}">
......
resources/views/detail/content.blade.php
......@@ -234,8 +234,9 @@
<td>
<?php
switch ($order_invoice_info['inv_type']) {
case 2: echo '普通发票';break;
case 2: echo '个人普通发票';break;
case 3: echo '增值税发票';break;
case 4: echo '公司普通发票';break;
}
?>
</td>
......@@ -341,7 +342,7 @@
<td>{{$currency}}<span id="order-total" class="amount">{{$order_price_info['goods_price']}}</span></td>
</tr>
@if (isset($order_price_info['discount_amount']))
@if ($order_price_info['discount_amount'] != 0)
<tr>
<td>优惠券：</td>
<td class="edit-parent-td">
......
resources/views/orderlist/content.blade.php
......@@ -279,7 +279,19 @@
</tr>
<tr>
<td class="table-list-title">支付时间</td>
<td class="table-list-content">{{$v['order_pay_time'] != 0 ? date('Y-m-d H:i:s', $v['order_pay_time']) : ''}}</td>
<td class="table-list-content">
<?php
if ($v['order_pay_time'] != 0) {
echo date('Y-m-d H:i:s', $v['order_pay_time']);
} else {
if ($v['advance_pay_time'] != 0) {
echo date('Y-m-d H:i:s', $v['advance_pay_time']);
} else {
echo '';
}
}
?>
</td>
<td class="table-list-title">发票状态</td>
<td class="table-list-content">
<?php
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment