@colijnit/transaction 257.1.9 → 257.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/colijnit-transaction.umd.js +86 -21
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line-base.component.js +19 -12
- package/esm2015/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line.component.js +17 -3
- package/esm2015/lib/component/transaction-line/transaction-purchase-order-line/transaction-purchase-order-line-base.component.js +6 -1
- package/esm2015/lib/component/transaction-line-fields/transaction-line-description.component.js +6 -2
- package/esm2015/lib/component/transaction-line-fields/transaction-line-price/transaction-line-price.component.js +5 -1
- package/esm2015/lib/component/transaction-line-fields/transaction-line-reference.component.js +7 -4
- package/esm2015/lib/component/transaction-line-purchase-confirmation/transaction-line-purchase-confirmation.component.js +9 -8
- package/esm2015/lib/component/transaction-line-side-panel-default/transaction-line-side-panel-default.component.js +5 -5
- package/esm2015/lib/component/transaction-line-statusbar/transaction-line-statusbar.component.js +4 -5
- package/esm2015/lib/component/transaction-lines/transaction-lines.component.js +6 -3
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-order-confirmation/transaction-quick-access-order-confirmation.component.js +1 -1
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-overview/transaction-quick-access-overview.component.js +2 -2
- package/esm2015/lib/service/transaction-connector-adapter.service.js +14 -1
- package/esm2015/lib/service/transaction-connector.service.js +6 -1
- package/esm2015/lib/service/transaction.service.js +6 -1
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +91 -28
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line-base.component.d.ts +9 -9
- package/lib/component/transaction-line-fields/transaction-line-description.component.d.ts +1 -0
- package/lib/component/transaction-line-fields/transaction-line-price/transaction-line-price.component.d.ts +1 -0
- package/lib/component/transaction-line-fields/transaction-line-reference.component.d.ts +1 -0
- package/lib/service/transaction-connector-adapter.service.d.ts +2 -0
- package/lib/service/transaction-connector.service.d.ts +2 -0
- package/lib/service/transaction.service.d.ts +2 -0
- package/package.json +6 -6
- package/colijnit-transaction-257.1.8.tgz +0 -0
|
@@ -3,8 +3,8 @@ export class Version {
|
|
|
3
3
|
constructor() {
|
|
4
4
|
this.name = "@colijnit/transaction";
|
|
5
5
|
this.description = "Colijn IT transaction package";
|
|
6
|
-
this.symVer = "257.1.
|
|
7
|
-
this.publishDate = "
|
|
6
|
+
this.symVer = "257.1.11";
|
|
7
|
+
this.publishDate = "8-2-2025 20:48:35";
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsbUJBQW1CLENBQUM7SUFDM0MsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU3LjEuMTFcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCI4LTItMjAyNSAyMDo0ODozNVwiO1xufSJdfQ==
|
|
@@ -117,6 +117,7 @@ import { PurchaseReservation } from '@colijnit/transactionapi/build/model/purcha
|
|
|
117
117
|
import { PlanTimes } from '@colijnit/transactionapi/build/model/plan-times.bo';
|
|
118
118
|
import { BatchJobProgress } from '@colijnit/transactionapi/build/model/batch-job-progress.bo';
|
|
119
119
|
import { SLAProduct } from '@colijnit/transactionapi/build/model/SLA-product';
|
|
120
|
+
import { PurchaseHistory } from '@colijnit/transactionapi/build/model/purchase-history';
|
|
120
121
|
import { InternalParam } from '@colijnit/mainapi/build/enum/internal-param.enum';
|
|
121
122
|
import { RelationKind } from '@colijnit/relationapi/build/enum/relation-kind.enum';
|
|
122
123
|
import { BaseModuleScreenConfigService, BaseModuleService, FormMasterService, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, CoDialogModule, ButtonModule, CollapsibleModule, InputCheckboxModule, InputTextModule, ListOfValuesModule, FormModule, ScreenConfigurationModule, InputRadioButtonModule, IconModule, InputTextComponent, TooltipDirectiveModule, CheckmarkOverlayModule, FilterViewmodel, FormComponent, InputSearchModule, CoreComponentsTranslationModule, ColorPickerModule, InputTextareaModule, ColumnAlign, SimpleGridColumnDirective, OverlayService, ColorSequenceService, ClickoutsideModule, OverlayModule, CalendarComponent, InputNumberPickerModule, InputDatePickerComponent, InputDatePickerModule, ObserveVisibilityModule, SimpleGridModule, GridToolbarButtonModule, InputDateRangePickerModule, ContentViewMode, HourSchedulingComponentModule, HourSchedulingExpandableComponentModule, ViewModeButtonsModule, FilterItemModule, FilterItemMode, PaginationModule, PaginationBarModule, IconCollapseHandleModule, PriceDisplayPipeModule, Carousel3dModule, CarouselModule, FilterPipeModule, InputTextareaComponent, InputCheckboxComponent, ImageModule as ImageModule$1, PopupModule, CoDialogWizardModule, InputScannerModule } from '@colijnit/corecomponents_v12';
|
|
@@ -281,8 +282,8 @@ class Version {
|
|
|
281
282
|
constructor() {
|
|
282
283
|
this.name = "@colijnit/transaction";
|
|
283
284
|
this.description = "Colijn IT transaction package";
|
|
284
|
-
this.symVer = "257.1.
|
|
285
|
-
this.publishDate = "
|
|
285
|
+
this.symVer = "257.1.11";
|
|
286
|
+
this.publishDate = "8-2-2025 20:48:35";
|
|
286
287
|
}
|
|
287
288
|
}
|
|
288
289
|
|
|
@@ -4697,6 +4698,18 @@ class TransactionConnectorAdapterService {
|
|
|
4697
4698
|
}
|
|
4698
4699
|
});
|
|
4699
4700
|
}
|
|
4701
|
+
getLinePurchaseInfo(transId, lineNr) {
|
|
4702
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
4703
|
+
const response = yield this.connector.getLinePurchaseInfo(transId, lineNr);
|
|
4704
|
+
if (response && response.resultObject) {
|
|
4705
|
+
return this._boFactory.makeWithRawBackendData(PurchaseHistory, response.resultObject);
|
|
4706
|
+
}
|
|
4707
|
+
else {
|
|
4708
|
+
this._handleExceptionFromResponse(response);
|
|
4709
|
+
return null;
|
|
4710
|
+
}
|
|
4711
|
+
});
|
|
4712
|
+
}
|
|
4700
4713
|
deleteGoodsPicked(deleteGoodsPickedForOrderRequest) {
|
|
4701
4714
|
return __awaiter(this, void 0, void 0, function* () {
|
|
4702
4715
|
const response = yield this.connector.deleteGoodsPicked(deleteGoodsPickedForOrderRequest);
|
|
@@ -7599,6 +7612,11 @@ class TransactionConnectorService {
|
|
|
7599
7612
|
return this._adapterService.functionCall(this._adapterService.getGoodsPickedHistory, [transId, lineNr]);
|
|
7600
7613
|
});
|
|
7601
7614
|
}
|
|
7615
|
+
getLinePurchaseInfo(transId, lineNr) {
|
|
7616
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
7617
|
+
return this._adapterService.functionCall(this._adapterService.getLinePurchaseInfo, [transId, lineNr]);
|
|
7618
|
+
});
|
|
7619
|
+
}
|
|
7602
7620
|
deleteGoodsPicked(deleteGoodsPickedForOrderRequest) {
|
|
7603
7621
|
return __awaiter(this, void 0, void 0, function* () {
|
|
7604
7622
|
return this._adapterService.functionCall(this._adapterService.deleteGoodsPicked, [deleteGoodsPickedForOrderRequest]);
|
|
@@ -12670,6 +12688,11 @@ class TransactionService extends PendingReasonService {
|
|
|
12670
12688
|
return yield this.connector.getGoodsPickedHistory(transId, lineNr);
|
|
12671
12689
|
});
|
|
12672
12690
|
}
|
|
12691
|
+
getLinePurchaseInfo(transId, lineNr) {
|
|
12692
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
12693
|
+
return yield this.connector.getLinePurchaseInfo(transId, lineNr);
|
|
12694
|
+
});
|
|
12695
|
+
}
|
|
12673
12696
|
getOrderConfirmationEmailLayouts(transactionUUID) {
|
|
12674
12697
|
return __awaiter(this, void 0, void 0, function* () {
|
|
12675
12698
|
return yield this.connector.getOrderConfirmationEmailLayouts(transactionUUID);
|
|
@@ -17125,6 +17148,9 @@ class TransactionLineDescriptionComponent extends TransactionInputLineFieldBaseC
|
|
|
17125
17148
|
return true;
|
|
17126
17149
|
});
|
|
17127
17150
|
}
|
|
17151
|
+
cancelClicked() {
|
|
17152
|
+
this.detectChanges();
|
|
17153
|
+
}
|
|
17128
17154
|
needsUpdate(description) {
|
|
17129
17155
|
if (!this.showPurchaseDesc) {
|
|
17130
17156
|
return (this.transactionLine.goodDescription !== description);
|
|
@@ -17175,7 +17201,7 @@ TransactionLineDescriptionComponent.decorators = [
|
|
|
17175
17201
|
template: `
|
|
17176
17202
|
<div class="co-transaction-default-flex-row" *ngIf="(!editMode || readonly) && !defaultEditMode">
|
|
17177
17203
|
<div class="co-transaction-overflow-ellipsis" [textContent]="description"
|
|
17178
|
-
[screenConfigurationObject]="configNames?.description" screenConfigNativeElement
|
|
17204
|
+
[screenConfigurationObject]="configNames?.description" [title]="description" screenConfigNativeElement
|
|
17179
17205
|
></div>
|
|
17180
17206
|
<co-icon [iconData]="iconCacheService.getIcon(icons.EditPencil)" *ngIf="!readonly && !editMode && !customerPortal" (click)="editMode = true"
|
|
17181
17207
|
[screenConfigurationObject]="configNames?.descriptionEditBtn" screenConfigNativeElement
|
|
@@ -17191,6 +17217,7 @@ TransactionLineDescriptionComponent.decorators = [
|
|
|
17191
17217
|
[readonly]="readonly"
|
|
17192
17218
|
[model]="description"
|
|
17193
17219
|
(blur)="editMode = false"
|
|
17220
|
+
(cancelClicked)="cancelClicked()"
|
|
17194
17221
|
></co-input-text>
|
|
17195
17222
|
`,
|
|
17196
17223
|
providers: [{
|
|
@@ -19289,7 +19316,7 @@ class TransactionQuickAccessOverviewComponent extends TransactionQuickAccessSend
|
|
|
19289
19316
|
return true;
|
|
19290
19317
|
}
|
|
19291
19318
|
openSendDialog() {
|
|
19292
|
-
if (this.isAdditionalDocEnabled
|
|
19319
|
+
if (this.isAdditionalDocEnabled) {
|
|
19293
19320
|
this.getTermsAndConditionsForm();
|
|
19294
19321
|
}
|
|
19295
19322
|
this.showSendMethodDialog = true;
|
|
@@ -20771,8 +20798,12 @@ class TransactionPurchaseLineBaseComponent extends TransactionLineBaseComponent
|
|
|
20771
20798
|
this._getPurchaseOrderId();
|
|
20772
20799
|
}
|
|
20773
20800
|
_getPurchaseOrderId() {
|
|
20774
|
-
if (this.transactionLine &&
|
|
20775
|
-
|
|
20801
|
+
if (this.transactionLine &&
|
|
20802
|
+
this.transactionLine.isArticle &&
|
|
20803
|
+
this.transactionLine.commissionCode === '0' &&
|
|
20804
|
+
!this.transactionLine.purchaseOrderId &&
|
|
20805
|
+
(!this.transactionLine.refTransactions || this.transactionLine.refTransactions.length === 0) &&
|
|
20806
|
+
this.visible) {
|
|
20776
20807
|
this.transactionService.getPurchaseOrderForTransactionLine(this.transactionInfo.id, this.transactionLine.lineNr).then((history) => {
|
|
20777
20808
|
this.transactionLine.refTransactions.length = 0;
|
|
20778
20809
|
if (history && history.length > 0) {
|
|
@@ -20784,6 +20815,9 @@ class TransactionPurchaseLineBaseComponent extends TransactionLineBaseComponent
|
|
|
20784
20815
|
this.transactionEventService.transactionLineChanged.next(this.transactionLine);
|
|
20785
20816
|
this.transactionEventService.transactionLineRefTransactionsChanged.next(this.transactionLine);
|
|
20786
20817
|
this.detectChanges();
|
|
20818
|
+
// this.transactionService.getLinePurchaseInfo(this.transactionInfo.id, this.transactionLine.lineNr).then((history: PurchaseHistory) => {
|
|
20819
|
+
// console.log('history', history);
|
|
20820
|
+
// });
|
|
20787
20821
|
});
|
|
20788
20822
|
}
|
|
20789
20823
|
}
|
|
@@ -20818,6 +20852,13 @@ class TransactionPurchaseLineComponent extends TransactionPurchaseLineBaseCompon
|
|
|
20818
20852
|
statusBarGL: this.cfgNames.StatusBarGL,
|
|
20819
20853
|
statusBarGF: this.cfgNames.StatusBarGF
|
|
20820
20854
|
};
|
|
20855
|
+
// public statusBarConfigNames: StatusBarCfgNames = {
|
|
20856
|
+
// statusBarIB: this.cfgNames.StatusBarIB,
|
|
20857
|
+
// statusBarNT: this.cfgNames.StatusBarNT,
|
|
20858
|
+
// statusBarBN: this.cfgNames.StatusBarBN,
|
|
20859
|
+
// statusBarBG: this.cfgNames.StatusBarBG,
|
|
20860
|
+
// statusBarFC: this.cfgNames.StatusBarFC
|
|
20861
|
+
// }
|
|
20821
20862
|
this.discountConfigNames = {
|
|
20822
20863
|
linePriceList: this.cfgNames.LinePriceList,
|
|
20823
20864
|
lineDiscountAmount: this.cfgNames.LineDiscountAmount,
|
|
@@ -20865,7 +20906,7 @@ TransactionPurchaseLineComponent.decorators = [
|
|
|
20865
20906
|
[isFirst]="isFirst"
|
|
20866
20907
|
[showPurchaseDescAndPrice]="true">
|
|
20867
20908
|
<span *ngIf="transactionHeaderService.reservationMode && hasReservations" class="button reservation-button"><co-icon (click)="handleReservationModeClick(transactionLine.lineNr)"
|
|
20868
|
-
|
|
20909
|
+
[iconData]="iconCacheService.getIcon(icons.PalletBoxesRotate)"></co-icon></span>
|
|
20869
20910
|
<div class="transaction-line-wrapper" [class.transaction-not-definitive]="!transactionInfo.transactionDefinitive">
|
|
20870
20911
|
<div *ngIf=!preview class="transaction-line-extended-wrapper">
|
|
20871
20912
|
<div class="column1">
|
|
@@ -20873,7 +20914,14 @@ TransactionPurchaseLineComponent.decorators = [
|
|
|
20873
20914
|
class="status-bar-wrapper"
|
|
20874
20915
|
[screenConfigurationObject]="cfgNames.StatusBar"
|
|
20875
20916
|
[configNames]="statusBarConfigNames"
|
|
20876
|
-
[activeCategory]="category.SalesOrderPurchase"
|
|
20917
|
+
[activeCategory]="category.SalesOrderPurchase">
|
|
20918
|
+
</co-transaction-line-statusbar>
|
|
20919
|
+
|
|
20920
|
+
<!-- <co-transaction-line-statusbar-->
|
|
20921
|
+
<!-- [screenConfigurationObject]="cfgNames.StatusBar"-->
|
|
20922
|
+
<!-- [configNames]="statusBarConfigNames"-->
|
|
20923
|
+
<!-- [activeCategory]="category.SalesOrderPurchase">-->
|
|
20924
|
+
<!-- </co-transaction-line-statusbar>-->
|
|
20877
20925
|
</div>
|
|
20878
20926
|
<div class="column2">
|
|
20879
20927
|
<div class="transaction-field-wrapper">
|
|
@@ -22047,6 +22095,11 @@ class TransactionPurchaseOrderLineBaseComponent extends TransactionLineBaseCompo
|
|
|
22047
22095
|
this.detectChanges();
|
|
22048
22096
|
}), this.transactionEventService.overwritePurchaseOrderConfirmationCompletedChanged.subscribe(() => {
|
|
22049
22097
|
this._handleConfirmationOverwrite();
|
|
22098
|
+
}), this.transactionEventService.purchaseOrderConfirmationCompletedChanged.subscribe((completed) => {
|
|
22099
|
+
if (completed) {
|
|
22100
|
+
console.log('order confirmation completed from sidemenu. Refresh the transaction line.');
|
|
22101
|
+
this.detectChanges();
|
|
22102
|
+
}
|
|
22050
22103
|
}));
|
|
22051
22104
|
}
|
|
22052
22105
|
ngOnDestroy() {
|
|
@@ -30584,13 +30637,12 @@ TransactionLineStatusbarComponent.decorators = [
|
|
|
30584
30637
|
{ type: Component, args: [{
|
|
30585
30638
|
selector: 'co-transaction-line-statusbar',
|
|
30586
30639
|
template: `
|
|
30587
|
-
|
|
30588
|
-
|
|
30640
|
+
<co-statusbar [statusbarData]="statusbarData" [focusedStatusIndex]="focusedStatusIndex"></co-statusbar>
|
|
30641
|
+
`,
|
|
30589
30642
|
providers: [{
|
|
30590
30643
|
provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
|
|
30591
30644
|
useExisting: forwardRef(() => TransactionLineStatusbarComponent)
|
|
30592
|
-
}
|
|
30593
|
-
],
|
|
30645
|
+
}],
|
|
30594
30646
|
encapsulation: ViewEncapsulation.None,
|
|
30595
30647
|
changeDetection: ChangeDetectionStrategy.OnPush
|
|
30596
30648
|
},] }
|
|
@@ -30800,6 +30852,9 @@ class TransactionLinePriceComponent extends TransactionLineBaseComponent {
|
|
|
30800
30852
|
return !isNaN(this.transactionLine.purchasePrice) ? this.transactionLine.purchasePrice : this.transactionLine.defaultPurchasePrice;
|
|
30801
30853
|
}
|
|
30802
30854
|
}
|
|
30855
|
+
cancelClicked() {
|
|
30856
|
+
this.detectChanges();
|
|
30857
|
+
}
|
|
30803
30858
|
}
|
|
30804
30859
|
TransactionLinePriceComponent.decorators = [
|
|
30805
30860
|
{ type: Component, args: [{
|
|
@@ -30817,6 +30872,7 @@ TransactionLinePriceComponent.decorators = [
|
|
|
30817
30872
|
[readonly]="readonly"
|
|
30818
30873
|
[model]="getPrice()"
|
|
30819
30874
|
(blur)="editMode = false"
|
|
30875
|
+
(cancelClicked)="cancelClicked()"
|
|
30820
30876
|
></co-input-text>
|
|
30821
30877
|
`,
|
|
30822
30878
|
providers: [{
|
|
@@ -33766,7 +33822,7 @@ TransactionLineSidePanelDefaultComponent.decorators = [
|
|
|
33766
33822
|
</div>
|
|
33767
33823
|
</div>
|
|
33768
33824
|
</co-collapsible>
|
|
33769
|
-
|
|
33825
|
+
<!--<co-collapsible
|
|
33770
33826
|
[iconData]="iconCacheService.getIcon(icons.TriangleUp)"
|
|
33771
33827
|
[headerTitle]="'LOGISTICS_AND_PLANNING' | localize"
|
|
33772
33828
|
[expandButtonLast]="true"
|
|
@@ -33786,7 +33842,7 @@ TransactionLineSidePanelDefaultComponent.decorators = [
|
|
|
33786
33842
|
<co-input-text class="side-panel-input" [placeholder]="'ARTICLE_NR_SUPPLIER' | localize" [model]="transactionLine.supplierArticleNumber" [readonly]="readonly"></co-input-text>
|
|
33787
33843
|
</div>
|
|
33788
33844
|
</div>
|
|
33789
|
-
</co-collapsible
|
|
33845
|
+
</co-collapsible>-->
|
|
33790
33846
|
|
|
33791
33847
|
<co-collapsible
|
|
33792
33848
|
[iconData]="iconCacheService.getIcon(icons.TriangleUp)"
|
|
@@ -33802,7 +33858,7 @@ TransactionLineSidePanelDefaultComponent.decorators = [
|
|
|
33802
33858
|
<div class="side-panel-input-row">
|
|
33803
33859
|
<co-transaction-line-reference class="side-panel-input"></co-transaction-line-reference>
|
|
33804
33860
|
</div>
|
|
33805
|
-
|
|
33861
|
+
<!--<div class="side-panel-input-row">
|
|
33806
33862
|
<co-input-text class="side-panel-input" [placeholder]="'CUSTOMER' | localize" [readonly]="readonly"></co-input-text>
|
|
33807
33863
|
<co-input-text class="side-panel-input" [model]="transactionLine.orderLineSetCode" [placeholder]="'ORDER_RULESET' | localize" [readonly]="readonly"></co-input-text>
|
|
33808
33864
|
</div>
|
|
@@ -33817,7 +33873,7 @@ TransactionLineSidePanelDefaultComponent.decorators = [
|
|
|
33817
33873
|
<div class="side-panel-input-row">
|
|
33818
33874
|
<co-input-text class="side-panel-input" [placeholder]="'TRANSPORT_COST' | localize" [readonly]="readonly"></co-input-text>
|
|
33819
33875
|
<co-input-text class="side-panel-input" [placeholder]="'TRANSPORT_COST_LINE_TOTAL' | localize" [readonly]="readonly"></co-input-text>
|
|
33820
|
-
</div
|
|
33876
|
+
</div>-->
|
|
33821
33877
|
</div>
|
|
33822
33878
|
</co-collapsible>
|
|
33823
33879
|
</div>
|
|
@@ -33883,7 +33939,7 @@ class TransactionLineReferenceComponent extends TransactionInputLineFieldBaseCom
|
|
|
33883
33939
|
set child(content) {
|
|
33884
33940
|
if (content) {
|
|
33885
33941
|
this.input = content;
|
|
33886
|
-
this.input.commit = (reference) => this.
|
|
33942
|
+
this.input.commit = (reference) => this.handleCommit(reference);
|
|
33887
33943
|
this.setEditMode(false);
|
|
33888
33944
|
}
|
|
33889
33945
|
else if (this.input) {
|
|
@@ -33903,6 +33959,9 @@ class TransactionLineReferenceComponent extends TransactionInputLineFieldBaseCom
|
|
|
33903
33959
|
return true;
|
|
33904
33960
|
});
|
|
33905
33961
|
}
|
|
33962
|
+
cancelClicked() {
|
|
33963
|
+
this.detectChanges();
|
|
33964
|
+
}
|
|
33906
33965
|
}
|
|
33907
33966
|
TransactionLineReferenceComponent.decorators = [
|
|
33908
33967
|
{ type: Component, args: [{
|
|
@@ -33911,8 +33970,8 @@ TransactionLineReferenceComponent.decorators = [
|
|
|
33911
33970
|
<co-input-text #input
|
|
33912
33971
|
[placeholder]="'REFERENCE' | localize"
|
|
33913
33972
|
[type]="'text'"
|
|
33914
|
-
[readonly]="readonly"
|
|
33915
|
-
[showSaveCancel]="true"
|
|
33973
|
+
[readonly]="readonly" [model]="transactionLine.reference"
|
|
33974
|
+
[showSaveCancel]="true" (cancelClicked)="cancelClicked()"
|
|
33916
33975
|
></co-input-text>
|
|
33917
33976
|
`,
|
|
33918
33977
|
encapsulation: ViewEncapsulation.None
|
|
@@ -35189,7 +35248,7 @@ class TransactionLinePurchaseConfirmationComponent extends TransactionLineBaseCo
|
|
|
35189
35248
|
if (this.docDeliveryBatch.docAmount && this.docDeliveryBatch.confirmedPrice) {
|
|
35190
35249
|
this.confirmingOrder = true;
|
|
35191
35250
|
// check if there is a corresponding "G record"
|
|
35192
|
-
const existingBatch = this.transactionLine.purchasePortalLine.docBatchArray.find(ba => ba.deliveryBatch === this.docDeliveryBatch.deliveryBatch && ba.historical ===
|
|
35251
|
+
const existingBatch = this.transactionLine.purchasePortalLine.docBatchArray.find(ba => ba.deliveryBatch === this.docDeliveryBatch.deliveryBatch && ba.historical === 'G');
|
|
35193
35252
|
if (existingBatch) { // change that one
|
|
35194
35253
|
existingBatch.confirmedPrice = this.docDeliveryBatch.confirmedPrice;
|
|
35195
35254
|
existingBatch.docAmount = this.docDeliveryBatch.docAmount;
|
|
@@ -35206,6 +35265,7 @@ class TransactionLinePurchaseConfirmationComponent extends TransactionLineBaseCo
|
|
|
35206
35265
|
if (success) {
|
|
35207
35266
|
this._initNewDocDeliveryBatch();
|
|
35208
35267
|
this.confirmingOrder = false;
|
|
35268
|
+
this.transactionEventService.purchaseOrderConfirmationCompletedChanged.next(success);
|
|
35209
35269
|
}
|
|
35210
35270
|
}
|
|
35211
35271
|
else {
|
|
@@ -35282,12 +35342,12 @@ TransactionLinePurchaseConfirmationComponent.decorators = [
|
|
|
35282
35342
|
selector: 'co-transaction-line-purchase-confirmation',
|
|
35283
35343
|
template: `
|
|
35284
35344
|
<div class="ai-toggle-button-wrapper" *ngIf="purchaseConfirmationService.confirmationAnalysisId">
|
|
35285
|
-
|
|
35286
|
-
|
|
35287
|
-
|
|
35288
|
-
|
|
35289
|
-
|
|
35290
|
-
|
|
35345
|
+
<co-button
|
|
35346
|
+
[label]="'PURCHASE_CONFIRMATION' | localize"
|
|
35347
|
+
[isToggleButton]="true"
|
|
35348
|
+
[isToggled]="showPurchaseConfirmationAI"
|
|
35349
|
+
(click)="showPurchaseConfirmationAI = !showPurchaseConfirmationAI"
|
|
35350
|
+
></co-button>
|
|
35291
35351
|
</div>
|
|
35292
35352
|
<div class="confirmation-details-wrapper form-and-buttons">
|
|
35293
35353
|
<ng-container *ngIf="!showPurchaseConfirmationAI">
|
|
@@ -45994,8 +46054,11 @@ TransactionLinesComponent.decorators = [
|
|
|
45994
46054
|
(cdkDropListDropped)="handleDrop($event)"
|
|
45995
46055
|
(cdkDropListEntered)="handleDropListEntered($event)"
|
|
45996
46056
|
>
|
|
45997
|
-
<div class="draggable-transaction-line"
|
|
45998
|
-
|
|
46057
|
+
<div class="draggable-transaction-line"
|
|
46058
|
+
*ngFor="let line of (historicTransactionLines ? historicTransactionLines : transactionLines);let isFirst = first; trackBy:trackByFn;"
|
|
46059
|
+
[cdkDragDisabled]="activeCategory !== category.SalesOrderOverview"
|
|
46060
|
+
cdkDrag>
|
|
46061
|
+
<co-icon *ngIf="!preview && activeCategory === category.SalesOrderOverview" class="transaction-line-drag-handle"
|
|
45999
46062
|
[class.show]="line === selectedTransactionLine && transactionLines.length > 1" cdkDragHandle
|
|
46000
46063
|
[iconData]="iconCacheService.getIcon(icons.GripDotsVerticalSolid)">
|
|
46001
46064
|
</co-icon>
|