From 54b03986cf47236196b2223e0420f181044295ec Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Wed, 27 Oct 2021 20:20:59 +0800
Subject: [PATCH] update commission

---
 app/Models/admin/AdminModel.php               |  2 +-
 .../views/admin_pages/commission.blade.php    | 52 +++++++++++--------
 .../views/admin_pages/print_order.blade.php   |  6 ---
 3 files changed, 30 insertions(+), 30 deletions(-)

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 @@
 <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>
diff --git a/resources/views/admin_pages/print_order.blade.php b/resources/views/admin_pages/print_order.blade.php
index fe12468..f9ae73d 100644
--- a/resources/views/admin_pages/print_order.blade.php
+++ b/resources/views/admin_pages/print_order.blade.php
@@ -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 */