合同样式修改

app/Admin/Controllers/OrderController.php

@@ -123,7 +123,7 @@ class OrderController extends AdminController
                 $filter->startWith('company_name')->width(3);
                 $filter->startWith('company_name')->width(3);
                 $filter->startWith('scmUser.user_sn',admin_trans('scm-user.fields.user_sn'))->width(3);
                 $filter->startWith('scmUser.user_sn',admin_trans('scm-user.fields.user_sn'))->width(3);
                 $filter->equal('status')->select(admin_trans("order.options.status_search"))->width(3);
                 $filter->equal('status')->select(admin_trans("order.options.status_search"))->width(3);
-                $filter->equal('sales_id',trans('inquiry.fields.sales_name'))->select(CmsUser::pluck('name', 'userId')->where("status",0)->toArray())->width(3);
+                $filter->equal('sale_id',trans('inquiry.fields.sales_name'))->select(CmsUser::pluck('name', 'userId')->where("status",0)->toArray())->width(3);
 
 
             });
             });
 
 

resources/views/export/order_contract_CI.blade.php

@@ -10,44 +10,44 @@
     </tr>
     </tr>
     <tr>
     <tr>
         <td colspan="10" style="text-align:center">
         <td colspan="10" style="text-align:center">
-            SELLER /CONTACT:Joanna Email:Joanna@ichunt.com Tel: (+86)755-3580 8309 Fax: (+86)755-3580 0650 Mob:
-            +8613600403130
+            SELLER /CONTACT:{{@$info["orderList"]["adminUser"]["name"]}} Email:{{@$info["orderList"]["adminUser"]["email"]}} Tel: +86{{@$info["orderList"]["adminUser"]["mobile"]}} Fax: (+86){{@$info["orderList"]["adminUser"]["fax"]}} Mob:
+            +86{{@$info["orderList"]["adminUser"]["mobile"]}}
         </td>
         </td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="10" style="text-align:center;font-size: 16px;font-weight: bold;">Proforma Invoice</td>
+        <td colspan="10" style="text-align:center;font-size: 16px;font-weight: bold;">COMMERCIAL INVOICE</td>
     </tr>
     </tr>
 </table>
 </table>
 
 
 <table border="1">
 <table border="1">
     <tbody>
     <tbody>
     <tr>
     <tr>
-        <td colspan="2">Buyer：</td>
+        <td colspan="2" style="font-weight: bold;">Buyer：</td>
         <td colspan="3">{{@$ship["consignee"]}}</td>
         <td colspan="3">{{@$ship["consignee"]}}</td>
-        <td colspan="2">Seller：</td>
+        <td colspan="2" style="font-weight: bold;">Seller：</td>
         <td colspan="3">SEMOUR ELECTRONICS CO. LIMITED</td>
         <td colspan="3">SEMOUR ELECTRONICS CO. LIMITED</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="2">Address：：</td>
+        <td colspan="2" style="font-weight: bold;">Address：：</td>
         <td colspan="3">{{@$ship["country_name"]}} {{@$ship["province"]}} {{@$ship["city"]}} {{@$ship["detail_address"]}}</td>
         <td colspan="3">{{@$ship["country_name"]}} {{@$ship["province"]}} {{@$ship["city"]}} {{@$ship["detail_address"]}}</td>
-        <td colspan="2">Invoice No：</td>
+        <td colspan="2" style="font-weight: bold;">Invoice No：</td>
         <td colspan="3">{{@$info["sn"]}}</td>
         <td colspan="3">{{@$info["sn"]}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="2">Contac：</td>
+        <td colspan="2" style="font-weight: bold;">Contac：</td>
         <td colspan="3">{{@$info["orderList"]["scm_user"]["name"]}}</td>
         <td colspan="3">{{@$info["orderList"]["scm_user"]["name"]}}</td>
-        <td colspan="2">Contac：</td>
+        <td colspan="2" style="font-weight: bold;">Contac：</td>
         <td colspan="3">{{@$info["orderList"]["sale_name"]}}</td>
         <td colspan="3">{{@$info["orderList"]["sale_name"]}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="2">Phone：</td>
+        <td colspan="2" style="font-weight: bold;">Phone：</td>
         <td colspan="3">sssasasdsdsdsdsfdsfdfdsf32r433434343434343434</td>
         <td colspan="3">sssasasdsdsdsdsfdsfdfdsf32r433434343434343434</td>
-        <td colspan="2">Phone：</td>
+        <td colspan="2" style="font-weight: bold;">Phone：</td>
         <td colspan="3">{{ $info["orderList"]["adminUser"]["mobile"] ?? ""}}</td>
         <td colspan="3">{{ $info["orderList"]["adminUser"]["mobile"] ?? ""}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
         <td colspan="5"></td>
         <td colspan="5"></td>
-        <td colspan="2">Invoice date：</td>
+        <td colspan="2" style="font-weight: bold;">Invoice date：</td>
         <td colspan="3">{{date("Y-m-d",$info["orderList"]["create_time"])}}</td>
         <td colspan="3">{{date("Y-m-d",$info["orderList"]["create_time"])}}</td>
     </tr>
     </tr>
    <!-- <tr>
    <!-- <tr>
@@ -71,15 +71,15 @@
 <table>
 <table>
     <tbody>
     <tbody>
     <tr>
     <tr>
-        <td>Slno</td>
-        <td>CUSTOMER P/N</td>
-        <td>Manufacturer</td>
-        <td>Description</td>
-        <td>QTY（Total）</td>
-        <td>UNIT</td>
-        <td>UNIT PRICE</td>
-        <td>CURRENCY</td>
-        <td>AMOUNT</td>
+        <td style="font-weight: bold;">Slno</td>
+        <td style="font-weight: bold;">CUSTOMER P/N</td>
+        <td style="font-weight: bold;">Manufacturer</td>
+        <td style="font-weight: bold;">Description</td>
+        <td style="font-weight: bold;">QTY（Total）</td>
+        <td style="font-weight: bold;">UNIT</td>
+        <td style="font-weight: bold;">UNIT PRICE</td>
+        <td style="font-weight: bold;">CURRENCY</td>
+        <td style="font-weight: bold;">AMOUNT</td>
     </tr>
     </tr>
     @if(!empty($info["orderList"]["order_items"]))
     @if(!empty($info["orderList"]["order_items"]))
     @foreach($info["orderList"]["order_items"] as $k=>$item)
     @foreach($info["orderList"]["order_items"] as $k=>$item)
@@ -97,59 +97,60 @@
     @endforeach
     @endforeach
     @endif
     @endif
     <tr>
     <tr>
-        <td colspan="8">Bank Charge</td>
-        <td>$40.00</td>
+        <td colspan="8"  style="font-weight: bold;">Bank Charge</td>
+        <td>{{$info["orderList"]["payServiceFee_format"] ?? ""}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="8">Freight Cost</td>
-        <td>$40.00</td>
+        <td colspan="8"  style="font-weight: bold;">Freight Cost</td>
+        <td>{{$info["orderList"]["carriage_format"] ?? ""}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="2">TOTAL:</td>
-        <td colspan="2">$40.00</td>
-        <td colspan="2">Total Amount</td>
-        <td colspan="3">$40.00</td>
+        <td colspan="1"  style="font-weight: bold;">TOTAL:</td>
+        <td colspan="3"></td>
+        <td colspan="1">{{$info["orderList"]["total_qty"] ?? ""}}</td>
+        <td colspan="3"  style="font-weight: bold;">Total Amount</td>
+        <td colspan="1">{{$info["orderList"]["total_amount_format"] ?? ""}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="8">Payment Term：</td>
-        <td>Advance payment</td>
+        <td   style="font-weight: bold;">Payment Term：</td>
+        <td colspan="8"style="text-align: left">100%advance</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="8">Delivery Date：</td>
-        <td>28 April 2022</td>
+        <td   style="font-weight: bold;">Delivery Date：</td>
+        <td colspan="8" style="text-align: left">{{date("Y-m-d")}}</td>
     </tr>
     </tr>
     </tbody>
     </tbody>
 </table>
 </table>
 <table style="width:80%;table-layout: fixed;" border="1">
 <table style="width:80%;table-layout: fixed;" border="1">
     <tbody>
     <tbody>
     <tr>
     <tr>
-        <td colspan="9" style="word-break: break-all; word-wrap:break-word;width: 100%;">Remark:1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.2.All bank fees are the responsibility of the customer.</td>
+        <td colspan="9"  style="word-break: break-all; word-wrap:break-word;width: 100%; height: 60px;font-weight: bold;">Remark:1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.2.All bank fees are the responsibility of the customer.</td>
     </tr>
     </tr>
     </tbody>
     </tbody>
 </table>
 </table>
 <table style="width:80%;table-layout: fixed;" border="1">
 <table style="width:80%;table-layout: fixed;" border="1">
     <tbody>
     <tbody>
     <tr>
     <tr>
-        <td>Terms &amp; Conditions</td>
+        <td  style="font-weight: bold;height: 20px;">Terms &amp; Conditions</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td>1.Your order is NCNR.</td>
+        <td height="20">1.Your order is NCNR.</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td>2.All Claims of shortage or shipment errors or shipment damage must be made within 15 days of after
+        <td height="20">2.All Claims of shortage or shipment errors or shipment damage must be made within 15 days of after
             delivery.
             delivery.
         </td>
         </td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td>3.Our liability shall be limited to the invoiced value of the materials or its replacement.</td>
+        <td height="20">3.Our liability shall be limited to the invoiced value of the materials or its replacement.</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td>4.Parts are warranty 6 month form, fit, and function guarantee. All returns must be authorized by our sales
+        <td height="20">4.Parts are warranty 6 month form, fit, and function guarantee. All returns must be authorized by our sales
             department within 6 month of receipts of shipment.
             department within 6 month of receipts of shipment.
         </td>
         </td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td>5.VAT and Bank transfer charger is excluded in the invoice amount. Buyer will be responsible for TAX and
+        <td height="20">5.VAT and Bank transfer charger is excluded in the invoice amount. Buyer will be responsible for TAX and
             Bank Charges if there is any.
             Bank Charges if there is any.
         </td>
         </td>
     </tr>
     </tr>

resources/views/export/order_contract_PI.blade.php

@@ -10,8 +10,8 @@
     </tr>
     </tr>
     <tr>
     <tr>
         <td colspan="10" style="text-align:center">
         <td colspan="10" style="text-align:center">
-            SELLER /CONTACT:Joanna Email:Joanna@ichunt.com Tel: (+86)755-3580 8309 Fax: (+86)755-3580 0650 Mob:
-            +8613600403130
+            SELLER /CONTACT:{{@$info["orderList"]["adminUser"]["name"]}} Email:{{@$info["orderList"]["adminUser"]["email"]}} Tel: +86{{@$info["orderList"]["adminUser"]["mobile"]}} Fax: (+86){{@$info["orderList"]["adminUser"]["fax"]}} Mob:
+            +86{{@$info["orderList"]["adminUser"]["mobile"]}}
         </td>
         </td>
     </tr>
     </tr>
     <tr>
     <tr>

resources/views/export/order_contract_PL.blade.php

@@ -10,48 +10,48 @@
     </tr>
     </tr>
     <tr>
     <tr>
         <td colspan="10" style="text-align:center">
         <td colspan="10" style="text-align:center">
-            SELLER /CONTACT:Joanna Email:Joanna@ichunt.com Tel: (+86)755-3580 8309 Fax: (+86)755-3580 0650 Mob:
-            +8613600403130
+            SELLER /CONTACT:{{@$info["orderList"]["adminUser"]["name"]}} Email:{{@$info["orderList"]["adminUser"]["email"]}} Tel: +86{{@$info["orderList"]["adminUser"]["mobile"]}} Fax: (+86){{@$info["orderList"]["adminUser"]["fax"]}} Mob:
+            +86{{@$info["orderList"]["adminUser"]["mobile"]}}
         </td>
         </td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="10" style="text-align:center;font-size: 16px;font-weight: bold;">Proforma Invoice</td>
+        <td colspan="10" style="text-align:center;font-size: 16px;font-weight: bold;">PACKING LIST</td>
     </tr>
     </tr>
 </table>
 </table>
 
 
 <table  border="1">
 <table  border="1">
     <tbody>
     <tbody>
     <tr>
     <tr>
-        <td width="8%">Ship to：</td>
+        <td width="8%" style="font-weight: bold;">Ship to：</td>
         <td width="20%">
         <td width="20%">
             {{@$ship["consignee"]}}
             {{@$ship["consignee"]}}
         </td>
         </td>
-        <td width="8%">Bill to:</td>
+        <td width="8%" style="font-weight: bold;">Bill to:</td>
         <td width="20%">{{@$bill["consignee"]}}</td>
         <td width="20%">{{@$bill["consignee"]}}</td>
-        <td>INV No.</td>
-        <td>Date：</td>
+        <td style="font-weight: bold;">INV No.</td>
+        <td style="font-weight: bold;">Date：</td>
         <!--        <td>{{@$info["sn"]}}</td>-->
         <!--        <td>{{@$info["sn"]}}</td>-->
         <!--        <td>Date：</td>-->
         <!--        <td>Date：</td>-->
         <!--        <td>{{date("Y-m-d")}}</td>-->
         <!--        <td>{{date("Y-m-d")}}</td>-->
     </tr>
     </tr>
     <tr>
     <tr>
-        <td>Company Name：</td>
+        <td style="font-weight: bold;">Company Name：</td>
         <td>{{@$ship["company_name"]}}</td>
         <td>{{@$ship["company_name"]}}</td>
-        <td>Company Name：</td>
+        <td style="font-weight: bold;">Company Name：</td>
         <td>{{@$bill["company_name"]}}</td>
         <td>{{@$bill["company_name"]}}</td>
         <td>{{@$info["sn"]}}</td>
         <td>{{@$info["sn"]}}</td>
         <td>{{date("Y-m-d")}}</td>
         <td>{{date("Y-m-d")}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
 
 
-        <td rowspan="2">Address:</td>
+        <td rowspan="2" style="font-weight: bold;">Address:</td>
         <td rowspan="2">{{@$ship["country_name"]}} {{@$ship["province"]}} {{@$ship["city"]}} {{@$ship["detail_address"]}}</td>
         <td rowspan="2">{{@$ship["country_name"]}} {{@$ship["province"]}} {{@$ship["city"]}} {{@$ship["detail_address"]}}</td>
-        <td rowspan="2">Address:</td>
+        <td rowspan="2" style="font-weight: bold;">Address:</td>
         <td rowspan="2" style="width:100px;word-wrap: break-word">{{@$bill["country_name"]}} {{@$bill["province"]}}
         <td rowspan="2" style="width:100px;word-wrap: break-word">{{@$bill["country_name"]}} {{@$bill["province"]}}
             {{@$bill["city"]}} {{@$bill["detail_address"]}}
             {{@$bill["city"]}} {{@$bill["detail_address"]}}
         </td>
         </td>
-        <td>Payment terms：</td>
-        <td>Delivery terms：</td>
+        <td style="font-weight: bold;">Payment terms：</td>
+        <td style="font-weight: bold;">Delivery terms：</td>
         <!--        <td>100%advance</td>-->
         <!--        <td>100%advance</td>-->
         <!--        <td>-->
         <!--        <td>-->
         <!--        <td>Delivery terms：</td>-->
         <!--        <td>Delivery terms：</td>-->
@@ -65,21 +65,27 @@
 
 
 
 
     <tr>
     <tr>
-        <td>Tel:</td>
+        <td style="font-weight: bold;">Tel:</td>
         <td>{{@$ship["phone"]}}</td>
         <td>{{@$ship["phone"]}}</td>
-        <td>Tel:</td>
+        <td style="font-weight: bold;">Tel:</td>
         <td>{{@$bill["phone"]}}</td>
         <td>{{@$bill["phone"]}}</td>
-        <td>Buyer:</td>
+        <td style="font-weight: bold;">Buyer:</td>
         <td></td>
         <td></td>
 
 
     </tr>
     </tr>
     <tr>
     <tr>
-        <td>Attn:</td>
+        <td style="font-weight: bold;">Attn:</td>
         <td>{{@$ship["consignee"]}}</td>
         <td>{{@$ship["consignee"]}}</td>
-        <td>Attn:</td>
+        <td style="font-weight: bold;">Attn:</td>
         <td>{{@$bill["consignee"]}}</td>
         <td>{{@$bill["consignee"]}}</td>
         <td>
         <td>
-
+            @if(!empty($info["orderList"]["scm_user"]))
+            @if($info["orderList"]["scm_user"]["name"])
+            {{$info["orderList"]["scm_user"]["name"]}}
+            @else
+            {{$info["orderList"]["scm_user"]["company_name"]}}
+            @endif
+            @endif
         </td>
         </td>
         <td></td>
         <td></td>
     </tr>
     </tr>
@@ -88,15 +94,15 @@
 <table  border="1">
 <table  border="1">
     <tbody>
     <tbody>
     <tr>
     <tr>
-        <td width="100">Slno</td>
-        <td>CUSTOMER P/N</td>
-        <td>Manufacturer</td>
-        <td>Description</td>
-        <td>QTY（Total）</td>
-        <td>UNIT</td>
-        <td>UNIT PRICE</td>
-        <td>CURRENCY</td>
-        <td>AMOUNT</td>
+        <td style="font-weight: bold;">Slno</td>
+        <td style="font-weight: bold;">CUSTOMER P/N</td>
+        <td style="font-weight: bold;">Manufacturer</td>
+        <td style="font-weight: bold;">Description</td>
+        <td style="font-weight: bold;">QTY（Total）</td>
+        <td style="font-weight: bold;">UNIT</td>
+        <td style="font-weight: bold;">UNIT PRICE</td>
+        <td style="font-weight: bold;">CURRENCY</td>
+        <td style="font-weight: bold;">AMOUNT</td>
     </tr>
     </tr>
     @if(!empty($info["orderList"]["order_items"]))
     @if(!empty($info["orderList"]["order_items"]))
     @foreach($info["orderList"]["order_items"] as $k=>$item)
     @foreach($info["orderList"]["order_items"] as $k=>$item)
@@ -114,18 +120,18 @@
     @endforeach
     @endforeach
     @endif
     @endif
     <tr>
     <tr>
-        <td colspan="8" >Bank Charge</td>
+        <td colspan="8"  style="font-weight: bold;">Bank Charge</td>
         <td>{{$info["orderList"]["payServiceFee_format"] ?? ""}}</td>
         <td>{{$info["orderList"]["payServiceFee_format"] ?? ""}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="8">Freight Cost</td>
+        <td colspan="8"  style="font-weight: bold;">Freight Cost</td>
         <td>{{$info["orderList"]["carriage_format"] ?? ""}}</td>
         <td>{{$info["orderList"]["carriage_format"] ?? ""}}</td>
     </tr>
     </tr>
     <tr>
     <tr>
-        <td colspan="1">TOTAL:</td>
+        <td colspan="1"  style="font-weight: bold;">TOTAL:</td>
         <td colspan="3"></td>
         <td colspan="3"></td>
         <td colspan="1">{{$info["orderList"]["total_qty"] ?? ""}}</td>
         <td colspan="1">{{$info["orderList"]["total_qty"] ?? ""}}</td>
-        <td colspan="3">Total Amount</td>
+        <td colspan="3"  style="font-weight: bold;">Total Amount</td>
         <td colspan="1">{{$info["orderList"]["total_amount_format"] ?? ""}}</td>
         <td colspan="1">{{$info["orderList"]["total_amount_format"] ?? ""}}</td>
     </tr>
     </tr>
     </tbody>
     </tbody>
@@ -133,7 +139,7 @@
 <table style="width:80%;table-layout: fixed;" border="1">
 <table style="width:80%;table-layout: fixed;" border="1">
     <tbody>
     <tbody>
     <tr>
     <tr>
-        <td colspan="9" style="word-break: break-all; word-wrap:break-word;width: 100%;">Remark:1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.2.All bank fees are the responsibility of the customer.</td>
+        <td colspan="9" style="word-break: break-all; word-wrap:break-word;width: 100%; height: 60px;font-weight: bold;">Remark:1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.2.All bank fees are the responsibility of the customer.</td>
     </tr>
     </tr>
     </tbody>
     </tbody>
 </table>
 </table>