finish create default order for purchase on order page, wip select order product on order
This commit is contained in:
parent
15373665dd
commit
0964e70c5f
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -167,7 +167,7 @@ class OrderBdd {
|
||||
public function getOrderItemsReferenceByOrderId($orderId){
|
||||
$sql = "SELECT
|
||||
order_item.id as order_item_id,
|
||||
order_product.reference as order_product_reference,
|
||||
order_product.reference as order_product_reference
|
||||
FROM ".$this->orderTablePrefix."order_item as order_item
|
||||
LEFT JOIN ".$this->orderTablePrefix."order_product as order_product on order_item.fk_order_item_id = order_product.id
|
||||
WHERE order_item.fk_order_id = ?
|
||||
@ -281,7 +281,6 @@ class OrderBdd {
|
||||
LEFT JOIN ".$this->orderTablePrefix."lieu as lieu on devis.id_lieu = lieu.id
|
||||
LEFT JOIN ".$this->orderTablePrefix."provider as provider on orders.fk_provider_id = provider.id
|
||||
LEFT JOIN ".$this->orderTablePrefix."order_status as order_status on orders.fk_order_status_key = order_status.status_key
|
||||
LEFT JOIN ".$this->orderTablePrefix."order_type as order_type on orders.fk_order_type_key = order_type.order_type_key
|
||||
ORDER BY orders.id DESC;
|
||||
"
|
||||
;
|
||||
@ -301,15 +300,17 @@ class OrderBdd {
|
||||
`order_number`,
|
||||
`order_full_number`,
|
||||
`fk_order_status_key`,
|
||||
`id_nextcloud`
|
||||
`id_nextcloud`,
|
||||
`fk_order_type_key`
|
||||
)
|
||||
VALUES (?,?,?,?,?);";
|
||||
VALUES (?,?,?,?,?,?);";
|
||||
$this->execSQLNoData($sql, array(
|
||||
$currentDate,
|
||||
$currentOrderNumber,
|
||||
$currentOrderFullNumber,
|
||||
OrderStatusConstant::NEW_KEY,
|
||||
$idNextCloud
|
||||
$idNextCloud,
|
||||
OrderTypeConstant::ORDER_TYPE_PURCHASE
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
2
gestion/src/js/constants/orderTypeConstant.js
Normal file
2
gestion/src/js/constants/orderTypeConstant.js
Normal file
@ -0,0 +1,2 @@
|
||||
export const OrderTypeDevis = "DEVIS";
|
||||
export const OrderTypePurchase = "PURCHASE";
|
||||
@ -2,6 +2,7 @@ import { showError } from "@nextcloud/dialogs";
|
||||
import { baseUrl, checkSelectPurJs, LoadDT, showDone } from "../modules/mainFunction.mjs";
|
||||
import { OrderStatusOrdered,OrderStatusNew,OrderStatusCanceled } from "../constants/orderConstant.js";
|
||||
import { generateUrl } from "@nextcloud/router";
|
||||
import { OrderTypeDevis,OrderTypePurchase } from "../constants/orderTypeConstant.js";
|
||||
export class Order {
|
||||
|
||||
/**
|
||||
@ -26,8 +27,12 @@ export class Order {
|
||||
this.orderDetailsUrl = generateUrl(`/apps/gestion/order/${this.id}/details`);
|
||||
this.fkProviderId = myresp.fk_provider_id;
|
||||
this.providerName = ((myresp.provider_name == null || myresp.provider_name.length === 0) ? '-' : myresp.provider_name);
|
||||
this.orderType = myresp.fk_order_type_key;
|
||||
this.thanatoColumnClass = myresp.fk_order_type_key == OrderTypeDevis ? "" : "getThanatosSubcontractor";
|
||||
}
|
||||
|
||||
|
||||
|
||||
static getClientFullname(myresp){
|
||||
let clientPrenom = '';
|
||||
let clientNom = '';
|
||||
@ -87,10 +92,10 @@ export class Order {
|
||||
'<div>' + this.id + '</div>',
|
||||
'<input style="margin:0;padding:0;" class="orderInputDate" type="date" value=' + this.orderDate + ' data-id="' + this.id + '"/>',
|
||||
'<div>' + this.orderFullNumber + '</div>',
|
||||
'<div class="loadSelect_listdefunt" data-table="orders" data-column="fk_defunt_id" data-id="' + this.id + '" data-current="' + this.defuntId + '">'+ this.defuntName + '</div>',
|
||||
'<div class="loadSelect_listclient" data-table="orders" data-column="fk_client_id" data-id="' + this.id + '" data-current="' + this.clientId + '">'+ this.clientFullName + '</div>',
|
||||
'<div class="getThanatosSubcontractor" data-table="orders" data-column="fk_thanato_id" data-id="' + this.id + '" data-current="' + this.thanatoId + '">'+ this.thanatoFullName + '</div>',
|
||||
'<div class="loadSelect_listlieu" data-table="orders" data-column="fk_lieu_id" data-id="' + this.id + '" data-current="' + this.locationId + '">'+ this.locationName + '</div>',
|
||||
'<div>'+ this.defuntName + '</div>',
|
||||
'<div>'+ this.clientFullName + '</div>',
|
||||
'<div class="'+this.thanatoColumnClass+'" data-table="orders" data-column="fk_thanato_id" data-id="' + this.id + '" data-current="' + this.thanatoId + '">'+ this.thanatoFullName + '</div>',
|
||||
'<div>'+ this.locationName + '</div>',
|
||||
'<div>' + this.productReferences + '</div>',
|
||||
'<div class="selectProviders" data-table="orders" data-column="fk_provider_id" data-id="' + this.id + '" data-current="' + this.fkProviderId + '">'+ this.providerName + '</div>',
|
||||
'<div style="'+ Order.getComandStatusCssSytle(this.statusKey) +'">' + this.statusLabel + '</div>',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user