jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-07 23:41:17 +01:00
parent dd396a86aa
commit f6668a6dd3
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Datatables/Shop/DeliveriesDataTable.php
View File

@@ -28,7 +28,10 @@ class DeliveriesDataTable extends DataTable
'size' => 'sm', 'size' => 'sm',
]); ]);
}) })
->rawColumns(['active', 'action']); ->editColumn('address', function (Delivery $delivery) {
return $delivery->address . ' ' . $delivery->zipcode . ' ' . $delivery->city;
})
->rawColumns(['active', 'address', 'action']);
return parent::modifier($datatables); return parent::modifier($datatables);
} }
@@ -38,9 +41,7 @@ class DeliveriesDataTable extends DataTable
Column::make('active')->title(__('active'))->width(60)->class('text-center'), Column::make('active')->title(__('active'))->width(60)->class('text-center'),
Column::make('name')->title('Nom'), Column::make('name')->title('Nom'),
Column::make('sale_channel.name')->title(__('shop.sale_channels.name')), Column::make('sale_channel.name')->title(__('shop.sale_channels.name')),
Column::make('address')->title('Adresse'), Column::make('address')->title('Adresse')->searchable(false),
Column::make('zipcode')->title('Code postal'),
Column::make('city')->title('Ville'),
$this->makeColumnButtons(), $this->makeColumnButtons(),
]; ];
} }

4
app/Models/Shop/Customer.php
View File

@@ -19,9 +19,9 @@ class Customer extends Model
return $this->hasMany(Invoice::class); return $this->hasMany(Invoice::class);
} }
public function Deliveries() public function Delivery()
{ {
return $this->hasMany(Delivery::class); return $this->belongsTo(Delivery::class);
} }
public function Orders() public function Orders()

4
resources/views/Admin/Shop/Customers/form.blade.php
View File

@@ -16,8 +16,8 @@
@include('components.form.inputs.email', ['name' => 'email', 'value' => $customer['email'] ?? null, 'required' => true]) @include('components.form.inputs.email', ['name' => 'email', 'value' => $customer['email'] ?? null, 'required' => true])
</div> </div>
<div class="col-6"> <div class="col-6">
{{ Form::label('sale_channel_id', __('shop.sale_channels.name')) }} {{ Form::label('sale_delivery_id', __('shop.deliveries.name')) }}
@include('components.form.select', ['name' => 'sale_channel_id', 'list' => $sale_channels ?? [], 'value' => $customer['sale_channel_id'] ?? null, 'with_empty' => '', 'class' => 'select2']) @include('components.form.select', ['name' => 'sale_delivery_id', 'list' => $sale_deliveries ?? [], 'value' => $customer['sale_delivery_id'] ?? null, 'with_empty' => '', 'class' => 'select2'])
</div> </div>
</div> </div>
@include('components.address', ['with_country' => false]) @include('components.address', ['with_country' => false])

19
resources/views/Admin/Shop/Deliveries/form.blade.php
View File

@@ -9,14 +9,14 @@
<div class="row"> <div class="row">
<div class="col-5"> <div class="col-5">
{{ Form::label('active', __('active')) }}<br/> {{ Form::label('active', __('active')) }}<br/>
@include("components.form.toggle", ['value' => $delivery['active'] ?? false, 'on' => __('active'), 'off' => __('inactive')]) @include("components.form.toggle", ['name' => 'active', 'value' => $delivery['active'] ?? false, 'on' => __('active'), 'off' => __('inactive')])
</div> </div>
<div class="col-3"> <div class="col-3">
{{ Form::label('is_public', __('public')) }} {{ Form::label('is_public', __('type')) }}
@include('components.form.checkboxes.icheck', ['name' => 'is_public', 'value' => $delivery['is_public'] ?? null]) @include('components.form.toggle', ['name' => 'is_public', 'value' => $delivery['is_public'] ?? false, 'on' => __('public'), 'off' => __('administré')])
</div> </div>
<div class="col-4"> <div class="col-4">
{{ Form::label('is_public', __('A domicile')) }} {{ Form::label('at_house', __('defaut')) }}
@include('components.form.checkboxes.icheck', ['name' => 'at_house', 'value' => $delivery['at_house'] ?? null]) @include('components.form.checkboxes.icheck', ['name' => 'at_house', 'value' => $delivery['at_house'] ?? null])
</div> </div>
</div> </div>
@@ -32,10 +32,15 @@
@include('components.address', ['with_country' => false]) @include('components.address', ['with_country' => false])
<div class="row mb-3"> <div class="row mb-3">
<div class="col-6"> <div class="col-3">
{{ Form::label('event_date', __('date')) }} {{ Form::label('event_date_begin', __('date')) }}
@include('components.form.datepicker', ['name' => 'event_date', 'value' => $delivery['event_date'] ?? null]) @include('components.form.datepicker', ['name' => 'event_date_begin', 'value' => $delivery['event_date_begin'] ?? null])
</div> </div>
<div class="col-3">
{{ Form::label('event_date_end', __('date')) }}
@include('components.form.datepicker', ['name' => 'event_date_end', 'value' => $delivery['event_date_end'] ?? null])
</div>
</div> </div>
</div> </div>
</div> </div>