diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index 9d73786..d160407 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -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) - ( diff --git a/resources/views/admin_pages/commission.blade.php b/resources/views/admin_pages/commission.blade.php index baa3e34..b16f94c 100644 --- a/resources/views/admin_pages/commission.blade.php +++ b/resources/views/admin_pages/commission.blade.php @@ -11,15 +11,15 @@
| Teamstore | Invoice No. | -Total | Subtotal | Tax | +Shipping Fee | +Total | Currency | +CC Processing Fee (3.9%) | +Transaction Fee | Commission Rate | 25% | 5% | @@ -56,17 +59,20 @@
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ $c->StoreName }} | -{{ $c->InvoiceNumber }} | -{{ $c->Total }} | -{{ $c->SubTotal }} | -{{ $c->Tax }} | -{{ $c->Currency }} | -{{ $c->commission_rate }} | -{{ $c->twenty_five_percent }} | -{{ $c->five_percent }} | -||||
| {{ $c->StoreName }} | +{{ $c->InvoiceNumber }} | +{{ $c->SubTotal }} | +{{ $c->Tax }} | +{{ $c->ShippingCost }} | +{{ $c->Total }} | +{{ $c->Currency }} | +{{round($c->Total * 0.039,2) }} | +0.49 | +{{ $c->commission_rate }} | +{{ $c->twenty_five_percent }} | +{{ $c->five_percent }} | +