@aptos-scp/scp-component-store-selling-features-domain-model 1.11.3 → 1.12.0-patch.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/domain/model/Constants.d.ts +1 -0
- package/lib/domain/model/Constants.js +1 -0
- package/lib/domain/model/MerchandiseTransaction.d.ts +9 -0
- package/lib/domain/model/MerchandiseTransaction.js +54 -13
- package/lib/domain/model/TransactionReferenceLine.d.ts +3 -1
- package/lib/domain/model/TransactionReferenceLine.js +10 -4
- package/lib/domain/model/fee/BaseFeeLineDecorator.d.ts +1 -0
- package/lib/domain/model/fee/BaseFeeLineDecorator.js +3 -0
- package/lib/domain/model/fee/FeeLine.d.ts +4 -0
- package/lib/domain/model/fee/FeeLine.js +30 -7
- package/lib/domain/model/fee/IFeeLine.d.ts +2 -0
- package/lib/domain/model/item/BaseItemLineDecorator.d.ts +1 -0
- package/lib/domain/model/item/BaseItemLineDecorator.js +3 -0
- package/package.json +12 -9
|
@@ -850,6 +850,7 @@ export declare enum CollectedDataKey {
|
|
|
850
850
|
DomainNotificationEventType = "domainNotificationEventType",
|
|
851
851
|
NeedToRestoreOrderItem = "needToRestoreOrderItem",
|
|
852
852
|
FiscalTransactionNumber = "fiscalTransactionNumber",
|
|
853
|
+
AlternateFiscalSequenceNumber = "alternateFiscalSequenceNumber",
|
|
853
854
|
FiscalTypeCode = "fiscalTypeCode",
|
|
854
855
|
FiscalTransactionStartDateTime = "fiscalTransactionStartDateTime",
|
|
855
856
|
FiscalTransactionEndDateTime = "fiscalTransactionEndDateTime",
|
|
@@ -859,6 +859,7 @@ var CollectedDataKey;
|
|
|
859
859
|
CollectedDataKey["DomainNotificationEventType"] = "domainNotificationEventType";
|
|
860
860
|
CollectedDataKey["NeedToRestoreOrderItem"] = "needToRestoreOrderItem";
|
|
861
861
|
CollectedDataKey["FiscalTransactionNumber"] = "fiscalTransactionNumber";
|
|
862
|
+
CollectedDataKey["AlternateFiscalSequenceNumber"] = "alternateFiscalSequenceNumber";
|
|
862
863
|
CollectedDataKey["FiscalTypeCode"] = "fiscalTypeCode";
|
|
863
864
|
CollectedDataKey["FiscalTransactionStartDateTime"] = "fiscalTransactionStartDateTime";
|
|
864
865
|
CollectedDataKey["FiscalTransactionEndDateTime"] = "fiscalTransactionEndDateTime";
|
|
@@ -45,6 +45,7 @@ export interface TotalsBeforeVoid {
|
|
|
45
45
|
transactionTotalDeliveryFee?: Money;
|
|
46
46
|
transactionTotalBagFee?: Money;
|
|
47
47
|
transactionTotalPublicImprovementFee?: Money;
|
|
48
|
+
transactionTotalPreviouslyPaidItemFee?: Money;
|
|
48
49
|
transactionTotalCustomFeeByType?: CustomFeeTotal[];
|
|
49
50
|
transactionTotalShippingFee?: Money;
|
|
50
51
|
transactionTotalDonations?: Money;
|
|
@@ -95,6 +96,7 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
|
|
|
95
96
|
private _transactionTotalDeliveryFee;
|
|
96
97
|
private _transactionTotalBagFee;
|
|
97
98
|
private _transactionTotalPublicImprovementFee;
|
|
99
|
+
private _transactionTotalPreviouslyPaidItemFee;
|
|
98
100
|
private _transactionTotalCustomFeeByType;
|
|
99
101
|
private _transactionTotalShippingFee;
|
|
100
102
|
private _returnSubTotal;
|
|
@@ -137,6 +139,9 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
|
|
|
137
139
|
private _requiresVoid;
|
|
138
140
|
private _fiscalTransactionNumber?;
|
|
139
141
|
private _fiscalTypeCode?;
|
|
142
|
+
private _fiscalTransactionStartDateTime?;
|
|
143
|
+
private _fiscalTransactionEndDateTime?;
|
|
144
|
+
private _alternateFiscalSequenceNumber?;
|
|
140
145
|
private _fiscalTransactionSequenceNumber?;
|
|
141
146
|
private _fiscalTransactionSequenceNumberGenerator?;
|
|
142
147
|
private _invoiceFiscalTransactionNumber?;
|
|
@@ -206,6 +211,7 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
|
|
|
206
211
|
get transactionTotalDeliveryFee(): Money;
|
|
207
212
|
get transactionTotalBagFee(): Money;
|
|
208
213
|
get transactionTotalPublicImprovementFee(): Money;
|
|
214
|
+
get transactionTotalPreviouslyPaidItemFee(): Money;
|
|
209
215
|
get transactionTotalCustomFeeByType(): CustomFeeTotal[];
|
|
210
216
|
get transactionTotalShippingFee(): Money;
|
|
211
217
|
get returnSubTotal(): Money;
|
|
@@ -250,6 +256,9 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
|
|
|
250
256
|
get requiresVoid(): boolean;
|
|
251
257
|
get fiscalTransactionNumber(): string;
|
|
252
258
|
get fiscalTypeCode(): string;
|
|
259
|
+
get fiscalTransactionEndDateTime(): string;
|
|
260
|
+
get fiscalTransactionStartDateTime(): string;
|
|
261
|
+
get alternateFiscalSequenceNumber(): number;
|
|
253
262
|
get fiscalTransactionSequenceNumber(): number;
|
|
254
263
|
get fiscalTransactionSequenceNumberGenerator(): string;
|
|
255
264
|
get invoiceFiscalTransactionNumber(): string;
|
|
@@ -30,6 +30,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
30
30
|
this._transactionTotalDeliveryFee = new scp_component_business_core_1.Money(0, accountingCurrency);
|
|
31
31
|
this._transactionTotalBagFee = new scp_component_business_core_1.Money(0, accountingCurrency);
|
|
32
32
|
this._transactionTotalPublicImprovementFee = new scp_component_business_core_1.Money(0, accountingCurrency);
|
|
33
|
+
this._transactionTotalPreviouslyPaidItemFee = new scp_component_business_core_1.Money(0, accountingCurrency);
|
|
33
34
|
this._transactionTotalCustomFeeByType = undefined;
|
|
34
35
|
this._transactionTotalShippingFee = new scp_component_business_core_1.Money(0, accountingCurrency);
|
|
35
36
|
this._transactionSubTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
|
|
@@ -162,6 +163,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
162
163
|
transaction._transactionTotalDeliveryFee = this._transactionTotalDeliveryFee;
|
|
163
164
|
transaction._transactionTotalBagFee = this._transactionTotalBagFee;
|
|
164
165
|
transaction._transactionTotalPublicImprovementFee = this._transactionTotalPublicImprovementFee;
|
|
166
|
+
transaction._transactionTotalPreviouslyPaidItemFee = this._transactionTotalPreviouslyPaidItemFee;
|
|
165
167
|
transaction._transactionTotalCustomFeeByType = this._transactionTotalCustomFeeByType;
|
|
166
168
|
transaction._transactionTotalShippingFee = this._transactionTotalShippingFee;
|
|
167
169
|
transaction._returnSubTotal = this._returnSubTotal;
|
|
@@ -203,6 +205,9 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
203
205
|
transaction._requiresVoid = this._requiresVoid;
|
|
204
206
|
transaction._fiscalTransactionNumber = this._fiscalTransactionNumber;
|
|
205
207
|
transaction._fiscalTypeCode = this._fiscalTypeCode;
|
|
208
|
+
transaction._fiscalTransactionStartDateTime = this._fiscalTransactionStartDateTime;
|
|
209
|
+
transaction._fiscalTransactionEndDateTime = this._fiscalTransactionEndDateTime;
|
|
210
|
+
transaction._alternateFiscalSequenceNumber = this._alternateFiscalSequenceNumber;
|
|
206
211
|
transaction._fiscalTransactionSequenceNumber = this._fiscalTransactionSequenceNumber;
|
|
207
212
|
transaction._fiscalTransactionSequenceNumberGenerator = this._fiscalTransactionSequenceNumberGenerator;
|
|
208
213
|
transaction._invoiceFiscalTransactionNumber = this._invoiceFiscalTransactionNumber;
|
|
@@ -384,6 +389,9 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
384
389
|
get transactionTotalPublicImprovementFee() {
|
|
385
390
|
return this._transactionTotalPublicImprovementFee;
|
|
386
391
|
}
|
|
392
|
+
get transactionTotalPreviouslyPaidItemFee() {
|
|
393
|
+
return this._transactionTotalPreviouslyPaidItemFee;
|
|
394
|
+
}
|
|
387
395
|
get transactionTotalCustomFeeByType() {
|
|
388
396
|
return this._transactionTotalCustomFeeByType;
|
|
389
397
|
}
|
|
@@ -521,6 +529,15 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
521
529
|
get fiscalTypeCode() {
|
|
522
530
|
return this._fiscalTypeCode;
|
|
523
531
|
}
|
|
532
|
+
get fiscalTransactionEndDateTime() {
|
|
533
|
+
return this._fiscalTransactionEndDateTime;
|
|
534
|
+
}
|
|
535
|
+
get fiscalTransactionStartDateTime() {
|
|
536
|
+
return this._fiscalTransactionStartDateTime;
|
|
537
|
+
}
|
|
538
|
+
get alternateFiscalSequenceNumber() {
|
|
539
|
+
return this._alternateFiscalSequenceNumber;
|
|
540
|
+
}
|
|
524
541
|
get fiscalTransactionSequenceNumber() {
|
|
525
542
|
return this._fiscalTransactionSequenceNumber;
|
|
526
543
|
}
|
|
@@ -584,7 +601,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
584
601
|
return this._salesperson;
|
|
585
602
|
}
|
|
586
603
|
updateTransactionTotalsBeforeVoid(totalsBeforeVoid) {
|
|
587
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
|
|
604
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
|
|
588
605
|
const newTransaction = this.clone();
|
|
589
606
|
//make sure all the Money entries in totalsBeforeVoid are the correct type
|
|
590
607
|
if (totalsBeforeVoid) {
|
|
@@ -609,7 +626,8 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
609
626
|
totalsBeforeVoid.transactionTotalDeliveryFee = this.convertAmountToAccountingCurrency((_s = totalsBeforeVoid.transactionTotalDeliveryFee) === null || _s === void 0 ? void 0 : _s.amount);
|
|
610
627
|
totalsBeforeVoid.transactionTotalBagFee = this.convertAmountToAccountingCurrency((_t = totalsBeforeVoid.transactionTotalBagFee) === null || _t === void 0 ? void 0 : _t.amount);
|
|
611
628
|
totalsBeforeVoid.transactionTotalPublicImprovementFee = this.convertAmountToAccountingCurrency((_u = totalsBeforeVoid.transactionTotalPublicImprovementFee) === null || _u === void 0 ? void 0 : _u.amount);
|
|
612
|
-
totalsBeforeVoid.
|
|
629
|
+
totalsBeforeVoid.transactionTotalPreviouslyPaidItemFee = this.convertAmountToAccountingCurrency((_v = totalsBeforeVoid.transactionTotalPreviouslyPaidItemFee) === null || _v === void 0 ? void 0 : _v.amount);
|
|
630
|
+
totalsBeforeVoid.transactionTotalCustomFeeByType = (_w = totalsBeforeVoid.transactionTotalCustomFeeByType) === null || _w === void 0 ? void 0 : _w.map((fee) => {
|
|
613
631
|
var _a;
|
|
614
632
|
return {
|
|
615
633
|
feeId: fee.feeId,
|
|
@@ -618,11 +636,11 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
618
636
|
amount: this.convertAmountToAccountingCurrency((_a = fee.amount) === null || _a === void 0 ? void 0 : _a.amount),
|
|
619
637
|
};
|
|
620
638
|
});
|
|
621
|
-
totalsBeforeVoid.transactionTotalShippingFee = this.convertAmountToAccountingCurrency((
|
|
622
|
-
totalsBeforeVoid.transactionTax = this.convertAmountToAccountingCurrency((
|
|
623
|
-
totalsBeforeVoid.transactionTaxableAmount = this.convertAmountToAccountingCurrency((
|
|
624
|
-
totalsBeforeVoid.transactionTotalTendered = this.convertAmountToAccountingCurrency((
|
|
625
|
-
totalsBeforeVoid.transactionTotalExcludingTax = this.convertAmountToAccountingCurrency((
|
|
639
|
+
totalsBeforeVoid.transactionTotalShippingFee = this.convertAmountToAccountingCurrency((_x = totalsBeforeVoid.transactionTotalShippingFee) === null || _x === void 0 ? void 0 : _x.amount);
|
|
640
|
+
totalsBeforeVoid.transactionTax = this.convertAmountToAccountingCurrency((_y = totalsBeforeVoid.transactionTax) === null || _y === void 0 ? void 0 : _y.amount);
|
|
641
|
+
totalsBeforeVoid.transactionTaxableAmount = this.convertAmountToAccountingCurrency((_z = totalsBeforeVoid.transactionTaxableAmount) === null || _z === void 0 ? void 0 : _z.amount);
|
|
642
|
+
totalsBeforeVoid.transactionTotalTendered = this.convertAmountToAccountingCurrency((_0 = totalsBeforeVoid.transactionTotalTendered) === null || _0 === void 0 ? void 0 : _0.amount);
|
|
643
|
+
totalsBeforeVoid.transactionTotalExcludingTax = this.convertAmountToAccountingCurrency((_1 = totalsBeforeVoid.transactionTotalExcludingTax) === null || _1 === void 0 ? void 0 : _1.amount);
|
|
626
644
|
}
|
|
627
645
|
newTransaction._totalsBeforeVoid = totalsBeforeVoid;
|
|
628
646
|
return newTransaction;
|
|
@@ -740,13 +758,13 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
740
758
|
}
|
|
741
759
|
// Calculated totals
|
|
742
760
|
get transactionTotal() {
|
|
743
|
-
return this.getTransactionTotal(this.transactionTax, this.transactionSubTotal);
|
|
761
|
+
return this.getTransactionTotal(this.transactionTax, this.transactionSubTotal, this.transactionTotalPreviouslyPaidItemFee);
|
|
744
762
|
}
|
|
745
763
|
get transactionTotalExcludingPreviouslyCollected() {
|
|
746
764
|
return this.getTransactionTotal(this.transactionTotalTaxExcludingPreviouslyCollected, this.transactionSubTotalExcludingPreviouslyCollected);
|
|
747
765
|
}
|
|
748
766
|
get transactionBalanceDue() {
|
|
749
|
-
return this.getTransactionBalanceDue(this.transactionTotal, this.transactionTotalTendered, true);
|
|
767
|
+
return this.getTransactionBalanceDue(this.transactionTotal, this.transactionTotalTendered, true, this.transactionTotalPreviouslyPaidItemFee);
|
|
750
768
|
}
|
|
751
769
|
get transactionBalanceDueExcludingPreviouslyCollected() {
|
|
752
770
|
return this.getTransactionBalanceDue(this.transactionTotalExcludingPreviouslyCollected, this.transactionTotalTenderedExcludingPreviouslyCollected, true);
|
|
@@ -789,6 +807,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
789
807
|
["transaction.deliveryFee", this._transactionTotalDeliveryFee],
|
|
790
808
|
["transaction.bagFee", this._transactionTotalBagFee],
|
|
791
809
|
["transaction.publicImprovementFee", this._transactionTotalPublicImprovementFee],
|
|
810
|
+
["transaction.transactionTotalPreviouslyPaidItemFee", this._transactionTotalPreviouslyPaidItemFee],
|
|
792
811
|
["transaction.customFeeByType", this._transactionTotalCustomFeeByType],
|
|
793
812
|
["transaction.shippingFee", this._transactionTotalShippingFee],
|
|
794
813
|
["transaction.subTotal", this._transactionSubTotal],
|
|
@@ -917,6 +936,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
917
936
|
_transactionTotalDeliveryFee: this.transactionTotalDeliveryFee,
|
|
918
937
|
_transactionTotalBagFee: this._transactionTotalBagFee,
|
|
919
938
|
_transactionTotalPublicImprovementFee: this._transactionTotalPublicImprovementFee,
|
|
939
|
+
_transactionTotalPreviouslyPaidItemFee: this.transactionTotalPreviouslyPaidItemFee,
|
|
920
940
|
_transactionTotalCustomFeeByType: this._transactionTotalCustomFeeByType,
|
|
921
941
|
_transactionTotalShippingFee: this._transactionTotalShippingFee,
|
|
922
942
|
_transactionSubTotal: this.transactionSubTotal,
|
|
@@ -981,6 +1001,9 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
981
1001
|
_requiresVoid: this._requiresVoid,
|
|
982
1002
|
_fiscalTransactionNumber: this._fiscalTransactionNumber,
|
|
983
1003
|
_fiscalTypeCode: this._fiscalTypeCode,
|
|
1004
|
+
_fiscalTransactionStartDateTime: this._fiscalTransactionStartDateTime,
|
|
1005
|
+
_fiscalTransactionEndDateTime: this._fiscalTransactionEndDateTime,
|
|
1006
|
+
_alternateFiscalSequenceNumber: this._alternateFiscalSequenceNumber,
|
|
984
1007
|
_fiscalTransactionSequenceNumber: this._fiscalTransactionSequenceNumber,
|
|
985
1008
|
_fiscalTransactionSequenceNumberGenerator: this._fiscalTransactionSequenceNumberGenerator,
|
|
986
1009
|
_invoiceFiscalTransactionNumber: this._invoiceFiscalTransactionNumber,
|
|
@@ -1010,6 +1033,9 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
1010
1033
|
this._transactionTotalPublicImprovementFee =
|
|
1011
1034
|
transactionJsonObj._transactionTotalPublicImprovementFee &&
|
|
1012
1035
|
new scp_component_business_core_1.Money(transactionJsonObj._transactionTotalPublicImprovementFee);
|
|
1036
|
+
this._transactionTotalPreviouslyPaidItemFee =
|
|
1037
|
+
transactionJsonObj._transactionTotalPreviouslyPaidItemFee &&
|
|
1038
|
+
new scp_component_business_core_1.Money(transactionJsonObj._transactionTotalPreviouslyPaidItemFee);
|
|
1013
1039
|
this._transactionTotalCustomFeeByType = transactionJsonObj._transactionTotalCustomFeeByType;
|
|
1014
1040
|
this._transactionTotalShippingFee =
|
|
1015
1041
|
transactionJsonObj._transactionTotalShippingFee &&
|
|
@@ -1124,6 +1150,9 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
1124
1150
|
this._requiresVoid = transactionJsonObj._requiresVoid;
|
|
1125
1151
|
this._fiscalTransactionNumber = transactionJsonObj._fiscalTransactionNumber;
|
|
1126
1152
|
this._fiscalTypeCode = transactionJsonObj._fiscalTypeCode;
|
|
1153
|
+
this._fiscalTransactionStartDateTime = transactionJsonObj._fiscalTransactionStartDateTime;
|
|
1154
|
+
this._fiscalTransactionEndDateTime = transactionJsonObj._fiscalTransactionEndDateTime;
|
|
1155
|
+
this._alternateFiscalSequenceNumber = transactionJsonObj._alternateFiscalSequenceNumber;
|
|
1127
1156
|
this._fiscalTransactionSequenceNumber = transactionJsonObj._fiscalTransactionSequenceNumber;
|
|
1128
1157
|
this._fiscalTransactionSequenceNumberGenerator =
|
|
1129
1158
|
transactionJsonObj._fiscalTransactionSequenceNumberGenerator;
|
|
@@ -1207,6 +1236,8 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
1207
1236
|
new scp_component_business_core_1.Money(transactionJsonObj._totalsBeforeVoid.transactionTotalBagFee),
|
|
1208
1237
|
transactionTotalPublicImprovementFee: transactionJsonObj._totalsBeforeVoid.transactionTotalPublicImprovementFee &&
|
|
1209
1238
|
new scp_component_business_core_1.Money(transactionJsonObj._totalsBeforeVoid.transactionTotalPublicImprovementFee),
|
|
1239
|
+
transactionTotalPreviouslyPaidItemFee: transactionJsonObj._totalsBeforeVoid.transactionTotalPreviouslyPaidItemFee &&
|
|
1240
|
+
new scp_component_business_core_1.Money(transactionJsonObj._totalsBeforeVoid.transactionTotalPreviouslyPaidItemFee),
|
|
1210
1241
|
transactionTotalCustomFeeByType: transactionJsonObj._totalsBeforeVoid.transactionTotalCustomFeeByType,
|
|
1211
1242
|
transactionTotalShippingFee: transactionJsonObj._totalsBeforeVoid.transactionTotalShippingFee &&
|
|
1212
1243
|
new scp_component_business_core_1.Money(transactionJsonObj._totalsBeforeVoid.transactionTotalShippingFee),
|
|
@@ -1232,7 +1263,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
1232
1263
|
return new scp_component_business_core_1.Money(amount, this.accountingCurrency);
|
|
1233
1264
|
}
|
|
1234
1265
|
}
|
|
1235
|
-
getTransactionTotal(taxAmount, subTotalAmount) {
|
|
1266
|
+
getTransactionTotal(taxAmount, subTotalAmount, transactionTotalPreviouslyPaidItemFee) {
|
|
1236
1267
|
let taxToAddToTotal = taxAmount;
|
|
1237
1268
|
if (this.taxIncludedInPrice()) {
|
|
1238
1269
|
taxToAddToTotal = new scp_component_business_core_1.Money("0", this._accountingCurrency);
|
|
@@ -1243,13 +1274,23 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
|
|
|
1243
1274
|
taxToAddToTotal = taxToAddToTotal.minus(this.transactionTaxAdjustmentAmount);
|
|
1244
1275
|
}
|
|
1245
1276
|
}
|
|
1277
|
+
if (!transactionTotalPreviouslyPaidItemFee) {
|
|
1278
|
+
transactionTotalPreviouslyPaidItemFee = new scp_component_business_core_1.Money("0", this._accountingCurrency);
|
|
1279
|
+
}
|
|
1246
1280
|
return subTotalAmount
|
|
1247
1281
|
.plus(taxToAddToTotal)
|
|
1248
1282
|
.plus(this.transactionTotalFee)
|
|
1249
|
-
.plus(this.transactionTotalDonations)
|
|
1283
|
+
.plus(this.transactionTotalDonations)
|
|
1284
|
+
.plus(transactionTotalPreviouslyPaidItemFee);
|
|
1250
1285
|
}
|
|
1251
|
-
getTransactionBalanceDue(totalAmount, totalTendered, removeTotalTendered) {
|
|
1252
|
-
let balanceDue
|
|
1286
|
+
getTransactionBalanceDue(totalAmount, totalTendered, removeTotalTendered, transactionTotalPreviouslyPaidItemFee) {
|
|
1287
|
+
let balanceDue;
|
|
1288
|
+
if (transactionTotalPreviouslyPaidItemFee) {
|
|
1289
|
+
balanceDue = totalAmount.plus(transactionTotalPreviouslyPaidItemFee);
|
|
1290
|
+
}
|
|
1291
|
+
else {
|
|
1292
|
+
balanceDue = totalAmount;
|
|
1293
|
+
}
|
|
1253
1294
|
if (removeTotalTendered) {
|
|
1254
1295
|
balanceDue = balanceDue.minus(totalTendered.plus(this.denominationRounding));
|
|
1255
1296
|
}
|
|
@@ -46,6 +46,7 @@ export declare class TransactionReferenceLine extends BaseTransactionLine {
|
|
|
46
46
|
private _transactionTotal?;
|
|
47
47
|
private _originalReceiptCategory?;
|
|
48
48
|
private _timezoneOffsetInMinutes?;
|
|
49
|
+
private _alternateFiscalSequenceNumber?;
|
|
49
50
|
/**
|
|
50
51
|
* The create method is called by the transaction line factory to create an instance and initialize it from the
|
|
51
52
|
* data collected during the qualification process.
|
|
@@ -74,6 +75,7 @@ export declare class TransactionReferenceLine extends BaseTransactionLine {
|
|
|
74
75
|
get referenceNumber(): string;
|
|
75
76
|
get originalTradeType(): string;
|
|
76
77
|
get fiscalTransactionNumber(): string;
|
|
78
|
+
get alternateFiscalSequenceNumber(): number;
|
|
77
79
|
get invoiceFiscalTransactionNumber(): string;
|
|
78
80
|
get invoiceTransactionNumber(): number;
|
|
79
81
|
get fiscalTypeCode(): string;
|
|
@@ -106,7 +108,7 @@ export declare class TransactionReferenceLine extends BaseTransactionLine {
|
|
|
106
108
|
get workstationNumber(): number;
|
|
107
109
|
get orderReference(): IOrderReferenceInfo;
|
|
108
110
|
get originalPromotionCoupons(): IOriginalPromotionCouponInfo[];
|
|
109
|
-
protected constructor(lineNumber: number, lineType: string, tenantId: string, retailLocationId: string, deviceId: string, businessDayDate: string, transactionNumber: number, transactionId: string, transactionStartDateTime?: Date, transactionEndDateTime?: Date, transactionType?: TransactionType, inputSource?: string, closingState?: MerchandiseTransactionClosingState, zReportNumber?: string, fiscalId?: string, fiscalYReceiptNumber?: string, printerSerialNumber?: string, referenceNumber?: string, isTransactionForReturnReference?: boolean, fiscalReceiptDate?: string, taxLotteryCustomerCode?: string, isTransactionForOfflineReturnReference?: boolean, invoiceNumber?: string, workstationNumber?: number, orderReference?: IOrderReferenceInfo, originalTradeType?: string, storeName?: string, fiscalTransactionNumber?: string, fiscalTypeCode?: string, invoiceSequenceNumber?: number, invoiceFiscalTransactionNumber?: string, invoiceTransactionNumber?: number, orderFulfillmentType?: string, transactionTotal?: IMoney, originalPromotionCoupons?: IOriginalPromotionCouponInfo[], originalReceiptCategory?: ReceiptCategory, fiscalTransactionStartDateTime?: string, fiscalTransactionEndDateTime?: string, fiscalSignature?: IFiscalSignature, timezoneOffsetInMinutes?: number);
|
|
111
|
+
protected constructor(lineNumber: number, lineType: string, tenantId: string, retailLocationId: string, deviceId: string, businessDayDate: string, transactionNumber: number, transactionId: string, transactionStartDateTime?: Date, transactionEndDateTime?: Date, transactionType?: TransactionType, inputSource?: string, closingState?: MerchandiseTransactionClosingState, zReportNumber?: string, fiscalId?: string, fiscalYReceiptNumber?: string, printerSerialNumber?: string, referenceNumber?: string, isTransactionForReturnReference?: boolean, fiscalReceiptDate?: string, taxLotteryCustomerCode?: string, isTransactionForOfflineReturnReference?: boolean, invoiceNumber?: string, workstationNumber?: number, orderReference?: IOrderReferenceInfo, originalTradeType?: string, storeName?: string, fiscalTransactionNumber?: string, fiscalTypeCode?: string, invoiceSequenceNumber?: number, invoiceFiscalTransactionNumber?: string, invoiceTransactionNumber?: number, orderFulfillmentType?: string, transactionTotal?: IMoney, originalPromotionCoupons?: IOriginalPromotionCouponInfo[], originalReceiptCategory?: ReceiptCategory, fiscalTransactionStartDateTime?: string, fiscalTransactionEndDateTime?: string, fiscalSignature?: IFiscalSignature, timezoneOffsetInMinutes?: number, alternateFiscalSequenceNumber?: number);
|
|
110
112
|
protected newTransactionLine(): TransactionReferenceLine;
|
|
111
113
|
}
|
|
112
114
|
export declare function isTransactionReferenceLine(transactionLine: ITransactionLine): transactionLine is TransactionReferenceLine;
|
|
@@ -8,7 +8,7 @@ const receipt_1 = require("./receipt");
|
|
|
8
8
|
exports.TRANSACTION_REFERENCE_LINE_TYPE = "TransactionReference";
|
|
9
9
|
exports.START_POST_VOID_TRANSACTION_LINE_TYPE = "StartPostVoid";
|
|
10
10
|
class TransactionReferenceLine extends BaseTransactionLine_1.BaseTransactionLine {
|
|
11
|
-
constructor(lineNumber, lineType, tenantId, retailLocationId, deviceId, businessDayDate, transactionNumber, transactionId, transactionStartDateTime, transactionEndDateTime, transactionType, inputSource, closingState, zReportNumber, fiscalId, fiscalYReceiptNumber, printerSerialNumber, referenceNumber, isTransactionForReturnReference, fiscalReceiptDate, taxLotteryCustomerCode, isTransactionForOfflineReturnReference, invoiceNumber, workstationNumber, orderReference, originalTradeType, storeName, fiscalTransactionNumber, fiscalTypeCode, invoiceSequenceNumber, invoiceFiscalTransactionNumber, invoiceTransactionNumber, orderFulfillmentType, transactionTotal, originalPromotionCoupons, originalReceiptCategory, fiscalTransactionStartDateTime, fiscalTransactionEndDateTime, fiscalSignature, timezoneOffsetInMinutes) {
|
|
11
|
+
constructor(lineNumber, lineType, tenantId, retailLocationId, deviceId, businessDayDate, transactionNumber, transactionId, transactionStartDateTime, transactionEndDateTime, transactionType, inputSource, closingState, zReportNumber, fiscalId, fiscalYReceiptNumber, printerSerialNumber, referenceNumber, isTransactionForReturnReference, fiscalReceiptDate, taxLotteryCustomerCode, isTransactionForOfflineReturnReference, invoiceNumber, workstationNumber, orderReference, originalTradeType, storeName, fiscalTransactionNumber, fiscalTypeCode, invoiceSequenceNumber, invoiceFiscalTransactionNumber, invoiceTransactionNumber, orderFulfillmentType, transactionTotal, originalPromotionCoupons, originalReceiptCategory, fiscalTransactionStartDateTime, fiscalTransactionEndDateTime, fiscalSignature, timezoneOffsetInMinutes, alternateFiscalSequenceNumber) {
|
|
12
12
|
super(lineNumber, lineType);
|
|
13
13
|
this._tenantId = tenantId;
|
|
14
14
|
this._zReportNumber = zReportNumber;
|
|
@@ -48,6 +48,7 @@ class TransactionReferenceLine extends BaseTransactionLine_1.BaseTransactionLine
|
|
|
48
48
|
this._transactionTotal = transactionTotal;
|
|
49
49
|
this._originalReceiptCategory = originalReceiptCategory;
|
|
50
50
|
this._timezoneOffsetInMinutes = timezoneOffsetInMinutes;
|
|
51
|
+
this._alternateFiscalSequenceNumber = alternateFiscalSequenceNumber;
|
|
51
52
|
}
|
|
52
53
|
/**
|
|
53
54
|
* The create method is called by the transaction line factory to create an instance and initialize it from the
|
|
@@ -85,6 +86,7 @@ class TransactionReferenceLine extends BaseTransactionLine_1.BaseTransactionLine
|
|
|
85
86
|
const transactionNumber = collectedData.get("transactionNumber");
|
|
86
87
|
const originalTradeType = collectedData.get("originalTradeType");
|
|
87
88
|
const fiscalTransactionNumber = collectedData.get(Constants_1.CollectedDataKey.FiscalTransactionNumber);
|
|
89
|
+
const alternateFiscalSequenceNumber = collectedData.get(Constants_1.CollectedDataKey.AlternateFiscalSequenceNumber);
|
|
88
90
|
const fiscalTypeCode = collectedData.get(Constants_1.CollectedDataKey.FiscalTypeCode);
|
|
89
91
|
const fiscalTransactionStartDateTime = collectedData.get(Constants_1.CollectedDataKey.FiscalTransactionStartDateTime);
|
|
90
92
|
const fiscalTransactionEndDateTime = collectedData.get(Constants_1.CollectedDataKey.FiscalTransactionEndDateTime);
|
|
@@ -139,7 +141,7 @@ class TransactionReferenceLine extends BaseTransactionLine_1.BaseTransactionLine
|
|
|
139
141
|
const transactionTotal = collectedData.get(Constants_1.CollectedDataKey.TransactionTotal);
|
|
140
142
|
const originalReceiptCategory = collectedData.get(Constants_1.CollectedDataKey.OriginalReceiptCategory);
|
|
141
143
|
const timezoneOffsetInMinutes = collectedData.get(Constants_1.CollectedDataKey.TimezoneOffsetInMinutes);
|
|
142
|
-
return new TransactionReferenceLine(lineNumber, lineType, tenantId, retailLocationId, deviceId, businessDayDate, transactionNumber, transactionId, transactionStartDateTime, transactionEndDateTime, transactionType, inputSource, closingState, zReportNumber, fiscalId, fiscalYReceiptNumber, printerSerialNumber, referenceNumber, isTransactionForReturnReference, fiscalReceiptDate, taxLotteryCustomerCode, isTransactionForOfflineReturnReference, invoiceNumber, workstationNumber, orderReference, originalTradeType, storeName, fiscalTransactionNumber, fiscalTypeCode, invoiceSequenceNumber, invoiceFiscalTransactionNumber, invoiceTransactionNumber, orderFulfillmentType, transactionTotal, originalPromotionCoupons, originalReceiptCategory, fiscalTransactionStartDateTime, fiscalTransactionEndDateTime, fiscalSignature, timezoneOffsetInMinutes);
|
|
144
|
+
return new TransactionReferenceLine(lineNumber, lineType, tenantId, retailLocationId, deviceId, businessDayDate, transactionNumber, transactionId, transactionStartDateTime, transactionEndDateTime, transactionType, inputSource, closingState, zReportNumber, fiscalId, fiscalYReceiptNumber, printerSerialNumber, referenceNumber, isTransactionForReturnReference, fiscalReceiptDate, taxLotteryCustomerCode, isTransactionForOfflineReturnReference, invoiceNumber, workstationNumber, orderReference, originalTradeType, storeName, fiscalTransactionNumber, fiscalTypeCode, invoiceSequenceNumber, invoiceFiscalTransactionNumber, invoiceTransactionNumber, orderFulfillmentType, transactionTotal, originalPromotionCoupons, originalReceiptCategory, fiscalTransactionStartDateTime, fiscalTransactionEndDateTime, fiscalSignature, timezoneOffsetInMinutes, alternateFiscalSequenceNumber);
|
|
143
145
|
}
|
|
144
146
|
static createFromJsonObject(transactionLineJsonObj) {
|
|
145
147
|
const lineNumber = BaseTransactionLine_1.BaseTransactionLine.lineNumberFromJsonObject(transactionLineJsonObj);
|
|
@@ -158,6 +160,7 @@ class TransactionReferenceLine extends BaseTransactionLine_1.BaseTransactionLine
|
|
|
158
160
|
const transactionId = transactionLineJsonObj._transactionId;
|
|
159
161
|
const originalTradeType = transactionLineJsonObj._originalTradeType;
|
|
160
162
|
const fiscalTransactionNumber = transactionLineJsonObj._fiscalTransactionNumber;
|
|
163
|
+
const alternateFiscalSequenceNumber = transactionLineJsonObj._alternateFiscalSequenceNumber;
|
|
161
164
|
const invoiceFiscalTransactionNumber = transactionLineJsonObj._invoiceFiscalTransactionNumber;
|
|
162
165
|
const invoiceTransactionNumber = transactionLineJsonObj._invoiceTransactionNumber;
|
|
163
166
|
const fiscalTypeCode = transactionLineJsonObj._fiscalTypeCode;
|
|
@@ -188,7 +191,7 @@ class TransactionReferenceLine extends BaseTransactionLine_1.BaseTransactionLine
|
|
|
188
191
|
const originalPromotionCoupons = transactionLineJsonObj._originalPromotionCoupons;
|
|
189
192
|
const storeName = transactionLineJsonObj._storeName;
|
|
190
193
|
const invoiceSequenceNumber = transactionLineJsonObj._invoiceSequenceNumber;
|
|
191
|
-
const transactionReferenceLine = new TransactionReferenceLine(lineNumber, lineType, tenantId, retailLocationId, deviceId, businessDayDate, transactionNumber, transactionId, transactionStartDateTime, transactionEndDateTime, transactionType, inputSource, closingState, zReportNumber, fiscalId, fiscalYReceiptNumber, printerSerialNumber, referenceNumber, isTransactionForReturnReference, fiscalReceiptDate, taxLotteryCustomerCode, isTransactionForOfflineReturnReference, invoiceNumber, workstationNumber, orderReference, originalTradeType, storeName, fiscalTransactionNumber, fiscalTypeCode, invoiceSequenceNumber, invoiceFiscalTransactionNumber, invoiceTransactionNumber, orderFulfillmentType, transactionTotal, originalPromotionCoupons, originalReceiptCategory, fiscalTransactionStartDateTime, fiscalTransactionEndDateTime, fiscalSignature, timezoneOffsetInMinutes);
|
|
194
|
+
const transactionReferenceLine = new TransactionReferenceLine(lineNumber, lineType, tenantId, retailLocationId, deviceId, businessDayDate, transactionNumber, transactionId, transactionStartDateTime, transactionEndDateTime, transactionType, inputSource, closingState, zReportNumber, fiscalId, fiscalYReceiptNumber, printerSerialNumber, referenceNumber, isTransactionForReturnReference, fiscalReceiptDate, taxLotteryCustomerCode, isTransactionForOfflineReturnReference, invoiceNumber, workstationNumber, orderReference, originalTradeType, storeName, fiscalTransactionNumber, fiscalTypeCode, invoiceSequenceNumber, invoiceFiscalTransactionNumber, invoiceTransactionNumber, orderFulfillmentType, transactionTotal, originalPromotionCoupons, originalReceiptCategory, fiscalTransactionStartDateTime, fiscalTransactionEndDateTime, fiscalSignature, timezoneOffsetInMinutes, alternateFiscalSequenceNumber);
|
|
192
195
|
transactionReferenceLine.loadFromJsonObject(transactionLineJsonObj);
|
|
193
196
|
return transactionReferenceLine;
|
|
194
197
|
}
|
|
@@ -213,6 +216,9 @@ class TransactionReferenceLine extends BaseTransactionLine_1.BaseTransactionLine
|
|
|
213
216
|
get fiscalTransactionNumber() {
|
|
214
217
|
return this._fiscalTransactionNumber;
|
|
215
218
|
}
|
|
219
|
+
get alternateFiscalSequenceNumber() {
|
|
220
|
+
return this._alternateFiscalSequenceNumber;
|
|
221
|
+
}
|
|
216
222
|
get invoiceFiscalTransactionNumber() {
|
|
217
223
|
return this._invoiceFiscalTransactionNumber;
|
|
218
224
|
}
|
|
@@ -310,7 +316,7 @@ class TransactionReferenceLine extends BaseTransactionLine_1.BaseTransactionLine
|
|
|
310
316
|
return this._originalPromotionCoupons;
|
|
311
317
|
}
|
|
312
318
|
newTransactionLine() {
|
|
313
|
-
return new TransactionReferenceLine(this.lineNumber, this.lineType, this._tenantId, this._retailLocationId, this._deviceId, this._businessDayDate, this._transactionNumber, this._transactionId, this._transactionStartDateTime, this._transactionEndDateTime, this._transactionType, this._inputSource, this._closingState, this._zReportNumber, this._fiscalId, this._fiscalYReceiptNumber, this._printerSerialNumber, this._referenceNumber, this._isTransactionForReturnReference, this._fiscalReceiptDate, this._taxLotteryCustomerCode, this._isTransactionForOfflineReturnReference, this._invoiceNumber, this._workstationNumber, this._orderReference, this._originalTradeType, this._storeName, this._fiscalTransactionNumber, this._fiscalTypeCode, this._invoiceSequenceNumber, this._invoiceFiscalTransactionNumber, this._invoiceTransactionNumber, this._orderFulfillmentType, this._transactionTotal, this._originalPromotionCoupons, this._originalReceiptCategory, this._fiscalTransactionStartDateTime, this._fiscalTransactionEndDateTime, this.fiscalSignature, this._timezoneOffsetInMinutes);
|
|
319
|
+
return new TransactionReferenceLine(this.lineNumber, this.lineType, this._tenantId, this._retailLocationId, this._deviceId, this._businessDayDate, this._transactionNumber, this._transactionId, this._transactionStartDateTime, this._transactionEndDateTime, this._transactionType, this._inputSource, this._closingState, this._zReportNumber, this._fiscalId, this._fiscalYReceiptNumber, this._printerSerialNumber, this._referenceNumber, this._isTransactionForReturnReference, this._fiscalReceiptDate, this._taxLotteryCustomerCode, this._isTransactionForOfflineReturnReference, this._invoiceNumber, this._workstationNumber, this._orderReference, this._originalTradeType, this._storeName, this._fiscalTransactionNumber, this._fiscalTypeCode, this._invoiceSequenceNumber, this._invoiceFiscalTransactionNumber, this._invoiceTransactionNumber, this._orderFulfillmentType, this._transactionTotal, this._originalPromotionCoupons, this._originalReceiptCategory, this._fiscalTransactionStartDateTime, this._fiscalTransactionEndDateTime, this.fiscalSignature, this._timezoneOffsetInMinutes, this._alternateFiscalSequenceNumber);
|
|
314
320
|
}
|
|
315
321
|
}
|
|
316
322
|
exports.TransactionReferenceLine = TransactionReferenceLine;
|
|
@@ -48,6 +48,7 @@ export declare abstract class BaseFeeLineDecorator extends BaseLineDecorator<IFe
|
|
|
48
48
|
get lineNumberFromReturnCanonicalTransaction(): number;
|
|
49
49
|
get sublineIndexFromReturnCanonicalTransaction(): number;
|
|
50
50
|
get originalTransactionLineReference(): ITransactionLineReferenceType;
|
|
51
|
+
get taxIndicatorOnReceipt(): string;
|
|
51
52
|
protected constructor(lineDecoratorType: string, decoratedTransactionLine: IFeeLine, annotationDescription: string, annotationSourceType: string, annotationSourceLineNumber?: number, couldDecoratorAffectPricing?: boolean, couldDecoratorAffectTaxation?: boolean);
|
|
52
53
|
get taxGroupId(): string;
|
|
53
54
|
get taxByAuthority(): IAppliedTax[];
|
|
@@ -138,6 +138,9 @@ class BaseFeeLineDecorator extends BaseLineDecorator_1.BaseLineDecorator {
|
|
|
138
138
|
get originalTransactionLineReference() {
|
|
139
139
|
return this.decoratedTransactionLine.originalTransactionLineReference;
|
|
140
140
|
}
|
|
141
|
+
get taxIndicatorOnReceipt() {
|
|
142
|
+
return this.decoratedTransactionLine.taxIndicatorOnReceipt;
|
|
143
|
+
}
|
|
141
144
|
constructor(lineDecoratorType, decoratedTransactionLine, annotationDescription, annotationSourceType, annotationSourceLineNumber, couldDecoratorAffectPricing, couldDecoratorAffectTaxation) {
|
|
142
145
|
super(lineDecoratorType, decoratedTransactionLine, annotationDescription, annotationSourceType, annotationSourceLineNumber, couldDecoratorAffectPricing, couldDecoratorAffectTaxation);
|
|
143
146
|
}
|
|
@@ -48,6 +48,8 @@ export declare class FeeLine extends BaseTransactionLine implements IFeeLine, IC
|
|
|
48
48
|
private _quantityAllowed?;
|
|
49
49
|
private _itemLineReference?;
|
|
50
50
|
private _percent?;
|
|
51
|
+
private _prepaidAmount?;
|
|
52
|
+
private _prepaidTaxAmount?;
|
|
51
53
|
private _maximumAmount?;
|
|
52
54
|
private _returnRule?;
|
|
53
55
|
private _sublines?;
|
|
@@ -142,6 +144,8 @@ export declare class FeeLine extends BaseTransactionLine implements IFeeLine, IC
|
|
|
142
144
|
get maximumAmount(): Money;
|
|
143
145
|
get returnRule(): string;
|
|
144
146
|
get sublines(): IFeeSubline[];
|
|
147
|
+
get prepaidAmount(): Money;
|
|
148
|
+
get prepaidTaxAmount(): Money;
|
|
145
149
|
static feeTypeFromJsonObject(transactionLineJsonObj: any): FeeType;
|
|
146
150
|
static feeTypeFromCollectedData(collectedData: Readonly<Map<string, any>>): FeeType;
|
|
147
151
|
static taxGroupIdFromJsonObject(transactionLineJsonObj: any): string;
|
|
@@ -35,6 +35,8 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
|
|
|
35
35
|
this._returnRule = returnRule;
|
|
36
36
|
this._unitPrice = undefined;
|
|
37
37
|
this._sublines = undefined;
|
|
38
|
+
this._prepaidAmount = undefined;
|
|
39
|
+
this._prepaidTaxAmount = undefined;
|
|
38
40
|
}
|
|
39
41
|
/**
|
|
40
42
|
* The create method is called by the transaction line factory to create an instance and initialize it from the
|
|
@@ -96,16 +98,10 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
|
|
|
96
98
|
return this._feeId;
|
|
97
99
|
}
|
|
98
100
|
get couldAffectPricing() {
|
|
99
|
-
if (FeeLine.isPickupFulfilmentTransaction) {
|
|
100
|
-
return false;
|
|
101
|
-
}
|
|
102
101
|
return true;
|
|
103
102
|
}
|
|
104
103
|
get couldAffectTaxation() {
|
|
105
|
-
if (
|
|
106
|
-
return false;
|
|
107
|
-
}
|
|
108
|
-
else if (this._sublineFromOriginalItemFee !== undefined) {
|
|
104
|
+
if (this._sublineFromOriginalItemFee !== undefined) {
|
|
109
105
|
return true;
|
|
110
106
|
}
|
|
111
107
|
return this.couldAffectPricing;
|
|
@@ -253,6 +249,12 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
|
|
|
253
249
|
get sublines() {
|
|
254
250
|
return this._sublines;
|
|
255
251
|
}
|
|
252
|
+
get prepaidAmount() {
|
|
253
|
+
return this._prepaidAmount;
|
|
254
|
+
}
|
|
255
|
+
get prepaidTaxAmount() {
|
|
256
|
+
return this._prepaidTaxAmount;
|
|
257
|
+
}
|
|
256
258
|
static feeTypeFromJsonObject(transactionLineJsonObj) {
|
|
257
259
|
return transactionLineJsonObj._feeType;
|
|
258
260
|
}
|
|
@@ -414,6 +416,8 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
|
|
|
414
416
|
newTransactionFeeLine._sublines = this._sublines;
|
|
415
417
|
newTransactionFeeLine._taxGroupId = this._taxGroupId;
|
|
416
418
|
newTransactionFeeLine._taxByAuthority = this._taxByAuthority;
|
|
419
|
+
newTransactionFeeLine._prepaidAmount = this._prepaidAmount;
|
|
420
|
+
newTransactionFeeLine._prepaidTaxAmount = this._prepaidTaxAmount;
|
|
417
421
|
newTransactionFeeLine._taxExemptDisplayName = this._taxExemptDisplayName;
|
|
418
422
|
newTransactionFeeLine._taxExempt = this._taxExempt;
|
|
419
423
|
newTransactionFeeLine._preTaxExemptDetails = this._preTaxExemptDetails;
|
|
@@ -498,6 +502,12 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
|
|
|
498
502
|
if (!this._fulfillmentGroupIds && transactionLineJsonObj._fulfillmentGroupIds) {
|
|
499
503
|
this._fulfillmentGroupIds = transactionLineJsonObj._fulfillmentGroupIds;
|
|
500
504
|
}
|
|
505
|
+
this._prepaidAmount = transactionLineJsonObj._prepaidAmount
|
|
506
|
+
? new scp_component_business_core_1.Money(transactionLineJsonObj._prepaidAmount)
|
|
507
|
+
: undefined;
|
|
508
|
+
this._prepaidTaxAmount = transactionLineJsonObj._prepaidTaxAmount
|
|
509
|
+
? new scp_component_business_core_1.Money(transactionLineJsonObj._prepaidTaxAmount)
|
|
510
|
+
: undefined;
|
|
501
511
|
this.loadFeesByFulfillmentGroupFromJsonObject(transactionLineJsonObj);
|
|
502
512
|
}
|
|
503
513
|
loadTaxInformation(transactionLineJsonObj) {
|
|
@@ -534,6 +544,7 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
|
|
|
534
544
|
}
|
|
535
545
|
}
|
|
536
546
|
loadFromCollectedData(collectedData) {
|
|
547
|
+
const accountingCurrency = collectedData.get(Constants_1.CollectedDataKey.AccountingCurrency);
|
|
537
548
|
if (!this._feeId && collectedData.has(Constants_1.CollectedDataKey.FeeId)) {
|
|
538
549
|
this._feeId = collectedData.get(Constants_1.CollectedDataKey.FeeId);
|
|
539
550
|
}
|
|
@@ -610,6 +621,18 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
|
|
|
610
621
|
if (!this.taxByAuthority && collectedData.has(Constants_1.CollectedDataKey.TaxByAuthority)) {
|
|
611
622
|
this._taxByAuthority = collectedData.get(Constants_1.CollectedDataKey.TaxByAuthority);
|
|
612
623
|
}
|
|
624
|
+
if (collectedData.has(Constants_1.CollectedDataKey.PrepaidAmount)) {
|
|
625
|
+
this._prepaidAmount = collectedData.get(Constants_1.CollectedDataKey.PrepaidAmount);
|
|
626
|
+
}
|
|
627
|
+
else {
|
|
628
|
+
this._prepaidAmount = new scp_component_business_core_1.Money(0, accountingCurrency);
|
|
629
|
+
}
|
|
630
|
+
if (collectedData.has(Constants_1.CollectedDataKey.PrepaidTaxAmount)) {
|
|
631
|
+
this._prepaidTaxAmount = collectedData.get(Constants_1.CollectedDataKey.PrepaidTaxAmount);
|
|
632
|
+
}
|
|
633
|
+
else {
|
|
634
|
+
this._prepaidTaxAmount = new scp_component_business_core_1.Money(0, accountingCurrency);
|
|
635
|
+
}
|
|
613
636
|
}
|
|
614
637
|
if (collectedData.has(Constants_1.CollectedDataKey.OriginalTaxOverride)) {
|
|
615
638
|
const originalTaxOverride = collectedData.get(Constants_1.CollectedDataKey.OriginalTaxOverride);
|
|
@@ -43,6 +43,8 @@ export interface IFeeLine extends ITransactionLine, IVoidableLine {
|
|
|
43
43
|
readonly quantityAllowed?: boolean;
|
|
44
44
|
readonly itemLineReference?: ISameTransactionLineReference;
|
|
45
45
|
readonly percent?: string;
|
|
46
|
+
readonly prepaidAmount?: Money;
|
|
47
|
+
readonly prepaidTaxAmount?: Money;
|
|
46
48
|
readonly maximumAmount?: Money;
|
|
47
49
|
readonly returnRule?: string;
|
|
48
50
|
readonly sublines?: IFeeSubline[];
|
|
@@ -134,6 +134,7 @@ export declare abstract class BaseItemLineDecorator extends BaseLineDecorator<II
|
|
|
134
134
|
get extendedRegularAmount(): Money;
|
|
135
135
|
get originalRedemptionLoyaltyTransactionKeys(): string[];
|
|
136
136
|
get originalSaleLoyaltyTransactionKeys(): string[];
|
|
137
|
+
get taxIndicatorOnReceipt(): string;
|
|
137
138
|
setTransactionLineTaxes(transactionLineTaxes: ITransactionLineTaxes, extendedAmount?: Money): IItemLine;
|
|
138
139
|
setPricingSourceIndicator(calculationSource: SourceIndicator, dataSource: SourceIndicator): IItemLine;
|
|
139
140
|
setTaxationSourceIndicator(calculationSource: SourceIndicator, dataSource: SourceIndicator): IItemLine;
|
|
@@ -354,6 +354,9 @@ class BaseItemLineDecorator extends BaseLineDecorator_1.BaseLineDecorator {
|
|
|
354
354
|
get originalSaleLoyaltyTransactionKeys() {
|
|
355
355
|
return this.decoratedTransactionLine.originalSaleLoyaltyTransactionKeys;
|
|
356
356
|
}
|
|
357
|
+
get taxIndicatorOnReceipt() {
|
|
358
|
+
return this.decoratedTransactionLine.taxIndicatorOnReceipt;
|
|
359
|
+
}
|
|
357
360
|
setTransactionLineTaxes(transactionLineTaxes, extendedAmount) {
|
|
358
361
|
const itemLine = this.decoratedTransactionLine.setTransactionLineTaxes(transactionLineTaxes, extendedAmount || this.extendedAmount);
|
|
359
362
|
return this.updateDecoratedTransactionLine(itemLine);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aptos-scp/scp-component-store-selling-features-domain-model",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.12.0-patch.1",
|
|
4
4
|
"description": "This component library provides the common components to handle the coordination of processing the business events from the UI.",
|
|
5
5
|
"private": false,
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
@@ -57,12 +57,12 @@
|
|
|
57
57
|
"@aptos-scp/scp-component-pricing": "^7.54.1",
|
|
58
58
|
"@aptos-scp/scp-component-store-items": "^1.19.0",
|
|
59
59
|
"@aptos-scp/scp-component-store-selling-core": "^18.8.2",
|
|
60
|
-
"@aptos-scp/scp-component-taxation": "^5.
|
|
60
|
+
"@aptos-scp/scp-component-taxation": "^5.27.2",
|
|
61
61
|
"@aptos-scp/scp-component-user": "^1.4.0",
|
|
62
62
|
"@aptos-scp/scp-types-client-registration": "^1.4.0",
|
|
63
63
|
"@aptos-scp/scp-types-core-config": "^2.2.1",
|
|
64
|
-
"@aptos-scp/scp-types-commerce-devices": "^3.
|
|
65
|
-
"@aptos-scp/scp-types-commerce-transaction": "^1.
|
|
64
|
+
"@aptos-scp/scp-types-commerce-devices": "^3.3.0",
|
|
65
|
+
"@aptos-scp/scp-types-commerce-transaction": "^1.62.1",
|
|
66
66
|
"@aptos-scp/scp-types-customer": "^3.7.0",
|
|
67
67
|
"@aptos-scp/scp-types-einvoice": "^1.17.0",
|
|
68
68
|
"@aptos-scp/scp-types-inventory": "^2.0.0",
|
|
@@ -83,8 +83,8 @@
|
|
|
83
83
|
"@aptos-scp/scp-component-taxation": "^5.25.0",
|
|
84
84
|
"@aptos-scp/scp-component-user": "^1.4.0",
|
|
85
85
|
"@aptos-scp/scp-types-client-registration": "^1.4.0",
|
|
86
|
-
"@aptos-scp/scp-types-commerce-devices": "^3.
|
|
87
|
-
"@aptos-scp/scp-types-commerce-transaction": "^1.
|
|
86
|
+
"@aptos-scp/scp-types-commerce-devices": "^3.3.0",
|
|
87
|
+
"@aptos-scp/scp-types-commerce-transaction": "^1.62.1",
|
|
88
88
|
"@aptos-scp/scp-types-core": "^1.0.5",
|
|
89
89
|
"@aptos-scp/scp-types-core-config": "^2.2.1",
|
|
90
90
|
"@aptos-scp/scp-types-currency-conversion": "^1.2.0",
|
|
@@ -176,6 +176,9 @@
|
|
|
176
176
|
"extension": [
|
|
177
177
|
".ts"
|
|
178
178
|
],
|
|
179
|
+
"require": [
|
|
180
|
+
"ts-node/register"
|
|
181
|
+
],
|
|
179
182
|
"reporter": [
|
|
180
183
|
"text-summary",
|
|
181
184
|
"html",
|
|
@@ -186,9 +189,9 @@
|
|
|
186
189
|
"instrument": true,
|
|
187
190
|
"check-coverage": true,
|
|
188
191
|
"lines": 65,
|
|
189
|
-
"statements":
|
|
190
|
-
"functions":
|
|
191
|
-
"branches":
|
|
192
|
+
"statements": 66,
|
|
193
|
+
"functions": 41,
|
|
194
|
+
"branches": 52
|
|
192
195
|
},
|
|
193
196
|
"husky": {
|
|
194
197
|
"hooks": {
|