cief/izyim
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim.git synced 2026-08-31 10:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

large commit

Browse Source
This commit is contained in:
Omair Saleh
2019-10-05 13:09:26 +08:00
parent a20feebe0c
commit 0e5f2939e3
94 changed files with 1131 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/Order.php
+7 -4
View File
@@ -7,12 +7,13 @@ use App\Classes\Modules\Steps\GetStep;
use App\Classes\Modules\Steps\StepAttachments;
use App\Models\OrderStep;
use App\Http\Resources\OrderStep as OrderStepResource;
use App\Models\OrderWarehouse;
use App\Models\TrackingNumber;
use Carbon\Carbon;
use Illuminate\Http\Resources\Json\JsonResource;
use App\Models\AddressBook as AddressBookModel;
use App\Models\DeliveryArrangement as DeliveryArrangementModel;
use App\Models\PackingList as PackingListModel;
use App\Models\Package as PackagesModel;
use App\Models\ShippingArrangement as ShippingArrangementModel;
use App\Models\Warehouse as WarehouseModel;
use App\Models\Company as CompanyModel;
@@ -27,7 +28,8 @@ class Order extends JsonResource
*/
public function toArray($request)
{
$warehouse = $this->warehouse_id ? WarehouseModel::where('id', $this->warehouse_id)->first() : null;
$warehouseId = OrderWarehouse::where('order_id', $this->id)->where('type', 0)->pluck('warehouse_id');
$warehouse = $warehouseId ? WarehouseModel::where('id', $warehouseId)->first() : null;
$receiveDate = OrderStep::where('order_id', $this->id)->where('reference_id', 'MS_WAREHOUSE_RECEIVING')->pluck('complete_date')->first();
return [
'id' => $this->id,
@@ -40,6 +42,7 @@ class Order extends JsonResource
'complete' => (int)$this->complete,
'date' => $this->created_at->format('d/m/Y'),
'current_step' => [
'reference_id' => $this->current_step,
'details' => (new GetStep())->execute($this->current_step),
'attachments' => (new StepAttachments())->execute($this->id, $this->current_step)
],
@@ -50,8 +53,8 @@ class Order extends JsonResource
'tracking_number' => TrackingNumber::Where('order_id', $this->id)->where('type', 0)->pluck('tracking_no')->first(),
'receive_date' => $receiveDate ? Carbon::parse($receiveDate)->format('d-m-Y') : null
],
'packing_list' => new PackingList(PackingListModel::where('order_id', $this->id)->first()),
'shipping_arrangement' => new ShippingArrangement(ShippingArrangementModel::where('order_id', $this->id)->first()),
'packages' => Package::collection(PackagesModel::where('order_id', $this->id)->get()),
'shipping_arrangement' => [],
'delivery_arrangement' => new DeliveryArrangement(DeliveryArrangementModel::where('order_id', $this->id)->first())
];
}