diff --git a/app/Http/Controllers/Orders/OrderController.php b/app/Http/Controllers/Orders/OrderController.php index fbb3bfc..0eea00d 100644 --- a/app/Http/Controllers/Orders/OrderController.php +++ b/app/Http/Controllers/Orders/OrderController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Orders; use App\Classes\Modules\Orders\DataTransferObjects\PackingListObject; use App\Models\AddressBook; use App\Models\Company; +use App\Models\Contact; use App\Models\CustomIssues; use App\Models\Order; use App\Models\OrderWarehouse; @@ -75,11 +76,13 @@ class OrderController extends Controller $order = order::findOrFail($orderId); $warehouse = OrderWarehouse::where('order_id', $orderId)->firstOrFail(); $warehouseAddress = AddressBook::where('type', 2)->where('reference_id', $warehouse->id)->firstOrFail(); + $warehouseContact = Contact::where('type', 2)->where('reference_id', $warehouse->id)->get(); $data = [ 'order' => $order, 'company' => Company::findOrFail($order->company_id), 'delivery_address' => AddressBook::where('id', $order->address_id)->first(), - 'warehouse_address' => $warehouseAddress + 'warehouse_address' => $warehouseAddress, + 'warehouse_contact' => $warehouseContact ]; return view('pages.pdf.qr', $data); diff --git a/app/Http/Resources/Warehouse.php b/app/Http/Resources/Warehouse.php index 8220b11..c6c5cf6 100644 --- a/app/Http/Resources/Warehouse.php +++ b/app/Http/Resources/Warehouse.php @@ -14,16 +14,17 @@ class Warehouse extends JsonResource */ public function toArray($request) { + $billing = $this->addressBook()->where('reference_id', $this->id)->where('type', 2)->where('billing', true)->first(); return [ 'id' => $this->id, 'name' => $this->name, 'email' => $this->email, - 'street_one' => $this->street_one, - 'street_two' => $this->street_two, - 'city' => $this->city, - 'state' => $this->state, - 'post_code' => $this->post_code, - 'country' => $this->country + 'street_one' => $billing ? $billing->street_one : null, + 'street_two' => $billing ? $billing->street_two : null, + 'city' => $billing ? $billing->city : null, + 'state' => $billing ? $billing->state : null, + 'post_code' => $billing ? $billing->post_code : null, + 'country' => $billing ? $billing->country : null ]; } } diff --git a/resources/views/pages/pdf/qr.blade.php b/resources/views/pages/pdf/qr.blade.php index b4fa37f..4b4437c 100644 --- a/resources/views/pages/pdf/qr.blade.php +++ b/resources/views/pages/pdf/qr.blade.php @@ -57,8 +57,8 @@
仓库地址:
-{{$warehouse_address->street_one.' '.$warehouse_address->street_two.' '.$warehouse_address->city.' '.$warehouse_address->post_code.' '.$warehouse_address->state}}
- {{--联系电话:杨先生 13900055019 / 梁先生 18529309778
--}} +{{$warehouse_address->street_one.' '.$warehouse_address->street_two.' '.$warehouse_address->city.' '.$warehouse_address->state.' 邮编:'.$warehouse_address->post_code}}
+联系:{{$warehouse_contacts[0]->contact.' '.$warehouse_contacts[0]->name}} / {{$warehouse_contacts[1]->contact.' '.$warehouse_contacts[1]->name}}