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(){ 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.Total * 0.029) AS proc_fee,
(pd.SubTotal - 0.29) AS trans_rate, ROUND((( (pd.SubTotal - 0.29) AS trans_rate, ROUND(((
SELECT trans_rate) - ( SELECT trans_rate) - (

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

@@ -45,10 +45,13 @@
<tr> <tr>
<th>Teamstore</th> <th>Teamstore</th>
<th>Invoice No.</th> <th>Invoice No.</th>
<th>Total</th>
<th>Subtotal</th> <th>Subtotal</th>
<th>Tax</th> <th>Tax</th>
<th>Shipping Fee</th>
<th>Total</th>
<th>Currency</th> <th>Currency</th>
<th>CC Processing Fee (3.9%)</th>
<th>Transaction Fee</th>
<th>Commission Rate</th> <th>Commission Rate</th>
<th>25%</th> <th>25%</th>
<th>5%</th> <th>5%</th>
@@ -59,10 +62,13 @@
<tr> <tr>
<td>{{ $c->StoreName }}</td> <td>{{ $c->StoreName }}</td>
<td><a href="{{ url('admin/orders/view') . '/' . $c->CartKey }}">{{ $c->InvoiceNumber }}</a></td> <td><a href="{{ url('admin/orders/view') . '/' . $c->CartKey }}">{{ $c->InvoiceNumber }}</a></td>
<td>{{ $c->Total }}</td>
<td>{{ $c->SubTotal }}</td> <td>{{ $c->SubTotal }}</td>
<td>{{ $c->Tax }}</td> <td>{{ $c->Tax }}</td>
<td>{{ $c->ShippingCost }}</td>
<td>{{ $c->Total }}</td>
<td>{{ $c->Currency }}</td> <td>{{ $c->Currency }}</td>
<td>{{round($c->Total * 0.039,2) }}</td>
<td>0.49</td>
<td>{{ $c->commission_rate }}</td> <td>{{ $c->commission_rate }}</td>
<td>{{ $c->twenty_five_percent }}</td> <td>{{ $c->twenty_five_percent }}</td>
<td>{{ $c->five_percent }}</td> <td>{{ $c->five_percent }}</td>

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

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