Skip to content

Commit 7c620dd

Browse files
committed
Revert JS changes
1 parent d22c6ea commit 7c620dd

10 files changed

Lines changed: 195 additions & 306 deletions

discounts/javascript/discount/default/src/generate_cart_run.liquid

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
{%- if flavor contains "vanilla-js" -%}
2+
// @ts-check
3+
4+
import {
5+
OrderDiscountSelectionStrategy,
6+
ProductDiscountSelectionStrategy,
7+
} from '../generated/api';
8+
29
/**
310
* @typedef {import("../generated/api").CartInput} CartInput
411
* @typedef {import("../generated/api").FunctionCartRunResult} FunctionCartRunResult
5-
* @typedef {import("../generated/api").OrderDiscountSelectionStrategy} OrderDiscountSelectionStrategy
6-
* @typedef {import("../generated/api").ProductDiscountSelectionStrategy} ProductDiscountSelectionStrategy
712
*/
13+
814
/**
915
* generateCartRun
1016
* @param {CartInput} input - The CartInput
@@ -138,4 +144,4 @@ export function generateCartRun(input: CartInput): FunctionCartRunResult {
138144
],
139145
};
140146
}
141-
{%- endif -%}
147+
{%- endif -%}
Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,48 @@
11
{%- if flavor contains "vanilla-js" -%}
2+
// @ts-check
3+
4+
import { DeliveryDiscountSelectionStrategy} from '../generated/api';
5+
26
/**
3-
* @typedef {import("../generated/api").CartInput} DeliveryInput
4-
* @typedef {import("../generated/api").FunctionCartRunResult} FunctionDeliveryRunResult
5-
* @typedef {import("../generated/api").OrderDiscountSelectionStrategy} DeliveryDiscountSelectionStrategy
7+
* @typedef {import("../generated/api").DeliveryInput} RunInput
8+
* @typedef {import("../generated/api").FunctionDeliveryRunResult} FunctionDeliveryRunResult
69
*/
710
/**
8-
* generateCartRun
9-
* @param {DeliveryInput} input - The DeliveryInput
11+
* generateDeliveryRun
12+
* @param {RunInput} input - The DeliveryInput
1013
* @returns {FunctionDeliveryRunResult} - The function result with discounts.
1114
*/
1215
export function generateDeliveryRun(input) {
13-
const firstDeliveryGroup = input.cart.deliveryGroups[0];
14-
if (!firstDeliveryGroup) {
15-
throw new Error('No delivery groups found');
16-
}
17-
return {
18-
operations: [
19-
{
20-
addDeliveryDiscounts: {
21-
candidates: [
22-
{
23-
message: 'FREE DELIVERY',
24-
targets: [
25-
{
26-
deliveryGroup: {
27-
id: firstDeliveryGroup.id,
28-
},
29-
},
30-
],
31-
value: {
32-
percentage: {
33-
value: 100,
34-
},
35-
},
36-
},
37-
],
38-
selectionStrategy: DeliveryDiscountSelectionStrategy.All,
39-
},
40-
},
41-
],
42-
};
16+
const firstDeliveryGroup = input.cart.deliveryGroups[0];
17+
if (!firstDeliveryGroup) {
18+
throw new Error('No delivery groups found');
19+
}
20+
return {
21+
operations: [
22+
{
23+
addDeliveryDiscounts: {
24+
candidates: [
25+
{
26+
message: 'FREE DELIVERY',
27+
targets: [
28+
{
29+
deliveryGroup: {
30+
id: firstDeliveryGroup.id,
31+
},
32+
},
33+
],
34+
value: {
35+
percentage: {
36+
value: 100,
37+
},
38+
},
39+
},
40+
],
41+
selectionStrategy: DeliveryDiscountSelectionStrategy.All,
42+
},
43+
},
44+
],
45+
};
4346
}
4447
{%- elsif flavor contains "typescript" -%}
4548
import {
@@ -83,4 +86,4 @@ export function generateDeliveryRun(
8386
],
8487
};
8588
}
86-
{%- endif -%}
89+
{%- endif -%}
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
{%- if flavor contains "vanilla-js" -%}
2-
export { generateCartRun } from './generate_cart_run';
3-
export { generateDeliveryRun } from './generate_delivery_run';
4-
{%- elsif flavor contains "typescript" -%}
5-
export {generateCartRun} from './generate_cart_run';
6-
export {generateDeliveryRun} from './generate_delivery_run';
7-
{%- endif -%}
1+
export * from './generate_cart_run';
2+
export * from './generate_delivery_run';

0 commit comments

Comments
 (0)