@unchainedshop/plugins 2.7.0 → 2.7.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/pricing/delivery-swiss-tax.js +3 -0
- package/lib/pricing/delivery-swiss-tax.js.map +1 -1
- package/lib/pricing/product-discount.js +11 -0
- package/lib/pricing/product-discount.js.map +1 -1
- package/lib/pricing/product-swiss-tax.js +3 -0
- package/lib/pricing/product-swiss-tax.js.map +1 -1
- package/package.json +17 -17
- package/src/pricing/delivery-swiss-tax.ts +6 -1
- package/src/pricing/product-discount.ts +12 -0
- package/src/pricing/product-swiss-tax.ts +6 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DeliveryPricingAdapter, DeliveryPricingDirector } from '@unchainedshop/core-delivery';
|
|
2
|
+
import { DeliveryPricingRowCategory, } from '@unchainedshop/types/delivery.pricing.js';
|
|
2
3
|
import { SwissTaxCategories } from './tax/ch.js';
|
|
3
4
|
const getTaxRate = ({ order, provider }) => {
|
|
4
5
|
const taxCategoryFromProvider = provider?.configuration?.find(({ key }) => {
|
|
@@ -47,6 +48,7 @@ export const DeliverySwissTax = {
|
|
|
47
48
|
pricingAdapter.resultSheet().addTax({
|
|
48
49
|
amount: taxAmount,
|
|
49
50
|
rate: taxRate,
|
|
51
|
+
baseCategory: DeliveryPricingRowCategory.Delivery,
|
|
50
52
|
meta: { adapter: DeliverySwissTax.key },
|
|
51
53
|
});
|
|
52
54
|
}
|
|
@@ -55,6 +57,7 @@ export const DeliverySwissTax = {
|
|
|
55
57
|
pricingAdapter.resultSheet().addTax({
|
|
56
58
|
amount: taxAmount,
|
|
57
59
|
rate: taxRate,
|
|
60
|
+
baseCategory: DeliveryPricingRowCategory.Delivery,
|
|
58
61
|
meta: { adapter: DeliverySwissTax.key },
|
|
59
62
|
});
|
|
60
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-swiss-tax.js","sourceRoot":"","sources":["../../src/pricing/delivery-swiss-tax.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"delivery-swiss-tax.js","sourceRoot":"","sources":["../../src/pricing/delivery-swiss-tax.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,8 +29,19 @@ const ProductDiscount = {
|
|
|
29
29
|
pricingAdapter.resultSheet().addTax({
|
|
30
30
|
amount: taxAmount * -1,
|
|
31
31
|
rate: taxRate,
|
|
32
|
+
discountId,
|
|
33
|
+
baseCategory: ProductPricingRowCategory.Discount,
|
|
32
34
|
meta: { adapter: ProductDiscount.key, discountId, ...meta },
|
|
33
35
|
});
|
|
36
|
+
if (!isNetPrice) {
|
|
37
|
+
pricingAdapter.resultSheet().addDiscount({
|
|
38
|
+
amount: taxAmount,
|
|
39
|
+
discountId,
|
|
40
|
+
isNetPrice: false,
|
|
41
|
+
isTaxable: false,
|
|
42
|
+
meta: { adapter: ProductDiscount.key, discountId, ...meta },
|
|
43
|
+
});
|
|
44
|
+
}
|
|
34
45
|
}
|
|
35
46
|
};
|
|
36
47
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-discount.js","sourceRoot":"","sources":["../../src/pricing/product-discount.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,yBAAyB,GAC1B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,WAAW,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGhE,MAAM,eAAe,GAAyD;IAC5E,GAAG,qBAAqB;IAExB,GAAG,EAAE,yCAAyC;IAC9C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,kCAAkC;IACzC,UAAU,EAAE,EAAE;IAEd,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE7D,MAAM,YAAY,GAAG,CACnB,QAAgD,EAChD,KAAa,EACb,qBAAmD,EACnD,EAAE;YACF,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;YAChC,MAAM,EAAE,UAAU,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,qBAAqB,CAAC;YACvE,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;YACjE,MAAM,SAAS,GAAG,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"product-discount.js","sourceRoot":"","sources":["../../src/pricing/product-discount.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
|
|
2
|
+
import { ProductPricingRowCategory, } from '@unchainedshop/types/products.pricing.js';
|
|
2
3
|
import { SwissTaxCategories } from './tax/ch.js';
|
|
3
4
|
export const getTaxRate = (context) => {
|
|
4
5
|
const { product, order } = context;
|
|
@@ -52,6 +53,7 @@ export const ProductSwissTax = {
|
|
|
52
53
|
pricingAdapter.resultSheet().addTax({
|
|
53
54
|
amount: taxAmount,
|
|
54
55
|
rate: taxRate,
|
|
56
|
+
baseCategory: ProductPricingRowCategory.Item,
|
|
55
57
|
meta: { adapter: ProductSwissTax.key },
|
|
56
58
|
});
|
|
57
59
|
}
|
|
@@ -60,6 +62,7 @@ export const ProductSwissTax = {
|
|
|
60
62
|
pricingAdapter.resultSheet().addTax({
|
|
61
63
|
amount: taxAmount,
|
|
62
64
|
rate: taxRate,
|
|
65
|
+
baseCategory: ProductPricingRowCategory.Item,
|
|
63
66
|
meta: { adapter: ProductSwissTax.key },
|
|
64
67
|
});
|
|
65
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-swiss-tax.js","sourceRoot":"","sources":["../../src/pricing/product-swiss-tax.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"product-swiss-tax.js","sourceRoot":"","sources":["../../src/pricing/product-swiss-tax.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAEL,yBAAyB,GAC1B,MAAM,0CAA0C,CAAC;AAGlD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAA4C,EAAE,EAAE;IACzE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEnC,MAAM,oBAAoB,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACtD,GAAG,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAC5D,CAAC;IACF,MAAM,WAAW,GACf,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,KAAK,EAAE,KAAK,oBAAoB,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CACtF,IAAI,kBAAkB,CAAC,OAAO,CAAC;IAElC,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;IAClF,IAAI,WAAW,GAAG,OAAO,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;IAEhD,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;YACjE,eAAe,EAAE,KAAK,CAAC,UAAU;SAClC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK,CAAC,cAAc,CAAC;QAExE,IAAI,OAAO,EAAE,WAAW,GAAG,EAAE,EAAE,CAAC;YAC9B,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,OAAO,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,IAAI,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAA2B;IACrD,GAAG,qBAAqB;IAExB,GAAG,EAAE,0CAA0C;IAC/C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,4BAA4B;IACnC,UAAU,EAAE,EAAE;IAEd,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAE3B,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,IAAI,CAAC,CAAC,MAAM,8BAA8B,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;oBACrD,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;gBACpC,CAAC;gBACD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;gBACpC,qBAAqB,CAAC,GAAG,CAAC,yCAAyC,OAAO,EAAE,CAAC,CAAC;gBAC9E,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,GAAG,EAAE,EAAE,EAAE;oBACvF,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;wBAC1D,cAAc,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;4BAC5C,GAAG,GAAG;4BACN,MAAM,EAAE,CAAC,SAAS;4BAClB,SAAS,EAAE,KAAK;4BAChB,UAAU,EAAE,KAAK;4BACjB,IAAI,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE;yBACvC,CAAC,CAAC;wBACH,cAAc,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;4BAClC,MAAM,EAAE,SAAS;4BACjB,IAAI,EAAE,OAAO;4BACb,YAAY,EAAE,yBAAyB,CAAC,IAAI;4BAC5C,IAAI,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE;yBACvC,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC;wBACvC,cAAc,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;4BAClC,MAAM,EAAE,SAAS;4BACjB,IAAI,EAAE,OAAO;4BACb,YAAY,EAAE,yBAAyB,CAAC,IAAI;4BAC5C,IAAI,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE;yBACvC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,sBAAsB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/plugins",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.1",
|
|
4
4
|
"main": "lib/plugins-index.js",
|
|
5
5
|
"types": "lib/plugins-index.d.ts",
|
|
6
6
|
"exports": {
|
|
@@ -88,22 +88,22 @@
|
|
|
88
88
|
"devDependencies": {
|
|
89
89
|
"@redis/client": "^1.5.14",
|
|
90
90
|
"@types/node": "^20.11.17",
|
|
91
|
-
"@unchainedshop/api": "^2.7.
|
|
92
|
-
"@unchainedshop/core-delivery": "^2.7.
|
|
93
|
-
"@unchainedshop/core-enrollments": "^2.7.
|
|
94
|
-
"@unchainedshop/core-filters": "^2.7.
|
|
95
|
-
"@unchainedshop/core-messaging": "^2.7.
|
|
96
|
-
"@unchainedshop/core-orders": "^2.7.
|
|
97
|
-
"@unchainedshop/core-payment": "^2.7.
|
|
98
|
-
"@unchainedshop/core-products": "^2.7.
|
|
99
|
-
"@unchainedshop/core-quotations": "^2.7.
|
|
100
|
-
"@unchainedshop/core-warehousing": "^2.7.
|
|
101
|
-
"@unchainedshop/core-worker": "^2.7.
|
|
102
|
-
"@unchainedshop/events": "^2.7.
|
|
103
|
-
"@unchainedshop/file-upload": "^2.7.
|
|
104
|
-
"@unchainedshop/logger": "^2.7.
|
|
105
|
-
"@unchainedshop/types": "^2.7.
|
|
106
|
-
"@unchainedshop/utils": "^2.7.
|
|
91
|
+
"@unchainedshop/api": "^2.7.1",
|
|
92
|
+
"@unchainedshop/core-delivery": "^2.7.1",
|
|
93
|
+
"@unchainedshop/core-enrollments": "^2.7.1",
|
|
94
|
+
"@unchainedshop/core-filters": "^2.7.1",
|
|
95
|
+
"@unchainedshop/core-messaging": "^2.7.1",
|
|
96
|
+
"@unchainedshop/core-orders": "^2.7.1",
|
|
97
|
+
"@unchainedshop/core-payment": "^2.7.1",
|
|
98
|
+
"@unchainedshop/core-products": "^2.7.1",
|
|
99
|
+
"@unchainedshop/core-quotations": "^2.7.1",
|
|
100
|
+
"@unchainedshop/core-warehousing": "^2.7.1",
|
|
101
|
+
"@unchainedshop/core-worker": "^2.7.1",
|
|
102
|
+
"@unchainedshop/events": "^2.7.1",
|
|
103
|
+
"@unchainedshop/file-upload": "^2.7.1",
|
|
104
|
+
"@unchainedshop/logger": "^2.7.1",
|
|
105
|
+
"@unchainedshop/types": "^2.7.1",
|
|
106
|
+
"@unchainedshop/utils": "^2.7.1",
|
|
107
107
|
"bluebird": "^3.7.2",
|
|
108
108
|
"event-iterator": "^2.0.0",
|
|
109
109
|
"express": "^4.18.2",
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { DeliveryPricingAdapter, DeliveryPricingDirector } from '@unchainedshop/core-delivery';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
DeliveryPricingRowCategory,
|
|
4
|
+
IDeliveryPricingAdapter,
|
|
5
|
+
} from '@unchainedshop/types/delivery.pricing.js';
|
|
3
6
|
|
|
4
7
|
import { Order } from '@unchainedshop/types/orders.js';
|
|
5
8
|
import { DeliveryProvider } from '@unchainedshop/types/delivery.js';
|
|
@@ -62,6 +65,7 @@ export const DeliverySwissTax: IDeliveryPricingAdapter = {
|
|
|
62
65
|
pricingAdapter.resultSheet().addTax({
|
|
63
66
|
amount: taxAmount,
|
|
64
67
|
rate: taxRate,
|
|
68
|
+
baseCategory: DeliveryPricingRowCategory.Delivery,
|
|
65
69
|
meta: { adapter: DeliverySwissTax.key },
|
|
66
70
|
});
|
|
67
71
|
} else {
|
|
@@ -69,6 +73,7 @@ export const DeliverySwissTax: IDeliveryPricingAdapter = {
|
|
|
69
73
|
pricingAdapter.resultSheet().addTax({
|
|
70
74
|
amount: taxAmount,
|
|
71
75
|
rate: taxRate,
|
|
76
|
+
baseCategory: DeliveryPricingRowCategory.Delivery,
|
|
72
77
|
meta: { adapter: DeliverySwissTax.key },
|
|
73
78
|
});
|
|
74
79
|
}
|
|
@@ -31,6 +31,7 @@ const ProductDiscount: IProductPricingAdapter<ProductDiscountConfiguration> = {
|
|
|
31
31
|
const { isNetPrice = false, taxRate, ...meta } = resolvedConfiguration;
|
|
32
32
|
const amount = calcUtils.applyRate(resolvedConfiguration, total);
|
|
33
33
|
const isTaxable = taxRate === undefined || taxRate === null;
|
|
34
|
+
|
|
34
35
|
pricingAdapter.resultSheet().addDiscount({
|
|
35
36
|
amount: amount * -1,
|
|
36
37
|
discountId,
|
|
@@ -43,8 +44,19 @@ const ProductDiscount: IProductPricingAdapter<ProductDiscountConfiguration> = {
|
|
|
43
44
|
pricingAdapter.resultSheet().addTax({
|
|
44
45
|
amount: taxAmount * -1,
|
|
45
46
|
rate: taxRate,
|
|
47
|
+
discountId,
|
|
48
|
+
baseCategory: ProductPricingRowCategory.Discount,
|
|
46
49
|
meta: { adapter: ProductDiscount.key, discountId, ...meta },
|
|
47
50
|
});
|
|
51
|
+
if (!isNetPrice) {
|
|
52
|
+
pricingAdapter.resultSheet().addDiscount({
|
|
53
|
+
amount: taxAmount,
|
|
54
|
+
discountId,
|
|
55
|
+
isNetPrice: false,
|
|
56
|
+
isTaxable: false,
|
|
57
|
+
meta: { adapter: ProductDiscount.key, discountId, ...meta },
|
|
58
|
+
});
|
|
59
|
+
}
|
|
48
60
|
}
|
|
49
61
|
};
|
|
50
62
|
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
IProductPricingAdapter,
|
|
4
|
+
ProductPricingRowCategory,
|
|
5
|
+
} from '@unchainedshop/types/products.pricing.js';
|
|
3
6
|
import { Product } from '@unchainedshop/types/products.js';
|
|
4
7
|
import { Order } from '@unchainedshop/types/orders.js';
|
|
5
8
|
import { SwissTaxCategories } from './tax/ch.js';
|
|
@@ -73,6 +76,7 @@ export const ProductSwissTax: IProductPricingAdapter = {
|
|
|
73
76
|
pricingAdapter.resultSheet().addTax({
|
|
74
77
|
amount: taxAmount,
|
|
75
78
|
rate: taxRate,
|
|
79
|
+
baseCategory: ProductPricingRowCategory.Item,
|
|
76
80
|
meta: { adapter: ProductSwissTax.key },
|
|
77
81
|
});
|
|
78
82
|
} else {
|
|
@@ -80,6 +84,7 @@ export const ProductSwissTax: IProductPricingAdapter = {
|
|
|
80
84
|
pricingAdapter.resultSheet().addTax({
|
|
81
85
|
amount: taxAmount,
|
|
82
86
|
rate: taxRate,
|
|
87
|
+
baseCategory: ProductPricingRowCategory.Item,
|
|
83
88
|
meta: { adapter: ProductSwissTax.key },
|
|
84
89
|
});
|
|
85
90
|
}
|