@colijnit/transaction 12.1.9 → 12.1.10

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 (214) hide show
  1. package/bundles/colijnit-transaction.umd.js +2673 -242
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.d.ts +84 -35
  4. package/colijnit-transaction.metadata.json +1 -1
  5. package/esm2015/colijnit-transaction.js +85 -36
  6. package/esm2015/lib/assets/dictionary/text.properties.js +39 -1
  7. package/esm2015/lib/component/checkout/checkout.component.js +1 -1
  8. package/esm2015/lib/component/checkout/checkout.module.js +1 -1
  9. package/esm2015/lib/component/confirmation-dialog/confirmation-dialog.component.js +17 -3
  10. package/esm2015/lib/component/core/base/default-ok-cancel-buttons.component.js +41 -0
  11. package/esm2015/lib/component/core/base/transaction-base.component.js +7 -9
  12. package/esm2015/lib/component/core/core.module.js +6 -3
  13. package/esm2015/lib/component/core/enum/app-popup-type.enum.js +8 -0
  14. package/esm2015/lib/component/order-confirmation-grid.component/order-confirmation-grid.component.js +70 -0
  15. package/esm2015/lib/component/order-confirmation-grid.component/order-confirmation-grid.module.js +29 -0
  16. package/esm2015/lib/component/order-grid/order-grid.component.js +99 -0
  17. package/esm2015/lib/component/order-grid/order-grid.module.js +28 -0
  18. package/esm2015/lib/component/stepper/stepper.component.js +1 -1
  19. package/esm2015/lib/component/tile/tile.component.js +1 -1
  20. package/esm2015/lib/component/transaction/transaction.component.js +72 -14
  21. package/esm2015/lib/component/transaction/transaction.module.js +10 -2
  22. package/esm2015/lib/component/transaction-commit-bar/transaction-commit-bar.component.js +46 -0
  23. package/esm2015/lib/component/transaction-commit-bar/transaction-commit-bar.module.js +27 -0
  24. package/esm2015/lib/component/transaction-confirmation-history/transaction-confirmation-history.component.js +28 -0
  25. package/esm2015/lib/component/transaction-confirmation-history/transaction-confirmation-history.module.js +27 -0
  26. package/esm2015/lib/component/transaction-header/transaction-header.component.js +14 -4
  27. package/esm2015/lib/component/transaction-header-delivery/transaction-header-delivery.component.js +5 -2
  28. package/esm2015/lib/component/transaction-history-grid/transaction-history-grid.component.js +47 -0
  29. package/esm2015/lib/component/transaction-history-grid/transaction-history-grid.module.js +27 -0
  30. package/esm2015/lib/component/transaction-history-grid-status/transaction-history-grid-status.component.js +36 -0
  31. package/esm2015/lib/component/transaction-history-grid-status/transaction-history-grid-status.module.js +23 -0
  32. package/esm2015/lib/component/transaction-line/transaction-line.component.js +11 -7
  33. package/esm2015/lib/component/transaction-line/transaction-line.module.js +2 -4
  34. package/esm2015/lib/component/transaction-line-fields/transaction-line-commission-code.component.js +49 -0
  35. package/esm2015/lib/component/transaction-line-fields/transaction-line-commission-code.module.js +23 -0
  36. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-date.component.js +40 -0
  37. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-date.module.js +23 -0
  38. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-method.component.js +48 -0
  39. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-method.module.js +23 -0
  40. package/esm2015/lib/component/transaction-line-fields/transaction-line-discount-amount.component.js +50 -0
  41. package/esm2015/lib/component/transaction-line-fields/transaction-line-discount-amount.module.js +23 -0
  42. package/esm2015/lib/component/transaction-line-fields/transaction-line-fields-base.component.js +22 -0
  43. package/esm2015/lib/component/transaction-line-fields/transaction-line-line-discount.component.js +50 -0
  44. package/esm2015/lib/component/transaction-line-fields/transaction-line-line-discount.module.js +23 -0
  45. package/esm2015/lib/component/transaction-line-fields/transaction-line-price-list.component.js +49 -0
  46. package/esm2015/lib/component/transaction-line-fields/transaction-line-price-list.module.js +23 -0
  47. package/esm2015/lib/component/transaction-line-fields/transaction-line-price.component.js +49 -0
  48. package/esm2015/lib/component/transaction-line-fields/transaction-line-price.module.js +23 -0
  49. package/esm2015/lib/component/transaction-line-fields/transaction-line-quantity.component.js +36 -0
  50. package/esm2015/lib/component/transaction-line-fields/transaction-line-quantity.module.js +23 -0
  51. package/esm2015/lib/component/transaction-line-fields/transaction-line-quantum-discount.component.js +50 -0
  52. package/esm2015/lib/component/transaction-line-fields/transaction-line-quantum-discount.module.js +23 -0
  53. package/esm2015/lib/component/transaction-line-fields/transaction-line-reference.component.js +48 -0
  54. package/esm2015/lib/component/transaction-line-fields/transaction-line-reference.module.js +23 -0
  55. package/esm2015/lib/component/transaction-line-fields/transaction-line-special-discount.component.js +50 -0
  56. package/esm2015/lib/component/transaction-line-fields/transaction-line-special-discount.module.js +23 -0
  57. package/esm2015/lib/component/transaction-line-fields/transaction-line-vat.component.js +49 -0
  58. package/esm2015/lib/component/transaction-line-fields/transaction-line-vat.module.js +23 -0
  59. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse.component.js +49 -0
  60. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse.module.js +24 -0
  61. package/esm2015/lib/component/transaction-line-side-panel/transaction-line-side-panel.component.js +57 -129
  62. package/esm2015/lib/component/transaction-line-side-panel/transaction-line-side-panel.module.js +14 -8
  63. package/esm2015/lib/component/transaction-line-side-panel-default/transaction-line-side-panel-default.component.js +134 -0
  64. package/esm2015/lib/component/transaction-line-side-panel-default/transaction-line-side-panel-default.module.js +56 -0
  65. package/esm2015/lib/component/transaction-lines/transaction-lines.component.js +7 -1
  66. package/esm2015/lib/component/transaction-lines-grid/transaction-lines-grid.component.js +16 -11
  67. package/esm2015/lib/component/transaction-lines-grid/transaction-lines-grid.module.js +4 -3
  68. package/esm2015/lib/component/transaction-nav-bar/transaction-nav-bar-button/transaction-nav-bar-button.component.js +29 -0
  69. package/esm2015/lib/component/transaction-nav-bar/transaction-nav-bar.component.js +65 -0
  70. package/esm2015/lib/component/transaction-nav-bar/transaction-nav-bar.module.js +26 -0
  71. package/esm2015/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.js +39 -0
  72. package/esm2015/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.module.js +25 -0
  73. package/esm2015/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.js +28 -0
  74. package/esm2015/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.module.js +27 -0
  75. package/esm2015/lib/enum/icon.enum.js +5 -1
  76. package/esm2015/lib/enum/status-type.enum.js +5 -0
  77. package/esm2015/lib/enum/tab-category.enum.js +10 -0
  78. package/esm2015/lib/model/icon-svg.js +6 -2
  79. package/esm2015/lib/pipe/delivery-time.pipe.js +4 -1
  80. package/esm2015/lib/service/dialog.service.js +14 -3
  81. package/esm2015/lib/service/ione-connector-adapter.service.js +255 -10
  82. package/esm2015/lib/service/pending-reason.service.js +20 -9
  83. package/esm2015/lib/service/transaction.service.js +187 -29
  84. package/fesm2015/colijnit-transaction.js +2477 -290
  85. package/fesm2015/colijnit-transaction.js.map +1 -1
  86. package/lib/component/confirmation-dialog/confirmation-dialog.component.d.ts +4 -0
  87. package/lib/component/core/base/default-ok-cancel-buttons.component.d.ts +13 -0
  88. package/lib/component/core/enum/app-popup-type.enum.d.ts +6 -0
  89. package/lib/component/core/image-display/style/_layout.scss +2 -4
  90. package/lib/component/order-confirmation-create/style/_layout.scss +5 -0
  91. package/lib/component/order-confirmation-create/style/_material-definition.scss +1 -0
  92. package/lib/component/order-confirmation-create/style/_theme.scss +5 -0
  93. package/lib/component/order-confirmation-create/style/material.scss +4 -0
  94. package/lib/component/order-confirmation-grid.component/order-confirmation-grid.component.d.ts +15 -0
  95. package/lib/component/order-confirmation-grid.component/order-confirmation-grid.module.d.ts +2 -0
  96. package/lib/component/order-confirmation-grid.component/style/_layout.scss +5 -0
  97. package/lib/component/order-confirmation-grid.component/style/_material-definition.scss +1 -0
  98. package/lib/component/order-confirmation-grid.component/style/_theme.scss +5 -0
  99. package/lib/component/order-confirmation-grid.component/style/material.scss +4 -0
  100. package/lib/component/order-grid/order-grid.component.d.ts +23 -0
  101. package/lib/component/order-grid/order-grid.module.d.ts +2 -0
  102. package/lib/component/order-grid/style/_layout.scss +21 -0
  103. package/lib/component/order-grid/style/_material-definition.scss +2 -0
  104. package/lib/component/order-grid/style/_theme.scss +6 -0
  105. package/lib/component/order-grid/style/material.scss +4 -0
  106. package/lib/component/transaction/style/_layout.scss +6 -0
  107. package/lib/component/transaction/style/material.scss +3 -0
  108. package/lib/component/transaction/transaction.component.d.ts +16 -1
  109. package/lib/component/transaction-commit-bar/style/_layout.scss +16 -0
  110. package/lib/component/transaction-commit-bar/style/_material-definition.scss +1 -0
  111. package/lib/component/transaction-commit-bar/style/_theme.scss +7 -0
  112. package/lib/component/transaction-commit-bar/style/material.scss +4 -0
  113. package/lib/component/transaction-commit-bar/transaction-commit-bar.component.d.ts +11 -0
  114. package/lib/component/transaction-commit-bar/transaction-commit-bar.module.d.ts +2 -0
  115. package/lib/component/transaction-confirmation-history/style/_layout.scss +7 -0
  116. package/lib/component/transaction-confirmation-history/style/_material-definition.scss +1 -0
  117. package/lib/component/transaction-confirmation-history/style/_theme.scss +7 -0
  118. package/lib/component/transaction-confirmation-history/style/material.scss +4 -0
  119. package/lib/component/transaction-confirmation-history/transaction-confirmation-history.component.d.ts +5 -0
  120. package/lib/component/transaction-confirmation-history/transaction-confirmation-history.module.d.ts +2 -0
  121. package/lib/component/transaction-header/transaction-header.component.d.ts +4 -1
  122. package/lib/component/transaction-history-grid/style/_layout.scss +7 -0
  123. package/lib/component/{service-order/transaction-sidebar/transaction-line-accordion.component.scss → transaction-history-grid/style/_material-definition.scss} +0 -0
  124. package/lib/component/transaction-history-grid/style/_theme.scss +7 -0
  125. package/lib/component/transaction-history-grid/style/material.scss +4 -0
  126. package/lib/component/transaction-history-grid/transaction-history-grid.component.d.ts +14 -0
  127. package/lib/component/transaction-history-grid/transaction-history-grid.module.d.ts +2 -0
  128. package/lib/component/transaction-history-grid-status/style/_layout.scss +28 -0
  129. package/lib/component/{service-order/transaction-edit-article-text/transaction-edit-article-text.component.scss → transaction-history-grid-status/style/_material-definition.scss} +0 -0
  130. package/lib/component/transaction-history-grid-status/style/_theme.scss +7 -0
  131. package/lib/component/transaction-history-grid-status/style/material.scss +4 -0
  132. package/lib/component/transaction-history-grid-status/transaction-history-grid-status.component.d.ts +9 -0
  133. package/lib/component/transaction-history-grid-status/transaction-history-grid-status.module.d.ts +2 -0
  134. package/lib/component/transaction-line/transaction-line.component.d.ts +3 -2
  135. package/lib/component/transaction-line-fields/transaction-line-commission-code.component.d.ts +12 -0
  136. package/lib/component/transaction-line-fields/transaction-line-commission-code.module.d.ts +2 -0
  137. package/lib/component/transaction-line-fields/transaction-line-delivery-date.component.d.ts +7 -0
  138. package/lib/component/transaction-line-fields/transaction-line-delivery-date.module.d.ts +2 -0
  139. package/lib/component/transaction-line-fields/transaction-line-delivery-method.component.d.ts +12 -0
  140. package/lib/component/transaction-line-fields/transaction-line-delivery-method.module.d.ts +2 -0
  141. package/lib/component/transaction-line-fields/transaction-line-discount-amount.component.d.ts +10 -0
  142. package/lib/component/transaction-line-fields/transaction-line-discount-amount.module.d.ts +2 -0
  143. package/lib/component/transaction-line-fields/transaction-line-fields-base.component.d.ts +6 -0
  144. package/lib/component/transaction-line-fields/transaction-line-line-discount.component.d.ts +10 -0
  145. package/lib/component/transaction-line-fields/transaction-line-line-discount.module.d.ts +2 -0
  146. package/lib/component/transaction-line-fields/transaction-line-price-list.component.d.ts +12 -0
  147. package/lib/component/transaction-line-fields/transaction-line-price-list.module.d.ts +2 -0
  148. package/lib/component/transaction-line-fields/transaction-line-price.component.d.ts +10 -0
  149. package/lib/component/transaction-line-fields/transaction-line-price.module.d.ts +2 -0
  150. package/lib/component/transaction-line-fields/transaction-line-quantity.component.d.ts +7 -0
  151. package/lib/component/transaction-line-fields/transaction-line-quantity.module.d.ts +2 -0
  152. package/lib/component/transaction-line-fields/transaction-line-quantum-discount.component.d.ts +10 -0
  153. package/lib/component/transaction-line-fields/transaction-line-quantum-discount.module.d.ts +2 -0
  154. package/lib/component/transaction-line-fields/transaction-line-reference.component.d.ts +10 -0
  155. package/lib/component/transaction-line-fields/transaction-line-reference.module.d.ts +2 -0
  156. package/lib/component/transaction-line-fields/transaction-line-special-discount.component.d.ts +10 -0
  157. package/lib/component/transaction-line-fields/transaction-line-special-discount.module.d.ts +2 -0
  158. package/lib/component/transaction-line-fields/transaction-line-vat.component.d.ts +12 -0
  159. package/lib/component/transaction-line-fields/transaction-line-vat.module.d.ts +2 -0
  160. package/lib/component/transaction-line-fields/transaction-line-warehouse.component.d.ts +12 -0
  161. package/lib/component/transaction-line-fields/transaction-line-warehouse.module.d.ts +2 -0
  162. package/lib/component/transaction-line-side-panel/style/_layout.scss +38 -21
  163. package/lib/component/transaction-line-side-panel/style/_material-definition.scss +4 -6
  164. package/lib/component/transaction-line-side-panel/style/_theme.scss +3 -1
  165. package/lib/component/transaction-line-side-panel/style/material.scss +5 -0
  166. package/lib/component/transaction-line-side-panel/transaction-line-side-panel.component.d.ts +6 -8
  167. package/lib/component/transaction-line-side-panel-default/style/_layout.scss +29 -0
  168. package/lib/component/transaction-line-side-panel-default/style/_material-definition.scss +10 -0
  169. package/lib/component/transaction-line-side-panel-default/style/_theme.scss +7 -0
  170. package/lib/component/transaction-line-side-panel-default/style/material.scss +4 -0
  171. package/lib/component/transaction-line-side-panel-default/transaction-line-side-panel-default.component.d.ts +16 -0
  172. package/lib/component/transaction-line-side-panel-default/transaction-line-side-panel-default.module.d.ts +2 -0
  173. package/lib/component/transaction-lines/transaction-lines.component.d.ts +5 -0
  174. package/lib/component/transaction-lines-grid/transaction-lines-grid.component.d.ts +4 -1
  175. package/lib/component/transaction-nav-bar/style/_layout.scss +13 -0
  176. package/lib/component/transaction-nav-bar/style/_material-definition.scss +1 -0
  177. package/lib/component/transaction-nav-bar/style/_theme.scss +7 -0
  178. package/lib/component/transaction-nav-bar/style/material.scss +4 -0
  179. package/lib/component/transaction-nav-bar/transaction-nav-bar-button/transaction-nav-bar-button.component.d.ts +14 -0
  180. package/lib/component/transaction-nav-bar/transaction-nav-bar-button/transaction-nav-bar-button.component.scss +23 -0
  181. package/lib/component/transaction-nav-bar/transaction-nav-bar.component.d.ts +18 -0
  182. package/lib/component/transaction-nav-bar/transaction-nav-bar.module.d.ts +2 -0
  183. package/lib/component/transaction-receiving-goods-details/style/_layout.scss +38 -0
  184. package/lib/component/transaction-receiving-goods-details/style/_material-definition.scss +1 -0
  185. package/lib/component/transaction-receiving-goods-details/style/_theme.scss +7 -0
  186. package/lib/component/transaction-receiving-goods-details/style/material.scss +4 -0
  187. package/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.component.d.ts +6 -0
  188. package/lib/component/transaction-receiving-goods-details/transaction-receiving-goods-details.module.d.ts +2 -0
  189. package/lib/component/transaction-receiving-goods-history/style/_layout.scss +7 -0
  190. package/lib/component/transaction-receiving-goods-history/style/_material-definition.scss +1 -0
  191. package/lib/component/transaction-receiving-goods-history/style/_theme.scss +7 -0
  192. package/lib/component/transaction-receiving-goods-history/style/material.scss +4 -0
  193. package/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.d.ts +5 -0
  194. package/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.module.d.ts +2 -0
  195. package/lib/enum/icon.enum.d.ts +5 -1
  196. package/lib/enum/status-type.enum.d.ts +3 -0
  197. package/lib/enum/tab-category.enum.d.ts +8 -0
  198. package/lib/service/dialog.service.d.ts +1 -0
  199. package/lib/service/ione-connector-adapter.service.d.ts +24 -7
  200. package/lib/service/pending-reason.service.d.ts +3 -2
  201. package/lib/service/transaction.service.d.ts +22 -9
  202. package/package.json +1 -1
  203. package/lib/component/sell-order/sell-order-side-panel/sell-order-side-panel.component.scss +0 -49
  204. package/lib/component/sell-order/sell-order.component.scss +0 -15
  205. package/lib/component/service-order/service-order.component.scss +0 -154
  206. package/lib/component/service-order/summary/transaction-delivery-summary.component.scss +0 -22
  207. package/lib/component/service-order/summary/transaction-summary-block.component.scss +0 -109
  208. package/lib/component/service-order/transaction-manager/transaction-manager.component.scss +0 -54
  209. package/lib/component/service-order/transaction-order-line-view/transaction-order-line-view.component.scss +0 -90
  210. package/lib/component/service-order/transaction-order-lines/transaction-order-lines.component.scss +0 -85
  211. package/lib/component/service-order/transaction-order-totals/transaction-order-totals.component.scss +0 -26
  212. package/lib/component/service-order/transaction-relation/transaction-relation-edit.component.scss +0 -24
  213. package/lib/component/service-order/transaction-sidebar/transaction-sidebar-right.component.scss +0 -17
  214. package/lib/component/service-order/warehouse/warehouse.component.scss +0 -54
@@ -13,11 +13,9 @@ import { GetPostalCodeRetrievalOutputParams } from "@colijnit/transactionapi/bui
13
13
  import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
14
14
  import { RelationRequest } from "@colijnit/transactionapi/build/model/relation-request";
15
15
  import { TransactionLineType } from "@colijnit/transactionapi/build/enum/transaction-line-type.enum";
16
- import { ResolvePendingLineReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
17
16
  import { CoDomainValue } from "@colijnit/transactionapi/build/model/co-domain-value.bo";
18
17
  import { TransactionArticleWarehouse } from "@colijnit/transactionapi/build/model/transaction-article-warehouse.bo";
19
18
  import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-full-object";
20
- import { LineOperationResponse } from "@colijnit/transactionapi/build/model/line-operation-response.bo";
21
19
  import { TransactionResponseBase } from "@colijnit/transactionapi/build/model/transaction-response-base.bo";
22
20
  import { Transaction } from "@colijnit/transactionapi/build/transaction";
23
21
  import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
@@ -26,6 +24,10 @@ import { CustomerGroup } from "@colijnit/transactionapi/build/model/customer-gro
26
24
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
27
25
  import { OptionsService } from "./options.service";
28
26
  import { CashRegister } from "@colijnit/transactionapi/build/model/cash-register";
27
+ import { ResolveLinePendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
28
+ import { PriceList } from "@colijnit/transactionapi/build/model/price-list";
29
+ import { Vat } from "@colijnit/transactionapi/build/model/vat";
30
+ import { DiscountType } from "@colijnit/transactionapi/build/enum/discount-type.enum";
29
31
  export declare class IOneConnectorAdapterService {
30
32
  private _optionsService;
31
33
  connector: Transaction;
@@ -52,6 +54,8 @@ export declare class IOneConnectorAdapterService {
52
54
  getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
53
55
  getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
54
56
  getRelationNumber(relationId: number): Promise<string>;
57
+ getPriceLists(code?: string): Promise<PriceList[]>;
58
+ getVatList(onlyValid?: boolean): Promise<Vat[]>;
55
59
  getSequenceValue(sequenceName: SequenceName): Promise<number>;
56
60
  insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
57
61
  updateCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
@@ -61,17 +65,30 @@ export declare class IOneConnectorAdapterService {
61
65
  setTransactionDeliveryOptions(transactionDeliveryOptionsRequest: SetTransactionDeliveryOptionsRequest): Promise<TransactionResponseBase>;
62
66
  getPostalCodeRetrieval(postcalCode: string, houseNo: string): Promise<GetPostalCodeRetrievalOutputParams>;
63
67
  getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
64
- addTransactionLine(uuid: string, articleLine: TransactionLineType, articleNo: string, amount: number, warehouseNo: number, commissionCode: string, isReturn: boolean, aboveLineNr: number, belowLineNr: number): Promise<LineOperationResponse>;
65
- addTextLineToTransaction(uuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<LineOperationResponse>;
66
- changeLineSequence(uuid: string, lineUuid: string, aboveLineNr?: number, belowLineNr?: number): Promise<LineOperationResponse>;
68
+ addTransactionLine(uuid: string, articleLine: TransactionLineType, articleNo: string, amount: number, warehouseNo: number, commissionCode: string, isReturn: boolean, aboveLineNr: number, belowLineNr: number): Promise<TransactionInfoResponse>;
69
+ addTextLineToTransaction(uuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
70
+ changeLineSequence(uuid: string, lineUuid: string, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
67
71
  cancelAddTransactionLine(lineUuid: string): Promise<TransactionInfoResponse>;
68
72
  deleteTransactionLine(uuid: string, lineUuid: string): Promise<TransactionInfoResponse>;
69
- changeTransactionLineQuantity(uuid: string, lineUuid: string, newQuantity: number): Promise<LineOperationResponse>;
70
- resolvePendingLineReason(pendingLineValues: ResolvePendingLineReasonRequest): Promise<TransactionInfoResponse>;
73
+ changeTransactionLineQuantity(uuid: string, lineUuid: string, newQuantity: number): Promise<TransactionInfoResponse>;
74
+ resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<TransactionInfoResponse>;
71
75
  getCommissionCodes(languageCode: string): Promise<CoDomainValue[]>;
72
76
  getInOutCollection(languageCode: string): Promise<CoDomainValue[]>;
73
77
  getTransactionArticleWarehouses(goodId: number): Promise<TransactionArticleWarehouse[]>;
74
78
  setRelationByUser(uuid: string, username: string, password: string): Promise<boolean>;
75
79
  getTextTypes(languageCode: string): Promise<CoDomainValue[]>;
76
80
  getStandardTexts(languageCode: string): Promise<StandardText[]>;
81
+ changeTransactionLineCommissionCode(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
82
+ changeTransactionLineWarehouse(uuid: string, lineUuid: string, warehouseNumber: number): Promise<TransactionInfoResponse>;
83
+ changeTransactionLinePrice(uuid: string, lineUuid: string, price: number): Promise<TransactionInfoResponse>;
84
+ changeTransactionLinePriceList(uuid: string, lineUuid: string, priceList: string): Promise<TransactionInfoResponse>;
85
+ changeTransactionLineVat(uuid: string, lineUuid: string, id: number): Promise<TransactionInfoResponse>;
86
+ changeTransactionLineLineDiscount(uuid: string, lineUuid: string, type: DiscountType, discount: number, reason: string, code: string): Promise<TransactionInfoResponse>;
87
+ changeTransactionLineDeliveryMethod(uuid: string, lineUuid: string, method: string): Promise<TransactionInfoResponse>;
88
+ changeTransactionLineDeliveryDate(uuid: string, lineUuid: string, date: Date): Promise<TransactionInfoResponse>;
89
+ changeTransactionLineAssemblyTime(uuid: string, lineUuid: string, time: number): Promise<TransactionInfoResponse>;
90
+ changeTransactionLineEditTime(uuid: string, lineUuid: string, time: number): Promise<TransactionInfoResponse>;
91
+ changeTransactionLineSupplierArticleNumber(uuid: string, lineUuid: string, articleNumber: string): Promise<TransactionInfoResponse>;
92
+ changeTransactionLineReference(uuid: string, lineUuid: string, reference: string): Promise<TransactionInfoResponse>;
93
+ changeTransactionLineCollectionCode(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
77
94
  }
@@ -1,11 +1,11 @@
1
1
  import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
2
- import { ResolvePendingLineReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
3
2
  import { OptionsService } from "./options.service";
4
3
  import { IOneConnectorAdapterService } from "./ione-connector-adapter.service";
5
4
  import { BehaviorSubject } from "rxjs";
6
5
  import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
7
6
  import { SetTransactionDeliveryOptionsRequest } from "@colijnit/transactionapi/build/model/set-transaction-delivery-options-request.bo";
8
7
  import { DialogService } from "./dialog.service";
8
+ import { ResolveLinePendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
9
9
  export declare class PendingReasonService {
10
10
  protected dialogService: DialogService;
11
11
  protected options: OptionsService;
@@ -22,8 +22,9 @@ export declare class PendingReasonService {
22
22
  protected handleLineOperationStatuses(response: TransactionInfoResponse): Promise<boolean>;
23
23
  protected _rememberCurrentTransaction(value: TransactionInfoResponse): Promise<void>;
24
24
  private _handleLineOperationStatus;
25
- resolvePendingLineReason(pendingLineValues: ResolvePendingLineReasonRequest): Promise<void>;
25
+ resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<void>;
26
26
  private _confirmAction;
27
+ private _showReasonDialog;
27
28
  private _setTransactionDeliveryOptions;
28
29
  private _setAmount;
29
30
  private _initializeTransaction;
@@ -13,7 +13,6 @@ import { CoDomainValue } from "@colijnit/transactionapi/build/model/co-domain-va
13
13
  import { TransactionArticleWarehouse } from "@colijnit/transactionapi/build/model/transaction-article-warehouse.bo";
14
14
  import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-full-object";
15
15
  import { LineOperationStatus } from "@colijnit/transactionapi/build/model/line-operation-status.bo";
16
- import { LineOperationResponse } from "@colijnit/transactionapi/build/model/line-operation-response.bo";
17
16
  import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
18
17
  import { StandardText } from "../model/standard-text";
19
18
  import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
@@ -21,14 +20,30 @@ import { Address } from "@colijnit/transactionapi/build/model/address.bo";
21
20
  import { RelationAnyType } from "@colijnit/transactionapi/build/model/relation-any-type";
22
21
  import { PendingReasonService } from "./pending-reason.service";
23
22
  import { CashRegister } from "@colijnit/transactionapi/build/model/cash-register";
23
+ import { PriceList } from "@colijnit/transactionapi/build/model/price-list";
24
+ import { Vat } from "@colijnit/transactionapi/build/model/vat";
25
+ import { DiscountType } from "@colijnit/transactionapi/build/enum/discount-type.enum";
24
26
  export declare class TransactionService extends PendingReasonService {
27
+ private _imageCache;
25
28
  pendingLineOperationStatus(lineOperationStatuses: LineOperationStatus[]): LineOperationStatus | undefined;
29
+ updatePriceTransactionLine(uuid: string, lineUuid: string, price: number): Promise<boolean>;
30
+ updateReferenceTransactionLine(uuid: string, lineUuid: string, reference: string): Promise<boolean>;
31
+ updateQuantityTransactionLine(uuid: string, lineUuid: string, quantity: number): Promise<boolean>;
32
+ updateDeliveryDateTransactionLine(uuid: string, lineUuid: string, date: Date): Promise<boolean>;
33
+ updatePriceListTransactionLine(uuid: string, lineUuid: string, priceList: string): Promise<boolean>;
34
+ updateVatTransactionLine(uuid: string, lineUuid: string, id: number): Promise<boolean>;
35
+ updateCommissionCodeTransactionLine(uuid: string, lineUuid: string, code: string): Promise<boolean>;
36
+ updateWarehouseTransactionLine(uuid: string, lineUuid: string, warehouseNumber: number): Promise<boolean>;
37
+ updateDeliveryMethodTransactionLine(uuid: string, lineUuid: string, method: string): Promise<boolean>;
38
+ updateDiscountTransactionLine(uuid: string, lineUuid: string, type: DiscountType, discount: number, reason?: string, code?: string): Promise<boolean>;
26
39
  getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
27
40
  getDocumentContent(id: number): Promise<string>;
28
41
  getGoodIdFromArticleNr(sku: string): Promise<number>;
29
42
  getCountry(countryCode: string): Promise<Country>;
30
43
  getCashRegisters(): Promise<CashRegister[]>;
31
44
  getRelationNumber(relationId: number): Promise<string>;
45
+ getPriceLists(): Promise<PriceList[]>;
46
+ getVatLists(): Promise<Vat[]>;
32
47
  saveRelation(): Promise<boolean>;
33
48
  getSequenceValue(): Promise<number>;
34
49
  getRelationPrivacySettings(): Promise<RelationPrivacySetting[]>;
@@ -55,18 +70,16 @@ export declare class TransactionService extends PendingReasonService {
55
70
  getArticleImageByArticleNumber(articleNumber: string): Promise<string>;
56
71
  getArticleImageByGoodId(goodId: number): Promise<string>;
57
72
  addArticle(articleNo: string, amount?: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number): Promise<boolean>;
58
- addTransactionLine(lineType: TransactionLineType, articleNo: string, amount: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<LineOperationResponse>;
59
- addTextLine(showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<LineOperationResponse>;
60
- addTextLineToTransaction(transactionUuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<LineOperationResponse>;
61
- changeLineSequence(lineUuid: string, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<LineOperationResponse>;
62
- deleteTransactionLine(transactionUuid: string, TransactionLineUuid: string, remember?: boolean): Promise<LineOperationResponse>;
63
- changeTransactionLineQuantity(lineUuid: string, newQuantity: number, remember?: boolean): Promise<LineOperationResponse>;
73
+ addTransactionLine(lineType: TransactionLineType, articleNo: string, amount: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
74
+ addTextLine(showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
75
+ addTextLineToTransaction(transactionUuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
76
+ changeLineSequence(lineUuid: string, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
77
+ deleteTransactionLine(transactionUuid: string, TransactionLineUuid: string, remember?: boolean): Promise<TransactionInfoResponse>;
78
+ changeTransactionLineQuantity(lineUuid: string, newQuantity: number, remember?: boolean): Promise<TransactionInfoResponse>;
64
79
  setRelationByUser(username: string, password: string): Promise<boolean>;
65
80
  getCustomerFullObjectByRelationId(relationId: number): Promise<CustomerFullObject>;
66
81
  getTextTypes(languageCode: string): Promise<CoDomainValue[]>;
67
82
  getStandardTexts(languageCode: string): Promise<StandardText[]>;
68
83
  getFirstAddress(relation: RelationAnyType): Address;
69
84
  private _checkAndCreateTransaction;
70
- private _rememberCurrentTransactionLineStatus;
71
- private _rememberResponse;
72
85
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@colijnit/transaction",
3
- "version": "12.1.9",
3
+ "version": "12.1.10",
4
4
  "description": "Colijn IT transaction module for Angular 12",
5
5
  "private": false,
6
6
  "peerDependencies": {
@@ -1,49 +0,0 @@
1
- @import "../../../style/variables";
2
-
3
- :host {
4
-
5
- co-collapsible {
6
- padding: 30px 15px 0 15px;
7
- }
8
-
9
- .double-input-wrapper {
10
- display: flex;
11
- flex-direction: row;
12
- width: 100%;
13
-
14
- co-input-text {
15
- padding-right: 10px;
16
- width: 50%;
17
- }
18
-
19
- co-input-combo-box {
20
- width: 50%;
21
- }
22
- }
23
-
24
- .input-wrapper {
25
- padding-right: 10px;
26
- }
27
-
28
- .collapsible-content-wrapper {
29
- padding-bottom: 20px;
30
- }
31
-
32
- ::ng-deep ejs-combobox {
33
- padding-right: 10px;
34
- }
35
-
36
- .side-panel-header-wrapper {
37
- padding: 5px;
38
- display: flex;
39
- justify-content: space-between;
40
- align-items: center;
41
- background: $tp-color-grey;
42
- margin-bottom: 20px;
43
- }
44
-
45
- .side-panel-header {
46
- font-size: 1.2em;
47
- font-family: $tp-font-family;
48
- }
49
- }
@@ -1,15 +0,0 @@
1
- @import "../../style/variables";
2
-
3
- :host {
4
-
5
- .sell-order-wrapper {
6
- display: flex;
7
- flex-direction: column;
8
- width: 100%;
9
-
10
- .side-panel-wrapper {
11
- width: 30%;
12
- height: 100%;
13
- }
14
- }
15
- }
@@ -1,154 +0,0 @@
1
- @import "../../style/variables";
2
- //@import "src/style/styles";
3
- /*
4
-
5
- :host {
6
- %transaction-tab {
7
- @extend %flex-column;
8
- @extend %full-width;
9
- @extend %overflow-hidden;
10
- padding-bottom: 60px;
11
- }
12
-
13
- @extend %transaction-tab;
14
- .page-wrapper & {
15
- padding: 20px;
16
- margin-bottom: 60px;
17
- }
18
- transaction-order-totals {
19
- display: flex;
20
- flex-direction: column;
21
- align-items: flex-end;
22
- }
23
-
24
- .transaction-totals-show {
25
- padding: 20px;
26
- }
27
-
28
- .transaction-totals-hide {
29
- position: relative;
30
- bottom: 0;
31
- right: 0;
32
- }
33
- }
34
-
35
- ::ng-deep #transaction_planning_agenda {
36
- //transform: scale(1) translate(-50%, 0) !important;
37
- top: 160px !important;
38
- width: calc(100vw - 80px) !important;
39
- .popup-card-title {
40
- padding: 10px 20px;
41
- background: $tp-color-active-light;
42
- color: white;
43
- .header-wrapper {
44
- align-items: center !important;
45
- }
46
- .separator {
47
- border-color: white !important;
48
- }
49
- .header {
50
- font-size: 15px;
51
- font-weight: normal;
52
- }
53
- .sub-header {
54
- font-size: 18px;
55
- color: white !important;
56
- font-weight: bold !important;
57
- }
58
- button-select {
59
- icon {
60
- [fill] {
61
- fill: white;
62
- }
63
- }
64
- }
65
- }
66
- .popup-card-content {
67
- overflow: hidden;
68
- }
69
- @include screen-xs() {
70
- width: 100vw !important;
71
- .popup-card-content {
72
- padding: 0;
73
- }
74
- }
75
-
76
- }
77
-
78
- $block_content_height: 60px;
79
- $color-border: #dedede;
80
- .column-separator {
81
- padding-right: 25px;
82
- border-right: 1px solid #0000001c;
83
- }
84
-
85
- .floating-icon-wrapper {
86
- position: fixed;
87
- bottom: 50px;
88
- right: 50px;
89
- display: flex;
90
- flex-shrink: 0;
91
- align-items: center;
92
- justify-content: center;
93
- background: $tp-color-dark-accent;
94
- height: 50px;
95
- width: 50px;
96
- opacity: 0.5;
97
- transition: opacity 0.4s ease-in-out;
98
- border-radius: 50%;
99
- overflow: hidden;
100
- box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.6);
101
- -webkit-box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.6);
102
- -moz-box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.6);
103
- cursor: pointer;
104
- &:hover {
105
- opacity: 1;
106
- transition: opacity 0.4s ease-in-out;
107
- }
108
- ::ng-deep icon {
109
- height: 44px !important;
110
- width: 44px !important;
111
- color: white !important;
112
- flex-shrink: 0;
113
- }
114
- }
115
- .transaction-wrapper {
116
- padding: 0 20px;
117
- }
118
-
119
- .view-mode-buttons co-button {
120
- padding: 0;
121
- }
122
-
123
- .transaction-view {
124
- display: flex;
125
- margin-top: 10px;
126
- justify-content: stretch;
127
-
128
- .view-mode-buttons {
129
- display: flex;
130
- flex-direction: row;
131
- @extend %margin-left-medium;
132
- button-select {
133
- ::ng-deep button-colijn {
134
- border-radius: 0;
135
- }
136
- &:first-child {
137
- margin-right: 5px;
138
- ::ng-deep button-colijn {
139
- @include border-left-radius(3px);
140
- @include border-right-radius(3px);
141
- }
142
- }
143
-
144
- &:nth-child(2) ::ng-deep button-colijn {
145
- @include border-left-radius(3px);
146
- }
147
- &:last-child ::ng-deep button-colijn {
148
- @include border-right-radius(3px);
149
- }
150
- }
151
- }
152
-
153
- }
154
- */
@@ -1,22 +0,0 @@
1
- @import "../../../style/variables";
2
- /*
3
- @import "src/style/styles";
4
-
5
- :host {
6
- .planning-wrapper {
7
- display: flex;
8
- justify-content: space-between;
9
- align-items: center;
10
- flex-direction: row;
11
- color: $tp-color-action;
12
- margin-top: -10px;
13
- font-size: 13px;
14
- ::ng-deep icon {
15
- cursor: pointer;
16
- [fill] {
17
- fill: $tp-color-action;
18
- }
19
- }
20
- }
21
- }
22
- */
@@ -1,109 +0,0 @@
1
- @import "../../../style/variables";
2
- /*
3
- @import "src/style/styles";
4
-
5
- $block_content_height: 60px;
6
- $summary-block-width: 368px;
7
- $summary-block-min-height: 130px;
8
-
9
- :host {
10
- width: $summary-block-width;
11
- min-height: $summary-block-min-height;
12
- height: auto;
13
- display: flex;
14
- flex-direction: column;
15
- // border: 1px solid $color_border;
16
- // outline: 1px solid $color-border;
17
- margin-top: 1px;
18
- margin-left: 1px;
19
- padding: 30px 20px;
20
- .content-wrapper {
21
- .value-block {
22
- margin-bottom: 10px;
23
- ::ng-deep .planning-wrapper {
24
- justify-content: flex-start;
25
- arrow-link {
26
- margin-right: 10px;
27
- }
28
- }
29
- }
30
- }
31
- .disabled-indicator {
32
- position: absolute;
33
- top: 0;
34
- left: 0;
35
- display: none;
36
- }
37
- &.disabled {
38
- .disabled-indicator {
39
- display: block;
40
- }
41
- }
42
- ::ng-deep image-display {
43
- height: $block_content_height;
44
- width: $block_content_height;
45
- flex-shrink: 0;
46
- span {
47
- display: none;
48
- }
49
- }
50
-
51
- .icon-wrapper {
52
- display: flex;
53
- flex-shrink: 0;
54
- align-items: center;
55
- justify-content: center;
56
- background: #F8FBFA;
57
- height: $block_content_height;
58
- width: $block_content_height;
59
- border-radius: 50%;
60
- border: 1px solid $tp-color-border;
61
- overflow: hidden;
62
- ::ng-deep icon {
63
- height: 60px !important;
64
- width: 60px !important;
65
- flex-shrink: 0;
66
- }
67
- }
68
-
69
- .title {
70
- font-size: 13px;
71
- color: $tp-color-dark;
72
- }
73
-
74
- .block-wrapper {
75
- position: relative;
76
- display: flex;
77
- align-items: center;
78
- }
79
-
80
- .border {
81
- border-radius: 3px;
82
- padding: 15px;
83
- background: white;
84
- border: 1px solid $tp-color-border;
85
- }
86
-
87
- .content-wrapper {
88
- display: flex;
89
- flex-direction: column;
90
- justify-content: center;
91
- margin-left: 10px;
92
- min-height: $block_content_height;
93
- height: auto;
94
- width: 100%;
95
- }
96
-
97
- .header-label, .subheader-label {
98
- font-size: 11px;
99
- line-height: 13px;
100
- color: $tp-color-label;
101
- }
102
-
103
- .header, .subheader {
104
- font-size: 13px;
105
- font-weight: bold;
106
- color: $tp-color-dark;
107
- }
108
- }
109
- */
@@ -1,54 +0,0 @@
1
- @import "../../../style/variables";
2
- /*
3
- @import "src/style/styles";
4
-
5
- ::ng-deep #warehouseDialog {
6
- align-items: center;
7
- max-height: 100%;
8
-
9
- ::ng-deep co-form {
10
- height: 100%;
11
- width: 500px;
12
- }
13
-
14
- ::ng-deep .form-content {
15
- height: calc(100% - 80px);
16
- width: 100%;
17
-
18
- .message-field {
19
- @extend %margin-left-medium;
20
- height: 20px;
21
- word-wrap: break-word;
22
- white-space: normal;
23
- }
24
- }
25
-
26
- }
27
-
28
- co-button:not(:last-child) {
29
- margin-right: 10px;
30
- }
31
-
32
- .commission-fields {
33
- @extend %margin-left-medium;
34
- justify-content: space-between;
35
- margin: 10px 0 10px;
36
- }
37
-
38
- .warehouse-line-container {
39
- @extend %flex;
40
- @extend %flex-row;
41
- }
42
-
43
- .warehouse-description-item {
44
- width: 15rem;
45
- }
46
-
47
- .warehouse-nr-item {
48
- width: 5rem;
49
- }
50
-
51
- co-input-number-picker co-button {
52
- max-width: 20px;
53
- }
54
- */
@@ -1,90 +0,0 @@
1
- @import "../../../style/variables";
2
- /*
3
- @import "src/style/styles";
4
-
5
- :host {
6
- display: block;
7
- padding: 20px;
8
-
9
- ::ng-deep collapseable {
10
- width: 100% !important;
11
- }
12
- }
13
-
14
- .horizontal {
15
- display: flex;
16
- flex-direction: row;
17
- }
18
-
19
- .service-request-button-wrapper {
20
- display: flex;
21
- justify-content: center;
22
- margin-top: 20px;
23
- }
24
-
25
- .transaction-order-line-r {
26
- display: flex;
27
- justify-content: stretch;
28
- flex-direction: row;
29
-
30
- @media (max-width: 800px) {
31
- flex-direction: column;
32
- }
33
-
34
- .transaction-order-line-image {
35
- @extend %margin-vertical-big;
36
- display: flex;
37
- flex: 1 0 auto !important;
38
- flex-direction: column;
39
- align-items: center;
40
- justify-content: center;
41
- padding-right: 10px;
42
- image-display {
43
- @include square(6em);
44
- }
45
- ::ng-deep no-image-display {
46
- display: none;
47
- }
48
- }
49
- .transaction-order-line-description {
50
- @extend %margin-big;
51
- display: flex;
52
- flex-direction: column;
53
- width: auto;
54
- max-width: 355px;
55
- margin-left: 10px;
56
- .cart-line-description-main {
57
- font-weight: bold;
58
- }
59
- .cart-line-description-artnr {
60
- @extend %font-small;
61
- }
62
- }
63
- .transaction-order-line-right {
64
- justify-content: flex-end;
65
- align-items: center;
66
- .transaction-order-line-stock {
67
- @extend %margin-vertical-big;
68
- width: 10em;
69
- }
70
-
71
- .transaction-order-line-amount {
72
- @extend %margin-big;
73
- width: 15em;
74
- }
75
-
76
- .transaction-order-line-totals {
77
- display: flex;
78
- @extend %margin-vertical-big;
79
- @extend %margin-left-big;
80
- justify-content: flex-end;
81
- min-width: 100px;
82
- font-weight: bold;
83
-
84
- span {
85
- text-align: right;
86
- }
87
- }
88
- }
89
- }
90
- */