Edward Yang
parent
ff6c2211a0
commit
68aacec7d4
|
|
@ -13,6 +13,7 @@ namespace Beike\Admin\Http\Controllers;
|
|||
|
||||
use Beike\Admin\Http\Resources\OrderSimple;
|
||||
use Beike\Models\Order;
|
||||
use Beike\Models\OrderShipment;
|
||||
use Beike\Repositories\OrderRepo;
|
||||
use Beike\Services\ShipmentService;
|
||||
use Beike\Services\StateMachineService;
|
||||
|
|
@ -103,4 +104,20 @@ class OrderController extends Controller
|
|||
|
||||
return json_success(trans('common.updated_success'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新发货信息
|
||||
*/
|
||||
public function updateShipment(Request $request, Order $order, int $orderShipmentId): array
|
||||
{
|
||||
$data = $request->all();
|
||||
$orderShipment = OrderShipment::query()->where('order_id', $order->id)->findOrFail($orderShipmentId);
|
||||
ShipmentService::updateShipment($orderShipment, $data);
|
||||
hook_action('admin.order.update_shipment.after', [
|
||||
'request_data' => $data,
|
||||
'shipment' => $orderShipment,
|
||||
]);
|
||||
|
||||
return json_success(trans('common.updated_success'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@ Route::prefix($adminName)
|
|||
Route::middleware('can:orders_export')->get('orders/export', [Controllers\OrderController::class, 'export'])->name('orders.export');
|
||||
Route::middleware('can:orders_show')->get('orders/{order}', [Controllers\OrderController::class, 'show'])->name('orders.show');
|
||||
Route::middleware('can:orders_update_status')->put('orders/{order}/status', [Controllers\OrderController::class, 'updateStatus'])->name('orders.update_status');
|
||||
Route::middleware('can:orders_update_status')->put('orders/{order}/shipments/{shipment}', [Controllers\OrderController::class, 'updateShipment'])->name('orders.update_shipment');
|
||||
|
||||
// 插件
|
||||
Route::middleware('can:plugins_index')->get('plugins', [Controllers\PluginController::class, 'index'])->name('plugins.index');
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ namespace Beike\Models;
|
|||
|
||||
class OrderShipment extends Base
|
||||
{
|
||||
protected $table = 'order_shipments';
|
||||
|
||||
protected $fillable = [
|
||||
'order_id', 'express_code', 'express_company', 'express_number',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -184,8 +184,8 @@ class OrderRepo
|
|||
|
||||
$shippingAddress->country = $shippingAddress->country->name ?? '';
|
||||
$shippingAddress->country_id = $shippingAddress->country->id ?? 0;
|
||||
$paymentAddress->country = $paymentAddress->country->name ?? '';
|
||||
$paymentAddress->country_id = $paymentAddress->country->id ?? 0;
|
||||
$paymentAddress->country = $paymentAddress->country->name ?? '';
|
||||
$paymentAddress->country_id = $paymentAddress->country->id ?? 0;
|
||||
} else {
|
||||
$shippingAddress = (Object) ($current['guest_shipping_address'] ?? []);
|
||||
$paymentAddress = (Object) ($current['guest_payment_address'] ?? []);
|
||||
|
|
|
|||
|
|
@ -54,4 +54,19 @@ class ShipmentService
|
|||
|
||||
return $company ? $company['name'] ?? '' : '';
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $orderShipment
|
||||
* @param $data
|
||||
* @throws \Throwable
|
||||
*/
|
||||
public static function updateShipment($orderShipment, $data)
|
||||
{
|
||||
$shipmentData = [
|
||||
'express_code' => $data['express_code'] ?? '',
|
||||
'express_company' => $data['express_name'] ?? '',
|
||||
'express_number' => $data['express_number'] ?? '',
|
||||
];
|
||||
$orderShipment->updateOrFail($shipmentData);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -215,10 +215,28 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
@foreach ($order->orderShipments as $ship)
|
||||
<tr>
|
||||
<td>{{ $ship->express_company }}</td>
|
||||
<td>{{ $ship->express_number }}</td>
|
||||
<td>{{ $ship->created_at }}</td>
|
||||
<tr data-id="{{ $ship->id }}">
|
||||
<td>
|
||||
<div class="edit-show">{{ $ship->express_company }}</div>
|
||||
|
||||
<select class="form-select edit-form express-code d-none" aria-label="Default select example">
|
||||
@foreach (system_setting('base.express_company', []) as $item)
|
||||
<option value="{{ $item['code'] }}" {{ $ship->express_code == $item['code'] ? 'selected' : '' }}>{{ $item['name'] }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<div class="edit-show">{{ $ship->express_number }}</div>
|
||||
<input type="text" class="form-control edit-form express-number d-none" placeholder="{{ __('order.express_number') }}" value="{{ $ship->express_number }}">
|
||||
</td>
|
||||
<td class="d-flex justify-content-between align-items-center">
|
||||
{{ $ship->created_at }}
|
||||
<div class="btn btn-outline-primary btn-sm edit-shipment">{{ __('common.edit') }}</div>
|
||||
<div class="d-none shipment-tool">
|
||||
<div class="btn btn-primary btn-sm">{{ __('common.confirm') }}</div>
|
||||
<div class="btn btn-outline-secondary btn-sm">{{ __('common.cancel') }}</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
|
|
@ -258,6 +276,40 @@
|
|||
@push('footer')
|
||||
@can('orders_update_status')
|
||||
<script>
|
||||
$('.edit-shipment').click(function() {
|
||||
$(this).siblings('.shipment-tool').removeClass('d-none');
|
||||
$(this).addClass('d-none');
|
||||
|
||||
$(this).parents('tr').find('.edit-show').addClass('d-none');
|
||||
$(this).parents('tr').find('.edit-form').removeClass('d-none');
|
||||
});
|
||||
|
||||
$('.shipment-tool .btn-outline-secondary').click(function() {
|
||||
$(this).parent().siblings('.edit-shipment').removeClass('d-none');
|
||||
$(this).parent().addClass('d-none');
|
||||
|
||||
$(this).parents('tr').find('.edit-show').removeClass('d-none');
|
||||
$(this).parents('tr').find('.edit-form').addClass('d-none');
|
||||
});
|
||||
|
||||
$('.shipment-tool .btn-primary').click(function() {
|
||||
const id = $(this).parents('tr').data('id');
|
||||
const express_code = $(this).parents('tr').find('.express-code').val();
|
||||
const express_name = $(this).parents('tr').find('.express-code option:selected').text();
|
||||
const express_number = $(this).parents('tr').find('.express-number').val();
|
||||
|
||||
$(this).parent().siblings('.edit-shipment').removeClass('d-none');
|
||||
$(this).parent().addClass('d-none');
|
||||
|
||||
$(this).parents('tr').find('.edit-show').removeClass('d-none');
|
||||
$(this).parents('tr').find('.edit-form').addClass('d-none');
|
||||
|
||||
$http.put(`/orders/{{ $order->id }}/shipments/${id}`, {express_code,express_name,express_number}).then((res) => {
|
||||
layer.msg(res.message);
|
||||
window.location.reload();
|
||||
})
|
||||
});
|
||||
|
||||
new Vue({
|
||||
el: '#app',
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue