Merge branch 'add-order-v2' into 'master'
added new features for warehouse order request See merge request fronk/thetool!953
This commit is contained in:
@@ -41,6 +41,7 @@ class WarehouseOrderRequestController extends TTCrud {
|
||||
'table' => ['filter' => 'select'],
|
||||
'modal' => ['type' => 'select', 'items' => []]],
|
||||
['key' => 'warehouseLocation', 'text' => 'Lagerort', 'required' => false, 'type' => 'varchar'],
|
||||
['key' => 'canceled', 'text' => 'Storniert', 'required' => false, 'modal' => ['visible' => false, 'type' => 'select', 'items' => [['value' => 0, 'text' => 'Nein'], ['value' => 1, 'text' => 'Ja']]], 'table' => ['filter' => 'select']],
|
||||
['key' => 'note', 'text' => 'Notiz', 'required' => false, 'type' => 'textarea'],
|
||||
['key' => 'actions',
|
||||
'text' => 'Aktionen',
|
||||
@@ -133,6 +134,38 @@ class WarehouseOrderRequestController extends TTCrud {
|
||||
$email->send();
|
||||
}
|
||||
|
||||
protected function cancelAction() {
|
||||
$id = $this->request->id;
|
||||
$cancel = $this->request->cancel;
|
||||
|
||||
if (!is_numeric($id) || !is_numeric($cancel)) {
|
||||
self::returnJson(['error' => 'Invalid request']);
|
||||
}
|
||||
|
||||
$order = (array) WarehouseOrderRequestModel::get($id);
|
||||
|
||||
if (empty($order)) {
|
||||
self::returnJson(['error' => 'Order not found']);
|
||||
}
|
||||
|
||||
// $cancel is either 0 for uncancelling or 1 for cancelling
|
||||
|
||||
if ($cancel == 1) {
|
||||
$order['canceled'] = 1;
|
||||
} else {
|
||||
$order['canceled'] = 0;
|
||||
}
|
||||
|
||||
$order['id'] = $id;
|
||||
|
||||
if (!WarehouseOrderRequestModel::update($order)) {
|
||||
self::returnJson(['error' => 'Error updating order']);
|
||||
}
|
||||
|
||||
self::returnJson(['success' => true, 'message' => 'Order updated']);
|
||||
|
||||
}
|
||||
|
||||
protected function getHistoryAction() {
|
||||
$this->prepareCrudConfig();
|
||||
self::returnJson((new WarehouseHistoryController)->getHistory($this->request->id, $this->mod, $this->columns));
|
||||
|
||||
@@ -15,5 +15,6 @@ class WarehouseOrderRequestModel extends TTCrudBaseModel {
|
||||
public ?string $warehouseLocation;
|
||||
public ?string $note;
|
||||
|
||||
public ?int $canceled;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user