@colijnit/transaction 256.1.13 → 256.1.15

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.
Files changed (43) hide show
  1. package/bundles/colijnit-transaction.umd.js +198 -65
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.metadata.json +1 -1
  4. package/esm2015/lib/component/avatar/avatar.component.js +7 -3
  5. package/esm2015/lib/component/delivery-planning-main/component/delivery-planning-overview/delivery-planning-overview.component.js +30 -27
  6. package/esm2015/lib/component/purchase-confirmation-lines/purchase-confirmation-lines.component.js +37 -33
  7. package/esm2015/lib/component/purchase-confirmation-lines/purchase-confirmation-lines.module.js +4 -3
  8. package/esm2015/lib/component/relation/relation-contact-details/relation-contact-details.component.js +3 -1
  9. package/esm2015/lib/component/transaction-line/transaction-overview-line/transaction-overview-line.component.js +84 -42
  10. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.js +16 -5
  11. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse.component.js +6 -6
  12. package/esm2015/lib/component/transaction-line-image-and-description/transaction-line-image-and-description.component.js +3 -2
  13. package/esm2015/lib/component/transaction-search/transaction-search-result/transaction-search-result.component.js +19 -3
  14. package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-purchase-reservation-order-tile/transaction-purchase-reservation-order-tile.component.js +2 -2
  15. package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-pos-order-tile/transaction-search-pos-order-tile.component.js +64 -63
  16. package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-purchase-order-tile/transaction-search-purchase-order-tile.component.js +24 -22
  17. package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-order-tile/transaction-search-sales-order-tile.component.js +27 -29
  18. package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-quotation-tile/transaction-search-sales-quotation-tile.component.js +23 -19
  19. package/esm2015/lib/component/transaction-search/transaction-shipping-method-dialog/transaction-shipping-method-dialog.component.js +33 -4
  20. package/esm2015/lib/enum/icon.enum.js +3 -1
  21. package/esm2015/lib/model/icon-svg.js +3 -1
  22. package/esm2015/lib/service/transaction-base.service.js +4 -1
  23. package/esm2015/lib/service/transaction.service.js +11 -1
  24. package/esm2015/lib/transaction-version.js +3 -3
  25. package/fesm2015/colijnit-transaction.js +383 -249
  26. package/fesm2015/colijnit-transaction.js.map +1 -1
  27. package/lib/component/avatar/avatar.component.d.ts +1 -0
  28. package/lib/component/purchase-confirmation-lines/style/_layout.scss +70 -25
  29. package/lib/component/purchase-confirmation-lines/style/_material-definition.scss +21 -1
  30. package/lib/component/service-wizard-qa/question-answer-item/style/_material-definition.scss +1 -1
  31. package/lib/component/transaction-line/transaction-overview-line/style/_layout.scss +126 -1
  32. package/lib/component/transaction-line/transaction-overview-line/transaction-overview-line.component.d.ts +1 -0
  33. package/lib/component/transaction-line-action-buttons/style/_layout.scss +1 -1
  34. package/lib/component/transaction-line-fields/transaction-line-warehouse-location.component.d.ts +4 -1
  35. package/lib/component/transaction-search/transaction-search-result/transaction-search-result.component.d.ts +3 -1
  36. package/lib/component/transaction-search/transaction-search-tile/transaction-search-tile/style/_layout.scss +100 -46
  37. package/lib/component/transaction-search/transaction-search-tile/transaction-search-tile/style/_material-definition.scss +10 -7
  38. package/lib/component/transaction-search/transaction-search-tile/transaction-search-tile/style/_theme.scss +7 -3
  39. package/lib/component/transaction-search/transaction-shipping-method-dialog/transaction-shipping-method-dialog.component.d.ts +4 -1
  40. package/lib/enum/icon.enum.d.ts +2 -0
  41. package/lib/service/transaction.service.d.ts +1 -0
  42. package/package.json +3 -3
  43. package/colijnit-transaction-256.1.12.tgz +0 -0
@@ -251,6 +251,7 @@ import { ReceiveGoodsForPurchaseOrderCorrectionRequest } from '@colijnit/transac
251
251
  import { PurchaseOrderLineReceiptCorrectionDetails } from '@colijnit/transactionapi/build/model/purchase-order-line-receipt-correction-details.bo';
252
252
  import { RouterModule } from '@angular/router';
253
253
  import { QuantityInHistoricState } from '@colijnit/transactionapi/build/enum/quantity-in-historic-state.enum';
254
+ import { BatchTransactionSendingRequest } from '@colijnit/transactionapi/build/model/batch-transaction-sending-request';
254
255
  import { TransactionLspInformationRequest } from '@colijnit/transactionapi/build/model/transaction-lsp-information-request';
255
256
  import { TransactionLspRequestLine } from '@colijnit/transactionapi/build/model/transaction-lsp-request-line.bo';
256
257
  import { ExternalCatalogAddArticleRequest } from '@colijnit/transactionapi/build/model/external-catalog-add-article-request';
@@ -277,8 +278,8 @@ class Version {
277
278
  constructor() {
278
279
  this.name = "@colijnit/transaction";
279
280
  this.description = "Colijn IT transaction package";
280
- this.symVer = "256.1.13";
281
- this.publishDate = "20-11-2024 10:36:14";
281
+ this.symVer = "256.1.15";
282
+ this.publishDate = "21-11-2024 17:22:17";
282
283
  }
283
284
  }
284
285
 
@@ -561,6 +562,7 @@ var Icon;
561
562
  Icon["RegularCartFlatbedBoxesCircleCheck"] = "regular_cart_flatbed_boxes_circle_check";
562
563
  Icon["RegularCartShoppingCircleQuestion"] = "regular_cart_shopping_circle_question";
563
564
  Icon["RegularCartShoppingClock"] = "regular_cart_shopping_clock";
565
+ Icon["RegularCartShoppingTag"] = "regular_cart_shopping_tag";
564
566
  Icon["RegularEuroSignMinus"] = "regular_euro_sign_minus";
565
567
  Icon["RegularIndustryClock"] = "regular_industry_clock";
566
568
  Icon["RegularIndustryTag"] = "regular_industry_tag";
@@ -584,6 +586,7 @@ var Icon;
584
586
  Icon["SlideIn"] = "slide_in";
585
587
  Icon["SquareFull"] = "square_full";
586
588
  Icon["SquareFullSolid"] = "square_full_solid";
589
+ Icon["StoreLight"] = "store_light";
587
590
  Icon["SyncAlt"] = "sync_alt";
588
591
  Icon["Tag"] = "tag";
589
592
  Icon["TagLight"] = "tag_light";
@@ -716,6 +719,7 @@ const IconSvg = {
716
719
  "regular_cart_flatbed_boxes_circle_check": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M24 0C10.7 0 0 10.7 0 24S10.7 48 24 48c16 0 32 0 48 0c4.4 0 8 3.6 8 8c0 117.4 0 234.7 0 352c0 30.9 25.1 56 56 56c8 0 16 0 24 0c0 26.5 21.5 48 48 48s48-21.5 48-48c30.8 0 61.7 0 92.5 0c-9.6-14.6-17-30.8-21.9-48c-39.5 0-79.1 0-118.6 0c-24 0-48 0-72 0c-4.4 0-8-3.6-8-8c0-117.4 0-234.7 0-352c0-30.9-25.1-56-56-56C56 0 40 0 24 0zM240 80l128 0c0 55.7 0 111.5 0 167.2c13.8-14.6 30-26.8 48-36c0-43.7 0-87.5 0-131.2c0-26.5-21.5-48-48-48c-42.7 0-85.3 0-128 0c-26.5 0-48 21.5-48 48c0 74.7 0 149.3 0 224c0 26.5 21.5 48 48 48c26.9 0 53.8 0 80.7 0c1.5-16.8 5.4-32.9 11.3-48c-30.7 0-61.3 0-92 0c0-74.7 0-149.3 0-224zm320 0l0 64c-21.3 0-42.7 0-64 0c0-21.3 0-42.7 0-64c21.3 0 42.7 0 64 0zM496 32c-26.5 0-48 21.5-48 48c0 21.3 0 42.7 0 64c0 26.5 21.5 48 48 48c21.3 0 42.7 0 64 0c26.5 0 48-21.5 48-48c0-21.3 0-42.7 0-64c0-26.5-21.5-48-48-48c-21.3 0-42.7 0-64 0zM352 368c0-79.5 64.5-144 144-144s144 64.5 144 144s-64.5 144-144 144s-144-64.5-144-144zm211.3-20.7c6.2-6.2 6.2-16.4 0-22.6s-16.4-6.2-22.6 0c-20.2 20.2-40.5 40.5-60.7 60.7c-9.6-9.6-19.1-19.1-28.7-28.7c-6.2-6.2-16.4-6.2-22.6 0s-6.2 16.4 0 22.6c13.3 13.3 26.7 26.7 40 40c6.2 6.2 16.4 6.2 22.6 0c24-24 48-48 72-72z\"/></svg>",
717
720
  "regular_cart_shopping_circle_question": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M24 0C10.7 0 0 10.7 0 24S10.7 48 24 48c15.2 0 30.3 0 45.5 0c3.8 0 7.1 2.7 7.9 6.5c17.2 90.4 34.4 180.7 51.6 271c6.5 34 36.2 58.5 70.7 58.5c40.3 0 80.7 0 121 0c-.5-5.3-.7-10.6-.7-16c0-10.9 1-21.6 2.9-32c-41.1 0-82.1 0-123.2 0c-11.5 0-21.4-8.2-23.6-19.5c-1.8-9.5-3.6-19-5.4-28.5c56.2 0 112.3 0 168.5 0c9.2-18 21.4-34.2 36-48c-71.2 0-142.4 0-213.6 0c-10.2-53.3-20.3-106.7-30.5-160c129.9 0 259.7 0 389.6 0c-10.1 37.4-20.1 74.7-30.2 112.1c1.8-.1 3.7-.1 5.5-.1c14.8 0 29.1 1.8 42.8 5.2c10.3-38.3 20.6-76.6 30.9-114.8C576.6 57 557.4 32 531.1 32c-137 0-274 0-411 0C111 12.8 91.6 0 69.5 0C54.3 0 39.2 0 24 0zM176 512c17.1 0 33-9.1 41.6-24s8.6-33.1 0-48s-24.4-24-41.6-24s-33 9.1-41.6 24s-8.6 33.1 0 48s24.4 24 41.6 24zM640 368c0 79.5-64.5 144-144 144s-144-64.5-144-144s64.5-144 144-144s144 64.5 144 144zM496 416c-13.3 0-24 10.7-24 24s10.7 24 24 24s24-10.7 24-24s-10.7-24-24-24zM473.6 280c-23 0-41.6 18.6-41.6 41.6c0 2.1 0 4.3 0 6.4c0 8.8 7.2 16 16 16s16-7.2 16-16c0-2.1 0-4.3 0-6.4c0-5.3 4.3-9.6 9.6-9.6c13.5 0 27 0 40.5 0c7.7 0 13.9 6.2 13.9 13.9c0 5.2-2.9 9.9-7.4 12.3c-10.7 5.6-21.3 11.2-32 16.8c-5.3 2.8-8.6 8.2-8.6 14.2c0 4.9 0 9.8 0 14.8c0 8.8 7.2 16 16 16s16-7.2 16-16c0-1.7 0-3.4 0-5.1c7.8-4.1 15.6-8.2 23.5-12.3c15.1-7.9 24.5-23.6 24.5-40.6c0-25.4-20.6-45.9-45.9-45.9c-13.5 0-27 0-40.5 0z\"/></svg>",
718
721
  "regular_cart_shopping_clock": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M0 24C0 10.7 10.7 0 24 0L69.5 0C91.6 0 111 12.8 120.1 32l411 0c26.3 0 45.5 25 38.6 50.4L538.8 197.2c-13.7-3.4-28-5.2-42.8-5.2c-1.8 0-3.7 0-5.5 .1L520.7 80 131.1 80l30.5 160 213.6 0c-14.6 13.8-26.8 30-36 48l-168.5 0 5.4 28.5c2.2 11.3 12.1 19.5 23.6 19.5l123.2 0c-1.9 10.4-2.9 21.1-2.9 32c0 5.4 .2 10.7 .7 16l-121 0c-34.5 0-64.2-24.5-70.7-58.5L77.4 54.5c-.8-3.8-4.1-6.5-7.9-6.5L24 48C10.7 48 0 37.3 0 24zM134.4 440c8.6-14.9 24.4-24 41.6-24s33 9.1 41.6 24s8.6 33.1 0 48s-24.4 24-41.6 24s-33-9.1-41.6-24s-8.6-33.1 0-48zM352 368c0-79.5 64.5-144 144-144s144 64.5 144 144s-64.5 144-144 144s-144-64.5-144-144zm128-64l0 64c0 8.8 7.2 16 16 16l48 0c8.8 0 16-7.2 16-16s-7.2-16-16-16l-32 0 0-48c0-8.8-7.2-16-16-16s-16 7.2-16 16z\"/></svg>",
722
+ "regular_cart_shopping_tag": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M0 24C0 10.7 10.7 0 24 0L69.5 0C91.6 0 111 12.8 120.1 32l411 0c26.3 0 45.5 25 38.6 50.4l-37 137.3-4.4-4.4c-10.6-10.6-23.9-17.9-38.3-21.3L520.7 80 131.1 80l30.5 160 160.3 0c-1.2 5-1.9 10.2-1.9 15.5l0 32.5-149.3 0 5.4 28.5c2.2 11.3 12.1 19.5 23.6 19.5L320 336l0 8.2c0 14.1 3.8 27.8 10.7 39.8l-131 0c-34.5 0-64.2-24.5-70.7-58.5L77.4 54.5c-.8-3.8-4.1-6.5-7.9-6.5L24 48C10.7 48 0 37.3 0 24zM134.4 440c8.6-14.9 24.4-24 41.6-24s33 9.1 41.6 24s8.6 33.1 0 48s-24.4 24-41.6 24s-33-9.1-41.6-24s-8.6-33.1 0-48zM359 262.6c0-17.6 14.3-32 32-32l82.7 0c17 0 33.3 6.7 45.3 18.7L626.3 356.7c18.7 18.7 18.7 49.1 0 67.9l-73.4 73.3c-18.7 18.7-49.1 18.7-67.9 0L377.7 390.6c-12-12-18.7-28.3-18.7-45.2l0-82.8zm56 48c0 13.3 10.7 24 24 24s24-10.7 24-24s-10.7-24-24-24s-24 10.7-24 24zm2.1 163.6l36.7 36.8c-4.8-1-9.4-2.8-13.8-5.3c-11.9-6.8-20.1-18.3-22.9-31.4z\"/></svg>",
719
723
  "regular_euro_sign_minus": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 576 512\"><path d=\"M0 216c0-13.3 10.7-24 24-24l33.3 0C84.8 99.5 170.5 32 272 32l24 0c13.3 0 24 10.7 24 24s-10.7 24-24 24l-24 0c-74.6 0-138.4 46.4-164 112l156 0c13.3 0 24 10.7 24 24s-10.7 24-24 24L96.7 240c-.5 5.3-.7 10.6-.7 16s.2 10.7 .7 16L264 272c6.4 0 12.1 2.5 16.4 6.5c-7.6 12.9-13.6 26.8-17.8 41.5L108 320c25.1 64.4 87.1 110.3 160 112c6.9 17.6 16.5 33.7 28.3 48c-.1 0-.2 0-.3 0l-24 0C170.5 480 84.8 412.5 57.3 320L24 320c-13.3 0-24-10.7-24-24s10.7-24 24-24l24.6 0c-.4-5.3-.6-10.6-.6-16s.2-10.7 .6-16L24 240c-13.3 0-24-10.7-24-24zM288 368c0-79.5 64.5-144 144-144s144 64.5 144 144s-64.5 144-144 144s-144-64.5-144-144zm64 0c0 8.8 7.2 16 16 16l128 0c8.8 0 16-7.2 16-16s-7.2-16-16-16l-128 0c-8.8 0-16 7.2-16 16z\"/></svg>",
720
724
  "regular_industry_clock": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M88 80c-4.4 0-8 3.6-8 8c0 72 0 144 0 216c0 16 0 32 0 48c0 18.7 0 37.3 0 56c0 13.3 10.7 24 24 24c76 0 152 0 228 0c6.9 17.5 16.5 33.7 28.3 48c-85.4 0-170.9 0-256.3 0c-39.8 0-72-32.2-72-72c0-18.7 0-37.3 0-56c0-16 0-32 0-48c0-72 0-144 0-216c0-30.9 25.1-56 56-56c16 0 32 0 48 0c30.9 0 56 25.1 56 56c0 28.3 0 56.6 0 84.9c34.6-20.2 69.2-40.4 103.8-60.6c32-18.7 72.2 4.4 72.2 41.5c0 9 0 18 0 27c34-21.8 68.1-43.6 102.1-65.4c32-20.4 73.9 2.5 73.9 40.5c0 14.2 0 28.5 0 42.7c-15.3-4.3-31.4-6.6-48-6.6c0-12 0-24.1 0-36.1c-46.4 29.7-92.7 59.3-139.1 89c-7.4 4.7-16.8 5-24.5 .8s-12.5-12.3-12.5-21.1c0-23.6 0-47.3 0-70.9c-46.6 27.2-93.2 54.5-139.8 81.7c-7.4 4.3-16.6 4.4-24 .1s-12-12.2-12-20.8c0-42.2 0-84.5 0-126.7c0-4.4-3.6-8-8-8c-16 0-32.1 0-48.1 0zM352 368c0-79.5 64.5-144 144-144s144 64.5 144 144s-64.5 144-144 144s-144-64.5-144-144zm160-64c0-8.8-7.2-16-16-16s-16 7.2-16 16c0 21.3 0 42.7 0 64c0 8.8 7.2 16 16 16c16 0 32 0 48 0c8.8 0 16-7.2 16-16s-7.2-16-16-16c-10.7 0-21.3 0-32 0c0-16 0-32 0-48z\"/></svg>",
721
725
  "regular_industry_tag": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M88 80c-4.4 0-8 3.6-8 8c0 72 0 144 0 216c0 16 0 32 0 48c0 18.7 0 37.3 0 56c0 13.3 10.7 24 24 24c90.3 0 180.7 0 271 0c16 16 32 32 48 48c-106.3 0-212.6 0-318.9 0c-39.8 0-72-32.2-72-72c0-18.7 0-37.3 0-56c0-16 0-32 0-48c0-72 0-144 0-216c0-30.9 25.1-56 56-56c16 0 32 0 48 0c30.9 0 56 25.1 56 56c0 28.3 0 56.6 0 84.9c34.6-20.2 69.2-40.4 103.8-60.6c32-18.7 72.2 4.4 72.2 41.5c0 9 0 18 0 27c34-21.8 68.1-43.6 102.1-65.4c32-20.4 73.9 2.5 73.9 40.5c0 25 0 50.1 0 75.1c-5.2-5.2-10.5-10.5-15.7-15.7c-9.1-9.1-20.2-15.8-32.3-19.6c0-13.3 0-26.5 0-39.8c-18.8 12-37.6 24.1-56.4 36.1c-18.7 0-37.4 0-56.1 0c-28.4 0-52.4 18.6-60.6 44.3c-2-3.5-3-7.5-3-11.7c0-23.6 0-47.3 0-70.9c-46.6 27.2-93.2 54.5-139.8 81.7c-7.4 4.3-16.6 4.4-24 .1s-12-12.2-12-20.8c0-42.2 0-84.5 0-126.7c0-4.4-3.6-8-8-8c-16 0-32.1 0-48.1 0zM359 262.6c0-17.6 14.3-32 32-32c27.6 0 55.1 0 82.7 0c17 0 33.3 6.7 45.3 18.7c35.8 35.8 71.5 71.6 107.3 107.4c18.7 18.7 18.7 49.1 0 67.9c-24.5 24.4-48.9 48.9-73.4 73.3c-18.7 18.7-49.1 18.7-67.9 0c-35.8-35.8-71.5-71.5-107.3-107.3c-12-12-18.7-28.3-18.7-45.2c0-27.6 0-55.2 0-82.8zm80 72c13.3 0 24-10.7 24-24s-10.7-24-24-24s-24 10.7-24 24s10.7 24 24 24z\"/></svg>",
@@ -739,6 +743,7 @@ const IconSvg = {
739
743
  "slide_in": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><g><path d=\"M2,2.17H28V28.17H2V2.17Zm24.76,1.24H3.24V26.93H26.76V3.4Z\" fill=\"#484f60\"/><polygon points=\"23.71 13.42 18.41 13.42 18.41 10.43 14.12 14.72 18.41 19.01 18.41 16.02 23.71 16.02 23.71 13.42\" fill=\"#484f60\"/><rect x=\"2\" y=\"2.17\" width=\"9\" height=\"26\" fill=\"#484f60\"/></g></g></svg>",
740
744
  "square_full": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M464 48v416h-416v-416H464zM512 0H0v512h512V0z\"/></svg>",
741
745
  "square_full_solid": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M0 0h512v512H0V0z\"/></svg>",
746
+ "store_light": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 576 512\"><path d=\"M520.6 120.9s0 0 0 0c18.7 29.6 .3 66.6-29.2 70.6c-2.6 .3-5.2 .5-7.9 .5c-16.5 0-31.2-7.2-41.5-18.5c-6.1-6.7-14.7-10.5-23.7-10.5s-17.6 3.8-23.7 10.5c-10.2 11.2-24.8 18.4-41.4 18.4c-16.5 0-31.3-7.2-41.4-18.4c-6.1-6.7-14.7-10.5-23.7-10.5s-17.7 3.8-23.7 10.5C254 184.8 239.3 192 222.7 192c-16.5 0-31.3-7.2-41.4-18.4c-6.1-6.7-14.7-10.5-23.7-10.5s-17.7 3.8-23.7 10.5C123.6 184.8 109 192 92.4 192c-2.6 0-5.2-.2-7.9-.5c-29.3-4-47.7-41-29.1-70.6c0 0 0 0 0 0L111.6 32l352.8 0 56.2 88.9zM483.4 224c4.1 0 8.1-.3 12.1-.8c55.5-7.4 81.8-72.5 52.1-119.4L490.3 13.1C485.2 5 476.1 0 466.4 0L109.6 0C99.9 0 90.8 5 85.7 13.1L28.3 103.8c-29.6 46.8-3.4 111.9 51.9 119.4c4 .5 8.1 .8 12.1 .8c19.6 0 37.5-6.4 52-17c4.8-3.5 9.2-7.6 13.2-11.9c4 4.4 8.4 8.4 13.2 11.9c14.5 10.6 32.4 17 52 17c19.6 0 37.5-6.4 52-17c4.8-3.5 9.2-7.6 13.2-12c4 4.4 8.4 8.4 13.2 11.9c14.5 10.6 32.4 17 52 17c19.8 0 37.8-6.5 52.3-17.3c4.7-3.5 9-7.4 12.9-11.7c3.9 4.3 8.3 8.3 13 11.8c14.5 10.7 32.5 17.2 52.2 17.2zM80 256c-8.8 0-16 7.2-16 16l0 80 0 16 0 16 0 64c0 35.3 28.7 64 64 64l320 0c35.3 0 64-28.7 64-64l0-64 0-16 0-16 0-80c0-8.8-7.2-16-16-16s-16 7.2-16 16l0 80L96 352l0-80c0-8.8-7.2-16-16-16zM96 384l384 0 0 64c0 17.7-14.3 32-32 32l-320 0c-17.7 0-32-14.3-32-32l0-64z\"/></svg>",
742
747
  "sync_alt": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M370.72 133.28C339.458 104.008 298.888 87.962 255.848 88c-77.458.068-144.328 53.178-162.791 126.85-1.344 5.363-6.122 9.15-11.651 9.15H24.103c-7.498 0-13.194-6.807-11.807-14.176C33.933 94.924 134.813 8 256 8c66.448 0 126.791 26.136 171.315 68.685L463.03 40.97C478.149 25.851 504 36.559 504 57.941V192c0 13.255-10.745 24-24 24H345.941c-21.382 0-32.09-25.851-16.971-40.971l41.75-41.749zM32 296h134.059c21.382 0 32.09 25.851 16.971 40.971l-41.75 41.75c31.262 29.273 71.835 45.319 114.876 45.28 77.418-.07 144.315-53.144 162.787-126.849 1.344-5.363 6.122-9.15 11.651-9.15h57.304c7.498 0 13.194 6.807 11.807 14.176C478.067 417.076 377.187 504 256 504c-66.448 0-126.791-26.136-171.315-68.685L48.97 471.03C33.851 486.149 8 475.441 8 454.059V320c0-13.255 10.745-24 24-24z\"/></svg>",
743
748
  "tag": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M40,29.15v-.68a5.28,5.28,0,0,0-1.34-3.25L24.78,11.34A5.34,5.34,0,0,0,21.53,10H11.9A1.91,1.91,0,0,0,10,11.9v9.63a5.28,5.28,0,0,0,1.34,3.25L25.22,38.66A5.28,5.28,0,0,0,28.47,40h.68a5.28,5.28,0,0,0,3.24-1.34l6.27-6.27A5.28,5.28,0,0,0,40,29.15ZM13.13,16.72a2.54,2.54,0,1,1,3.59,0A2.55,2.55,0,0,1,13.13,16.72Zm15.9,19L17.84,24.55l1.34-1.34L30.37,34.4Zm2.69-2.69L20.52,21.87l1.35-1.35,11.19,11.2Zm2.68-2.69L23.21,19.18l1.34-1.34L35.75,29Z\" fill=\"#484f60\"/></svg>",
744
749
  "tag_light": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 448 512\"><path d=\"M32 229.5V80c0-8.8 7.2-16 16-16H197.5c8.5 0 16.6 3.4 22.6 9.4l176 176c12.5 12.5 12.5 32.8 0 45.3L262.6 428.1c-12.5 12.5-32.8 12.5-45.3 0l-176-176L18.7 274.7l22.6-22.6c-6-6-9.4-14.1-9.4-22.6zm-32 0c0 17 6.7 33.3 18.7 45.3l176 176c25 25 65.5 25 90.5 0L418.7 317.3c25-25 25-65.5 0-90.5l-176-176c-12-12-28.3-18.7-45.3-18.7H48C21.5 32 0 53.5 0 80V229.5zM112 168a24 24 0 1 0 0-48 24 24 0 1 0 0 48z\"/></svg>",
@@ -9795,6 +9800,9 @@ class TransactionBaseService extends BaseModuleService {
9795
9800
  }
9796
9801
  rollback(refresh = false, force = false) {
9797
9802
  return __awaiter(this, void 0, void 0, function* () {
9803
+ if (!this.transactionLocked) {
9804
+ return;
9805
+ }
9798
9806
  this.transactionEventService.blockScreen.next(false);
9799
9807
  if (this.manualSaveParam && !force) {
9800
9808
  return true;
@@ -10988,6 +10996,7 @@ class TransactionService extends PendingReasonService {
10988
10996
  }
10989
10997
  updateGoodDescriptionTransactionLine(uuid, lineUuid, goodDescription) {
10990
10998
  return __awaiter(this, void 0, void 0, function* () {
10999
+ yield this._checkAndAddRelationTransaction();
10991
11000
  const response = yield this.connector.changeTransactionLineGoodDescription(uuid, lineUuid, goodDescription);
10992
11001
  if (response) {
10993
11002
  this.transactionDirty = true;
@@ -11473,6 +11482,7 @@ class TransactionService extends PendingReasonService {
11473
11482
  }
11474
11483
  deleteTransactionLine(transactionUuid, TransactionLineUuid) {
11475
11484
  return __awaiter(this, void 0, void 0, function* () {
11485
+ yield this._checkAndAddRelationTransaction();
11476
11486
  const response = yield this.connector.deleteTransactionLine(transactionUuid, TransactionLineUuid);
11477
11487
  if (response) {
11478
11488
  this.transactionDirty = true;
@@ -11486,6 +11496,7 @@ class TransactionService extends PendingReasonService {
11486
11496
  }
11487
11497
  changeTransactionLineQuantity(transactionUuid, lineUuid, newQuantity) {
11488
11498
  return __awaiter(this, void 0, void 0, function* () {
11499
+ yield this._checkAndAddRelationTransaction();
11489
11500
  const response = yield this.connector.changeTransactionLineQuantity(transactionUuid, lineUuid, newQuantity)
11490
11501
  .catch(() => {
11491
11502
  return null;
@@ -12611,6 +12622,13 @@ class TransactionService extends PendingReasonService {
12611
12622
  }
12612
12623
  return Promise.resolve(true);
12613
12624
  }
12625
+ _checkAndAddRelationTransaction() {
12626
+ return __awaiter(this, void 0, void 0, function* () {
12627
+ if (this.currentTransaction && this.currentTransaction.transactionInfo && this.relation && !this.currentTransaction.transactionInfo.relation) {
12628
+ return this.saveRelation();
12629
+ }
12630
+ });
12631
+ }
12614
12632
  _checkAndCreateTransaction() {
12615
12633
  return __awaiter(this, void 0, void 0, function* () {
12616
12634
  if (!this.currentTransaction || !this.currentTransaction.transactionInfo || !this.currentTransaction.transactionInfo.transactionNr) {
@@ -16273,9 +16291,10 @@ TransactionLineImageAndDescriptionComponent.decorators = [
16273
16291
  </div>
16274
16292
  <co-icon *ngIf="transactionLine.isPayment" class="payment-line-icon" [iconData]="iconCacheService.getIcon(icons.UpFromLineRegular)">
16275
16293
  </co-icon>
16276
- <div class="colorBlock" *ngIf="transactionLine.color" [style.background-color]="transactionLine.color"></div>
16294
+
16277
16295
  <div class="transaction-line-description" data-action="openSidePanel">
16278
16296
  <div class="description-wrapper">
16297
+ <div class="colorBlock" *ngIf="transactionLine.color" [style.background-color]="transactionLine.color"></div>
16279
16298
  <co-transaction-line-description class="transaction-line-description-description"
16280
16299
  [configNames]="imageAndDescriptionConfigNames"
16281
16300
  [transactionInfo]="transactionInfo"
@@ -17227,25 +17246,28 @@ TransactionSearchPurchaseOrderTileComponent.decorators = [
17227
17246
  selector: "co-transaction-search-purchase-order-tile",
17228
17247
  template: `
17229
17248
  <div class="transaction-tile-wrapper" (click)="onTransactionClick(transaction)">
17249
+ <div [class]="'type-indicator color-' + transaction.transactionKind"></div>
17230
17250
  <div class="tile">
17231
17251
  <div class="tile-header">
17232
17252
  <div class="tile-upper-left">
17233
17253
  <div class="transaction-tile-avatar">
17234
17254
  <co-avatar [image]="transaction.execImage" [relationId]="transaction.handledBy"></co-avatar>
17255
+ <span [textContent]="transaction.transNr"></span>
17235
17256
  </div>
17236
17257
  </div>
17237
17258
  <div class="tile-upper-middle">
17238
- <div class="header"><span [textContent]="transaction.transNr"></span></div>
17239
- <div class="text"><span [textContent]="transaction.brancheName"></span></div>
17259
+ <co-icon [iconData]="iconCacheService.getIcon(icons.StoreLight)" class="store-icon"></co-icon>
17260
+ <div class="text"><span [textContent]="transaction.branchNr"></span></div>
17240
17261
  </div>
17262
+
17241
17263
  <div class="tile-upper-right">
17242
17264
  <div class="status-bar-wrapper" (click)="$event.stopPropagation()">
17243
17265
  <co-transaction-statusbar
17244
- [screenConfigurationObject]="cfgNames.StatusBar"
17245
- [configNames]="statusBarConfigNames"
17246
- [transaction]="transaction"></co-transaction-statusbar>
17266
+ [screenConfigurationObject]="cfgNames.StatusBar"
17267
+ [configNames]="statusBarConfigNames"
17268
+ [transaction]="transaction">
17269
+ </co-transaction-statusbar>
17247
17270
  </div>
17248
- <div class="header total-price-vat"><span [textContent]="transaction.totalPriceWithVat | currency:'EUR'"></span></div>
17249
17271
  </div>
17250
17272
  </div>
17251
17273
  <div class="tile-body">
@@ -17258,27 +17280,26 @@ TransactionSearchPurchaseOrderTileComponent.decorators = [
17258
17280
  </div>
17259
17281
  <div class="tile-footer">
17260
17282
  <div class="tile-bottom-left order-info-section">
17261
- <div class="label"><span [textContent]="'ORDER_DATE' | localize"></span></div>
17283
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularCartShoppingClock)" class="store-icon"></co-icon>
17262
17284
  <div class="value">
17263
- <span [textContent]="transaction.getTransDate() | date:'dd MMM yyyy'"></span></div>
17285
+ <span [textContent]="transaction.getTransDate() | date:'dd-MM-yyyy'"></span>
17286
+ </div>
17264
17287
  </div>
17265
17288
  <div class="tile-bottom-middle order-info-section">
17266
- <div class="label"><span [textContent]="'DELIVERY_DATE' | localize"></span></div>
17267
- <div class="value">
17268
- <span [textContent]="transaction.getDeliveryDate() | date:'dd MMM yyyy'"></span>
17269
- <div *ngIf="transaction.getDeliveryDate()">
17270
- <co-icon *ngIf="transaction.deliveryDateDefinitive; else indefinite"
17271
- [iconData]="this.iconCacheService.getIcon(this.icons.Lock)" class="lock-icon"></co-icon>
17272
- <ng-template #indefinite>
17273
- <co-icon [iconData]="this.iconCacheService.getIcon(this.icons.Unlock)" class="unlock-icon"></co-icon>
17274
- </ng-template>
17275
- </div>
17289
+ <div class="value" *ngIf="transaction.getDeliveryDate()">
17290
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularTruckMovingClock)" class="store-icon"></co-icon>
17291
+ <span [textContent]="transaction.getDeliveryDate() | date:'dd-MM-yyyy'"></span>
17292
+ <co-icon *ngIf="transaction.deliveryDateDefinitive; else indefinite"
17293
+ [iconData]="iconCacheService.getIcon(icons.Lock)" class="lock-icon"></co-icon>
17294
+ <ng-template #indefinite>
17295
+ <co-icon [iconData]="iconCacheService.getIcon(icons.Unlock)" class="unlock-icon"></co-icon>
17296
+ </ng-template>
17276
17297
  </div>
17277
17298
  </div>
17278
17299
  <div class="tile-bottom-right order-info-section">
17279
- <div class="label"><span [textContent]="'ORDER_RULE' | localize"></span></div>
17280
- <div class="value">
17281
- <span [textContent]="'68/00'"></span></div>
17300
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularCartShoppingTag)" class="store-icon"></co-icon>
17301
+ <div class="value"><span
17302
+ [textContent]="transaction.totalPriceWithVat | currency:'EUR'"></span></div>
17282
17303
  </div>
17283
17304
  </div>
17284
17305
  </div>
@@ -17319,29 +17340,28 @@ TransactionSearchSalesOrderTileComponent.decorators = [
17319
17340
  selector: "co-transaction-search-sales-order-tile",
17320
17341
  template: `
17321
17342
  <div class="transaction-tile-wrapper" (click)="onTransactionClick(transaction)">
17343
+ <div [class]="'type-indicator color-' + transaction.transactionKind"></div>
17322
17344
  <div class="tile">
17323
17345
  <div class="tile-header">
17324
- <div class="tile-upper-left" *ngIf="showAvatar">
17325
- <div class="transaction-tile-avatar">
17346
+ <div class="tile-upper-left">
17347
+ <div class="transaction-tile-avatar">
17326
17348
  <co-avatar [image]="transaction.execImage" [relationId]="transaction.handledBy"></co-avatar>
17327
- </div>
17328
- </div>
17329
- <div class="tile-upper-middle">
17330
- <div class="header">
17331
17349
  <span [textContent]="transaction.transNr"></span>
17332
- <div class="type-indicator"><span [textContent]="transaction.transactionKind"></span></div>
17350
+ </div>
17333
17351
  </div>
17334
- <div class="text"><span [textContent]="transaction.brancheName"></span></div>
17335
- </div>
17352
+ <div class="tile-upper-middle">
17353
+ <co-icon [iconData]="iconCacheService.getIcon(icons.StoreLight)" class="store-icon"></co-icon>
17354
+ <div class="text"><span [textContent]="transaction.branchNr"></span></div>
17355
+ </div>
17356
+
17336
17357
  <div class="tile-upper-right">
17337
17358
  <div class="status-bar-wrapper" (click)="$event.stopPropagation()">
17338
17359
  <co-transaction-statusbar
17339
17360
  [screenConfigurationObject]="cfgNames.StatusBar"
17340
17361
  [configNames]="statusBarConfigNames"
17341
- [transaction]="transaction"></co-transaction-statusbar>
17362
+ [transaction]="transaction">
17363
+ </co-transaction-statusbar>
17342
17364
  </div>
17343
- <div class="header total-price-vat"><span
17344
- [textContent]="transaction.totalPriceWithVat | currency:'EUR'"></span></div>
17345
17365
  </div>
17346
17366
  </div>
17347
17367
  <div class="tile-body">
@@ -17360,27 +17380,26 @@ TransactionSearchSalesOrderTileComponent.decorators = [
17360
17380
  </div>
17361
17381
  <div class="tile-footer">
17362
17382
  <div class="tile-bottom-left order-info-section">
17363
- <div class="label"><span [textContent]="'ORDER_DATE' | localize"></span></div>
17364
- <div class="value">
17365
- <span [textContent]="transaction.getTransDate() | date:'dd MMM yyyy'"></span></div>
17383
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularCartShoppingClock)" class="store-icon"></co-icon>
17384
+ <div class="value">
17385
+ <span [textContent]="transaction.getTransDate() | date:'dd-MM-yyyy'"></span>
17386
+ </div>
17366
17387
  </div>
17367
17388
  <div class="tile-bottom-middle order-info-section">
17368
- <div class="label"><span [textContent]="'DELIVERY_DATE' | localize"></span></div>
17369
- <div class="value">
17370
- <span [textContent]="transaction.getDeliveryDate() | date:'dd MMM yyyy'"></span>
17371
- <div *ngIf="transaction.getDeliveryDate()">
17372
- <co-icon *ngIf="transaction.deliveryDateDefinitive; else indefinite"
17373
- [iconData]="iconCacheService.getIcon(icons.Lock)" class="lock-icon"></co-icon>
17374
- <ng-template #indefinite>
17375
- <co-icon [iconData]="iconCacheService.getIcon(icons.Unlock)" class="unlock-icon"></co-icon>
17376
- </ng-template>
17377
- </div>
17389
+ <div class="value" *ngIf="transaction.getDeliveryDate()">
17390
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularTruckMovingClock)" class="store-icon"></co-icon>
17391
+ <span [textContent]="transaction.getDeliveryDate() | date:'dd-MM-yyyy'"></span>
17392
+ <co-icon *ngIf="transaction.deliveryDateDefinitive; else indefinite"
17393
+ [iconData]="iconCacheService.getIcon(icons.Lock)" class="lock-icon"></co-icon>
17394
+ <ng-template #indefinite>
17395
+ <co-icon [iconData]="iconCacheService.getIcon(icons.Unlock)" class="unlock-icon"></co-icon>
17396
+ </ng-template>
17378
17397
  </div>
17379
17398
  </div>
17380
17399
  <div class="tile-bottom-right order-info-section">
17381
- <div class="label"><span [textContent]="'ORDER_RULE' | localize"></span></div>
17382
- <div class="value">
17383
- <span [textContent]="'68/00'"></span></div>
17400
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularCartShoppingTag)" class="store-icon"></co-icon>
17401
+ <div class="value"><span
17402
+ [textContent]="transaction.totalPriceWithVat | currency:'EUR'"></span></div>
17384
17403
  </div>
17385
17404
  </div>
17386
17405
  </div>
@@ -18682,6 +18701,7 @@ class TransactionOverviewLineComponent extends TransactionBaseComponent {
18682
18701
  this.descriptionDblClick = new EventEmitter();
18683
18702
  this.stock = StockStatus.Low;
18684
18703
  this.mouseOver = false;
18704
+ this.noLabel = false; // Temp test without labels
18685
18705
  this.statusBarConfigNames = {
18686
18706
  statusBarBT: this.cfgNames.StatusBarBT,
18687
18707
  statusBarTG: this.cfgNames.StatusBarTG,
@@ -18740,49 +18760,75 @@ TransactionOverviewLineComponent.decorators = [
18740
18760
  <div class="transaction-line-wrapper">
18741
18761
  <div *ngIf=!preview class="transaction-line-extended-wrapper">
18742
18762
  <div class="column1">
18743
- <span class="transaction-field-label" [textContent]="'COMMISSION_CODE' | localize" *ngIf="isFirst"></span>
18763
+ <co-transaction-line-statusbar
18764
+ [screenConfigurationObject]="cfgNames.StatusBar"
18765
+ [configNames]="statusBarConfigNames"
18766
+ [transactionInfo]="transactionInfo"
18767
+ [transactionLine]="transactionLine"
18768
+ [activeCategory]="category.SalesOrderOverview"></co-transaction-line-statusbar>
18769
+ </div>
18770
+ <div class="column2">
18771
+ <span class="transaction-field-label" [textContent]="'COMMISSION_CODE' | localize" *ngIf="noLabel"></span>
18772
+ <div class="transaction-field-wrapper">
18773
+ <div class="inside-field">
18774
+ <span class="transaction-inside-label" [textContent]="'COMMISSION_CODE' | localize"></span>
18744
18775
  <co-transaction-line-commission-button
18745
- [screenConfigurationObject]="cfgNames.LineCommission"
18746
- [transactionLine]="transactionLine"
18747
- [transactionInfo]="transactionInfo"
18776
+ [screenConfigurationObject]="cfgNames.LineCommission"
18777
+ [transactionLine]="transactionLine"
18778
+ [transactionInfo]="transactionInfo"
18748
18779
  ></co-transaction-line-commission-button>
18780
+ </div>
18781
+ </div>
18782
+ <span class="transaction-field-label" [textContent]="'WAREHOUSE_AND_STATUS' | localize" *ngIf="noLabel"></span>
18783
+ <div class="transaction-field-wrapper">
18784
+ <div class="inside-field">
18785
+ <span class="transaction-inside-label" [textContent]="'WAREHOUSE' | localize"></span>
18786
+ <co-transaction-line-warehouse-button
18787
+ [screenConfigurationObject]="cfgNames.LineWarehouse"
18788
+ [transactionLine]="transactionLine"
18789
+ [transactionInfo]="transactionInfo"
18790
+ ></co-transaction-line-warehouse-button>
18791
+ </div>
18749
18792
  </div>
18750
- <div class="column2">
18751
- <span class="transaction-field-label" [textContent]="'WAREHOUSE_AND_STATUS' | localize" *ngIf="isFirst"></span>
18752
- <co-transaction-line-warehouse-button
18753
- [screenConfigurationObject]="cfgNames.LineWarehouse"
18754
- [transactionLine]="transactionLine"
18755
- [transactionInfo]="transactionInfo"
18756
- ></co-transaction-line-warehouse-button>
18757
- <co-transaction-line-statusbar
18758
- [screenConfigurationObject]="cfgNames.StatusBar"
18759
- [configNames]="statusBarConfigNames"
18760
- [transactionInfo]="transactionInfo"
18761
- [transactionLine]="transactionLine"
18762
- [activeCategory]="category.SalesOrderOverview"></co-transaction-line-statusbar>
18763
18793
  </div>
18764
- <div class="column3">
18765
- <span class="transaction-field-label" [textContent]="'DELIVERY_INFORMATION' | localize" *ngIf="isFirst"></span>
18794
+ <div class="column3">
18795
+ <span class="transaction-field-label" [textContent]="'DELIVERY_INFORMATION' | localize" *ngIf="noLabel"></span>
18796
+ <div class="transaction-field-wrapper">
18797
+ <div class="inside-field">
18798
+ <span class="transaction-inside-label" [textContent]="'DELIVERY_METHOD' | localize"></span>
18766
18799
  <co-transaction-line-delivery-button
18767
- [screenConfigurationObject]="cfgNames.LineDeliveryMethod"
18768
- [transactionLine]="transactionLine"
18769
- [transactionInfo]="transactionInfo"
18800
+ [screenConfigurationObject]="cfgNames.LineDeliveryMethod"
18801
+ [transactionLine]="transactionLine"
18802
+ [transactionInfo]="transactionInfo"
18770
18803
  ></co-transaction-line-delivery-button>
18804
+ </div>
18805
+ </div>
18806
+ <div class="transaction-field-wrapper">
18807
+ <div class="inside-field">
18808
+ <span class="transaction-inside-label" [textContent]="'DELIVERY_DATE' | localize"></span>
18771
18809
  <co-transaction-line-delivery-date-button class="transaction-line-delivery-date two-column"
18772
- [screenConfigurationObject]="cfgNames.LineDeliveryDate"
18773
- [transactionInfo]="transactionInfo"
18774
- [transactionLine]="transactionLine"
18810
+ [screenConfigurationObject]="cfgNames.LineDeliveryDate"
18811
+ [transactionInfo]="transactionInfo"
18812
+ [transactionLine]="transactionLine"
18775
18813
  ></co-transaction-line-delivery-date-button>
18814
+ </div>
18776
18815
  </div>
18777
- </div>
18778
- <div class="transaction-line-section">
18779
- <span class="transaction-field-label" [textContent]="'TOTALS_AND_DISCOUNT' | localize" *ngIf="isFirst"></span>
18780
- <co-transaction-line-vat-button *ngIf="!preview"
18781
- [screenConfigurationObject]="cfgNames.LineVat"
18782
- [transactionLine]="transactionLine"
18783
- [transactionInfo]="transactionInfo"
18784
- ></co-transaction-line-vat-button>
18785
- <div class="transaction-line-totals">
18816
+ </div>
18817
+ <div class="column4">
18818
+ <span class="transaction-field-label" [textContent]="'TOTALS_AND_DISCOUNT' | localize" *ngIf="noLabel"></span>
18819
+ <div class="transaction-field-wrapper">
18820
+ <div class="inside-field">
18821
+ <span class="transaction-inside-label" [textContent]="'VAT' | localize"></span>
18822
+ <co-transaction-line-vat-button *ngIf="!preview"
18823
+ [screenConfigurationObject]="cfgNames.LineVat"
18824
+ [transactionLine]="transactionLine"
18825
+ [transactionInfo]="transactionInfo"
18826
+ ></co-transaction-line-vat-button>
18827
+ </div>
18828
+ </div>
18829
+ <div class="transaction-field-wrapper">
18830
+ <div class="inside-field">
18831
+ <span class="transaction-inside-label" [textContent]="'PRICE' | localize"></span>
18786
18832
  <co-transaction-line-price class="transaction-line-totals-price price"
18787
18833
  [screenConfigurationObject]="cfgNames.LinePrice"
18788
18834
  [transactionInfo]="transactionInfo"
@@ -18790,25 +18836,40 @@ TransactionOverviewLineComponent.decorators = [
18790
18836
  [showLabel]="false"
18791
18837
  [defaultEditMode]="false"
18792
18838
  ></co-transaction-line-price>
18839
+ </div>
18840
+ </div>
18841
+ <div class="transaction-field-wrapper">
18842
+ <div class="inside-field">
18843
+ <span class="transaction-inside-label" [textContent]="'DISCOUNT' | localize"></span>
18793
18844
  <co-transaction-line-discount-button *ngIf="!preview"
18794
18845
  [screenConfigurationObject]="cfgNames.LineDiscount"
18795
18846
  [configNames]="discountConfigNames"
18796
18847
  [transactionLine]="transactionLine"
18797
18848
  [transactionInfo]="transactionInfo"
18798
18849
  ></co-transaction-line-discount-button>
18799
- <div class="transaction-line-totals-amount">
18800
- <co-transaction-line-amount class="amount-number-picker"
18801
- [screenConfigurationObject]="cfgNames.LineAmount"
18802
- [transactionLine]="transactionLine"
18803
- [transactionInfo]="transactionInfo"
18804
- ></co-transaction-line-amount>
18805
- </div>
18850
+ </div>
18851
+ </div>
18852
+ <div class="transaction-field-wrapper">
18853
+ <div class="inside-field">
18854
+ <span class="transaction-inside-label" [textContent]="'QUANTITY' | localize"></span>
18855
+ <co-transaction-line-amount class="amount-number-picker"
18856
+ [screenConfigurationObject]="cfgNames.LineAmount"
18857
+ [transactionLine]="transactionLine"
18858
+ [transactionInfo]="transactionInfo"
18859
+ ></co-transaction-line-amount>
18860
+ </div>
18861
+ </div>
18862
+ <div class="transaction-field-wrapper">
18863
+ <div class="inside-field">
18864
+ <span class="transaction-inside-label" [textContent]="'TOTAL' | localize"></span>
18806
18865
  <co-editable-label class="transaction-line-totals-total price"
18807
18866
  [model]="transactionLine.displayNetLineTotal | coCurrency: true"
18808
18867
  [editModel]="transactionLine.displayNetLineTotal"
18809
18868
  [readonly]="true"
18810
18869
  ></co-editable-label>
18870
+ </div>
18811
18871
  </div>
18872
+ </div>
18812
18873
  </div>
18813
18874
  </div>
18814
18875
  </ng-container>
@@ -23138,28 +23199,26 @@ TransactionSearchSalesQuotationTileComponent.decorators = [
23138
23199
  selector: "co-transaction-search-sales-quotation-tile",
23139
23200
  template: `
23140
23201
  <div class="transaction-tile-wrapper" (click)="onTransactionClick(transaction)">
23202
+ <div [class]="'type-indicator color-' + transaction.transactionKind"></div>
23141
23203
  <div class="tile">
23142
23204
  <div class="tile-header">
23143
23205
  <div class="tile-upper-left">
23144
23206
  <div class="transaction-tile-avatar">
23145
23207
  <co-avatar [image]="transaction.execImage" [relationId]="transaction.handledBy"></co-avatar>
23146
- </div>
23147
- </div>
23148
- <div class="tile-upper-middle">
23149
- <div class="header">
23150
23208
  <span [textContent]="transaction.transNr"></span>
23151
- <div class="type-indicator"><span [textContent]="transaction.transactionKind"></span></div>
23152
23209
  </div>
23153
- <div class="text"><span [textContent]="transaction.brancheName"></span></div>
23154
23210
  </div>
23155
- <div class="tile-upper-right">
23156
- <div class="header total-price-vat"><span [textContent]="transaction.totalPriceWithVat | currency:'EUR'"></span></div>
23211
+ <div class="tile-upper-middle">
23212
+ <co-icon [iconData]="iconCacheService.getIcon(icons.StoreLight)" class="store-icon"></co-icon>
23213
+ <div class="text"><span [textContent]="transaction.branchNr"></span></div>
23157
23214
  </div>
23158
23215
  </div>
23159
23216
  <div class="tile-body">
23160
23217
  <div class="tile-middle-left">
23161
- <co-input-checkbox *ngIf="showCheckbox"
23162
- [(model)]="transaction.selected"
23218
+ <co-input-checkbox
23219
+ *ngIf="showCheckbox"
23220
+ [(model)]="transaction.selected"
23221
+ (modelChange)="onSelectedClick(transaction)"
23163
23222
  ></co-input-checkbox>
23164
23223
  </div>
23165
23224
  <div class="tile-middle-middle">
@@ -23170,20 +23229,26 @@ TransactionSearchSalesQuotationTileComponent.decorators = [
23170
23229
  </div>
23171
23230
  <div class="tile-footer">
23172
23231
  <div class="tile-bottom-left order-info-section">
23173
- <div class="label"><span [textContent]="'QUOTATION_DATE' | localize"></span></div>
23232
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularWarehouseClock)" class="store-icon"></co-icon>
23174
23233
  <div class="value">
23175
- <span [textContent]="transaction.getTransDate() | date:'dd MMM yyyy'"></span></div>
23234
+ <span [textContent]="transaction.getTransDate() | date:'dd-MM-yyyy'"></span>
23235
+ </div>
23176
23236
  </div>
23177
23237
  <div class="tile-bottom-middle order-info-section">
23178
- <div class="label"><span [textContent]="'DELIVERY_DATE' | localize"></span></div>
23179
- <div class="value">
23180
- <span [textContent]="transaction.getDeliveryDate() | date:'dd MMM yyyy'"></span>
23238
+ <div class="value" *ngIf="transaction.getDeliveryDate()">
23239
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularTruckMovingClock)" class="store-icon"></co-icon>
23240
+ <span [textContent]="transaction.getDeliveryDate() | date:'dd-MM-yyyy'"></span>
23241
+ <co-icon *ngIf="transaction.deliveryDateDefinitive; else indefinite"
23242
+ [iconData]="iconCacheService.getIcon(icons.Lock)" class="lock-icon"></co-icon>
23243
+ <ng-template #indefinite>
23244
+ <co-icon [iconData]="iconCacheService.getIcon(icons.Unlock)" class="unlock-icon"></co-icon>
23245
+ </ng-template>
23181
23246
  </div>
23182
23247
  </div>
23183
23248
  <div class="tile-bottom-right order-info-section">
23184
- <div class="label"><span [textContent]="'QUOTATION_LINE' | localize"></span></div>
23185
- <div class="value">
23186
- <span [textContent]="'68/00'"></span></div>
23249
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularCartShoppingTag)" class="store-icon"></co-icon>
23250
+ <div class="value"><span
23251
+ [textContent]="transaction.totalPriceWithVat | currency:'EUR'"></span></div>
23187
23252
  </div>
23188
23253
  </div>
23189
23254
  </div>
@@ -23578,70 +23643,71 @@ TransactionSearchPosOrderTileComponent.decorators = [
23578
23643
  { type: Component, args: [{
23579
23644
  selector: 'co-transaction-search-pos-order-tile',
23580
23645
  template: `
23581
- <div class="transaction-tile-wrapper" (click)="onTransactionClick(transaction)">
23582
- <div class="tile">
23583
- <div class="tile-header">
23584
- <div class="tile-upper-left">
23585
- <div class="transaction-tile-avatar">
23586
- <co-avatar [image]="transaction.execImage" [relationId]="transaction.handledBy"></co-avatar>
23587
- </div>
23588
- </div>
23589
- <div class="tile-upper-middle">
23590
- <div class="header">
23591
- <span [textContent]="transaction.transNr"></span>
23592
- <div class="type-indicator"><span [textContent]="transaction.transactionKind"></span></div>
23593
- </div>
23594
- <div class="text"><span [textContent]="transaction.brancheName"></span></div>
23595
- </div>
23596
- <div class="tile-upper-right">
23597
- <div class="status-bar-wrapper" (click)="$event.stopPropagation()">
23598
- <co-transaction-statusbar
23599
- [screenConfigurationObject]="cfgNames.StatusBar"
23600
- [configNames]="statusBarConfigNames"
23601
- [transaction]="transaction"></co-transaction-statusbar>
23602
- </div>
23603
- <div class="header total-price-vat"><span [textContent]="transaction.totalPriceWithVat | currency:'EUR'"></span></div>
23604
- </div>
23605
- </div>
23606
- <div class="tile-body">
23607
- <div class="tile-middle-left">
23608
- <co-input-checkbox *ngIf="showCheckbox"
23609
- [(model)]="transaction.selected"
23610
- ></co-input-checkbox>
23611
- </div>
23612
- <div class="tile-middle-middle">
23613
- <div class="text"><span [textContent]="transaction.relationName"></span></div>
23614
- <div class="text"><span [textContent]="transaction.getAdres()"></span></div>
23615
- </div>
23616
- <div class="tile-middle-right"></div>
23617
- </div>
23618
- <div class="tile-footer">
23619
- <div class="tile-bottom-left order-info-section">
23620
- <div class="label"><span [textContent]="'ORDER_DATE' | localize"></span></div>
23621
- <div class="value">
23622
- <span [textContent]="transaction.getTransDate() | date:'dd MMM yyyy'"></span></div>
23623
- </div>
23624
- <div class="tile-bottom-middle order-info-section">
23625
- <div class="label"><span [textContent]="'DELIVERY_DATE' | localize"></span></div>
23626
- <div class="value">
23627
- <span [textContent]="transaction.getDeliveryDate() | date:'dd MMM yyyy'"></span>
23628
- <div *ngIf="transaction.getDeliveryDate()">
23629
- <co-icon *ngIf="transaction.deliveryDateDefinitive; else indefinite"
23630
- [iconData]="iconCacheService.getIcon(icons.Lock)" class="lock-icon"></co-icon>
23631
- <ng-template #indefinite>
23632
- <co-icon [iconData]="iconCacheService.getIcon(icons.Unlock)" class="unlock-icon"></co-icon>
23633
- </ng-template>
23634
- </div>
23635
- </div>
23636
- </div>
23637
- <div class="tile-bottom-right order-info-section">
23638
- <div class="label"><span [textContent]="'ORDER_RULE' | localize"></span></div>
23639
- <div class="value">
23640
- <span [textContent]="'68/00'"></span></div>
23641
- </div>
23642
- </div>
23646
+ <div class="transaction-tile-wrapper" (click)="onTransactionClick(transaction)">
23647
+ <div [class]="'type-indicator color-' + transaction.transactionKind"></div>
23648
+ <div class="tile">
23649
+ <div class="tile-header">
23650
+ <div class="tile-upper-left">
23651
+ <div class="transaction-tile-avatar">
23652
+ <co-avatar [image]="transaction.execImage" [relationId]="transaction.handledBy"></co-avatar>
23653
+ <span [textContent]="transaction.transNr"></span>
23654
+ </div>
23643
23655
  </div>
23656
+ <div class="tile-upper-middle">
23657
+ <co-icon [iconData]="iconCacheService.getIcon(icons.StoreLight)" class="store-icon"></co-icon>
23658
+ <div class="text"><span [textContent]="transaction.branchNr"></span></div>
23659
+ </div>
23660
+
23661
+ <div class="tile-upper-right">
23662
+ <div class="status-bar-wrapper" (click)="$event.stopPropagation()">
23663
+ <co-transaction-statusbar
23664
+ [screenConfigurationObject]="cfgNames.StatusBar"
23665
+ [configNames]="statusBarConfigNames"
23666
+ [transaction]="transaction">
23667
+ </co-transaction-statusbar>
23668
+ </div>
23669
+ </div>
23670
+ </div>
23671
+ <div class="tile-body">
23672
+ <div class="tile-middle-left">
23673
+ <co-input-checkbox
23674
+ *ngIf="showCheckbox"
23675
+ [(model)]="transaction.selected"
23676
+ (modelChange)="onSelectedClick(transaction)"
23677
+ ></co-input-checkbox>
23678
+ </div>
23679
+ <div class="tile-middle-middle">
23680
+ <div class="text"><span [textContent]="transaction.relationName"></span></div>
23681
+ <div class="text"><span [textContent]="transaction.getAdres()"></span></div>
23682
+ </div>
23683
+ <div class="tile-middle-right"></div>
23684
+ </div>
23685
+ <div class="tile-footer">
23686
+ <div class="tile-bottom-left order-info-section">
23687
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularCartShoppingClock)" class="store-icon"></co-icon>
23688
+ <div class="value">
23689
+ <span [textContent]="transaction.getTransDate() | date:'dd-MM-yyyy'"></span>
23690
+ </div>
23691
+ </div>
23692
+ <div class="tile-bottom-middle order-info-section">
23693
+ <div class="value" *ngIf="transaction.getDeliveryDate()">
23694
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularTruckMovingClock)" class="store-icon"></co-icon>
23695
+ <span [textContent]="transaction.getDeliveryDate() | date:'dd-MM-yyyy'"></span>
23696
+ <co-icon *ngIf="transaction.deliveryDateDefinitive; else indefinite"
23697
+ [iconData]="iconCacheService.getIcon(icons.Lock)" class="lock-icon"></co-icon>
23698
+ <ng-template #indefinite>
23699
+ <co-icon [iconData]="iconCacheService.getIcon(icons.Unlock)" class="unlock-icon"></co-icon>
23700
+ </ng-template>
23701
+ </div>
23702
+ </div>
23703
+ <div class="tile-bottom-right order-info-section">
23704
+ <co-icon [iconData]="iconCacheService.getIcon(icons.RegularCartShoppingTag)" class="store-icon"></co-icon>
23705
+ <div class="value"><span
23706
+ [textContent]="transaction.totalPriceWithVat | currency:'EUR'"></span></div>
23707
+ </div>
23708
+ </div>
23644
23709
  </div>
23710
+ </div>
23645
23711
  `,
23646
23712
  encapsulation: ViewEncapsulation.None
23647
23713
  },] }
@@ -26990,10 +27056,6 @@ class TransactionLineWarehouseComponent extends TransactionFilterPopupBaseCompon
26990
27056
  }
26991
27057
  ngOnInit() {
26992
27058
  this.viewModels.length = 0;
26993
- this.transactionService.getWarehouseStockInfoByGoodAndBranch(this.transactionLine.goodId, this.transactionInfo).then((warehouses) => {
26994
- this.collection = !this.transactionLine.dropShipment ? warehouses.slice() : warehouses.slice().filter((warehouse) => warehouse.dropShipment);
26995
- this.detectChanges();
26996
- });
26997
27059
  }
26998
27060
  commit(warehouse) {
26999
27061
  return __awaiter(this, void 0, void 0, function* () {
@@ -27001,7 +27063,7 @@ class TransactionLineWarehouseComponent extends TransactionFilterPopupBaseCompon
27001
27063
  const oldWarehouse = this.transactionLine.warehouseNumber;
27002
27064
  const success = yield this.transactionService.updateWarehouseTransactionLine(this.transactionService.currentTransaction.transactionInfo.uuid, this.transactionLine.uuid, warehouse);
27003
27065
  if (!success) {
27004
- this.transactionLine.warehouseNumber = warehouse;
27066
+ this.transactionLine.warehouseNumber = oldWarehouse;
27005
27067
  }
27006
27068
  return success;
27007
27069
  }
@@ -27014,6 +27076,10 @@ class TransactionLineWarehouseComponent extends TransactionFilterPopupBaseCompon
27014
27076
  this.readonly = true;
27015
27077
  this.addLineTooltipMessage(this.dictionaryService.get("ORDER_LINE_HAS_LOGISTICAL_STATE"));
27016
27078
  }
27079
+ this.transactionService.getWarehouseStockInfoByGoodAndBranch(this.transactionLine.goodId, this.transactionInfo).then((warehouses) => {
27080
+ this.collection = !this.transactionLine.dropShipment ? warehouses.slice() : warehouses.slice().filter((warehouse) => warehouse.dropShipment);
27081
+ this.detectChanges();
27082
+ });
27017
27083
  }
27018
27084
  }
27019
27085
  TransactionLineWarehouseComponent.decorators = [
@@ -29806,12 +29872,17 @@ class TransactionLineWarehouseLocationComponent extends TransactionFilterPopupBa
29806
29872
  this.checkField = 'locationNr';
29807
29873
  this.propsForLabel = [{ label: 'locationNo' }, { label: 'description' }];
29808
29874
  }
29875
+ set warehouseNr(value) {
29876
+ this._warehouseNr = value;
29877
+ if (this._warehouseNr !== null && this._warehouseNr !== undefined) {
29878
+ this._getLocations();
29879
+ }
29880
+ }
29881
+ get warehouseNr() {
29882
+ return this._warehouseNr;
29883
+ }
29809
29884
  ngOnInit() {
29810
29885
  this.viewModels.length = 0;
29811
- this._articleService.getWarehouseLocations(this.warehouseNr).then((locations) => {
29812
- this.collection = locations.slice();
29813
- this.detectChanges();
29814
- });
29815
29886
  }
29816
29887
  commit(locationNr) {
29817
29888
  return __awaiter(this, void 0, void 0, function* () {
@@ -29819,6 +29890,12 @@ class TransactionLineWarehouseLocationComponent extends TransactionFilterPopupBa
29819
29890
  return true;
29820
29891
  });
29821
29892
  }
29893
+ _getLocations() {
29894
+ this._articleService.getWarehouseLocations(this._warehouseNr).then((locations) => {
29895
+ this.collection = locations.slice();
29896
+ this.detectChanges();
29897
+ });
29898
+ }
29822
29899
  }
29823
29900
  TransactionLineWarehouseLocationComponent.decorators = [
29824
29901
  { type: Component, args: [{
@@ -31126,7 +31203,7 @@ class AvatarComponent {
31126
31203
  else {
31127
31204
  this._setImageFromRelation();
31128
31205
  }
31129
- this._changeDetector.detectChanges();
31206
+ this._detectChanges();
31130
31207
  });
31131
31208
  }
31132
31209
  _setImageFromRelation() {
@@ -31173,7 +31250,7 @@ class AvatarComponent {
31173
31250
  if (content && this._image) {
31174
31251
  this._image.thumbnailBody = content;
31175
31252
  this.imageSrc = this.image.thumbnailBodyAsDataUri;
31176
- this._changeDetector.detectChanges();
31253
+ this._detectChanges();
31177
31254
  return true;
31178
31255
  }
31179
31256
  else {
@@ -31186,6 +31263,10 @@ class AvatarComponent {
31186
31263
  if (this.relation) {
31187
31264
  this.backgroundColor = this._colorSequenceService.getRandomColor(this.relation.relationId);
31188
31265
  }
31266
+ this._detectChanges();
31267
+ }
31268
+ _detectChanges() {
31269
+ this._changeDetector.markForCheck();
31189
31270
  this._changeDetector.detectChanges();
31190
31271
  }
31191
31272
  }
@@ -32531,6 +32612,8 @@ RelationContactDetailsComponent.decorators = [
32531
32612
  template: `
32532
32613
  <co-relation-contact-options
32533
32614
  [relation]="relation"
32615
+ [emailScreenConfigurationObject]="configNames.relationEmailAddress"
32616
+ [phoneScreenConfigurationObject]="configNames.relationPhone"
32534
32617
  (relationChange)="handleRelationChange($event)"
32535
32618
  ></co-relation-contact-options>
32536
32619
  <div class="default-data-row" *ngIf="relationKind === relKind.Customer">
@@ -43854,39 +43937,43 @@ PurchaseConfirmationLinesComponent.decorators = [
43854
43937
  (click)="handleClearAnalysis()"></co-icon>
43855
43938
  </div>
43856
43939
  <div class="purchase-confirmation-lines-drag-drop-list">
43857
- <table class="purchase-confirmation-table">
43858
- <colgroup>
43859
- <col class="purchase-confirmation-linked-color" />
43860
- <col class="purchase-confirmation-line-drag-handle" />
43861
- <col />
43862
- <col />
43863
- <col />
43864
- <col />
43865
- <col />
43866
- <col />
43867
- </colgroup>
43868
- <tr>
43869
- <th></th>
43870
- <th></th>
43871
- <th class="right-align" [textContent]="'AMOUNT' | localize"></th>
43872
- <th [textContent]="'ARTICLE_NO_SUPPLIER' | localize"></th>
43873
- <th [textContent]="'DESCRIPTION' | localize"></th>
43874
- <th class="right-align" [textContent]="'DELIVERY_DATE' | localize"></th>
43875
- <th class="right-align" [textContent]="'PRICE' | localize"></th>
43876
- <th [textContent]="'LINK' | localize"></th>
43877
- </tr>
43878
- <tr class="draggable-purchase-confirmation-line" *ngFor="let confirmationViewModel of purchaseConfirmations; trackBy:trackByFn;" draggable="true"
43940
+ <div class="purchase-confirmation-table">
43941
+ <div class="draggable-purchase-confirmation-line" *ngFor="let confirmationViewModel of purchaseConfirmations; trackBy:trackByFn;" draggable="true"
43879
43942
  (dragstart)="handleDragStart($event, confirmationViewModel)">
43880
- <td [style.background-color]="confirmationViewModel.color"></td>
43881
- <td><co-icon class="purchase-confirmation-line-drag-handle" [iconData]="iconCacheService.getIcon(icons.GripDotsVerticalSolid)"></co-icon></td>
43882
- <td class="right-align" [textContent]="confirmationViewModel.confirmation.productQuantity"></td>
43883
- <td [textContent]="confirmationViewModel.confirmation.supplierProductCode"></td>
43884
- <td [textContent]="confirmationViewModel.confirmation.productDescription"></td>
43885
- <td [textContent]="confirmationViewModel.confirmation.deliveryDate | date: 'dd-MM-yyyy'"></td>
43886
- <td class="right-align" [textContent]="confirmationViewModel.confirmation.price | coCurrency"></td>
43887
- <td #parentForOverlay class="link-button" [textContent]="'...'" (click)="showPopup(parentForOverlay, confirmationViewModel)"></td>
43888
- </tr>
43889
- </table>
43943
+ <div class="draggable-color-drag">
43944
+ <span class="color-drag" [style.background-color]="confirmationViewModel.color"></span>
43945
+ <span><co-icon class="purchase-confirmation-line-drag-handle" [iconData]="iconCacheService.getIcon(icons.GripDotsVerticalSolid)"></co-icon></span>
43946
+ </div>
43947
+ <div class="draggable-content-line">
43948
+ <div class="draggable-top-line">
43949
+ <span class="draggable-description" [textContent]="confirmationViewModel.confirmation.productDescription"></span>
43950
+ <div class="draggable-supplier-code">
43951
+ <span [textContent]="'SUPPLIERNR_ARTICLE' | localize"></span>
43952
+ <span [textContent]="confirmationViewModel.confirmation.supplierProductCode"></span>
43953
+ </div>
43954
+ </div>
43955
+ <div class="draggable-bottom-line">
43956
+ <div class="draggable-delivery">
43957
+ <label [textContent]="'DELIVERY_DATE' | localize"></label>
43958
+ <span class="draggable-delivery" [textContent]="confirmationViewModel.confirmation.deliveryDate | date: 'dd-MM-yyyy'"></span>
43959
+ </div>
43960
+ <div class="draggable-quantity">
43961
+ <label [textContent]="'QUANTITY' | localize"></label>
43962
+ <span class="draggable-quantity" [textContent]="confirmationViewModel.confirmation.productQuantity"></span>
43963
+ </div>
43964
+ <div class="draggable-price">
43965
+ <label [textContent]="'PRICE' | localize"></label>
43966
+ <span class="draggable-price" [textContent]="confirmationViewModel.confirmation.price | coCurrency"></span>
43967
+ </div>
43968
+ </div>
43969
+ </div>
43970
+ <div #parentForOverlay class="link-button" (click)="showPopup(parentForOverlay, confirmationViewModel)">
43971
+ <co-button class="action-menu-button"
43972
+ [iconData]="iconCacheService.getIcon(icons.EllipsisLight)">
43973
+ </co-button>
43974
+ </div>
43975
+ </div>
43976
+ </div>
43890
43977
  </div>
43891
43978
  `,
43892
43979
  providers: [
@@ -43936,7 +44023,8 @@ PurchaseConfirmationLinesModule.decorators = [
43936
44023
  PipeModule,
43937
44024
  DragDropModule,
43938
44025
  IconModule,
43939
- TransactionLinesPopupModule
44026
+ TransactionLinesPopupModule,
44027
+ ButtonModule
43940
44028
  ],
43941
44029
  declarations: [
43942
44030
  PurchaseConfirmationLinesComponent
@@ -44728,9 +44816,10 @@ class DeliveryPlanningOverviewComponent {
44728
44816
  });
44729
44817
  }
44730
44818
  planOrderLines(order, transportDay, week) {
44819
+ var _a;
44731
44820
  return __awaiter(this, void 0, void 0, function* () {
44732
44821
  let oldWeek = week;
44733
- if (order.lines.length) {
44822
+ if (((_a = order.lines) === null || _a === void 0 ? void 0 : _a.length) > 0) {
44734
44823
  order.linesLoaded = true;
44735
44824
  order.tasks = [];
44736
44825
  order.tasksLoaded = true;
@@ -44780,37 +44869,39 @@ class DeliveryPlanningOverviewComponent {
44780
44869
  let planOrder = yield this._transactionCon.getPlanOrder(this._transaction.currentTransaction.transactionInfo.id);
44781
44870
  yield this.getSequenceOrderValue(planOrder);
44782
44871
  yield this.getOrderLinesPlanned(planOrder);
44783
- let selectedLines = this._transaction.currentTransaction.transactionLines.filter((transLines) => transLines.selected);
44784
- //Does the order already exist?
44785
- if ((_a = transportDay === null || transportDay === void 0 ? void 0 : transportDay.plannedOrders) === null || _a === void 0 ? void 0 : _a.find(order => order.transId === planOrder.transId)) {
44786
- //Yes the order exists
44787
- //If the line(s) we're trying to plan already are planned we need to validate if we need to plan anyway
44788
- let cantPlanSelectedLines = [];
44789
- if (selectedLines.length > 0) {
44790
- transportDay.plannedOrders.find((plannedOrder) => plannedOrder.transId === planOrder.transId).lines.forEach((plannedLine) => {
44791
- if (selectedLines.find((selectedLine) => selectedLine.lineNr === plannedLine.originalLineNr)) {
44792
- cantPlanSelectedLines.push(plannedLine);
44872
+ if (planOrder.partDelivery) {
44873
+ let selectedLines = this._transaction.currentTransaction.transactionLines.filter((transLines) => transLines.selected);
44874
+ //Does the order already exist?
44875
+ if ((_a = transportDay === null || transportDay === void 0 ? void 0 : transportDay.plannedOrders) === null || _a === void 0 ? void 0 : _a.find(order => order.transId === planOrder.transId)) {
44876
+ //Yes the order exists
44877
+ //If the line(s) we're trying to plan already are planned we need to validate if we need to plan anyway
44878
+ let cantPlanSelectedLines = [];
44879
+ if (selectedLines.length > 0) {
44880
+ transportDay.plannedOrders.find((plannedOrder) => plannedOrder.transId === planOrder.transId).lines.forEach((plannedLine) => {
44881
+ if (selectedLines.find((selectedLine) => selectedLine.lineNr === plannedLine.originalLineNr)) {
44882
+ cantPlanSelectedLines.push(plannedLine);
44883
+ }
44884
+ });
44885
+ if (cantPlanSelectedLines.length === planOrder.lines.length) {
44886
+ yield this._dialog.showError("NO_LINES_TO_PLAN", true);
44887
+ return;
44793
44888
  }
44794
- });
44795
- if (cantPlanSelectedLines.length === planOrder.lines.length) {
44796
- yield this._dialog.showError("NO_LINES_TO_PLAN", true);
44889
+ }
44890
+ else {
44891
+ yield this._dialog.showError("NO_LINES_SELECTED", true);
44797
44892
  return;
44798
44893
  }
44894
+ let plannedOrder = transportDay.plannedOrders.find((plannedOrder) => plannedOrder.transId === planOrder.transId);
44895
+ //All lines that need to be planned for an order are in planOrder now
44896
+ //Which means that we just filter the lines out that DON'T match a selected line AND are planned
44897
+ planOrder.lines.filter((toPlanLine) => !plannedOrder.lines.find((plannedOrderLine) => plannedOrderLine.originalLineNr === toPlanLine.originalLineNr)
44898
+ && !selectedLines.find((selectedLine) => selectedLine.lineNr === toPlanLine.originalLineNr));
44799
44899
  }
44800
44900
  else {
44801
- yield this._dialog.showError("NO_LINES_SELECTED", true);
44802
- return;
44901
+ //Order does not exist, lets prepare it with the selected lines
44902
+ //Filter the lines for only the selected ones
44903
+ planOrder.lines = planOrder.lines.filter(plannedOrderLine => selectedLines.find((selectedLine) => plannedOrderLine.originalLineNr === selectedLine.lineNr));
44803
44904
  }
44804
- let plannedOrder = transportDay.plannedOrders.find((plannedOrder) => plannedOrder.transId === planOrder.transId);
44805
- //All lines that need to be planned for an order are in planOrder now
44806
- //Which means that we just filter the lines out that DON'T match a selected line AND are planned
44807
- planOrder.lines.filter((toPlanLine) => !plannedOrder.lines.find((plannedOrderLine) => plannedOrderLine.originalLineNr === toPlanLine.originalLineNr)
44808
- && !selectedLines.find((selectedLine) => selectedLine.lineNr === toPlanLine.originalLineNr));
44809
- }
44810
- else {
44811
- //Order does not exist, lets prepare it with the selected lines
44812
- //Filter the lines for only the selected ones
44813
- planOrder.lines = planOrder.lines.filter(plannedOrderLine => selectedLines.find((selectedLine) => plannedOrderLine.originalLineNr === selectedLine.lineNr));
44814
44905
  }
44815
44906
  //Send the prepared order to the
44816
44907
  this.openPlanningPopup(planOrder, transportDay, week);
@@ -48250,6 +48341,7 @@ class TransactionSearchResultComponent {
48250
48341
  this.showBatchOptions = false;
48251
48342
  this.showShippingMethodDialog = false;
48252
48343
  this.selectedTransactions = [];
48344
+ this.batchTransactionSendingRequest = new BatchTransactionSendingRequest();
48253
48345
  this._subs = [];
48254
48346
  }
48255
48347
  set activeContentViewMode(value) {
@@ -48354,6 +48446,19 @@ class TransactionSearchResultComponent {
48354
48446
  if (selectedTransactions.length === 0) {
48355
48447
  return;
48356
48448
  }
48449
+ this.batchTransactionSendingRequest.transIds = [];
48450
+ for (const transaction of selectedTransactions) {
48451
+ this.batchTransactionSendingRequest.transIds.push(transaction.transId);
48452
+ }
48453
+ if (this.batchCategory === 'overview') {
48454
+ // ReportingOrderConfirmationService.startOrderconfirmationsBatch
48455
+ }
48456
+ else if (this.batchCategory === 'delivery order') {
48457
+ // ReportingDeliveryNoteService.startDeliveryNotesBatch
48458
+ }
48459
+ else if (this.batchCategory === 'invoice') {
48460
+ // ReportingInvoiceService.startInvoicesbatch
48461
+ }
48357
48462
  // this.showProcessOrdersLoader = true;
48358
48463
  // const printDeliveryNotesRequest: PrintDeliveryNotesRequest = new PrintDeliveryNotesRequest();
48359
48464
  // let printDeliveryNoteRequest: PrintDeliveryNoteRequest = new PrintDeliveryNoteRequest();
@@ -48390,7 +48495,8 @@ class TransactionSearchResultComponent {
48390
48495
  shippingDialogCancelClicked() {
48391
48496
  this.showShippingMethodDialog = false;
48392
48497
  }
48393
- shippingDialogSaveClicked() {
48498
+ shippingDialogSaveClicked(request) {
48499
+ this.batchTransactionSendingRequest = request;
48394
48500
  this.onProcessOrders();
48395
48501
  this.showShippingMethodDialog = false;
48396
48502
  }
@@ -48478,7 +48584,7 @@ TransactionSearchResultComponent.decorators = [
48478
48584
  [category]="batchCategory"
48479
48585
  [selectedTransactions]="selectedTransactions"
48480
48586
  (cancelClicked)="shippingDialogCancelClicked()"
48481
- (saveClicked)="shippingDialogSaveClicked()">
48587
+ (saveClicked)="shippingDialogSaveClicked($event)">
48482
48588
  </co-shipping-method-dialog>
48483
48589
  `,
48484
48590
  providers: [
@@ -48592,22 +48698,26 @@ class ShippingMethodDialogComponent {
48592
48698
  this.saveClicked = new EventEmitter();
48593
48699
  this.cancelClicked = new EventEmitter();
48594
48700
  this.icons = Icon;
48701
+ this.useDefaultLayout = false;
48595
48702
  this.printLayouts = [];
48596
48703
  this.emailLayouts = [];
48597
48704
  this.printerList = [];
48598
- this.useDefaultShippingMethods = true;
48705
+ this.useDefaultShippingMethods = false;
48706
+ this.batchTransactionSendingRequest = new BatchTransactionSendingRequest();
48599
48707
  }
48600
48708
  showClass() {
48601
48709
  return true;
48602
48710
  }
48603
48711
  ngOnInit() {
48604
- this.useDefaultLayout = !!this.transBaseService.relation;
48605
48712
  this._getPrintLayouts();
48606
48713
  this._getEmailLayouts();
48607
48714
  this._getPrinters();
48715
+ this._getDefaultSendMethod();
48608
48716
  }
48609
48717
  saveButtonClicked() {
48610
- this.saveClicked.emit();
48718
+ this.batchTransactionSendingRequest.useRelationSpecificReports = this.useDefaultLayout;
48719
+ this.batchTransactionSendingRequest.useRelationSpecificSendMethods = this.useDefaultShippingMethods;
48720
+ this.saveClicked.emit(this.batchTransactionSendingRequest);
48611
48721
  }
48612
48722
  cancelButtonClicked() {
48613
48723
  this.cancelClicked.emit();
@@ -48617,6 +48727,13 @@ class ShippingMethodDialogComponent {
48617
48727
  const success = yield this.transactionService.getOrderConfirmationPrintLayouts('');
48618
48728
  if (success) {
48619
48729
  this.printLayouts = success;
48730
+ for (const layout of this.printLayouts) {
48731
+ if (layout.isDefault) {
48732
+ this.useDefaultLayout = true;
48733
+ this.batchTransactionSendingRequest.reportIdForPrinting = layout.reportId;
48734
+ break;
48735
+ }
48736
+ }
48620
48737
  }
48621
48738
  return success;
48622
48739
  });
@@ -48626,6 +48743,13 @@ class ShippingMethodDialogComponent {
48626
48743
  const success = yield this.transactionService.getOrderConfirmationEmailLayouts('');
48627
48744
  if (success) {
48628
48745
  this.emailLayouts = success;
48746
+ for (const layout of this.emailLayouts) {
48747
+ if (layout.isDefault) {
48748
+ this.useDefaultLayout = true;
48749
+ this.batchTransactionSendingRequest.reportIdForEmail = layout.reportId;
48750
+ break;
48751
+ }
48752
+ }
48629
48753
  }
48630
48754
  return success;
48631
48755
  });
@@ -48639,6 +48763,16 @@ class ShippingMethodDialogComponent {
48639
48763
  return success;
48640
48764
  });
48641
48765
  }
48766
+ _getDefaultSendMethod() {
48767
+ return __awaiter(this, void 0, void 0, function* () {
48768
+ const relationId = this.selectedTransactions[0].relationNr;
48769
+ const success = yield this.transactionService.getOrderConfirmationDefaultSendMethod(relationId);
48770
+ if (success) {
48771
+ this.useDefaultShippingMethods = true;
48772
+ }
48773
+ return success;
48774
+ });
48775
+ }
48642
48776
  }
48643
48777
  ShippingMethodDialogComponent.decorators = [
48644
48778
  { type: Component, args: [{
@@ -53361,7 +53495,7 @@ TransactionPurchaseReservationOrderTileComponent.decorators = [
53361
53495
  <div class="tile-upper-right">
53362
53496
  <div class="column">
53363
53497
  <span class="title" [textContent]="'AMOUNT_AVAILABLE2' | localize"></span>
53364
- <span class="bold center-align" [textContent]="purchaseReservationPurchaseLine.amountInOrder - purchaseReservationPurchaseLine.amountReserved "></span>
53498
+ <span class="bold center-align" [textContent]="purchaseReservationPurchaseLine.amountToReservePurchase"></span>
53365
53499
  </div>
53366
53500
  <div class="column">
53367
53501
  <span class="title" [textContent]="'AMOUNT_RESERVATED' | localize"></span>