Skip to content
Code-Schnipsel Gruppen Projekte
Commit c3848b52 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

feat: candyman-gmbh/projektplanung#79 - default order status for orders

Übergeordneter a209004d
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
...@@ -595,6 +595,14 @@ define('package/quiqqer/order/bin/backend/controls/panels/Orders', [ ...@@ -595,6 +595,14 @@ define('package/quiqqer/order/bin/backend/controls/panels/Orders', [
return; return;
} }
self.$Currency.appendChild(
new QUIContextMenuItem({
name : '',
value: '',
text : '---'
})
);
for (i = 0, len = currencies.length; i < len; i++) { for (i = 0, len = currencies.length; i < len; i++) {
entry = currencies[i]; entry = currencies[i];
......
...@@ -645,6 +645,23 @@ ...@@ -645,6 +645,23 @@
]]></en> ]]></en>
</locale> </locale>
<locale name="order.status.settings.title">
<de><![CDATA[Status Einstellungen]]></de>
<en><![CDATA[Status settings]]></en>
</locale>
<locale name="order.settings.order.defaultOrderStatus">
<de><![CDATA[Standard Bestellstatus]]></de>
<en><![CDATA[Default Order status]]></en>
</locale>
<locale name="order.settings.order.defaultOrderStatus.description">
<de><![CDATA[
Legt den standard Bestellstatus fest, welche eine Bestellung direkt beim Anlegen erhalten soll.
]]></de>
<en><![CDATA[
Defines the standard order status, which a purchase order should receive directly when it is created.
]]></en>
</locale>
<locale name="order.settings.autoInvoicePost"> <locale name="order.settings.autoInvoicePost">
<de><![CDATA[Rechnung automatisch buchen]]></de> <de><![CDATA[Rechnung automatisch buchen]]></de>
<en><![CDATA[Posting Invoices automatically]]></en> <en><![CDATA[Posting Invoices automatically]]></en>
......
...@@ -34,6 +34,13 @@ ...@@ -34,6 +34,13 @@
</conf> </conf>
</section> </section>
<section name="orderStatus">
<conf name="standard">
<type><![CDATA[integer]]></type>
<defaultvalue><![CDATA[1]]></defaultvalue>
</conf>
</section>
<section name="orderProcess"> <section name="orderProcess">
<conf name="showArticleNumberInBasket"> <conf name="showArticleNumberInBasket">
<type><![CDATA[bool]]></type> <type><![CDATA[bool]]></type>
...@@ -145,6 +152,23 @@ ...@@ -145,6 +152,23 @@
</input> </input>
</settings> </settings>
<settings title="orderStatusSettings" name="orderStatusSettings">
<title>
<locale group="quiqqer/order" var="order.status.settings.title"/>
</title>
<input conf="orderStatus.standard">
<text>
<locale group="quiqqer/order" var="order.settings.order.defaultOrderStatus"/>
</text>
<description>
<locale group="quiqqer/order"
var="order.settings.order.defaultOrderStatus.description"
/>
</description>
</input>
</settings>
<settings title="orderProcess" name="orderProcess"> <settings title="orderProcess" name="orderProcess">
<title> <title>
<locale group="quiqqer/order" var="order.process.settings.title"/> <locale group="quiqqer/order" var="order.process.settings.title"/>
...@@ -152,7 +176,8 @@ ...@@ -152,7 +176,8 @@
<input type="checkbox" conf="orderProcess.showArticleNumberInBasket"> <input type="checkbox" conf="orderProcess.showArticleNumberInBasket">
<text> <text>
<locale group="quiqqer/order" var="order.settings.orderProcess.showArticleNumberInBasket"/> <locale group="quiqqer/order"
var="order.settings.orderProcess.showArticleNumberInBasket"/>
</text> </text>
</input> </input>
</settings> </settings>
......
...@@ -45,13 +45,18 @@ public function create($PermissionUser = null, $hash = false) ...@@ -45,13 +45,18 @@ public function create($PermissionUser = null, $hash = false)
$User = QUI::getUserBySession(); $User = QUI::getUserBySession();
$Orders = Handler::getInstance(); $Orders = Handler::getInstance();
$table = $Orders->table(); $table = $Orders->table();
$status = AbstractOrder::STATUS_CREATED;
if (Settings::getInstance()->get('orderStatus', 'standard')) {
$status = (int)Settings::getInstance()->get('orderStatus', 'standard');
}
QUI::getDataBase()->insert($table, [ QUI::getDataBase()->insert($table, [
'id_prefix' => QUI\ERP\Order\Utils\Utils::getOrderPrefix(), 'id_prefix' => QUI\ERP\Order\Utils\Utils::getOrderPrefix(),
'c_user' => $User->getId() ? $User->getId() : 0, 'c_user' => $User->getId() ? $User->getId() : 0,
'c_date' => \date('Y-m-d H:i:s'), 'c_date' => \date('Y-m-d H:i:s'),
'hash' => $hash, 'hash' => $hash,
'status' => AbstractOrder::STATUS_CREATED, 'status' => $status,
'customerId' => 0, 'customerId' => 0,
'paid_status' => AbstractOrder::PAYMENT_STATUS_OPEN, 'paid_status' => AbstractOrder::PAYMENT_STATUS_OPEN,
'successful' => 0 'successful' => 0
...@@ -127,13 +132,19 @@ public function createOrderInProcessDataBaseEntry($PermissionUser = null) ...@@ -127,13 +132,19 @@ public function createOrderInProcessDataBaseEntry($PermissionUser = null)
// @todo set default from customer // @todo set default from customer
$status = AbstractOrder::STATUS_CREATED;
if (Settings::getInstance()->get('orderStatus', 'standard')) {
$status = (int)Settings::getInstance()->get('orderStatus', 'standard');
}
QUI::getDataBase()->insert($table, [ QUI::getDataBase()->insert($table, [
'id_prefix' => QUI\ERP\Order\Utils\Utils::getOrderPrefix(), 'id_prefix' => QUI\ERP\Order\Utils\Utils::getOrderPrefix(),
'c_user' => $User->getId(), 'c_user' => $User->getId(),
'c_date' => \date('Y-m-d H:i:s'), 'c_date' => \date('Y-m-d H:i:s'),
'hash' => QUI\Utils\Uuid::get(), 'hash' => QUI\Utils\Uuid::get(),
'customerId' => $User->getId(), 'customerId' => $User->getId(),
'status' => AbstractOrder::STATUS_CREATED, 'status' => $status,
'paid_status' => AbstractOrder::PAYMENT_STATUS_OPEN, 'paid_status' => AbstractOrder::PAYMENT_STATUS_OPEN,
'successful' => 0 'successful' => 0
]); ]);
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren