webmaster/merchbay_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update commission

Browse Source
This commit is contained in:
franknstayn
2021-10-27 20:20:59 +08:00
parent da042e3493
commit 54b03986cf
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/admin/AdminModel.php
View File

@@ -431,7 +431,7 @@ class AdminModel extends Model
}
function selectCommission(){
$i = DB::select("SELECT t.StoreName, pd.InvoiceNumber, pd.CartKey, pd.Total, pd.SubTotal, pd.Tax, pd.Currency,
$i = DB::select("SELECT t.StoreName, pd.InvoiceNumber, pd.CartKey, pd.Total, pd.SubTotal, pd.Tax, pd.Currency, pd.ShippingCost,
(pd.Total * 0.029) AS proc_fee,
(pd.SubTotal - 0.29) AS trans_rate, ROUND(((
SELECT trans_rate) - (

52
resources/views/admin_pages/commission.blade.php
View File

@@ -11,15 +11,15 @@
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
Commission
<!-- <small>Optional description</small> -->
</h1>
<ol class="breadcrumb">
<li><a href="{{ url ('admin') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active"> Reports</li>
<li class="active"> Commission</li>
</ol>
<h1>
Commission
<!-- <small>Optional description</small> -->
</h1>
<ol class="breadcrumb">
<li><a href="{{ url ('admin') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active"> Reports</li>
<li class="active"> Commission</li>
</ol>
</section>
<!-- Main content -->
@@ -28,7 +28,7 @@
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<h4 class="box-title">Commission</h4>
<h4 class="box-title">Commission</h4>
</div>
<div class="box-body">
<div class="row">
@@ -39,16 +39,19 @@
</div>
</div>
<div class="col-md-12">
<table class="table table-bordered table-condensed nowrap" id="tbl_commission">
<thead>
<tr>
<th>Teamstore</th>
<th>Invoice No.</th>
<th>Total</th>
<th>Subtotal</th>
<th>Tax</th>
<th>Shipping Fee</th>
<th>Total</th>
<th>Currency</th>
<th>CC Processing Fee (3.9%)</th>
<th>Transaction Fee</th>
<th>Commission Rate</th>
<th>25%</th>
<th>5%</th>
@@ -56,17 +59,20 @@
</thead>
<tbody>
@foreach($array_commission as $c)
<tr>
<td>{{ $c->StoreName }}</td>
<td><a href="{{ url('admin/orders/view') . '/' . $c->CartKey }}">{{ $c->InvoiceNumber }}</a></td>
<td>{{ $c->Total }}</td>
<td>{{ $c->SubTotal }}</td>
<td>{{ $c->Tax }}</td>
<td>{{ $c->Currency }}</td>
<td>{{ $c->commission_rate }}</td>
<td>{{ $c->twenty_five_percent }}</td>
<td>{{ $c->five_percent }}</td>
</tr>
<tr>
<td>{{ $c->StoreName }}</td>
<td><a href="{{ url('admin/orders/view') . '/' . $c->CartKey }}">{{ $c->InvoiceNumber }}</a></td>
<td>{{ $c->SubTotal }}</td>
<td>{{ $c->Tax }}</td>
<td>{{ $c->ShippingCost }}</td>
<td>{{ $c->Total }}</td>
<td>{{ $c->Currency }}</td>
<td>{{round($c->Total * 0.039,2) }}</td>
<td>0.49</td>
<td>{{ $c->commission_rate }}</td>
<td>{{ $c->twenty_five_percent }}</td>
<td>{{ $c->five_percent }}</td>
</tr>
@endforeach
</tbody>
</table>

6
resources/views/admin_pages/print_order.blade.php
View File

@@ -341,12 +341,6 @@
position:relative;
}
}
.items {
/* page-break-after: always; */
/* page-break-inside:avoid; */
/* position:relative; */
}
@page
{
size: auto; /* auto is the initial value */